SmartDukaan – /

Rev 5113 – Ticket #1188 Add Availibility estimate to the Product feed.

amit.gupta — Fri, 04 May 2012 18:27:57 +0530

amit.gupta – 2 file(s) modified
Ticket #1188
Add Availibility estimate to the Product feed.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5112 – Logging the uri and referer in the request.

rajveer — Fri, 04 May 2012 17:46:14 +0530

rajveer – 1 file(s) modified
Logging the uri and referer in the request.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ExceptionController.java

Rev 5111 – Ticket #1223 - Added Apple to the Laptop's dropdown menu

varun.gupta — Fri, 04 May 2012 13:58:28 +0530

varun.gupta – 1 file(s) modified
Ticket #1223 - Added Apple to the Laptop's dropdown menu

~ /trunk/Website/src/main/resources/templates/header.vm

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 5109 – FreeformContent Object can be null for slides. So skipping in ...

amit.gupta — Thu, 03 May 2012 17:47:05 +0530

amit.gupta – 1 file(s) modified
FreeformContent Object can be null for slides.
So skipping in such cases.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 5108 – Now extracting AWB for order identity in place of OrderId ...

varun.gupta — Thu, 03 May 2012 14:54:38 +0530

varun.gupta – 1 file(s) modified
Now extracting AWB for order identity in place of OrderId for Aramex report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java

Rev 5107 – Changed listing in a page from 10 to 50

rajveer — Thu, 03 May 2012 14:50:51 +0530

rajveer – 1 file(s) modified
Changed listing in a page from 10 to 50

~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemList.ui.xml

Rev 5106 – Find the related accessories while localizing the exceptions

rajveer — Thu, 03 May 2012 13:39:34 +0530

rajveer – 2 file(s) modified
Find the related accessories while localizing the exceptions

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AccessoriesFinder.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 5105 – Modifying scripts as per new Prod1 and Prod4 servers

mandeep.dhir — Thu, 03 May 2012 13:26:59 +0530

mandeep.dhir – 1 file(s) modified
Modifying scripts as per new Prod1 and Prod4 servers

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.sh

Rev 5104 – Commenting out few lines for now

mandeep.dhir — Thu, 03 May 2012 13:23:34 +0530

mandeep.dhir – 2 file(s) modified
Commenting out few lines for now

~ /trunk/runutils/ContentUpdationManager.sh
~ /trunk/runutils/generate-content-from-catalog.sh

Rev 5103 – Modifying scripts as per new Prod1 and Prod4 servers

mandeep.dhir — Thu, 03 May 2012 13:11:16 +0530

mandeep.dhir – 5 file(s) modified
Modifying scripts as per new Prod1 and Prod4 servers

~ /trunk/runutils/build-for-shop2020.sh
~ /trunk/runutils/ContentUpdationManager.sh
~ /trunk/runutils/generate-content-from-catalog.sh
~ /trunk/runutils/push-content-to-production.sh
~ /trunk/runutils/start-price-comparison-server.sh

Rev 5102 – Ticket #1215 Add new payment options enabled by EBS reviewer: ...

phani.kumar — Wed, 02 May 2012 20:16:43 +0530

phani.kumar – 5 file(s) modified
Ticket #1215 Add new payment options enabled by EBS
reviewer: Rajveer

~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
+ /trunk/Website/src/main/webapp/images/citi_logo.gif
+ /trunk/Website/src/main/webapp/images/indian_bank.gif
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5101 – Ticket #1142 - Glossary page title made specific to glossary ...

varun.gupta — Wed, 02 May 2012 16:50:48 +0530

varun.gupta – 2 file(s) modified
Ticket #1142 - Glossary page title made specific to glossary term

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm

Rev 5100 – Updated availability of the Accessories.

amit.gupta — Wed, 02 May 2012 16:45:31 +0530

amit.gupta – 1 file(s) modified
Updated availability of the Accessories.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 5099 – Added service method to mark orders as paid to vendor

varun.gupta — Wed, 02 May 2012 14:59:37 +0530

varun.gupta – 6 file(s) modified
Added service method to mark orders as paid to vendor

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5098 – Modified handling of Bluedart report

varun.gupta — Wed, 02 May 2012 14:53:25 +0530

varun.gupta – 2 file(s) modified
Modified handling of Bluedart report

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm

Rev 5097 – removed time to procure variable from list

rajveer — Wed, 02 May 2012 14:07:32 +0530

rajveer – 1 file(s) modified
removed time to procure variable from list

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

Rev 5096 – Updated duplicate pages for junglee. Removed Duplication of Product Page ...

amit.gupta — Wed, 02 May 2012 13:25:08 +0530

amit.gupta – 1 file(s) modified
Updated duplicate pages for junglee. Removed Duplication of Product Page as Amazon not allowed to do so.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 5095 – Restricted this coupon for users registered on or before May ...

varun.gupta — Wed, 02 May 2012 13:02:43 +0530

varun.gupta – 1 file(s) modified
Restricted this coupon for users registered on or before May 1, 2012

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Phone_and_Accessory.py

Rev 5094 – Ticket #880 Add JS Code for Product Specific Retargetting reviewer: ...

phani.kumar — Wed, 02 May 2012 12:43:59 +0530

