SmartDukaan – /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 2536 – Added support to have an order picked up from a ...

chandranshu — Tue, 12 Jul 2011 17:07:09 +0530

chandranshu – 7 file(s) modified
Added support to have an order picked up from a customer in case of DOA

Rev 2339 – Started updating order status description in case of payment failure

chandranshu — Mon, 27 Jun 2011 13:35:32 +0530

chandranshu – 1 file(s) modified
Started updating order status description in case of payment failure

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 2242 – Removed access of non existing properties: lineitem.discounted_price and order.discounted_amount

varun.gupta — Fri, 17 Jun 2011 15:30:26 +0530

varun.gupta – 1 file(s) modified
Removed access of non existing properties: lineitem.discounted_price and order.discounted_amount

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 2220 – Silently ignore AWB nos not in our list

chandranshu — Thu, 16 Jun 2011 14:03:47 +0530

chandranshu – 1 file(s) modified
Silently ignore AWB nos not in our list

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 2219 – Coupon code now being stored in Transaction. discounted_price and discounted_amount ...

varun.gupta — Thu, 16 Jun 2011 13:43:14 +0530

varun.gupta – 11 file(s) modified
Coupon code now being stored in Transaction. discounted_price and discounted_amount fields dropped from lineitem and order tables.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 2050 – Trac #335 - Prices will be preceded by 'Rs.' and ...

varun.gupta — Thu, 02 Jun 2011 13:51:31 +0530

varun.gupta – 1 file(s) modified
Trac #335 - Prices will be preceded by 'Rs.' and have two digits after decimal in Order confirmation email.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1976 – Promotion Service code and relevant changes in other services

varun.gupta — Mon, 30 May 2011 19:20:16 +0530

varun.gupta – 19 file(s) modified
Promotion Service code and relevant changes in other services

+ /trunk/PyProj/src/shop2020/clients/PromotionClient.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
+ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/user/PromotionServer.py
+ /trunk/PyProj/src/shop2020/model/v1/user/test/PromotionTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/__init__.py

Rev 1911 – Added script to modify order status

chandranshu — Mon, 23 May 2011 13:07:31 +0530

chandranshu – 3 file(s) modified
Added script to modify order status

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/EditOrderDetails.py

Rev 1894 – Added getAddressById.

vikas — Thu, 19 May 2011 19:03:30 +0530

vikas – 5 file(s) modified
Added getAddressById.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 1886 – Ticket #380. Added Last 10 Orders to Statistics page.

ankur.singhal — Wed, 18 May 2011 19:05:27 +0530

ankur.singhal – 8 file(s) modified
Ticket #380. Added Last 10 Orders to Statistics page.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 1742 – Corrected the email message

rajveer — Fri, 06 May 2011 11:23:10 +0530

rajveer – 1 file(s) modified
Corrected the email message

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1730 – Adjustment of delivery time taking into account Holidays and Sundays.

ankur.singhal — Thu, 05 May 2011 16:19:46 +0530

