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

Rev 22703 – Refund to wallet in case order gets cancelled before it ...

amit.gupta — Fri, 20 Oct 2017 11:44:52 +0530

amit.gupta – 1 file(s) modified
Refund to wallet in case order gets cancelled before it gets delivered.

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

Rev 22697 – Removed unnecessary code from accept order.

amit.gupta — Thu, 19 Oct 2017 09:53:21 +0530

amit.gupta – 2 file(s) modified
Removed unnecessary code from accept order.

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

Rev 22638 –

amit.gupta — Sat, 14 Oct 2017 11:16:09 +0530

amit.gupta – 1 file(s) modified

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

Rev 22636 – Ecomm Integration Partial Checkin, Fofo Deals check in, Logistics Changes ...

amit.gupta — Sat, 14 Oct 2017 09:53:56 +0530

amit.gupta – 4 file(s) modified
Ecomm Integration Partial Checkin, Fofo Deals check in, Logistics Changes and Minor changes in order

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
+ /trunk/PyProj/src/shop2020/logistics/service/impl/EcomExpressService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 22499 – fixed date

amit.gupta — Mon, 25 Sep 2017 18:53:20 +0530

amit.gupta – 1 file(s) modified
fixed date

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

Rev 22491 – Added cod courier remittance for reporting purposes

amit.gupta — Sun, 24 Sep 2017 06:57:35 +0530

amit.gupta – 2 file(s) modified
Added cod courier remittance for reporting purposes

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

Rev 22484 – Changed saholic to profitmandi

amit.gupta — Thu, 21 Sep 2017 16:07:34 +0530

amit.gupta – 1 file(s) modified
Changed saholic to profitmandi

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

Rev 22455 – Added shipment

amit.gupta — Sun, 17 Sep 2017 09:57:46 +0530

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

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

Rev 22452 – Fixed bulk Order processing

amit.gupta — Sat, 16 Sep 2017 21:45:59 +0530

amit.gupta – 20 file(s) modified
Fixed bulk Order processing

~ /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/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
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-show.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/ItemPriceQuantity.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/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 22397 – Minor changes related to mail and messaging

amit.gupta — Fri, 08 Sep 2017 09:43:18 +0530

amit.gupta – 2 file(s) modified
Minor changes related to mail and messaging

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

Rev 22371 – Fixed bug for GST.

amit.gupta — Fri, 01 Sep 2017 18:41:19 +0530

amit.gupta – 1 file(s) modified
Fixed bug for GST.

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

Rev 22210 – Added Changes related to backend

amit.gupta — Sat, 05 Aug 2017 09:10:29 +0530

amit.gupta – 2 file(s) modified
Added Changes related to backend

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

Rev 22061 –

amit.gupta — Mon, 24 Jul 2017 09:24:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 22045 –

amit.gupta — Sun, 23 Jul 2017 23:45:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 22043 – Added changes in wallet report

amit.gupta — Sun, 23 Jul 2017 20:58:56 +0530

amit.gupta – 9 file(s) modified
Added changes in wallet report

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

Rev 21900 –

amit.gupta — Tue, 11 Jul 2017 21:25:19 +0530

amit.gupta – 1 file(s) modified

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

Rev 21899 –

amit.gupta — Tue, 11 Jul 2017 19:56:52 +0530

amit.gupta – 1 file(s) modified

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

Rev 21854 – Gst Changes, new company changes

amit.gupta — Wed, 05 Jul 2017 13:43:15 +0530

amit.gupta – 7 file(s) modified
Gst Changes, new company changes

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/GSTInvoiceGenerationService.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/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/createcompany.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 21844 – Gst Changes

amit.gupta — Mon, 03 Jul 2017 14:59:55 +0530

amit.gupta – 31 file(s) modified
Gst Changes

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/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/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Supplier.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/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StateInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/BuyerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SellerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TaxType.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/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Supplier.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/TaxType.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 21594 – Fixed duplicate serial number issue in bulk billing

