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

Rev 6848 – Sliding Banner and its user interface implementation.

kshitij.sood — Tue, 19 Feb 2013 12:59:14 +0530

kshitij.sood – 27 file(s) modified
Sliding Banner and its user interface implementation.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/ScpService.java
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/css/imgareaselect-default.css
+ /trunk/Website/src/main/webapp/css/jquery.slidy.css
+ /trunk/Website/src/main/webapp/images/add.png
+ /trunk/Website/src/main/webapp/images/background.gif
+ /trunk/Website/src/main/webapp/images/greendot.gif
+ /trunk/Website/src/main/webapp/images/reddot.gif
+ /trunk/Website/src/main/webapp/images/red_dot.gif
+ /trunk/Website/src/main/webapp/js/jquery.imgareaselect.pack.js
+ /trunk/Website/src/main/webapp/js/jquery.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.js
+ /trunk/Website/src/main/webapp/js/jquery.slidy.min.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm

Rev 6845 – Tagged Pages are now Solr searchable.

amit.gupta — Mon, 18 Feb 2013 23:40:56 +0530

amit.gupta – 4 file(s) modified
Tagged Pages are now Solr searchable.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py

Rev 6838 – CatalogDashboard changes for Insurance

vikram.raghav — Mon, 18 Feb 2013 14:41:32 +0530

vikram.raghav – 15 file(s) modified
CatalogDashboard changes for Insurance

~ /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/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/dashboard/shared/Utils.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/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 6826 – Now coming soon can go live next day or immediately(when ...

amit.gupta — Fri, 15 Feb 2013 11:14:36 +0530

amit.gupta – 2 file(s) modified
Now coming soon can go live next day or immediately(when pushed to production.)
ACTIVE items can be PAUSED or vice versa on the fly via catalog dashboard.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 6821 – Changes in logic for PO creation to include 1) MinStockLevel ...

amar.kumar — Thu, 14 Feb 2013 15:56:46 +0530

amar.kumar – 40 file(s) modified
Changes in logic for PO creation to include
1) MinStockLevel
2) Min number of days stock required

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.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/user/UserContextService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /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/ItemStockPurchaseParams.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/itemStockPurchaseParams.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/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/POType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnType.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
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 6805 – Added insurer to catalog service

anupam.singh — Mon, 11 Feb 2013 17:37:04 +0530

anupam.singh – 13 file(s) modified
Added insurer to catalog service

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

Rev 6777 – Added BestDeals Detail Text and Best Deals Details Link fields ...

vikram.raghav — Thu, 31 Jan 2013 16:54:25 +0530

vikram.raghav – 13 file(s) modified
Added BestDeals Detail Text and Best Deals Details Link fields to Catalogdashboard.

Rev 6696 – Update start date and coming start date while updating item.

rajveer — Thu, 17 Jan 2013 10:52:01 +0530

rajveer – 1 file(s) modified
Update start date and coming start date while updating item.

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

Rev 6661 – Enter and query while searching instead of or query.

rajveer — Mon, 14 Jan 2013 11:25:53 +0530

rajveer – 1 file(s) modified
Enter and query while searching instead of or query.

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

Rev 6550 – Added khushal bhatia in the reports.

rajveer — Fri, 28 Dec 2012 17:21:47 +0530

rajveer – 6 file(s) modified
Added khushal bhatia in the reports.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/scripts/vendorFulfilmentReport.py

Rev 6532 – Ignore inventory updates handle implemented to catalog dashboard.

amit.gupta — Mon, 24 Dec 2012 11:34:39 +0530

amit.gupta – 9 file(s) modified
Ignore inventory updates handle implemented to catalog dashboard.

Rev 6531 – Added new functionality of selective warehouse item inventory updates.

vikram.raghav — Fri, 21 Dec 2012 20:08:55 +0530

vikram.raghav – 15 file(s) modified
Added new functionality of selective warehouse item inventory updates.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/IgnoredInventoryUpdateItems.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 6518 – Changes in service handler and accessor for tag implementation in ...