phani.kumar – 3 file(s) modified
Ticket #880 Add JS Code for Product Specific Retargetting
reviewer: Varun Gupta

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
+ /trunk/Website/src/main/resources/templates/retargetingjs.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5093 – Updated duplicate pages for junglee.

amit.gupta — Wed, 02 May 2012 11:28:22 +0530

amit.gupta – 1 file(s) modified
Updated duplicate pages for junglee.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 5092 – Adding Abhishek

anupam.singh — Wed, 02 May 2012 11:24:23 +0530

anupam.singh – 1 file(s) modified
Adding Abhishek

~ /trunk/pentaho/scripts/AffiliatePerformanceReport.py

Rev 5091 – Using yesterday's date

anupam.singh — Wed, 02 May 2012 11:20:49 +0530

anupam.singh – 1 file(s) modified
Using yesterday's date

~ /trunk/pentaho/scripts/AffiliatePerformanceReport.py

Rev 5090 – type map is added to synonymmap if its null

amit.gupta — Wed, 02 May 2012 10:38:24 +0530

amit.gupta – 1 file(s) modified
type map is added to synonymmap if its null

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SynonymController.java

Rev 5089 – Added configuration for build test machine.

rajveer — Tue, 01 May 2012 19:05:29 +0530

rajveer – 1 file(s) modified
Added configuration for build test machine.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5088 – #847 Number of colors - Make it skippable

amit.gupta — Tue, 01 May 2012 16:39:29 +0530

amit.gupta – 1 file(s) modified
#847
Number of colors - Make it skippable

~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 5087 – This script generates an excel sheet which shows number of ...

anupam.singh — Tue, 01 May 2012 15:52:32 +0530

anupam.singh – 1 file(s) modified
This script generates an excel sheet which shows number of views and number of Add to carts that happened for last day for all traffic coming from MySmartPrice.in
Reviewer : Varun Gupta
Trac # 1189

+ /trunk/pentaho/scripts/AffiliatePerformanceReport.py

Rev 5086 – Added duplicate pages for junglee.

amit.gupta — Tue, 01 May 2012 14:44:54 +0530

amit.gupta – 1 file(s) modified
Added duplicate pages for junglee.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 5085 – Ticket #1182 - Rule module to give discount on purchase ...

varun.gupta — Tue, 01 May 2012 14:44:38 +0530

varun.gupta – 1 file(s) modified
Ticket #1182 - Rule module to give discount on purchase of mobile/tablet AND accessory

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Phone_and_Accessory.py

Rev 5084 – Ticket #1195 Search Suggestions to be populated from CMS Ticket ...

phani.kumar — Tue, 01 May 2012 13:02:29 +0530

phani.kumar – 4 file(s) modified
Ticket #1195 Search Suggestions to be populated from CMS
Ticket #1112 AutoSuggest Db should be refreshed daily
reviewer: Rajveer

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/SynonymExporter.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/AutoSuggestService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 5083 – Added new ip in the list of production servers.

rajveer — Tue, 01 May 2012 12:03:21 +0530

rajveer – 1 file(s) modified
Added new ip in the list of production servers.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5082 – Renamed the class as controller class

varun.gupta — Tue, 01 May 2012 04:01:21 +0530

varun.gupta – 1 file(s) modified
Renamed the class as controller class

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShareProductsController.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShareProducts.java@5003)

Rev 5081 – Adding try catch

anupam.singh — Mon, 30 Apr 2012 20:54:27 +0530

anupam.singh – 1 file(s) modified
Adding try catch

~ /trunk/pentaho/scripts/ProductActivityLoader.py

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 5079 – Added configuration of another production machine called PROD4.

rajveer — Mon, 30 Apr 2012 18:03:16 +0530

rajveer – 1 file(s) modified
Added configuration of another production machine called PROD4.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5078 – changed Synonymmap to static. No need to create it again ...

amit.gupta — Mon, 30 Apr 2012 17:15:34 +0530

amit.gupta – 1 file(s) modified
changed Synonymmap to static. No need to create it again and again.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java

Rev 5077 – Log exception in the ExceptionController.

rajveer — Mon, 30 Apr 2012 15:55:31 +0530

rajveer – 1 file(s) modified
Log exception in the ExceptionController.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ExceptionController.java

Rev 5076 – Ticket #1178 - Added server-side check for pincode when adding ...

varun.gupta — Mon, 30 Apr 2012 15:54:01 +0530

varun.gupta – 1 file(s) modified
Ticket #1178 - Added server-side check for pincode when adding new address

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java

Rev 5075 – Added null checks while fetching Synonym map. Create one if ...

amit.gupta — Mon, 30 Apr 2012 15:49:03 +0530

amit.gupta – 1 file(s) modified
Added null checks while fetching Synonym map. Create one if it does not exists.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SynonymController.java

Rev 5074 – #1113 Allow Brand level and category level synonyms Reviewer: Rajveer

amit.gupta — Mon, 30 Apr 2012 12:48:09 +0530

amit.gupta – 11 file(s) modified
#1113
Allow Brand level and category level synonyms
Reviewer: Rajveer

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SynonymController.java
+ /trunk/ContentCreation/src/main/webapp/js/synonym-index.js
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/synonym-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/synonym-update.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml