Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
26995 1969 d 22 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/catalog/impl/ Fixed tax rate issues  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
23321 2906 d 23 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/catalog/impl/  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
23320 2906 d 23 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/catalog/impl/  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
23313 2907 d 0 h amit.gupta /trunk/ 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
23306 2908 d 18 h ashik.ali /trunk/PyProj/src/shop2020/  
/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/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
23148 2936 d 21 h ashik.ali /trunk/PyProj/src/shop2020/  
/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
23142 2937 d 0 h ashik.ali /trunk/PyProj/src/shop2020/model/v1/catalog/impl/  
/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
22566 3024 d 6 h amit.gupta /trunk/ 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
22396 3055 d 4 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/catalog/impl/  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
22358 3062 d 22 h ashik.ali /trunk/PyProj/src/shop2020/  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
21838 3124 d 17 h amit.gupta /trunk/ Added new tax implementation i.e. gst  
/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/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/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/Item.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
19754 3536 d 0 h amit.gupta /trunk/ Added catalogitem id and dealprice on master sheet.  
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
/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
19714 3541 d 18 h manish.sharma /trunk/ Committed by Manish Sharma for Return Process Implementation on May-9-2016  
/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/catalog/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/model/v1/order/impl/OrderServiceHandler.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/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/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
19691 3546 d 1 h manish.sharma /trunk/ Committed by Manish Sharma for Return Process Implementation on May-5-2016  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemCondition.java
/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/catalog/impl/DataService.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/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/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnTransaction.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
19686 3546 d 23 h kshitij.sood /trunk/ Entity upload service  
/trunk/PyProj/src/shop2020/utils/ContentUploadUtil.py
/trunk/ThriftConfig/src/main/java/in/shop2020/content/BulkContentUpload.java
/trunk/ThriftConfig/src/main/java/in/shop2020/content/BulkContentUploadResult.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BulkUploadCatalog.java
/trunk/PyProj/src/shop2020/content/main/handler/ContentHandler.py
/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/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/thriftpy/content/ContentService.py
/trunk/PyProj/src/shop2020/thriftpy/content/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/content/ContentService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/ContentService/ContentService.thrift
19247 3583 d 14 h kshitij.sood /trunk/ Bulk addition from support for report Bulk-Add-Controller  
/trunk/PyDTR/src/dtr/utils/AddDataToMaster.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/dtr/BulkItems.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BulkAddInventory.java
/trunk/PyDTR/src/dtr/dao.py
/trunk/PyDTR/src/dtr/utils/utils.py
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/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/dtr/impl/DtrServiceHandler.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/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/dtr/DtrService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/dtr/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.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/dtr/DtrService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/DtrService/DtrService.thrift
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
18764 3621 d 20 h kshitij.sood /trunk/  
/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/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
18719 3623 d 22 h kshitij.sood /trunk/ Change in dtr pricing for bulk prices, to be used in live pricing controller & dtr pricing controller.  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/DtrPricing.java
/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/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
18600 3632 d 19 h kshitij.sood /trunk/PyProj/src/shop2020/model/v1/catalog/impl/  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
18414 3643 d 18 h kshitij.sood /trunk/ Maximum buy quantity + bulk items  
/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/thriftpy/model/v1/catalog/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Show All