Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
23313 2903 d 23 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
23310 2905 d 0 h amit.gupta /trunk/ Removed old tax methods and fixed tax rates for mobile category to 12  
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
23307 2905 d 16 h ashik.ali /trunk/ThriftConfig/src/main/java/in/shop2020/  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
23152 2933 d 17 h ashik.ali /trunk/  
/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
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
23151 2933 d 18 h ashik.ali /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
23144 2933 d 23 h ashik.ali /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateGstRate.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
22719 3008 d 0 h amit.gupta /trunk/ 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
21858 3115 d 23 h amit.gupta /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ Fixed hsncode -> hsnCode  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CategoryHsnCode.java
21853 3117 d 19 h amit.gupta /trunk/ Fixed CategoryHsnCode  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CategoryHsnCode.java
/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/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
21838 3121 d 15 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
19714 3538 d 17 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 3543 d 0 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 3543 d 21 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 3580 d 13 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 3618 d 19 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 3620 d 21 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
18598 3629 d 18 h kshitij.sood /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
18150 3668 d 17 h kshitij.sood /trunk/ Changes related to bulk pricing + catalog service.  
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/BulkPricingDialog.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/BulkItemPricing.java
/trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/BulkPricingDialog.ui.xml
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BulkItemPricing.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
/trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
/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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
15705 3853 d 18 h kshitij.sood /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
15702 3853 d 19 h kshitij.sood /trunk/  
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBDListingFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBDPricingFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CheckFeedSubmission.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/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AmazonFCWarehouseLocation.java

Show All