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 2859 d 6 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
20781 3274 d 19 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
13437 4041 d 3 h manish.sharma /trunk/Support/src/main/java/in/shop2020/support/controllers/ Committed by Manish Sharma for Change in Ebay Normal Order Creation Process on 24-Dec-2014  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
10943 4273 d 3 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/EbayNormalOrderCreatorController.java
9142 4414 d 2 h vikram.raghav /trunk/Support/src/main/java/in/shop2020/support/controllers/ Mark Payment status as success for ebay order  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
8925 4431 d 6 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 4439 d 5 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
8779 4447 d 23 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Sending itemId in getLogisticsInfo call instead of quantity  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
8723 4453 d 1 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Setting source while creating new users  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
8656 4459 d 7 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Change for setting paisapayId and salesRecord number in lineitem's extra info while creating Ebay order with our shipping  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
8569 4467 d 0 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 4474 d 4 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
8350 4482 d 1 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Skipping row if error is faced in assigning logistics provider  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
8343 4482 d 5 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 4482 d 6 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 14 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 4487 d 4 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 4487 d 6 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 4487 d 6 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 16 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

Show All