Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
24212 2628 d 21 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/order/impl/  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
23864 2751 d 21 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/order/impl/ Added LineItem Imei  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
23096 2945 d 0 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/order/impl/ Added recharge commissions  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
23081 2948 d 20 h amit.gupta /trunk/ 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
22491 3036 d 5 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/order/impl/ Added cod courier remittance for reporting purposes  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
21844 3118 d 21 h amit.gupta /trunk/ 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
21134 3215 d 20 h amit.gupta /trunk/ Added B2C to B2B for priority retailers  
/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/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.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/order/WalletReferenceType.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
21101 3219 d 22 h kshitij.sood /trunk/  
/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/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
21090 3225 d 16 h kshitij.sood /trunk/ PM Sales Associate  
/trunk/Support/src/main/java/in/shop2020/support/controllers/PmsaController.java
/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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Pmsa.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PmsaSearchFilter.java
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
21050 3236 d 23 h kshitij.sood /trunk/PyProj/src/shop2020/model/v1/order/impl/  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
21044 3237 d 16 h kshitij.sood /trunk/  
/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
20942 3254 d 23 h kshitij.sood /trunk/PyProj/src/shop2020/model/v1/order/impl/  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
20873 3260 d 23 h kshitij.sood /trunk/ Wallet changes order & payment  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/WalletPaymentService.java
/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/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/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.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
20818 3270 d 19 h kshitij.sood /trunk/  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddress.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
20745 3282 d 20 h kshitij.sood /trunk/PyProj/src/shop2020/  
/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
20737 3284 d 16 h kshitij.sood /trunk/PyProj/src/shop2020/model/v1/order/impl/  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
20025 3501 d 3 h amit.gupta /trunk/ Added changes related to company details/warehouse address  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/BuyerInfo.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-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/purchase/main/model/PurchaseOrder.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/SellerInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
19982 3504 d 12 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/order/impl/  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
19981 3504 d 13 h amit.gupta /trunk/PyProj/src/shop2020/model/v1/order/impl/  
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
19980 3504 d 14 h amit.gupta /trunk/ Added address_id to order table  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddress.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddressMapping.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/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-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/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

←Prev12Next→

Show All