SmartDukaan – /

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 5495 – Changing recipients

anupam.singh — Tue, 26 Jun 2012 18:25:16 +0530

anupam.singh – 1 file(s) modified
Changing recipients

~ /trunk/PyProj/src/shop2020/purchase/scripts/vendorFulfilmentReport.py

Rev 5494 – trac #1079 Reviewer : Mandeep Dhir Creating a report ...

anupam.singh — Tue, 26 Jun 2012 17:25:32 +0530

anupam.singh – 2 file(s) modified
trac #1079
Reviewer : Mandeep Dhir

Creating a report to measure vendor fulfilment performance.

+ /trunk/PyProj/src/shop2020/purchase/scripts
+ /trunk/PyProj/src/shop2020/purchase/scripts/vendorFulfilmentReport.py

Rev 5493 – Avoid adding queryString in case of null.

rajveer — Tue, 26 Jun 2012 16:54:56 +0530

rajveer – 1 file(s) modified
Avoid adding queryString in case of null.

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

Rev 5492 – Changed enum of voucherType

rajveer — Tue, 26 Jun 2012 15:32:36 +0530

rajveer – 4 file(s) modified
Changed enum of voucherType

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/SpiceDeckRechargeService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/VoucherType.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 5491 – Keep the url parameters on redirect.

rajveer — Tue, 26 Jun 2012 13:54:06 +0530

rajveer – 1 file(s) modified
Keep the url parameters on redirect.

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

Rev 5490 – Updated new types for XOLO

amit.gupta — Tue, 26 Jun 2012 12:43:19 +0530

amit.gupta – 1 file(s) modified
Updated new types for XOLO

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

Rev 5489 – #1451 Reviwer : rajveer Removed incosistencies in Category Url in ...

amit.gupta — Tue, 26 Jun 2012 11:57:13 +0530

amit.gupta – 2 file(s) modified
#1451
Reviwer : rajveer
Removed incosistencies in Category Url in Page header. Old url will redirect to new url.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 5488 – Ticket #1428 Generate Reconciliation report for Vendor payments based on ...

phani.kumar — Tue, 26 Jun 2012 11:48:06 +0530

phani.kumar – 1 file(s) modified
Ticket #1428 Generate Reconciliation report for Vendor payments based on date range

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

Rev 5487 – Enable Warehouse Executive to see RTO awaited, DOA Awaited, and ...

rajveer — Mon, 25 Jun 2012 19:28:02 +0530

rajveer – 1 file(s) modified
Enable Warehouse Executive to see RTO awaited, DOA Awaited, and return awaited orders.
Ticket #1371.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java

Rev 5486 – Added two enum values as per ticket #1418.

rajveer — Mon, 25 Jun 2012 15:53:54 +0530

rajveer – 1 file(s) modified
Added two enum values as per ticket #1418.

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

Rev 5485 – Removed seven products from SAnniverssary coupons

varun.gupta — Mon, 25 Jun 2012 13:16:39 +0530

varun.gupta – 1 file(s) modified
Removed seven products from SAnniverssary coupons

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

Rev 5484 – changing delayed delivery ticket's assigneeId from zaffar to manoj

amar.kumar — Mon, 25 Jun 2012 02:26:02 +0530

amar.kumar – 1 file(s) modified
changing delayed delivery ticket's assigneeId from zaffar to manoj

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java

Rev 5483 – Added method to enqueue email for sharing via mobile site

varun.gupta — Sun, 24 Jun 2012 18:00:10 +0530

varun.gupta – 1 file(s) modified
Added method to enqueue email for sharing via mobile site

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py

Rev 5482 – Added logic to ship Chennai pincodes by Delhivery. Reviewer: Mandeep

rajveer — Fri, 22 Jun 2012 18:56:25 +0530

rajveer – 1 file(s) modified
Added logic to ship Chennai pincodes by Delhivery.
Reviewer: Mandeep

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

Rev 5481 – Ticket #1428 Generate Reconciliation report for Vendor payments based on ...

phani.kumar — Fri, 22 Jun 2012 17:25:57 +0530

phani.kumar – 9 file(s) modified
Ticket #1428 Generate Reconciliation report for Vendor payments based on date range
Ticket #1427 In Vendor Reconciliation add Delhivery support
reviewer: Rajveer Singh

~ /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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5480 – Ensured that prices and availability ftp upload should only happen ...

amit.gupta — Fri, 22 Jun 2012 16:57:00 +0530

amit.gupta – 1 file(s) modified
Ensured that prices and availability ftp upload should only happen when the content at the production is updated early morning 5am.

~ /trunk/runutils/ContentUpdationManager.sh

Rev 5479 – Ensured that prices and availability should only happen when the ...

amit.gupta — Fri, 22 Jun 2012 16:33:39 +0530

amit.gupta – 2 file(s) modified
Ensured that prices and availability should only happen when the content at the production is updated early morning 5am.

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

Rev 5478 – Changed the path to execute it from egg package

rajveer — Fri, 22 Jun 2012 16:23:02 +0530

rajveer – 1 file(s) modified
Changed the path to execute it from egg package

