SmartDukaan – /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5768 – Trac#1551 New columns added

mandeep.dhir — Fri, 10 Aug 2012 15:09:28 +0530

mandeep.dhir – 7 file(s) modified
Trac#1551 New columns added

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAge.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 5731 – Bugfix - Fixing the delivery estimate for preferred sticky items

mandeep.dhir — Mon, 06 Aug 2012 12:20:14 +0530

mandeep.dhir – 1 file(s) modified
Bugfix - Fixing the delivery estimate for preferred sticky items

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5712 – Bug fix. Added another separate method to update vendor string ...

mandeep.dhir — Thu, 02 Aug 2012 13:49:36 +0530

mandeep.dhir – 7 file(s) modified
Bug fix. Added another separate method to update vendor string of a warehouse

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5663 – Even where warehouse id is zero - we wont use ...

mandeep.dhir — Tue, 24 Jul 2012 12:32:44 +0530

mandeep.dhir – 1 file(s) modified
Even where warehouse id is zero - we wont use it as billing warehouse

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5591 – Trac#1191 UI for CRUD operations on vendor/warehouse. Creation takes place ...

mandeep.dhir — Fri, 13 Jul 2012 12:13:41 +0530

mandeep.dhir – 16 file(s) modified
Trac#1191 UI for CRUD operations on vendor/warehouse.
Creation takes place now on staging and then goes live on production on next day.

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/webapp/js/supplier.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Supplier.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/runutils/generate-content-from-catalog.sh
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 5586 – changes in catalog dashboard to support hotspot reviewer: Mandeep Dhir

phani.kumar — Fri, 13 Jul 2012 00:33:28 +0530

phani.kumar – 15 file(s) modified
changes in catalog dashboard to support hotspot
reviewer: Mandeep Dhir

Rev 5557 – Bug fix. Updating cache when inventory is updated

mandeep.dhir — Mon, 09 Jul 2012 15:35:35 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Updating cache when inventory is updated

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5518 – Changed return value from None to 0.

rajveer — Thu, 28 Jun 2012 19:03:23 +0530

rajveer – 1 file(s) modified
Changed return value from None to 0.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5513 – Bugfix. Considering reserved field as well while computing availability. Not ...

mandeep.dhir — Thu, 28 Jun 2012 17:39:18 +0530

mandeep.dhir – 2 file(s) modified
Bugfix. Considering reserved field as well while computing availability.
Not letting warehouse variable get overridden

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py

Rev 5504 – Ticket #1462 Add Support to spice deck vouchers in catalogdashboard ...

phani.kumar — Wed, 27 Jun 2012 18:27:13 +0530

phani.kumar – 21 file(s) modified
Ticket #1462 Add Support to spice deck vouchers in catalogdashboard
reviewer: Rajveer Singh

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/VoucherItemDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VoucherItemMapping.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/VoucherItemDialog.ui.xml
~ /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/catalog/impl/InventoryServiceHandler.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/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VoucherItemMapping.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5474 – Bugfix Resetting availability to zero instead of deleting

mandeep.dhir — Fri, 22 Jun 2012 12:05:58 +0530

mandeep.dhir – 1 file(s) modified
Bugfix Resetting availability to zero instead of deleting

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5460 – Ticket #1355 Clearance Sale Page should be driven by Catalog ...

phani.kumar — Wed, 20 Jun 2012 15:28:32 +0530

phani.kumar – 19 file(s) modified
Ticket #1355 Clearance Sale Page should be driven by Catalog
reviewer: Anupam

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /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/catalog/impl/InventoryServiceHandler.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/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 5457 – Update cache for every item.

rajveer — Tue, 19 Jun 2012 17:18:04 +0530

rajveer – 1 file(s) modified
Update cache for every item.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5437 – Interface to add supplier inventory Merged 2 calls during scan ...

mandeep.dhir — Sun, 17 Jun 2012 21:53:31 +0530

mandeep.dhir – 26 file(s) modified
Interface to add supplier inventory
Merged 2 calls during scan IN to avoid errors
Using initialQuantity for serialized inventory items as well
Trac#1391

