SmartDukaan – /

Rev 23152 –

ashik.ali — Thu, 04 Jan 2018 18:19:39 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /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

Rev 23151 –

ashik.ali — Thu, 04 Jan 2018 17:45:56 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java

Rev 23150 – Added barcode for GST Invoice

amit.gupta — Thu, 04 Jan 2018 16:39:02 +0530

amit.gupta – 2 file(s) modified
Added barcode for GST Invoice

+ /trunk/HotspotDashboard/src/main/resources/ecom-express
+ /trunk/HotspotDashboard/src/main/resources/ecom-express/barcode.TTF

Rev 23149 –

ashik.ali — Thu, 04 Jan 2018 16:09:39 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 23148 –

ashik.ali — Thu, 04 Jan 2018 15:56:33 +0530

ashik.ali – 4 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py

Rev 23147 –

ashik.ali — Thu, 04 Jan 2018 15:54:55 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 23146 –

ashik.ali — Thu, 04 Jan 2018 12:40:55 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 23145 –

amit.gupta — Thu, 04 Jan 2018 12:40:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/logistics/service/impl/EcomExpressService.py

Rev 23144 –

ashik.ali — Thu, 04 Jan 2018 12:40:11 +0530

ashik.ali – 3 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateGstRate.java

Rev 23143 –

ashik.ali — Thu, 04 Jan 2018 12:34:56 +0530

ashik.ali – 3 file(s) modified

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 23142 –

ashik.ali — Thu, 04 Jan 2018 12:34:00 +0530

ashik.ali – 4 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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

Rev 23141 – Added Ecom For updating awbs.

amit.gupta — Wed, 03 Jan 2018 19:51:01 +0530

amit.gupta – 1 file(s) modified
Added Ecom For updating awbs.

+ /trunk/PyProj/src/shop2020/logistics/service/script/EcomAwbUpdater.py

Rev 23140 – Fixed issue with assigning awbs.

amit.gupta — Wed, 03 Jan 2018 19:46:12 +0530

amit.gupta – 1 file(s) modified
Fixed issue with assigning awbs.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 23139 – Fixed master

amit.gupta — Wed, 03 Jan 2018 18:07:36 +0530

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

~ /trunk/PyProj/src/shop2020/logistics/service/impl/EcomExpressService.py

Rev 23138 –

ashik.ali — Tue, 02 Jan 2018 17:04:38 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java

Rev 23137 –

ashik.ali — Tue, 02 Jan 2018 15:54:55 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 23136 –

ashik.ali — Tue, 02 Jan 2018 15:46:31 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 23135 – Fixed retailer costing logic pointed to first assigned provider only.

amit.gupta — Tue, 02 Jan 2018 15:44:54 +0530

amit.gupta – 1 file(s) modified
Fixed retailer costing logic pointed to first assigned provider only.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 23134 –

ashik.ali — Tue, 02 Jan 2018 13:25:04 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 23133 –

ashik.ali — Tue, 02 Jan 2018 13:18:02 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 23132 – Fixed logic of logistics

amit.gupta — Sat, 30 Dec 2017 19:53:19 +0530

amit.gupta – 5 file(s) modified
Fixed logic of logistics

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/EcomExpressService.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/SettleUnknownRechargeTransactions.py

Rev 23131 –

ashik.ali — Sat, 30 Dec 2017 13:31:00 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 23130 –

amit.gupta — Fri, 29 Dec 2017 17:27:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 23129 –

amit.gupta — Thu, 28 Dec 2017 20:25:42 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java

Rev 23128 –

amit.gupta — Thu, 28 Dec 2017 19:02:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 23127 –

amit.gupta — Thu, 28 Dec 2017 18:58:07 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 23126 –

amit.gupta — Thu, 28 Dec 2017 18:54:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 23125 –

amit.gupta — Thu, 28 Dec 2017 18:44:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/resources/struts.xml

Rev 23124 –

ashik.ali — Thu, 28 Dec 2017 18:13:03 +0530

ashik.ali – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/purchase/main/script/PendingPurchaseOrderReport.py

Rev 23123 –

amit.gupta — Thu, 28 Dec 2017 17:56:05 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java

Rev 23122 – Fixed Logistics issue

amit.gupta — Thu, 28 Dec 2017 17:42:26 +0530

amit.gupta – 2 file(s) modified
Fixed Logistics issue

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/pincode.vm

Rev 23121 – Added Uploading one courier partner at a time for Updating ...

amit.gupta — Thu, 28 Dec 2017 17:40:24 +0530

amit.gupta – 5 file(s) modified
Added Uploading one courier partner at a time for Updating serviceability and tat

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 23120 – Added recharge_commissions

amit.gupta — Wed, 27 Dec 2017 17:36:26 +0530

amit.gupta – 5 file(s) modified
Added recharge_commissions

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.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 23119 –

ashik.ali — Tue, 26 Dec 2017 19:17:33 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 23118 –

ashik.ali — Tue, 26 Dec 2017 18:26:24 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java

Rev 23117 –

ashik.ali — Tue, 26 Dec 2017 18:18:05 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 23116 –

ashik.ali — Tue, 26 Dec 2017 18:15:44 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java

Rev 23115 –

ashik.ali — Tue, 26 Dec 2017 18:12:59 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 23114 –

ashik.ali — Tue, 26 Dec 2017 18:09:47 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-fofo/build.gradle

Rev 23113 –

ashik.ali — Tue, 26 Dec 2017 18:08:55 +0530

ashik.ali – 7 file(s) modified

+ /trunk/profitmandi-fofo/src/test/resources
+ /trunk/profitmandi-fofo/src/test/resources/META-INF
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/dev.properties
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/env.property
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/payment-options.json
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/prod.properties
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/staging.properties