Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
8723 4452 d 19 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
8624 4460 d 1 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Setting customer name for Ebay Order only through sheet, not through previously created user's info  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
8432 4475 d 18 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Avoiding processing of ebay order if it has been already processed  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
8323 4483 d 0 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Getting new transaction client for every row  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
8303 4484 d 9 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
8259 4490 d 0 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ If address2 is empty, don't set it in order  
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
8241 4491 d 1 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
8182 4496 d 17 h amar.kumar /trunk/ Changes related to EBAY and minor changes related to use of rto orders for PO creation

Reviewed By: Rajveer Singh		  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayAramexInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayBluedartInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayDTDCInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayFedexInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayHeaderFooterProvider.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderResponse.java
/trunk/HotspotDashboard/src/main/resources/ebay-logo-grey-bg.jpg
/trunk/HotspotDashboard/src/main/resources/ebay-logo.jpg
/trunk/HotspotDashboard/src/main/resources/paisapay-logo.jpg
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayColorChangeController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayDashboardController.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/java/in/shop2020/support/controllers/EbaySubsidyUploaderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-color-change-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-listing-uploader-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-normal-order-creator-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-creator-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-update-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-subsidy-uploader-authsuccess.vm
/trunk/Support/src/main/webapp/css/ebay.css
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/EbayItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HoldInventoryDetail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/holdInventoryDetail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.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/InvoiceServlet.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/ChooseColorHandler.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/js/current-inventory.js
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/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/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.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/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.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/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/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/purchase/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/SourceOrderCreationController.java
/trunk/Support/src/main/webapp/WEB-INF/content/source-order-creation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift