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

Rev 21044 –

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

kshitij.sood – 9 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.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.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 21043 –

amit.gupta — Sun, 05 Mar 2017 22:46:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 20989 – Fixed movement of warehouse

amit.gupta — Sat, 25 Feb 2017 16:48:37 +0530

amit.gupta – 1 file(s) modified
Fixed movement of warehouse

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

Rev 20966 – Fixed split.

amit.gupta — Mon, 20 Feb 2017 21:13:51 +0530

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

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

Rev 20965 –

kshitij.sood — Mon, 20 Feb 2017 18:18:15 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20963 –

amit.gupta — Mon, 20 Feb 2017 16:08:17 +0530

amit.gupta – 1 file(s) modified

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

Rev 20959 –

kshitij.sood — Mon, 20 Feb 2017 01:14:07 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20958 –

kshitij.sood — Sun, 19 Feb 2017 23:26:37 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20954 –

kshitij.sood — Sun, 19 Feb 2017 17:45:43 +0530

kshitij.sood – 8 file(s) modified

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

Rev 20939 – Changes for wallet impl.

kshitij.sood — Fri, 17 Feb 2017 13:16:07 +0530

kshitij.sood – 1 file(s) modified
Changes for wallet impl.

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

Rev 20937 –

kshitij.sood — Thu, 16 Feb 2017 21:08:33 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20936 – Changes for wallet impl.

kshitij.sood — Thu, 16 Feb 2017 19:30:40 +0530

kshitij.sood – 1 file(s) modified
Changes for wallet impl.

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

Rev 20933 –

kshitij.sood — Thu, 16 Feb 2017 15:43:19 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20932 –

amit.gupta — Thu, 16 Feb 2017 15:13:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 20931 –

kshitij.sood — Thu, 16 Feb 2017 14:51:42 +0530

kshitij.sood – 3 file(s) modified

Rev 20928 –

kshitij.sood — Thu, 16 Feb 2017 13:30:24 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20927 – Changes for wallet impl.

kshitij.sood — Thu, 16 Feb 2017 13:27:41 +0530

kshitij.sood – 10 file(s) modified
Changes for wallet impl.

~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/UserWallet.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/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 20876 –

kshitij.sood — Sat, 11 Feb 2017 15:50:04 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20873 – Wallet changes order & payment

kshitij.sood — Sat, 11 Feb 2017 13:39:40 +0530

kshitij.sood – 21 file(s) modified
Wallet changes order & payment

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/IPaymentService.java
+ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/WalletPaymentService.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/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/thriftpy/model/v1/order/TransactionService.py
~ /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.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/user/Cart.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 20848 –

amit.gupta — Fri, 03 Feb 2017 20:59:17 +0530

amit.gupta – 1 file(s) modified

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

Rev 20819 –

kshitij.sood — Wed, 01 Feb 2017 17:07:53 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20814 –

kshitij.sood — Wed, 01 Feb 2017 12:19:47 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20812 –

kshitij.sood — Tue, 31 Jan 2017 18:58:26 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20811 – Changes in invoice, shipmentlogistic cost etc

kshitij.sood — Tue, 31 Jan 2017 17:58:36 +0530

kshitij.sood – 7 file(s) modified
Changes in invoice, shipmentlogistic cost etc

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

Rev 20806 –

amit.gupta — Tue, 31 Jan 2017 15:00:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 20802 – fixed seller

amit.gupta — Mon, 30 Jan 2017 18:52:53 +0530

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

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

Rev 20801 – PO can now will be only created for Andonis.

amit.gupta — Mon, 30 Jan 2017 16:55:57 +0530

amit.gupta – 1 file(s) modified
PO can now will be only created for Andonis.

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

Rev 20785 – Added new number

amit.gupta — Sun, 29 Jan 2017 00:25:41 +0530

amit.gupta – 1 file(s) modified
Added new number

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

Rev 20745 –

kshitij.sood — Fri, 20 Jan 2017 16:03:26 +0530

kshitij.sood – 9 file(s) modified

~ /trunk/PyProj/src/shop2020/logistics/service/impl/BluedartService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /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/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