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

Rev 7198 – Changes for 1) Adding dealtext, freebieItemId to Push to production ...

amar.kumar — Fri, 26 Apr 2013 13:03:06 +0530

amar.kumar – 3 file(s) modified
Changes for
1) Adding dealtext, freebieItemId to Push to production
2) Adding dealtext,freebieItemId and extra-info to Hotspotdashboard
3) Changes in customer communication mails to accomodate freebies
4) Adding extra conditions for billing of freebie

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7190 – Changes for Freebie Order Automation Reviewed by Amit Gupta

amar.kumar — Thu, 25 Apr 2013 15:17:13 +0530

amar.kumar – 48 file(s) modified
Changes for Freebie Order Automation

Reviewed by Amit Gupta

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/FreebieItem.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitFreebieOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitFreebieOrderEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitFreebieOrderBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitFreebieOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitFreebieOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitFreebieOrderResponse.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.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/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/FreebieItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 7181 – Changed name from Amit to Shiv.

rajveer — Thu, 18 Apr 2013 18:09:12 +0530

rajveer – 1 file(s) modified
Changed name from Amit to Shiv.

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

Rev 7180 – Store serial number in case of billing with hotspot.

rajveer — Thu, 18 Apr 2013 18:02:58 +0530

rajveer – 1 file(s) modified
Store serial number in case of billing with hotspot.

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

Rev 7172 – Searching a mobile number now filtered by storeId as well

anupam.singh — Wed, 17 Apr 2013 16:14:46 +0530

anupam.singh – 8 file(s) modified
Searching a mobile number now filtered by storeId as well

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm
~ /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 7169 – Changes in ReportController of RechargeWebapp 1.Added search by device ...

anupam.singh — Wed, 17 Apr 2013 14:59:38 +0530

anupam.singh – 15 file(s) modified
Changes in ReportController of RechargeWebapp
1.Added search by device number
2.Ability to download collection report for today
3.Reprint Invoice
4.Request new password

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm
~ /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/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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HotspotStore.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7163 – Reconcile wallet balance. Also process unknown recharges as per expected.

rajveer — Tue, 16 Apr 2013 18:05:23 +0530

rajveer – 2 file(s) modified
Reconcile wallet balance. Also process unknown recharges as per expected.

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

Rev 7151 – Enhanced functionalities for On store recharge.

amit.gupta — Mon, 15 Apr 2013 11:49:16 +0530

amit.gupta – 15 file(s) modified
Enhanced functionalities for On store recharge.

Rev 7139 – Store Recharge added.

amit.gupta — Thu, 11 Apr 2013 11:43:10 +0530

amit.gupta – 8 file(s) modified
Store Recharge added.

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.java
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7127 – Added process to refund store recharge transactions.

rajveer — Tue, 09 Apr 2013 13:10:43 +0530

rajveer – 3 file(s) modified
Added process to refund store recharge transactions.

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

Rev 7125 – FRC handling and Invalid circle handling in case of issuing ...

amit.gupta — Mon, 08 Apr 2013 15:07:20 +0530

amit.gupta – 7 file(s) modified
FRC handling and Invalid circle handling in case of issuing new sim card

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.java
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/frc-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 7122 – Corrected spelling mistake.

rajveer — Sat, 06 Apr 2013 14:20:36 +0530

rajveer – 1 file(s) modified
Corrected spelling mistake.

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

Rev 7120 – Added operator series in operator circle

rajveer — Fri, 05 Apr 2013 18:53:04 +0530

rajveer – 2 file(s) modified
Added operator series in operator circle

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

Rev 7109 – Method to print invoice

anupam.singh — Fri, 05 Apr 2013 13:57:47 +0530

anupam.singh – 7 file(s) modified
Method to print invoice

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.java
~ /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 7101 – Rechargetype convert to string.

rajveer — Thu, 04 Apr 2013 17:47:10 +0530

rajveer – 1 file(s) modified
Rechargetype convert to string.

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

Rev 7096 – Changes for rechargeWebapp

anupam.singh — Thu, 04 Apr 2013 15:40:53 +0530

anupam.singh – 26 file(s) modified
Changes for rechargeWebapp

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/authfail.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm (copied from /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm@7087)
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm
~ /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/order/impl/model/TelecomCircle.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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HotspotStore.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TelecomCircle.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7084 – Get all recharge transactions

rajveer — Wed, 03 Apr 2013 16:04:09 +0530

rajveer – 4 file(s) modified
Get all recharge transactions

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

Rev 7080 – Changes in RechargeWebapp

anupam.singh — Wed, 03 Apr 2013 14:18:10 +0530

anupam.singh – 19 file(s) modified
Changes in RechargeWebapp

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.java
~ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /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/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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FRC.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7076 – Added discount amount.

rajveer — Tue, 02 Apr 2013 19:00:55 +0530

rajveer – 2 file(s) modified
Added discount amount.

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

Rev 7075 – Added support to handle transactions for recharge transactions.

rajveer — Tue, 02 Apr 2013 18:26:49 +0530

rajveer – 9 file(s) modified
Added support to handle transactions for recharge transactions.

~ /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/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.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 7073 – Changes for rechargeFromStore

anupam.singh — Tue, 02 Apr 2013 16:12:55 +0530

