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

Rev 20638 – fixed logic for haryana pincodes

amit.gupta — Fri, 30 Dec 2016 13:39:54 +0530

amit.gupta – 1 file(s) modified
fixed logic for haryana pincodes

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

Rev 20637 – Added telangana

amit.gupta — Fri, 30 Dec 2016 13:38:15 +0530

amit.gupta – 1 file(s) modified
Added telangana

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

Rev 20601 – Only prod1 is for sales. Rest is off

amit.gupta — Mon, 26 Dec 2016 12:07:03 +0530

amit.gupta – 2 file(s) modified
Only prod1 is for sales.
Rest is off

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

Rev 20249 – Kept only relevent changes

amit.gupta — Tue, 02 Aug 2016 17:20:50 +0530

amit.gupta – 1 file(s) modified
Kept only relevent changes

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

Rev 20246 – Changed seller to HSSPL

amit.gupta — Tue, 02 Aug 2016 15:31:33 +0530

amit.gupta – 1 file(s) modified
Changed seller to HSSPL

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

Rev 20167 – new category delivery attempt failed added. Shipping charge re-evaluation after ...

aman.kumar — Wed, 13 Jul 2016 20:26:19 +0530

aman.kumar – 6 file(s) modified
new category delivery attempt failed added. Shipping charge re-evaluation after order cancellation

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 20123 –

kshitij.sood — Thu, 30 Jun 2016 21:09:40 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20116 –

kshitij.sood — Thu, 30 Jun 2016 15:20:21 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20111 – Return transaction thrift & service changes.

kshitij.sood — Wed, 29 Jun 2016 17:41:24 +0530

kshitij.sood – 5 file(s) modified
Return transaction thrift & service changes.

~ /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/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 20108 – Fixed

amit.gupta — Mon, 27 Jun 2016 19:39:39 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 20074 – Fixed unaccept

amit.gupta — Mon, 20 Jun 2016 18:49:11 +0530

amit.gupta – 1 file(s) modified
Fixed unaccept

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

Rev 20072 – Fixed warehouse address

amit.gupta — Mon, 20 Jun 2016 17:45:02 +0530

amit.gupta – 2 file(s) modified
Fixed warehouse address

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

Rev 20065 – Fixed order service

amit.gupta — Mon, 20 Jun 2016 13:18:11 +0530

amit.gupta – 4 file(s) modified
Fixed order service

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

Rev 20039 – Added none

amit.gupta — Thu, 16 Jun 2016 14:52:41 +0530

amit.gupta – 1 file(s) modified
Added none

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

Rev 20031 – Fixed field variables

amit.gupta — Thu, 16 Jun 2016 12:29:22 +0530

amit.gupta – 1 file(s) modified
Fixed field variables

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

Rev 20028 – Option to add delay in bulk.

kshitij.sood — Thu, 16 Jun 2016 12:18:19 +0530

kshitij.sood – 8 file(s) modified
Option to add delay in bulk.

~ /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/OrderServiceHandler.py
~ /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/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ShipmentDelayDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 20027 –

amit.gupta — Thu, 16 Jun 2016 11:30:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 20025 – Added changes related to company details/warehouse address

amit.gupta — Thu, 16 Jun 2016 09:03:01 +0530

amit.gupta – 18 file(s) modified
Added changes related to company details/warehouse address

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /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/purchase/main/model/PurchaseOrder.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/thriftpy/purchase/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/BuyerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SellerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 20024 – Removed warranty and expiry

kshitij.sood — Wed, 15 Jun 2016 17:23:36 +0530

kshitij.sood – 1 file(s) modified
Removed warranty and expiry

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

Rev 20021 – loader issue && fixes for refund transaction and refund order ...

aman.kumar — Wed, 15 Jun 2016 15:28:29 +0530

aman.kumar – 3 file(s) modified
loader issue && fixes for refund transaction and refund order scenario

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 19987 –

amit.gupta — Mon, 13 Jun 2016 16:07:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 19986 – Added change for Company 1 is set for now

amit.gupta — Mon, 13 Jun 2016 15:54:53 +0530

amit.gupta – 1 file(s) modified
Added change for Company 1 is set for now

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

Rev 19984 –

amit.gupta — Mon, 13 Jun 2016 09:24:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 19980 – Added address_id to order table

amit.gupta — Sun, 12 Jun 2016 22:26:14 +0530

amit.gupta – 13 file(s) modified
Added address_id to order table

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /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/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddress.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddressMapping.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19973 – Added changes related to company invoice

amit.gupta — Sun, 12 Jun 2016 14:57:06 +0530

amit.gupta – 13 file(s) modified
Added changes related to company invoice

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /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/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SellerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19960 –

amit.gupta — Fri, 10 Jun 2016 14:47:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 19953 – added changes related to new company

amit.gupta — Thu, 09 Jun 2016 19:22:13 +0530

amit.gupta – 2 file(s) modified
added changes related to new company

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

Rev 19950 – added changes related to new company

amit.gupta — Thu, 09 Jun 2016 17:13:57 +0530

amit.gupta – 7 file(s) modified
added changes related to new company

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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

Rev 19930 – Changing repayment date

manas — Tue, 07 Jun 2016 17:21:54 +0530

manas – 1 file(s) modified
Changing repayment date

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

Rev 19915 – Changes for settlement

manas — Mon, 06 Jun 2016 22:15:32 +0530

manas – 2 file(s) modified
Changes for settlement

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 19912 – Changes related to settlement

manas — Mon, 06 Jun 2016 21:45:44 +0530

manas – 8 file(s) modified
Changes related to settlement

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java
~ /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/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 19891 – Adding changes for credit outstanding payments

manas — Sat, 04 Jun 2016 14:06:00 +0530

manas – 2 file(s) modified
Adding changes for credit outstanding payments

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

Rev 19889 – Changes related to Outstanding payments

manas — Fri, 03 Jun 2016 21:56:41 +0530

manas – 10 file(s) modified
Changes related to Outstanding payments

~ /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/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/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 19873 – Adding default in sort

manas — Thu, 02 Jun 2016 13:25:10 +0530

manas – 1 file(s) modified
Adding default in sort

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

Rev 19872 – Adding default in sort

manas — Thu, 02 Jun 2016 13:19:59 +0530

manas – 1 file(s) modified
Adding default in sort

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

Rev 19871 – Adding default in sort

manas — Thu, 02 Jun 2016 13:13:43 +0530

manas – 1 file(s) modified
Adding default in sort

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

Rev 19868 – Adding changes for sorting in user sanctions

manas — Thu, 02 Jun 2016 12:48:28 +0530

manas – 4 file(s) modified
Adding changes for sorting in user sanctions

~ /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 19839 – Fixed unaccept_order

amit.gupta — Tue, 24 May 2016 18:16:35 +0530

amit.gupta – 1 file(s) modified
Fixed unaccept_order

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

Rev 19832 – Added unaccept order feature.

amit.gupta — Mon, 23 May 2016 12:31:00 +0530

amit.gupta – 12 file(s) modified
Added unaccept order feature.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/UnacceptConfirmationBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/UnacceptOrderhandler.java
~ /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/PendingStoreOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19821 – Committed by Manish Sharma for Return Process Implementation on May-19-2016

manish.sharma — Thu, 19 May 2016 18:48:03 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Return Process Implementation on May-19-2016

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