amit.gupta — Wed, 31 May 2017 17:00:56 +0530

amit.gupta – 1 file(s) modified
Fixed duplicate serial number issue in bulk billing

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

Rev 21537 –

kshitij.sood — Tue, 23 May 2017 13:07:11 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21536 –

kshitij.sood — Tue, 23 May 2017 13:04:57 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21535 –

kshitij.sood — Tue, 23 May 2017 12:57:55 +0530

kshitij.sood – 7 file(s) modified

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

Rev 21454 – Order creation changes

amit.gupta — Fri, 12 May 2017 10:19:57 +0530

amit.gupta – 6 file(s) modified
Order creation changes

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.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/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 21367 – Added changes related to cashback description.

amit.gupta — Thu, 04 May 2017 14:50:28 +0530

amit.gupta – 3 file(s) modified
Added changes related to cashback description.

Rev 21363 –

kshitij.sood — Thu, 04 May 2017 13:08:37 +0530

kshitij.sood – 5 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserWalletCreditController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 21210 –

amit.gupta — Thu, 13 Apr 2017 11:07:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 21154 – Added attributes during split

amit.gupta — Mon, 03 Apr 2017 18:36:42 +0530

amit.gupta – 1 file(s) modified
Added attributes during split

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

Rev 21153 – Fixed with original order id

amit.gupta — Mon, 03 Apr 2017 18:05:05 +0530

amit.gupta – 1 file(s) modified
Fixed with original order id

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

Rev 21151 – added temp

amit.gupta — Fri, 31 Mar 2017 19:10:01 +0530

amit.gupta – 1 file(s) modified
added temp

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

Rev 21140 –

amit.gupta — Tue, 28 Mar 2017 20:32:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 21139 –

amit.gupta — Tue, 28 Mar 2017 19:11:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 21134 – Added B2C to B2B for priority retailers

amit.gupta — Tue, 28 Mar 2017 16:22:03 +0530

amit.gupta – 9 file(s) modified
Added B2C to B2B for priority retailers

Rev 21106 – removed accepted order to move further.

amit.gupta — Mon, 27 Mar 2017 12:51:06 +0530

amit.gupta – 1 file(s) modified
removed accepted order to move further.

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

Rev 21105 – removed accepted orders

amit.gupta — Mon, 27 Mar 2017 12:45:20 +0530

amit.gupta – 1 file(s) modified
removed accepted orders

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

Rev 21101 –

kshitij.sood — Fri, 24 Mar 2017 13:50:03 +0530

kshitij.sood – 11 file(s) modified

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserWalletCreditController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 21098 – Fixed conflict

amit.gupta — Tue, 21 Mar 2017 13:52:37 +0530

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

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

Rev 21092 –

kshitij.sood — Mon, 20 Mar 2017 15:11:06 +0530

kshitij.sood – 10 file(s) modified

~ /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/Support/src/main/java/in/shop2020/support/controllers/PmsaController.java
~ /trunk/Support/src/main/webapp/js/pmsa-common.js
~ /trunk/Support/src/main/webapp/js/pmsa-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-myprofile.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 21090 – PM Sales Associate

kshitij.sood — Sat, 18 Mar 2017 20:30:20 +0530

kshitij.sood – 24 file(s) modified
PM Sales Associate

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/utils/Utils.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PmsaController.java
+ /trunk/Support/src/main/webapp/css/bootstrap.css
+ /trunk/Support/src/main/webapp/css/pmsa.css
+ /trunk/Support/src/main/webapp/css/simple-sidebar.css
+ /trunk/Support/src/main/webapp/js/bootstrap.min.js
+ /trunk/Support/src/main/webapp/js/pmsa-common.js
+ /trunk/Support/src/main/webapp/js/pmsa-events.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-add-user.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-result.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-search-results.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-search-user.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Pmsa.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PmsaSearchFilter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 21063 – Removed parveen

amit.gupta — Wed, 08 Mar 2017 11:35:49 +0530

amit.gupta – 1 file(s) modified
Removed parveen

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