SmartDukaan – /

Rev 7985 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Mon, 19 Aug 2013 17:46:38 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 19-Aug-2013

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

Rev 7984 – changes related to migration step 4 and 5.

amit.gupta — Mon, 19 Aug 2013 12:27:12 +0530

amit.gupta – 2 file(s) modified
changes related to migration step 4 and 5.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 7983 – Keep storing wallet balance.

rajveer — Sun, 18 Aug 2013 11:35:49 +0530

rajveer – 1 file(s) modified
Keep storing wallet balance.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py

Rev 7982 – Send mail to pradeep and amit tyagi.

rajveer — Sun, 18 Aug 2013 11:25:37 +0530

rajveer – 1 file(s) modified
Send mail to pradeep and amit tyagi.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py

Rev 7981 – Added code of delhivery back to path.

rajveer — Fri, 16 Aug 2013 15:40:44 +0530

rajveer – 1 file(s) modified
Added code of delhivery back to path.

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

Rev 7980 – Assign awb in case of reship.

rajveer — Fri, 16 Aug 2013 15:37:04 +0530

rajveer – 1 file(s) modified
Assign awb in case of reship.

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

Rev 7979 – Parent category for mobile is comparable.

amit.gupta — Thu, 15 Aug 2013 00:41:31 +0530

amit.gupta – 1 file(s) modified
Parent category for mobile is comparable.

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

Rev 7978 – Removed not required expanded entity.

amit.gupta — Wed, 14 Aug 2013 17:13:03 +0530

amit.gupta – 1 file(s) modified
Removed not required expanded entity.

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

Rev 7977 – Service changes to track user events.

kshitij.sood — Wed, 14 Aug 2013 15:27:32 +0530

kshitij.sood – 9 file(s) modified
Service changes to track user events.

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

Rev 7976 –

amit.gupta — Wed, 14 Aug 2013 15:00:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 7975 – Added dummy method for comparables.

amit.gupta — Wed, 14 Aug 2013 12:12:45 +0530

amit.gupta – 3 file(s) modified
Added dummy method for comparables.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java

Rev 7974 –

amit.gupta — Wed, 14 Aug 2013 11:34:20 +0530

amit.gupta – 1 file(s) modified

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

Rev 7973 – Changes related to migration step 2 and 3.

amit.gupta — Wed, 14 Aug 2013 10:45:31 +0530

amit.gupta – 11 file(s) modified
Changes related to migration step 2 and 3.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentStore/src/jython/comparisonrules/data_connectivity_math.py
~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/comparisonbuckets.xml
~ /trunk/ContentStore/src/xml/model/comparisondefinitions.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 7972 – Change to show last n days sale for selected item ...

amar.kumar — Tue, 13 Aug 2013 17:14:36 +0530

amar.kumar – 10 file(s) modified
Change to show last n days sale for selected item in CatalogDashboard

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.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/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /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 7971 – Minor bugfixes.

amit.gupta — Tue, 13 Aug 2013 14:41:44 +0530

amit.gupta – 1 file(s) modified
Minor bugfixes.

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

Rev 7970 – Added case brand in accessories section.

amit.gupta — Tue, 13 Aug 2013 12:30:26 +0530

amit.gupta – 1 file(s) modified
Added case brand in accessories section.

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

Rev 7969 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Tue, 13 Aug 2013 11:34:41 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 13-Aug-2013

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java

Rev 7968 – Changes for 1) While billing Freebie Order changing order ...

amar.kumar — Tue, 13 Aug 2013 01:24:22 +0530

amar.kumar – 11 file(s) modified
Changes for
1) While billing Freebie Order changing order of scans. Now first checking if freebie is available, then billing main product, then billing freebie
2) Change in Daily Inventory Mismatch between CIS and warehouse db to take care of in transit inventory.
3)

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.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/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.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/InventoryItemMapper.xml

Rev 7967 – Send emails to all stores where no recharge happened on ...

anupam.singh — Mon, 12 Aug 2013 18:40:59 +0530

anupam.singh – 12 file(s) modified
Send emails to all stores where no recharge happened on a given day.

~ /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/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HotspotServiceMatrix.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/hotspotServiceMatrix.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7966 – Minor bugfixes.

amit.gupta — Mon, 12 Aug 2013 18:18:49 +0530