~ /trunk/runutils/inventory-status-report.sh

Rev 5477 – Removed hardcoding for categories.

rajveer — Fri, 22 Jun 2012 15:14:33 +0530

rajveer – 1 file(s) modified
Removed hardcoding for categories.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py

Rev 5476 – #1429

amit.gupta — Fri, 22 Jun 2012 13:18:20 +0530

amit.gupta – 2 file(s) modified
#1429

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 5475 – #1368 Reviewer : Mandeep

amit.gupta — Fri, 22 Jun 2012 13:17:27 +0530

amit.gupta – 1 file(s) modified
#1368
Reviewer : Mandeep

~ /trunk/ContentStore/src/jython/comparisonrules/video_math.py

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 5473 – Ticket #1358

amit.gupta — Fri, 22 Jun 2012 11:51:20 +0530

amit.gupta – 1 file(s) modified
Ticket #1358

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

Rev 5472 – #1439, #1437

amit.gupta — Fri, 22 Jun 2012 11:41:11 +0530

amit.gupta – 1 file(s) modified
#1439, #1437

~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py

Rev 5471 – Added Headphones category

mandeep.dhir — Fri, 22 Jun 2012 11:25:35 +0530

mandeep.dhir – 1 file(s) modified
Added Headphones category

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py

Rev 5470 – S5300 Galaxy Pocket removed from the coupon

varun.gupta — Fri, 22 Jun 2012 03:38:40 +0530

varun.gupta – 1 file(s) modified
S5300 Galaxy Pocket removed from the coupon

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

Rev 5469 – Added infrastructure to generate, store, issue and activate voucher of ...

rajveer — Thu, 21 Jun 2012 18:32:15 +0530

rajveer – 13 file(s) modified
Added infrastructure to generate, store, issue and activate voucher of spicedeck.com.
Reviewer: Mandeep

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
+ /trunk/Support/src/main/java/in/shop2020/support/services/SpiceDeckRechargeService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Voucher.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/VoucherType.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 5468 – To remove statusCode from url, added it to restricted parameter ...

rajveer — Thu, 21 Jun 2012 14:57:32 +0530

rajveer – 4 file(s) modified
To remove statusCode from url, added it to restricted parameter list.

+ /trunk/Website/src/main/java/in/shop2020/serving/dispatcher
+ /trunk/Website/src/main/java/in/shop2020/serving/dispatcher/SaholicServletRedirectResult.java
x /trunk/Website/src/main/java/in/shop2020/serving/model
~ /trunk/Website/src/main/resources/struts.xml

Rev 5467 – #1439, #1437

amit.gupta — Thu, 21 Jun 2012 14:47:28 +0530

amit.gupta – 2 file(s) modified
#1439, #1437

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 5466 – Added support for tracking newsletter as a source Trac ...

anupam.singh — Thu, 21 Jun 2012 12:50:40 +0530

anupam.singh – 2 file(s) modified
Added support for tracking newsletter as a source

Trac #838
Reviewer : Amar Kumar

~ /trunk/pentaho/schema/ProductActivitySchema.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 5465 – Changing availibility to availability

mandeep.dhir — Thu, 21 Jun 2012 12:39:11 +0530

mandeep.dhir – 1 file(s) modified
Changing availibility to availability

~ /trunk/runutils/daily-inventory-report.sh

Rev 5464 – Using cartId directly to getDiscounts, instead of getting cartId from ...

amar.kumar — Thu, 21 Jun 2012 12:29:50 +0530

amar.kumar – 1 file(s) modified
Using cartId directly to getDiscounts, instead of getting cartId from line and then using it

~ /trunk/UserService/src/main/java/in/shop2020/user/handler/CartHandler.java

Rev 5463 – Trac#1212 Added purchase report for Hotspot as well. Also, updating ...

mandeep.dhir — Thu, 21 Jun 2012 10:53:37 +0530

mandeep.dhir – 1 file(s) modified
Trac#1212 Added purchase report for Hotspot as well.
Also, updating staging as well when mappings are uploaded

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 5462 – Trac#1212 Added purchase report for Hotspot as well. Also, updating ...

mandeep.dhir — Thu, 21 Jun 2012 10:38:05 +0530

mandeep.dhir – 3 file(s) modified
Trac#1212 Added purchase report for Hotspot as well.
Also, updating staging as well when mappings are uploaded

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5461 – Removed Galaxy Y Duos S6102 and Samsung Galaxy Y S5360 ...

varun.gupta — Wed, 20 Jun 2012 18:03:14 +0530

varun.gupta – 1 file(s) modified
Removed Galaxy Y Duos S6102 and Samsung Galaxy Y S5360 from the coupon

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_SAnniversary.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 5459 – Enhancing header

mandeep.dhir — Tue, 19 Jun 2012 18:00:18 +0530

mandeep.dhir – 1 file(s) modified
Enhancing header

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-index.vm

Rev 5458 – Successful updates should happen only when 60% rows are processed ...

mandeep.dhir — Tue, 19 Jun 2012 17:57:46 +0530

mandeep.dhir – 2 file(s) modified
Successful updates should happen only when 60% rows are processed without error

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-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