SmartDukaan – /

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

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

manish.sharma — Tue, 06 Aug 2013 18:23:08 +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/model/v1/order/impl/DataAccessors.py

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

manish.sharma — Tue, 06 Aug 2013 18:16:14 +0530

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

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

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

manish.sharma — Tue, 06 Aug 2013 18:12:54 +0530

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

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

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

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

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

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

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

manish.sharma — Tue, 06 Aug 2013 18:08:30 +0530

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

~ /trunk/Crm/pom.xml

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

manish.sharma — Tue, 06 Aug 2013 17:59:51 +0530

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

~ /trunk/Website/pom.xml

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

manish.sharma — Tue, 06 Aug 2013 17:53:33 +0530

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

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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

manish.sharma — Tue, 06 Aug 2013 17:49:26 +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/model/v1/order/impl/OrderServiceHandler.py

Rev 7937 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 17:36:44 +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/thriftpy/model/v1/order/TransactionService.py

Rev 7936 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 17:36:25 +0530

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

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 7935 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 17:24:14 +0530

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

+ /trunk/Common/src/main/java/in/shop2020/utils/FedExShipAccountInfo.java

Rev 7934 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 17:23:00 +0530

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

~ /trunk/Common/pom.xml

Rev 7933 –
and
s are removed from newly created features ...

amit.gupta — Tue, 06 Aug 2013 16:41:19 +0530

amit.gupta – 1 file(s) modified
<li> and <ul> s are removed from newly created features like organiser games and other features.

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

Rev 7932 – Removed feature with empty bullet and , "

amit.gupta — Tue, 06 Aug 2013 12:25:35 +0530

amit.gupta – 1 file(s) modified
Removed feature with empty bullet and , "

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

Rev 7931 – Commited by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 11:58:53 +0530

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

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FedExUpdatesController.java

Rev 7930 – Commited by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 11:57:16 +0530

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

+ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java

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

manish.sharma — Tue, 06 Aug 2013 11:16:40 +0530

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

~ /trunk/Website/pom.xml

SmartDukaan – /

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

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

Rev 7966 – Minor bugfixes.

Rev 7965 – bug fix.

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

Rev 7963 – non comparable entites are ignored.

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

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

Rev 7960 – Minor bug fixed

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

Rev 7958 – Added info related to score.

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

Rev 7956 – Adding refund reason "Flagged by gateway"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Rev 7937 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

Rev 7936 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

Rev 7935 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

Rev 7934 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

Rev 7933 – and s are removed from newly created features ...

Rev 7932 – Removed feature with empty bullet and , "

Rev 7931 – Commited by Manish Sharma for FedEx Integration - Tracking and ...

Rev 7930 – Commited by Manish Sharma for FedEx Integration - Tracking and ...

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

Rev 7933 –
and
s are removed from newly created features ...