~ /trunk/InventoryManager/pom.xml
~ /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/SupplierInventoryController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/DivisionStrategy.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/EffectiveAvailabilityComputer.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/Strategy.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/StrategyEvaluator.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/SubtractStrategy.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/resources/supplier-inventory.cfg
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-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/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/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 5424 – Corrected spelling from availibility to availability.

rajveer — Thu, 14 Jun 2012 16:36:41 +0530

rajveer – 3 file(s) modified
Corrected spelling from availibility to availability.

~ /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

Rev 5421 – Bugfix. Availability vs Availibility

mandeep.dhir — Thu, 14 Jun 2012 13:22:10 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. Availability vs Availibility

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5408 – Corrected preference vendor message, added Preferred vendor to alert message ...

amit.gupta — Wed, 13 Jun 2012 10:27:22 +0530

amit.gupta – 1 file(s) modified
Corrected preference vendor message, added Preferred vendor to alert message when new message is created.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5393 – Trac#1307 Using new logic for warehouse assignment. Not using preferred/default ...

mandeep.dhir — Sat, 09 Jun 2012 11:20:52 +0530

mandeep.dhir – 3 file(s) modified
Trac#1307 Using new logic for warehouse assignment. Not using preferred/default shippinglocation

~ /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

Rev 5385 – Ticket #1256

phani.kumar — Fri, 08 Jun 2012 14:41:01 +0530

phani.kumar – 6 file(s) modified
Ticket #1256

Rev 5381 – If no inventory found for item, return None.

rajveer — Thu, 07 Jun 2012 16:50:22 +0530

rajveer – 1 file(s) modified
If no inventory found for item, return None.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5336 – Added method to clear iteminventorycache in thrift. Also added script ...

rajveer — Thu, 31 May 2012 14:42:56 +0530

rajveer – 7 file(s) modified
Added method to clear iteminventorycache in thrift. Also added script to call the service method.

~ /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/catalog/script/ClearItemAvailabilityCache.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5333 – Bugfix. For items where warehousePreferenceSticky is set, we need to ...

mandeep.dhir — Thu, 31 May 2012 12:23:35 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. For items where warehousePreferenceSticky is set, we need to check its availability at all GOOD warehouses at preferred shipping location to determine if item is addable to Cart.
Reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5318 – Removed service level caching for item availability and added db ...

rajveer — Wed, 30 May 2012 12:24:21 +0530

rajveer – 2 file(s) modified
Removed service level caching for item availability and added db level caching.
Ticket# 1312
Reviewer# Mandeep

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py

Rev 5313 – Trac#1312 Added method to extract current inventory in a warehouse ...

mandeep.dhir — Tue, 29 May 2012 14:30:54 +0530

mandeep.dhir – 7 file(s) modified
Trac#1312 Added method to extract current inventory in a warehouse
Reviewer: Rajveer

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5305 – Removed unused fields from the item object in thrift. Also ...

rajveer — Tue, 29 May 2012 12:04:28 +0530

rajveer – 9 file(s) modified
Removed unused fields from the item object in thrift. Also removed, one unused table from service. Offloaded thrift item (now it will not get inventory along with item).

~ /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/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5295 – Caching the logistic estimation logic to reduce the number of ...

rajveer — Mon, 28 May 2012 19:04:46 +0530

rajveer – 5 file(s) modified
Caching the logistic estimation logic to reduce the number of calls on catalog service.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py

Rev 5217 – Added Catalog Support for Coming soon. #1279

amit.gupta — Mon, 21 May 2012 13:22:23 +0530

amit.gupta – 20 file(s) modified
Added Catalog Support for Coming soon.
#1279

+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ComingSoon.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ComingSoonDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ComingSoonDialog.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /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/catalog/impl/InventoryServiceHandler.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/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/status.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5213 – Trac#1167 No PLB sync for Negative running availability

mandeep.dhir — Sun, 20 May 2012 23:15:46 +0530

