SmartDukaan – /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 14567 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Thu, 19 Mar 2015 20:31:09 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 19-Mar-2015

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 14563 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Thu, 19 Mar 2015 18:46:54 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 19-Mar-2015

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 14522 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Wed, 18 Mar 2015 18:09:17 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 18-Mar-2015

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 14521 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Wed, 18 Mar 2015 18:03:37 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 18-Mar-2015

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 14519 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Wed, 18 Mar 2015 17:59:24 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 18-Mar-2015

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 14514 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Wed, 18 Mar 2015 17:22:38 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 18-Mar-2015

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 14491 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Tue, 17 Mar 2015 16:47:58 +0530

manish.sharma – 22 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 17-Mar-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
+ /trunk/InventoryManager/src/main/webapp/css/demo.css
+ /trunk/InventoryManager/src/main/webapp/css/jquery.dataTables.css
+ /trunk/InventoryManager/src/main/webapp/css/jquery.dataTables.min.css
+ /trunk/InventoryManager/src/main/webapp/css/jquery.dataTables_themeroller.css
~ /trunk/InventoryManager/src/main/webapp/js/doa.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.dataTables.1.10.3.min.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.dataTables.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery1.11.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DoaOutInventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 10886 – Committed by Manish Sharma for Showing Order Id for DOA ...

manish.sharma — Fri, 02 May 2014 19:12:34 +0530

manish.sharma – 7 file(s) modified
Committed by Manish Sharma for Showing Order Id for DOA in items on 02-May-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/webapp/js/doa.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 8313 – Correcting syntactical error

amar.kumar — Mon, 07 Oct 2013 14:38:17 +0530

amar.kumar – 1 file(s) modified
Correcting syntactical error

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 8182 – Changes related to EBAY and minor changes related to use ...

amar.kumar — Tue, 24 Sep 2013 19:33:26 +0530

amar.kumar – 80 file(s) modified
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/InboxPresenterImpl.java
~ /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/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/guice/ServerModule.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.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/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/js/current-inventory.js
~ /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/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/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/java/in/shop2020/support/controllers/SourceOrderCreationController.java
+ /trunk/Support/src/main/webapp/css/ebay.css
+ /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/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/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/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/EbayOrder.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

Rev 5620 – Trac#1295 Some bug fixes. - Warehouse change now ...

mandeep.dhir — Wed, 18 Jul 2012 12:37:26 +0530

mandeep.dhir – 8 file(s) modified
Trac#1295 Some bug fixes.
- Warehouse change now considers all sub-warehouses of a billing warehouse
- One with max availability os assigned
- SALE record is persisted now whenever DOA_INVALID_RESHIP happens
- Billing info is not copied with RET_USABLE_RESHIP stuff
- Not shifting reservation for each scan IN
- By default making ItemLOader a partial update

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 5185 – Trac#981 DOA replacement support. Fixing reserved field when order is ...

mandeep.dhir — Wed, 16 May 2012 10:14:51 +0530

mandeep.dhir – 32 file(s) modified
Trac#981 DOA replacement support. Fixing reserved field when order is cancelled from PO_RAISED etc. states > 7(BILLED).

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/webapp/js/doa.js
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml