SmartDukaan – /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

Rev 6906 – Send delivery success mail with attachment in case of insurance.

rajveer — Thu, 28 Feb 2013 12:32:33 +0530

rajveer – 8 file(s) modified
Send delivery success mail with attachment in case of insurance.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6903 – Insurance feature for our website

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

anupam.singh – 59 file(s) modified
Insurance feature for our website

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /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/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/test/Test.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/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.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/model/v1/user/Line.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/resources/templates/thinheader.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/shipping.css
+ /trunk/Website/src/main/webapp/images/insurance.png
+ /trunk/Website/src/main/webapp/images/insuredStamp.png
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-result.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 6870 – Shift orders if and only if billing warehouse is set.

rajveer — Fri, 22 Feb 2013 17:03:10 +0530

rajveer – 1 file(s) modified
Shift orders if and only if billing warehouse is set.

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

Rev 6864 – Move all orders to correct warehouse in morning.

rajveer — Thu, 21 Feb 2013 16:33:44 +0530

rajveer – 1 file(s) modified
Move all orders to correct warehouse in morning.

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

Rev 6821 – Changes in logic for PO creation to include 1) MinStockLevel ...

amar.kumar — Thu, 14 Feb 2013 15:56:46 +0530

amar.kumar – 40 file(s) modified
Changes in logic for PO creation to include
1) MinStockLevel
2) Min number of days stock required

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /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/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /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/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemStockPurchaseParams.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/itemStockPurchaseParams.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/POType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 6789 – Update transfer price and lnc at the time of order ...

rajveer — Tue, 05 Feb 2013 18:35:54 +0530

rajveer – 1 file(s) modified
Update transfer price and lnc at the time of order acceptance and warehouse movement.

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

Rev 6787 – Removed code of matching of color temporarily.

rajveer — Tue, 05 Feb 2013 13:41:11 +0530

rajveer – 1 file(s) modified
Removed code of matching of color temporarily.

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

Rev 6786 – Changes to add Scan Records in case of OurExternal Billing ...

amar.kumar — Mon, 04 Feb 2013 17:20:51 +0530

amar.kumar – 1 file(s) modified
Changes to add Scan Records in case of OurExternal Billing while
1) cancelling order after billing
2) validating return products as usable or unusable

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

Rev 6782 – Auto accept orders from 9I5 instead of 901.

rajveer — Mon, 04 Feb 2013 14:36:27 +0530

rajveer – 1 file(s) modified
Auto accept orders from 9I5 instead of 901.

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

Rev 6768 – Change in the arguments of method call for OursExternalBilling

amar.kumar — Wed, 30 Jan 2013 16:49:42 +0530

amar.kumar – 1 file(s) modified
Change in the arguments of method call for OursExternalBilling

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

Rev 6764 – Remove extra spaces from serialnumber and itemnumber.

rajveer — Wed, 30 Jan 2013 15:40:45 +0530

rajveer – 1 file(s) modified
Remove extra spaces from serialnumber and itemnumber.

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

Rev 6763 – Changes for Ours_External Billing

amar.kumar — Wed, 30 Jan 2013 15:27:21 +0530

amar.kumar – 1 file(s) modified
Changes for Ours_External Billing

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

Rev 6757 – Updated case temporarily.

rajveer — Tue, 29 Jan 2013 17:04:21 +0530

rajveer – 1 file(s) modified
Updated case temporarily.

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

Rev 6753 – Corrected comment.

rajveer — Tue, 29 Jan 2013 15:41:13 +0530

rajveer – 1 file(s) modified
Corrected comment.

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

Rev 6751 – Changes for billing of OURS EXTERNAL and changes for nlc ...

amar.kumar — Tue, 29 Jan 2013 14:58:50 +0530

amar.kumar – 6 file(s) modified
Changes for billing of OURS EXTERNAL and changes for nlc in InventoryService

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.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

Rev 6745 – While marking orders as delivered, we now commit the session ...

anupam.singh — Tue, 29 Jan 2013 12:02:30 +0530

anupam.singh – 1 file(s) modified
While marking orders as delivered, we now commit the session for each order individually instead of doing a bulk commit.

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

Rev 6744 – Scan out in case of after billing olny.

rajveer — Mon, 28 Jan 2013 17:00:08 +0530

rajveer – 1 file(s) modified
Scan out in case of after billing olny.

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

Rev 6742 – Coupon code should have been passed after arguments in createCoupon

anupam.singh — Sun, 27 Jan 2013 10:23:37 +0530

anupam.singh – 1 file(s) modified
Coupon code should have been passed after arguments in createCoupon

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

Rev 6741 – Passing empty coupon code while marking deliverd

anupam.singh — Sat, 26 Jan 2013 20:17:15 +0530

anupam.singh – 1 file(s) modified
Passing empty coupon code while marking deliverd

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

Rev 6736 – Added emi discount logic.

amit.gupta — Fri, 25 Jan 2013 15:42:43 +0530

amit.gupta – 22 file(s) modified
Added emi discount logic.

~ /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/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.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/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 6735 – Adding Sale Scan for Reshipped Orders when same product is ...

amar.kumar — Fri, 25 Jan 2013 14:36:10 +0530

amar.kumar – 1 file(s) modified
Adding Sale Scan for Reshipped Orders when same product is sent for reshipped order when billed from our warehouse

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

Rev 6734 – Adding permanent and temporary serviceAvailability flags

anupam.singh — Fri, 25 Jan 2013 01:24:01 +0530

anupam.singh – 2 file(s) modified
Adding permanent and temporary serviceAvailability flags

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

Rev 6728 – Update courier delivery estimate at the time of order shipping.

rajveer — Wed, 23 Jan 2013 13:03:43 +0530

rajveer – 1 file(s) modified
Update courier delivery estimate at the time of order shipping.

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