mandeep.dhir – 1 file(s) modified
Trac#1167 No PLB sync for Negative running availability

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

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

Rev 5167 – Order by catalog id also in case of same start ...

rajveer — Mon, 14 May 2012 15:37:18 +0530

rajveer – 1 file(s) modified
Order by catalog id also in case of same start date to display consistent view to user.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5147 – Trac#1173 Fixed PO amendment logic Trac#1237 Using preferredVendor when no ...

mandeep.dhir — Thu, 10 May 2012 10:21:57 +0530

mandeep.dhir – 4 file(s) modified
Trac#1173 Fixed PO amendment logic
Trac#1237 Using preferredVendor when no availability found at warehouses for arriving at fulfilment warehouse

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.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/purchase/main/handler/PurchaseServiceHandler.py

Rev 5133 – Bug fix. Warehouse to vendor relationship updated. Reviewer: Anupam

mandeep.dhir — Mon, 07 May 2012 13:39:48 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Warehouse to vendor relationship updated.
Reviewer: Anupam

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5125 – Bug Fix. For risky items only status check is not ...

mandeep.dhir — Mon, 07 May 2012 09:45:30 +0530

mandeep.dhir – 1 file(s) modified
Bug Fix. For risky items only status check is not safe. One should check for availability as well before sending product notifications.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5124 – Bug fix. Putting vendor object instead of vendorid

mandeep.dhir — Mon, 07 May 2012 09:14:29 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Putting vendor object instead of vendorid

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5116 – Bug fix. Putting vendor object instead of vendorid

mandeep.dhir — Sat, 05 May 2012 12:23:52 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Putting vendor object instead of vendorid

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5114 – Bug fix. Returning all warehouses as active ones

mandeep.dhir — Fri, 04 May 2012 23:32:52 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Returning all warehouses as active ones

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5110 – Trac#969, Trac#976, Trac#1058, Trac#909, Trac#996, Trac#1067, Trac#1175 Virtual warehouse modelling ...

mandeep.dhir — Fri, 04 May 2012 00:58:11 +0530

mandeep.dhir – 78 file(s) modified
Trac#969, Trac#976, Trac#1058, Trac#909, Trac#996, Trac#1067, Trac#1175
Virtual warehouse modelling
Bulk scan In feature
Categorization of Serialized vs NonSerialized items
Screen to display items whose inventory update was missed due to key mismatch

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.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/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.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/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.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/Order.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/LoginController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/RaisePOController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
~ /trunk/InventoryManager/src/main/webapp/css/common.css
+ /trunk/InventoryManager/src/main/webapp/css/demo_page.css
+ /trunk/InventoryManager/src/main/webapp/css/demo_table.css
+ /trunk/InventoryManager/src/main/webapp/css/demo_table_jui.css
~ /trunk/InventoryManager/src/main/webapp/js/current-inventory.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ignored-item-mapping-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/item-number-mapping.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-index.vm
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-result.vm
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.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/catalog/impl/InventoryServiceHandler.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/PurchaseOrderProcessor.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/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /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/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/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.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/service/handler/WarehouseServiceHandler.java

Rev 5080 – #1205 More alerts for Catalog Dashboard. 1.Preferred Warehouse Entry Change ...

amit.gupta — Mon, 30 Apr 2012 20:06:23 +0530

amit.gupta – 1 file(s) modified
#1205
More alerts for Catalog Dashboard.
1.Preferred Warehouse Entry Change
2.Warehouse Stickiness being Marked or Unmarked
3.Preferred Vendor Entry Change

Reviewer: phani

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5052 – Used formatter to convert int to string.

amit.gupta — Mon, 23 Apr 2012 19:22:50 +0530

amit.gupta – 1 file(s) modified
Used formatter to convert int to string.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5047 – Added alerts for change in item staus, price, promotion text ...

amit.gupta — Mon, 23 Apr 2012 10:54:40 +0530

amit.gupta – 1 file(s) modified
Added alerts for change in item staus, price, promotion text etc.
#1123
Reviewer: Phani

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py