anupam.singh – 25 file(s) modified
Changes for rechargeFromStore

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
x /RechargeDashboard/src/main/webapp/css/common.css
+ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css (copied from /RechargeDashboard/src/main/webapp/css/common.css@7068)
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/service-provider.vm
~ /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/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Company.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PayMethod.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletForCompany.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletHistoryForCompany.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7072 – Fixed small bug.

rajveer — Tue, 02 Apr 2013 14:58:22 +0530

rajveer – 1 file(s) modified
Fixed small bug.

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

Rev 7040 – Sending binary 0 for cases where insurance policy doc is ...

amar.kumar — Sun, 24 Mar 2013 23:36:19 +0530

amar.kumar – 2 file(s) modified
Sending binary 0 for cases where insurance policy doc is none.

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

Rev 7033 – Setting default insurer and insuranceAmount as 0

anupam.singh — Fri, 22 Mar 2013 17:40:33 +0530

anupam.singh – 3 file(s) modified
Setting default insurer and insuranceAmount as 0

~ /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/test/Test.py

Rev 7019 – Remove code to check insurer at the time of receive ...

rajveer — Thu, 21 Mar 2013 18:03:50 +0530

rajveer – 1 file(s) modified
Remove code to check insurer at the time of receive return.

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

Rev 6990 – Added arguments in transaction client

rajveer — Thu, 14 Mar 2013 18:37:41 +0530

rajveer – 2 file(s) modified
Added arguments in transaction client

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

Rev 6988 – Added support to fetch invoice number

rajveer — Thu, 14 Mar 2013 17:12:18 +0530

rajveer – 9 file(s) modified
Added support to fetch invoice number

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InvoiceController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/invoice-show.vm

Rev 6985 – Added capability to change the shipping address of an order ...

anupam.singh — Wed, 13 Mar 2013 16:56:30 +0530

anupam.singh – 10 file(s) modified
Added capability to change the shipping address of an order by outbound team

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /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 6980 – Added a method to generate hotspot invoice

anupam.singh — Tue, 12 Mar 2013 15:52:02 +0530

anupam.singh – 1 file(s) modified
Added a method to generate hotspot invoice

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

Rev 6969 – Change to set Order's invoice Number only after every other ...

amar.kumar — Thu, 07 Mar 2013 11:51:49 +0530

amar.kumar – 1 file(s) modified
Change to set Order's invoice Number only after every other operation is completed successfully in add_billing_details method

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

Rev 6957 – CC delivery success email in case of insurance.

rajveer — Wed, 06 Mar 2013 12:30:48 +0530

rajveer – 1 file(s) modified
CC delivery success email in case of insurance.

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

Rev 6947 – Changed filename of insurance policy document and read instructions.

rajveer — Tue, 05 Mar 2013 15:42:30 +0530

rajveer – 2 file(s) modified
Changed filename of insurance policy document and read instructions.

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

Rev 6943 – Changing Store returned Orders to go to RTO status instead ...

amar.kumar — Tue, 05 Mar 2013 14:14:26 +0530

amar.kumar – 1 file(s) modified
Changing Store returned Orders to go to RTO status instead of ReturnInTransit

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

Rev 6927 – Italisize the insurance line.

rajveer — Mon, 04 Mar 2013 15:07:55 +0530

rajveer – 1 file(s) modified
Italisize the insurance line.

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

Rev 6921 – Validate cart now applies insurance. Rule for emi coupon updated ...

anupam.singh — Fri, 01 Mar 2013 19:37:33 +0530

anupam.singh – 11 file(s) modified
Validate cart now applies insurance.
Rule for emi coupon updated to handle insurance amount
Signature for get insuranceAmount changed
JS validation for insuranceDetails updated
In case of discounts (not GV's) we reduce the price of insurance also
Added new Terms & conditions to policy doc

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /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/promotionrules/rule_specific_emi_discount_on_specific_items.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 6916 – NIA logo for insurance policy pdf to be mailed to ...

anupam.singh — Fri, 01 Mar 2013 00:41:39 +0530

anupam.singh – 3 file(s) modified
NIA logo for insurance policy pdf to be mailed to customer.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/resources
+ /trunk/PyProj/src/shop2020/model/v1/order/resources/nia-logo.jpg

Rev 6915 – Option to download policy doc from my purchases Using New ...

anupam.singh — Thu, 28 Feb 2013 20:49:18 +0530

anupam.singh – 7 file(s) modified
Option to download policy doc from my purchases
Using New India Assurance icon on cart page
Added new T&c to policy doc
in insurancedetailfor order table isDeclared field is 0 by default

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
+ /trunk/Website/src/main/webapp/images/insurance.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm

Rev 6914 – Name of file changed and made variable as string.

rajveer — Thu, 28 Feb 2013 17:54:28 +0530

rajveer – 2 file(s) modified
Name of file changed and made variable as string.

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

Rev 6912 – Added insurance to invoice Handling recieve return and clone order ...

anupam.singh — Thu, 28 Feb 2013 17:30:15 +0530

anupam.singh – 7 file(s) modified
Added insurance to invoice
Handling recieve return and clone order for insurance
Added theft insurance to header
validations for dob and guardianName fields
Added insurance expiry date on CRM

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 6911 – Insurance amount as string at the time of sending mail,

rajveer — Thu, 28 Feb 2013 16:24:07 +0530

rajveer – 1 file(s) modified
Insurance amount as string at the time of sending mail,

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