amit.gupta – 1 file(s) modified
Minor bugfixes.

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

Rev 7965 – bug fix.

amit.gupta — Mon, 12 Aug 2013 17:58:48 +0530

amit.gupta – 1 file(s) modified
bug fix.

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

Rev 7964 – Only scores will be shown for ready and completed entities.

amit.gupta — Mon, 12 Aug 2013 16:43:01 +0530

amit.gupta – 1 file(s) modified
Only scores will be shown for ready and completed entities.

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

Rev 7963 – non comparable entites are ignored.

amit.gupta — Mon, 12 Aug 2013 16:32:22 +0530

amit.gupta – 1 file(s) modified
non comparable entites are ignored.

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

Rev 7962 – scores are formatted and summary shows the final score.

amit.gupta — Mon, 12 Aug 2013 15:59:59 +0530

amit.gupta – 1 file(s) modified
scores are formatted and summary shows the final score.

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

Rev 7961 – Category Controller zone id can be used for any category.

amit.gupta — Mon, 12 Aug 2013 15:36:21 +0530

amit.gupta – 1 file(s) modified
Category Controller zone id can be used for any category.

~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 7960 – Minor bug fixed

amit.gupta — Mon, 12 Aug 2013 12:37:08 +0530

amit.gupta – 1 file(s) modified
Minor bug fixed

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 7959 – Not logging stack trace when amazon order is null

anupam.singh — Mon, 12 Aug 2013 12:20:05 +0530

anupam.singh – 1 file(s) modified
Not logging stack trace when amazon order is null

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java

Rev 7958 – Added info related to score.

amit.gupta — Mon, 12 Aug 2013 11:33:33 +0530

amit.gupta – 3 file(s) modified
Added info related to score.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-edit-new.vm

Rev 7957 – Changes in Movement Report to add bad inventory sheets and ...

amar.kumar — Thu, 08 Aug 2013 16:07:26 +0530

amar.kumar – 10 file(s) modified
Changes in Movement Report to add bad inventory sheets and adding columns for DOA_OUT, DOA_REPLACED and Transfer_in and Transfer_Out

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.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/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 7956 – Adding refund reason "Flagged by gateway"

anupam.singh — Thu, 08 Aug 2013 14:44:15 +0530

anupam.singh – 1 file(s) modified
Adding refund reason "Flagged by gateway"

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 7955 – Adding DOA_OUT DOA_Replaced, Transfer_In, Transfer_Out fields in Movement Report

amar.kumar — Thu, 08 Aug 2013 13:22:05 +0530

amar.kumar – 1 file(s) modified
Adding DOA_OUT DOA_Replaced, Transfer_In, Transfer_Out fields in Movement Report

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

Rev 7954 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Thu, 08 Aug 2013 11:30:52 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 08-Aug-2013

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

Rev 7953 – When the entire amount is being paid by coupon then ...

anupam.singh — Wed, 07 Aug 2013 18:13:01 +0530

anupam.singh – 2 file(s) modified
When the entire amount is being paid by coupon then two payments were being created. Fixing this issue.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CouponPaymentService.java

Rev 7952 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Wed, 07 Aug 2013 17:26:58 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 07-Aug-2013

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java

Rev 7951 – Get a new AWB number in all cases when converting ...

anupam.singh — Wed, 07 Aug 2013 15:38:39 +0530

anupam.singh – 1 file(s) modified
Get a new AWB number in all cases when converting from pickup store order to normal order.

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

Rev 7950 – Deleted by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Wed, 07 Aug 2013 15:32:53 +0530

manish.sharma – 1 file(s) modified
Deleted by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 07-Aug-2013

x /trunk/ShipDEWebServiceClient/bin

Rev 7949 – UTF-8 encoding is now used to render velocity template.

amit.gupta — Wed, 07 Aug 2013 14:33:13 +0530

amit.gupta – 1 file(s) modified
UTF-8 encoding is now used to render velocity template.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java

Rev 7948 – Added new emi codes for HSBC 9 month and 12 ...

amit.gupta — Tue, 06 Aug 2013 18:47:34 +0530

amit.gupta – 3 file(s) modified
Added new emi codes for HSBC 9 month and 12 month.

~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 7947 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 18:26:02 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 06-Aug-2013

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

Rev 7946 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 18:24:46 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 06-Aug-2013

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