Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
23454 2858 d 23 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/ Added changes related to orders  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/HsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
13435 4040 d 21 h manish.sharma /trunk/Support/src/main/java/in/shop2020/support/controllers/ Committed by Manish Sharma for Change in Ebay PS Order Creation Process on 24-Dec-2014  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
10944 4272 d 20 h vikram.raghav /trunk/Support/src/main/java/in/shop2020/support/controllers/ To mark ebay order payment success only when the ebay order is created.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
10941 4272 d 20 h vikram.raghav /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8925 4431 d 0 h amar.kumar /trunk/ Changes for
1) Marking order as bad while creating bulk order
2) Changes for Date parsing for Ebay Order
3) Changes for setting airway bill number for Our-shipping Ebay orders		  
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
8892 4438 d 22 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Changes for Setting WarehouseId in case of 3rd party fulfillment warehouse and no billing support  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
8574 4465 d 23 h amar.kumar /trunk/ Change for
1) accomodating New courier partner Dotzot for Ebay
2) Adding Snapdeal Reference Code for Invoices generated for Snapdeal Source		  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8573 4466 d 0 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Logging and continuing in case of Unknown logistics Provider  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8569 4466 d 17 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Change to add
1) PaisapayId and SalesrecordNumber to Ebay Order's lineitem extra_info field
2) SubOrderId and ReferenceCode to Snapdeal Order's lineitem extra_info field
3) Making address2 field as non-mandatory for Our Shipping Orders with Ebay source		  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
8488 4473 d 21 h amar.kumar /trunk/ Changes for creating/invoicing/accepting Snapdeal orders  
/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealDashboardController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
/trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-dashboard-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-order-creator-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SnapdealOrder.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.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/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreStatisticsController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
8372 4479 d 23 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Improvement in logging  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8343 4481 d 22 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Change in Ebay Order creation to skip the row if some issue occurs during setting Shipping/Delivery date  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8342 4481 d 23 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Skipping row if order is already created  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8303 4484 d 8 h amar.kumar /trunk/ Additional Changes related to Ebay  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayAwbUploaderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-awb-uploader-authsuccess.vm
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.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/OrderDetails.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/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderCountsHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderCountsRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderRequest.java
/trunk/PyProj/src/shop2020/helpers/impl/model/DashboardUser.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/InventoryStockReportGenerator.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/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayBluedartPaisapayUploaderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/DashboardUser.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
8291 4486 d 21 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Setting Transfer Price and Nlc for Ebay Orders while creating orders through Excel  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8286 4486 d 23 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Improvements related to dates for Ebay Uploaders  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8283 4486 d 23 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Improvements related to dates for Ebay Uploaders  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8281 4487 d 9 h amar.kumar /trunk/ Improvements related to dates for Ebay Uploaders  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8252 4490 d 17 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Change in parsing date for Ebay Orders  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
8241 4490 d 23 h amar.kumar /trunk/ Additional Changes for Ebay
1) to add extra digits in order form to paisapayId for Bluedart
2) Use overridden billingPrice
3) Set proper total weight		  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayBluedartPaisapayUploaderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-bluedart-paisapay-uploader-authsuccess.vm
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.java
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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/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/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

←Prev12Next→

Show All