SmartDukaan – /trunk/ThriftGen/

Rev 25269 –

tejbeer — Tue, 09 Jul 2019 17:06:01 +0530

tejbeer – 3 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 24832 – Added changes to save tp information for that day, to ...

tejbeer — Tue, 02 Apr 2019 11:47:29 +0530

tejbeer – 4 file(s) modified
Added changes to save tp information for that day, to figure out price drop difference while claiming it.

~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 23839 – changed mail domain profitmandi.com -> smartdukaan.com

amit.gupta — Tue, 03 Jul 2018 11:15:44 +0530

amit.gupta – 30 file(s) modified
changed mail domain profitmandi.com -> smartdukaan.com

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Warehouse.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/PyDTR/src/scripts/AmazonBestSellers.py
~ /trunk/PyDTR/src/scripts/FlipkartBestSeller.py
~ /trunk/PyDTR/src/scripts/HomeShopBestSellers.py
~ /trunk/PyDTR/src/scripts/PaytmBestSellers.py
~ /trunk/PyDTR/src/scripts/ProfitMandiUserDataUpdationRequest.py
~ /trunk/PyDTR/src/scripts/SaholicBestSellers.py
~ /trunk/PyDTR/src/scripts/ShopCluesBestSellers.py
~ /trunk/PyDTR/src/scripts/SnapdealBestSellers.py
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/EcomAwbUpdater.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/EcomExpressLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProfitMandiSalesAssociate.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/RQuickLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/PendingPurchaseOrderReport.py
~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 23446 – Added changes related to fofo.

amit.gupta — Mon, 19 Mar 2018 20:37:05 +0530

amit.gupta – 18 file(s) modified
Added changes related to fofo.

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipkartOrdersNew.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.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/RechargeService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 23436 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:57:05 +0530

ashik.ali – 1 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

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

Rev 23400 – Added

amit.gupta — Wed, 28 Feb 2018 14:04:59 +0530

amit.gupta – 5 file(s) modified
Added

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 23313 – Added tax rate

amit.gupta — Sat, 03 Feb 2018 12:39:10 +0530

amit.gupta – 8 file(s) modified
Added tax rate

~ /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
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-add-options.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 23308 –

ashik.ali — Thu, 01 Feb 2018 19:41:25 +0530

ashik.ali – 1 file(s) modified

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

Rev 23218 – Fixed Ecom Forward shipment

amit.gupta — Tue, 16 Jan 2018 08:32:24 +0530

amit.gupta – 8 file(s) modified
Fixed Ecom Forward shipment

+ /trunk/HotspotDashboard/src/main/resources/rquick-surface
+ /trunk/HotspotDashboard/src/main/resources/rquick-surface/barcode.TTF
~ /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/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 23161 –

ashik.ali — Fri, 05 Jan 2018 16:25:05 +0530

ashik.ali – 1 file(s) modified

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

Rev 23158 –

ashik.ali — Fri, 05 Jan 2018 15:23:32 +0530

ashik.ali – 1 file(s) modified

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

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 23149 –

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

ashik.ali – 1 file(s) modified

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

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 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 23117 –

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

ashik.ali – 1 file(s) modified

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

Rev 23081 – Added Price Drop and fixed tnc for suppliers

amit.gupta — Wed, 20 Dec 2017 15:57:50 +0530

amit.gupta – 20 file(s) modified
Added Price Drop and fixed tnc for suppliers

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/LoginController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PriceDropController.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/price-drop-index.vm
~ /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/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/purchase/main/model/Supplier.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/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Supplier.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 23069 – Added Price Drop

amit.gupta — Mon, 18 Dec 2017 17:16:48 +0530

amit.gupta – 9 file(s) modified
Added Price Drop

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PriceDropController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/price-drop-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 22754 – Fixed definition

amit.gupta — Sun, 29 Oct 2017 15:59:01 +0530

amit.gupta – 4 file(s) modified
Fixed definition

~ /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 22749 – Added new method isLogisticsCod

amit.gupta — Sun, 29 Oct 2017 06:50:15 +0530

amit.gupta – 9 file(s) modified
Added new method isLogisticsCod

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/EcomExpressService.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/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 22721 – Fixed fofo inventory assignment issue

amit.gupta — Sun, 22 Oct 2017 15:06:57 +0530

amit.gupta – 8 file(s) modified
Fixed fofo inventory assignment issue

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 22719 – Fixed fofo related code

amit.gupta — Sun, 22 Oct 2017 11:42:12 +0530

amit.gupta – 3 file(s) modified
Fixed fofo related code

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 22715 – Added isFofo to privatedealuser

amit.gupta — Sun, 22 Oct 2017 06:26:53 +0530

amit.gupta – 6 file(s) modified
Added isFofo to privatedealuser

~ /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/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 22566 – Added fofo tag

amit.gupta — Mon, 09 Oct 2017 07:26:41 +0530

amit.gupta – 7 file(s) modified
Added fofo tag

~ /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/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

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 22366 –

ashik.ali — Thu, 31 Aug 2017 17:45:44 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 22360 –

ashik.ali — Thu, 31 Aug 2017 15:00:03 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 22059 –

amit.gupta — Mon, 24 Jul 2017 08:53:47 +0530

amit.gupta – 4 file(s) modified

+ /trunk/PyProj/src/shop2020/model/v1/catalog/maintest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWalletHistory.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 22050 –

amit.gupta — Mon, 24 Jul 2017 00:04:22 +0530

amit.gupta – 2 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWalletHistory.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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 21963 – Fixed crm registration approval.

amit.gupta — Fri, 14 Jul 2017 11:31:31 +0530

amit.gupta – 6 file(s) modified
Fixed crm registration approval.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/DtrPricing.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 21908 – Fixed User Model added gstin Counter for customer purpose

amit.gupta — Wed, 12 Jul 2017 19:51:17 +0530

amit.gupta – 7 file(s) modified
Fixed User Model added gstin Counter for customer purpose

~ /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/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 21857 –

amit.gupta — Thu, 06 Jul 2017 11:36:01 +0530

amit.gupta – 1 file(s) modified

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

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 21847 – Added all suppliers

amit.gupta — Mon, 03 Jul 2017 16:33:06 +0530

amit.gupta – 7 file(s) modified
Added all suppliers

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
+ /trunk/PyProj/src/shop2020/model/v1/order/script/createcompany.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.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 21842 – Added new tax implementation i.e. gst

amit.gupta — Sat, 01 Jul 2017 15:11:30 +0530

amit.gupta – 1 file(s) modified
Added new tax implementation i.e. gst

~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 21840 – Added flag for selfpickup

amit.gupta — Fri, 30 Jun 2017 20:23:12 +0530

amit.gupta – 1 file(s) modified
Added flag for selfpickup

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 21838 – Added new tax implementation i.e. gst

amit.gupta — Fri, 30 Jun 2017 20:21:54 +0530

amit.gupta – 20 file(s) modified
Added new tax implementation i.e. gst

~ /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
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /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
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CategoryGst.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/GstRate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/SgstRates.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateCategoryGst.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateGstRates.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StateInfo.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift