SmartDukaan – /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java

Rev 6467 – Changes for Purchase Return Reviewed by Amit Gupta

amar.kumar — Fri, 07 Dec 2012 16:40:35 +0530

amar.kumar – 44 file(s) modified
Changes for Purchase Return
Reviewed by Amit Gupta

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/InventoryManager/src/main/webapp/css/common.css
+ /trunk/InventoryManager/src/main/webapp/images
+ /trunk/InventoryManager/src/main/webapp/images/add.png
+ /trunk/InventoryManager/src/main/webapp/images/copy.png
+ /trunk/InventoryManager/src/main/webapp/images/copy_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/csv.png
+ /trunk/InventoryManager/src/main/webapp/images/csv_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/pdf.png
+ /trunk/InventoryManager/src/main/webapp/images/pdf_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/print.png
+ /trunk/InventoryManager/src/main/webapp/images/print_hover.png
+ /trunk/InventoryManager/src/main/webapp/images/xls.png
+ /trunk/InventoryManager/src/main/webapp/images/xls_hover.png
+ /trunk/InventoryManager/src/main/webapp/js/jquery.colorbox-min.js
+ /trunk/InventoryManager/src/main/webapp/js/purchase-return.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-new.vm
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.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/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.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/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.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/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6322 – Changes for Following: 1) Option to download Order Confirmation Mail ...

amar.kumar — Sun, 11 Nov 2012 12:06:06 +0530

amar.kumar – 29 file(s) modified
Changes for Following:
1) Option to download Order Confirmation Mail from CRM
2) Option to add new pincode or update/disable serviceability for a provider from Support Reports (Cod-Reconciliation)
3) Option to get Scan Details for a given ItemId/Serial-Number from Inventory Webapp

Reviewed by Anupam Singh

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /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/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
~ /trunk/InventoryManager/src/main/webapp/css/common.css
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
+ /trunk/Support/src/main/webapp/css/pincode.css
+ /trunk/Support/src/main/webapp/js/pincode.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 5711 – Trac#1486 Reviewer: Anupam Ageing report for Mahipalpur

mandeep.dhir — Wed, 01 Aug 2012 16:39:12 +0530

mandeep.dhir – 14 file(s) modified
Trac#1486 Reviewer: Anupam
Ageing report for Mahipalpur

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/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/InventoryAge.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/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 5496 – Trac#1333 Trac#1423 - Daily Alerts for Invoice vs Scan ...

mandeep.dhir — Tue, 26 Jun 2012 18:28:48 +0530

mandeep.dhir – 16 file(s) modified
Trac#1333 Trac#1423
- Daily Alerts for Invoice vs Scan mismatch
- Scanning Item numbers and serial numbers for accessories
- Enumerated invoice numbers in Purchase receive UI
Reviewer: Rajveer

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/webapp/js/purchase.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
+ /trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.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/ThriftConfig/src/main/java/in/shop2020/warehouse/InvoiceScan.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/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 5372 – Trac#1344 Added report screens for Purchases report

mandeep.dhir — Wed, 06 Jun 2012 15:25:12 +0530

mandeep.dhir – 26 file(s) modified
Trac#1344 Added report screens for Purchases report

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/AccountingReportsController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java (copied from /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java@5368)
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReturnReportController.java (copied from /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java@5368)
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/accounting-reports-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sale-report-index.vm (copied from /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm@5368)
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sale-return-report-index.vm (copied from /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-index.vm@5368)
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-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/DetailedPurchaseScan.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/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 5361 – Trac#1065 Tracking Non-serialized inventory

mandeep.dhir — Mon, 04 Jun 2012 23:05:41 +0530

mandeep.dhir – 20 file(s) modified
Trac#1065 Tracking Non-serialized inventory

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/webapp/js/purchase.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.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/OrderService/OrderService.thrift
~ /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/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.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/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 4500 – Commiting warehouseservice

mandeep.dhir — Tue, 14 Feb 2012 00:55:07 +0530

mandeep.dhir – 76 file(s) modified
Commiting warehouseservice

+ /trunk/WarehouseService
+ /trunk/WarehouseService/.classpath
+ /trunk/WarehouseService/.project
+ /trunk/WarehouseService/.settings
+ /trunk/WarehouseService/.settings/org.eclipse.jdt.core.prefs
+ /trunk/WarehouseService/.settings/org.maven.ide.eclipse.prefs
+ /trunk/WarehouseService/pom.xml
+ /trunk/WarehouseService/src
+ /trunk/WarehouseService/src/main
+ /trunk/WarehouseService/src/main/java
+ /trunk/WarehouseService/src/main/java/in
+ /trunk/WarehouseService/src/main/java/in/shop2020
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/Scan.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ItemNumberHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ItemNumberMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java
+ /trunk/WarehouseService/src/main/resources
+ /trunk/WarehouseService/src/main/resources/context.xml
+ /trunk/WarehouseService/src/main/resources/in
+ /trunk/WarehouseService/src/main/resources/in/shop2020
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ItemNumberMapper.xml
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
+ /trunk/WarehouseService/src/main/resources/jdbc.properties
+ /trunk/WarehouseService/src/main/resources/log4j.properties
+ /trunk/WarehouseService/src/main/resources/mybatis-config.xml
+ /trunk/WarehouseService/src/test
+ /trunk/WarehouseService/src/test/java
+ /trunk/WarehouseService/src/test/resources
+ /trunk/WarehouseService/target
+ /trunk/WarehouseService/target/classes
+ /trunk/WarehouseService/target/classes/context.xml
+ /trunk/WarehouseService/target/classes/in
+ /trunk/WarehouseService/target/classes/in.shop2020.warehouse.persistence
+ /trunk/WarehouseService/target/classes/in/shop2020
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/domain
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/domain/InventoryItem.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/domain/Scan.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler/InventoryItemHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler/ItemNumberHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler/ScanHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/InventoryItemMapper.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ItemNumberMapper.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ItemNumberMapper.xml
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ScanMapper.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ScanMapper.xml
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service/handler
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service/WarehouseServer.class
+ /trunk/WarehouseService/target/classes/jdbc.properties
+ /trunk/WarehouseService/target/classes/log4j.properties
+ /trunk/WarehouseService/target/classes/mybatis-config.xml
+ /trunk/WarehouseService/target/maven-archiver
+ /trunk/WarehouseService/target/maven-archiver/pom.properties
+ /trunk/WarehouseService/target/surefire
+ /trunk/WarehouseService/target/test-classes
+ /trunk/WarehouseService/target/WarehouseService-0.0.1-SNAPSHOT.jar