Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
21134 3215 d 16 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
20873 3260 d 19 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
19980 3504 d 10 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
19973 3504 d 18 h amit.gupta /trunk/ Added changes related to company invoice  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SellerInfo.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/OrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
17470 3714 d 0 h manish.sharma /trunk/ Committed by Manish Sharma for Bulk Order Creation and Shipping Charges Implementation on 16-Nov-2015  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
/trunk/MobileSite/application/widgets/cart/views/carts.php
/trunk/MobileSite/application/widgets/checkout/views/shipping_process.php
/trunk/MobileSite/application/widgets/productinfo/views/product_details_b.php
/trunk/MobileSite/application/widgets/productinfo/views/product_details_d.php
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
13146 4067 d 14 h manish.sharma /trunk/ Committed by Manish Sharma for Bulk Shipment Creation Process on 27-Nov-2014  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptPackageOrderEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptPackageOrderEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AcceptOrderConfirmationBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptPackageOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptPackageOrderRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptPackageOrderResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/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
/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/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/Support/src/main/java/in/shop2020/support/controllers/AwbUploadController.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/awb-upload-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
/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/PrivateDealUser.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
12776 4129 d 16 h manish.sharma /trunk/ Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014  
/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/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
12772 4129 d 19 h manish.sharma /trunk/ Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014  
/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/FlipkartAdvantageOrder.java
/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
9416 4384 d 16 h amar.kumar /trunk/ Changes for
1) Allow Billing of Orders on CForm
2) Store and Show Mrp of items purchased in Purchase-order page
3) Add Support for C-Form in purchase-orders		  
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/TaxType.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/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/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/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
9299 4392 d 17 h kshitij.sood /trunk/ Service changes for one assist  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InsurerType.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/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/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/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/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInsurerMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
8717 4453 d 13 h amar.kumar /trunk/ Changes for billing of bad Inventory  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ProductCondition.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.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/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.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/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
7293 4626 d 19 h anupam.singh / - Changes related to StoreWebsite
- Added source to "change_transaction_status" method		  
/StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
/StoreWebsite/src/main/webapp/js/storewebsite.js
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/model/v1/order/script/CreateRTGSBulkOrders.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/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
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
7190 4648 d 17 h amar.kumar /trunk/ Changes for Freebie Order Automation

Reviewed by Amit Gupta		  
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/FreebieItem.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitFreebieOrderEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitFreebieOrderEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitFreebieOrderBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitFreebieOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitFreebieOrderRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitFreebieOrderResponse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/FreebieItem.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.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/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.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/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/model/v1/user/impl/CartDataAccessors.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/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/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/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java
6903 4705 d 7 h anupam.singh /trunk/ Insurance feature for our website  
/trunk/Website/src/main/resources/templates/thinheader.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-result.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/images/insurance.png
/trunk/Website/src/main/webapp/images/insuredStamp.png
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/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/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/test/Test.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/model/v1/user/promotionrules/rule_discount_to_specific_users.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.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/model/v1/user/UserContextService-remote
/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/catalog/Insurer.java
/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/Line.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/css/shipping.css
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/recharge.js
6726 4741 d 17 h rajveer /trunk/ Added new field of courier delivery time in order.  
/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/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
6525 4773 d 20 h rajveer /trunk/ Added the on time guarantee field to order.  
/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/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
6319 4815 d 21 h rajveer /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ GV amount added in order.  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
5553 4938 d 17 h rajveer /trunk/ Service infrastructure for In Store Pickup.  
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickupStore.java
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/model/v1/user/UserContextService-remote
/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/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.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/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
5527 4945 d 18 h anupam.singh /trunk/ Trac # 1453
B2B support Phase-1		  
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickUpType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Attribute.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderType.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/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
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
/trunk/Support/src/main/webapp/js/bulk-order-common.js
/trunk/Support/src/main/webapp/js/bulk-order-events.js
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
/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/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
5354 4974 d 9 h anupam.singh /trunk/ Trac # 1343
Improved Courier performance report by adding the following fields :
- AWB
- Product Name
- First Delivery Timestamp
- First Attempt Delay
- Return Receive Date

Reviewer : Amar		  
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierPerformanceController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

←Prev12Next→

Show All