kshitij.sood — Wed, 19 Dec 2012 23:09:20 +0530

kshitij.sood – 2 file(s) modified
Changes in service handler and accessor for tag implementation in catalog.

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

Rev 6511 – Added thrift service for new tag implementation in catalog.

kshitij.sood — Wed, 19 Dec 2012 12:29:55 +0530

kshitij.sood – 8 file(s) modified
Added thrift service for new tag implementation in catalog.

~ /trunk/PyProj/src/shop2020/config/ConfigServer.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/EntityTag.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 6501 – Added Chandan email id in various emails.

rajveer — Mon, 17 Dec 2012 11:48:05 +0530

rajveer – 5 file(s) modified
Added Chandan email id in various emails.

Rev 6255 – Only new out of stock mails should be sent. Previous ...

rajveer — Tue, 23 Oct 2012 18:53:11 +0530

rajveer – 2 file(s) modified
Only new out of stock mails should be sent. Previous day mails should be blocked.

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

Rev 6241 – Providing handle to categories team to decide whether selling prices ...

amit.gupta — Mon, 22 Oct 2012 09:36:55 +0530

amit.gupta – 24 file(s) modified
Providing handle to categories team to decide whether selling prices should be displayed or not.

~ /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/java/in/shop2020/catalog/util/ReportGenerator.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/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm
~ /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/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 6039 – New Vat rate implementation.

amit.gupta — Mon, 24 Sep 2012 12:43:12 +0530

amit.gupta – 15 file(s) modified
New Vat rate implementation.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /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/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6029 – Parameterising domain name and company name.

rajveer — Wed, 19 Sep 2012 11:20:15 +0530

rajveer – 3 file(s) modified
Parameterising domain name and company name.

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

Rev 5978 – Added support to cache item availability based on source

rajveer — Tue, 11 Sep 2012 16:17:27 +0530

rajveer – 9 file(s) modified
Added support to cache item availability based on source

~ /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/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/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 5944 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:34:33 +0530

mandeep.dhir – 58 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/PyProj/src
~ /trunk/PyProj/src/dist
~ /trunk/PyProj/src/shop2020/clients/CatalogClient.py
+ /trunk/PyProj/src/shop2020/clients/InventoryClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py (copied from /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py@5879)
~ /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
x /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/InventoryHistoryServer.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/ClearItemAvailabilityCache.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.sh
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/InitialInventoryLoader.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/ProcurementReportProcessor.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory
+ /trunk/PyProj/src/shop2020/model/v1/inventory/impl
+ /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/inventory/impl/__init__.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/InventoryHistoryServer.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/InventoryServer.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ClearItemAvailabilityCache.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/CompareInventory.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/CompareInventory.sh
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/InitialInventoryLoader.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/InventoryStockReportGenerator.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ProcurementReportProcessor.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/script/__init__.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/test
+ /trunk/PyProj/src/shop2020/model/v1/inventory/test/__init__.py
+ /trunk/PyProj/src/shop2020/model/v1/inventory/__init__.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
~ /trunk/PyProj/src/shop2020/model/v1/order/test/TestGetValidOrdersCount.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Tablet_campaign.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/test/domain/Test1.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
x /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
x /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/catalog/__init__.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/constants.py
+ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
+ /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/inventory/__init__.py

Rev 5885 – Sarvottam inventory autoupdate COD cut off fot store pick up

mandeep.dhir — Fri, 24 Aug 2012 13:22:42 +0530

mandeep.dhir – 8 file(s) modified
Sarvottam inventory autoupdate
COD cut off fot store pick up

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/EffectiveAvailabilityComputer.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/resources/supplier-inventory-exceptions.cfg
~ /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/order/impl/DataAccessors.py
~ /trunk/Support/pom.xml
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FileArchiveController.java

Rev 5866 – Changed refercences for method to send email.

rajveer — Wed, 22 Aug 2012 17:18:10 +0530

rajveer – 3 file(s) modified
Changed refercences for method to send email.

~ /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/script/InformUsers.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