ankur.singhal – 11 file(s) modified
Adjustment of delivery time taking into account Holidays and Sundays.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
+ /trunk/PyProj/src/shop2020/logistics/service/script/HolidaysLoader.py
+ /trunk/PyProj/src/shop2020/logistics/service/test/TestHolidays.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/test/TestDeliveryEstimate.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 1627 – added methods in PaymentsHandler and OrderServiceHandler for getting statistics. (max ...

ankur.singhal — Mon, 02 May 2011 11:22:20 +0530

ankur.singhal – 8 file(s) modified
added methods in PaymentsHandler and OrderServiceHandler for getting statistics. (max & min order amount, max & min payment amount, distinct customers who have bought)

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/payments/impl/PaymentsHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py

Rev 1596 – Added methods for getting registered users count and valid orders ...

ankur.singhal — Fri, 29 Apr 2011 12:05:49 +0530

ankur.singhal – 9 file(s) modified
Added methods for getting registered users count and valid orders count. These methods will be used for statistics in Support.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 1569 – Modified date format and HTML formatting of transaction info email.

varun.gupta — Wed, 27 Apr 2011 17:54:04 +0530

varun.gupta – 1 file(s) modified
Modified date format and HTML formatting of transaction info email.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1565 – Modified date format in Transaction Info email to user

varun.gupta — Wed, 27 Apr 2011 15:45:38 +0530

varun.gupta – 1 file(s) modified
Modified date format in Transaction Info email to user

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1528 – Ref: Ticket#279 --> customer can view only his/her order & ...

ankur.singhal — Tue, 26 Apr 2011 15:47:33 +0530

ankur.singhal – 4 file(s) modified
Ref: Ticket#279 --> customer can view only his/her order & payment details

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 1493 – Return all transactions/payments when status passed is None.

vikas — Thu, 21 Apr 2011 16:49:04 +0530

vikas – 2 file(s) modified
Return all transactions/payments when status passed is None.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py

Rev 1483 – Logic for selecting cancellable orders modified in get_cancellable_orders_for_customer()

varun.gupta — Thu, 21 Apr 2011 11:38:17 +0530

varun.gupta – 1 file(s) modified
Logic for selecting cancellable orders modified in get_cancellable_orders_for_customer()

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1479 – reconciliation of undelivered reports done till last midnight instead of ...

ankur.singhal — Wed, 20 Apr 2011 18:57:27 +0530

ankur.singhal – 1 file(s) modified
reconciliation of undelivered reports done till last midnight instead of current time as courier company would have sent the records updated till midnight.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1405 – enhanced service to get undelivered orders and print the report ...

ankur.singhal — Fri, 15 Apr 2011 15:18:30 +0530

ankur.singhal – 3 file(s) modified
enhanced service to get undelivered orders and print the report in csv format. Ref: Ticket #261

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/UndeliveredOrdersReport.py

Rev 1404 – Call to method sending transaction info email removed

varun.gupta — Fri, 15 Apr 2011 15:15:04 +0530

varun.gupta – 1 file(s) modified
Call to method sending transaction info email removed

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1398 – Functionality to enqueue transaction info email implemented

varun.gupta — Wed, 13 Apr 2011 18:28:49 +0530

varun.gupta – 6 file(s) modified
Functionality to enqueue transaction info email implemented

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 1382 – Two methods added to return cancellable & returnable orders of ...

varun.gupta — Wed, 13 Apr 2011 11:01:49 +0530

varun.gupta – 6 file(s) modified
Two methods added to return cancellable & returnable orders of a user

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 1351 – Code, to email transaction info, to customer modified to call ...

varun.gupta — Mon, 11 Apr 2011 12:31:34 +0530

varun.gupta – 2 file(s) modified
Code, to email transaction info, to customer modified to call HelperClient.sendMail()

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 1341 – Added support to get the transfer price from the vendor ...

chandranshu — Fri, 08 Apr 2011 19:11:02 +0530

chandranshu – 5 file(s) modified
Added support to get the transfer price from the vendor item pricing table after the warehouse has been decided

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 1334 – Added the catalog for 7th April

chandranshu — Fri, 08 Apr 2011 16:39:41 +0530

chandranshu – 6 file(s) modified
Added the catalog for 7th April

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-07-Apr-2011.xls
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 1276 – Added a method to print the details of a lineitem ...

chandranshu — Tue, 05 Apr 2011 19:35:20 +0530

chandranshu – 2 file(s) modified
Added a method to print the details of a lineitem to the LineItem entity class. Surrounded the email sending code in a try-excpet block

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 1262 – Functionality to email the customer on successful payment, added

varun.gupta — Tue, 05 Apr 2011 11:10:13 +0530

varun.gupta – 1 file(s) modified
Functionality to email the customer on successful payment, added

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1246 – Added uncommitted code for NDR reports

chandranshu — Sun, 03 Apr 2011 17:57:10 +0530

chandranshu – 6 file(s) modified
Added uncommitted code for NDR reports

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py

Rev 1225 – Batch numbers will now be generated incrementally

chandranshu — Thu, 31 Mar 2011 15:40:52 +0530

chandranshu – 2 file(s) modified
Batch numbers will now be generated incrementally

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 1220 – Added batchNo and serialNo columns to order and support for ...

chandranshu — Thu, 31 Mar 2011 14:08:39 +0530

chandranshu – 7 file(s) modified
Added batchNo and serialNo columns to order and support for batching orders

Rev 1219 – Update the status description when the payment is received

chandranshu — Thu, 31 Mar 2011 12:36:48 +0530

chandranshu – 1 file(s) modified
Update the status description when the payment is received

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 1217 – Added extra conditions to check that the item was marked ...

chandranshu — Thu, 31 Mar 2011 11:57:21 +0530

chandranshu – 2 file(s) modified
Added extra conditions to check that the item was marked as out of stock 2 days ago

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/MoveOrdersToPendingQueue.py

Rev 1208 – Added support for a out of stock timestamp

chandranshu — Wed, 30 Mar 2011 18:52:23 +0530

chandranshu – 7 file(s) modified
Added support for a out of stock timestamp

Rev 1149 – Splitted the addBillingDetails method to add jacket number separately

chandranshu — Fri, 25 Mar 2011 16:26:31 +0530

chandranshu – 4 file(s) modified
Splitted the addBillingDetails method to add jacket number separately

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 1135 – Added support to process RTO orders as well

chandranshu — Thu, 24 Mar 2011 19:06:59 +0530

chandranshu – 5 file(s) modified
Added support to process RTO orders as well

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 1132 – Added support for updating the delivery timestamp and receiver info ...

chandranshu — Thu, 24 Mar 2011 18:21:09 +0530

chandranshu – 9 file(s) modified
Added support for updating the delivery timestamp and receiver info of an order

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script
+ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/PyProj/src/shop2020/utils/EmailAttachmentDownloader.py

Rev 1113 – Added pickup time to order and a method to update ...

chandranshu — Wed, 23 Mar 2011 14:32:18 +0530

chandranshu – 6 file(s) modified
Added pickup time to order and a method to update it

Rev 995 – Added methods to get Orders for a supplied range of ...

varun.gupta — Tue, 15 Mar 2011 17:07:25 +0530

varun.gupta – 2 file(s) modified
Added methods to get Orders for a supplied range of Billing dates.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py