SmartDukaan – /

Rev 8024 – Comparisions are now editable

amit.gupta — Tue, 27 Aug 2013 16:28:34 +0530

amit.gupta – 7 file(s) modified
Comparisions are now editable

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/CmpScoresController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/cmp-scores-show.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java

Rev 8023 – all music and connectivity features made recommended.

amit.gupta — Tue, 27 Aug 2013 16:12:44 +0530

amit.gupta – 1 file(s) modified
all music and connectivity features made recommended.

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

Rev 8022 – content model changes to make all mobile models uniform.

amit.gupta — Tue, 27 Aug 2013 15:58:06 +0530

amit.gupta – 4 file(s) modified
content model changes to make all mobile models uniform.

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 8021 – Updated logic to get email from user email instead of ...

rajveer — Tue, 27 Aug 2013 15:44:39 +0530

rajveer – 5 file(s) modified
Updated logic to get email from user email instead of source.

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateOrderAcknowledgementFeed.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/AmazonOrder.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java

Rev 8020 – Create users based on amazon email id. Stop sending email ...

rajveer — Tue, 27 Aug 2013 15:10:45 +0530

rajveer – 13 file(s) modified
Create users based on amazon email id. Stop sending email to other sources users.

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/AmazonOrder.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/SpicedeckRechargeVoucherService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 8019 – Increasing procurement delay for Trade-Mumbai and Virgin to 3 days

amar.kumar — Tue, 27 Aug 2013 11:54:49 +0530

amar.kumar – 1 file(s) modified
Increasing procurement delay for Trade-Mumbai and Virgin to 3 days

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

Rev 8018 – Corrected name of company.

rajveer — Mon, 26 Aug 2013 13:23:37 +0530

rajveer – 1 file(s) modified
Corrected name of company.

~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-topup-authsuccess.vm

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

manish.sharma — Mon, 26 Aug 2013 12:14:37 +0530

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

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

Rev 8016 – Made change in invoice.

rajveer — Mon, 26 Aug 2013 11:37:23 +0530

rajveer – 1 file(s) modified
Made change in invoice.

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

Rev 8015 – Handle NPE for invoice servlet.

rajveer — Mon, 26 Aug 2013 11:30:46 +0530

rajveer – 1 file(s) modified
Handle NPE for invoice servlet.

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

Rev 8014 – migration related to video recording.

amit.gupta — Fri, 23 Aug 2013 17:06:20 +0530

amit.gupta – 1 file(s) modified
migration related to video recording.

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

Rev 8013 – Get data from warehouse table.

rajveer — Fri, 23 Aug 2013 13:00:46 +0530

rajveer – 1 file(s) modified
Get data from warehouse table.

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

Rev 8012 – Changes in mail format for reconcilication.

rajveer — Fri, 23 Aug 2013 12:50:58 +0530

rajveer – 1 file(s) modified
Changes in mail format for reconcilication.

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

Rev 8011 – Get data from warehouse table.

rajveer — Fri, 23 Aug 2013 12:46:52 +0530

rajveer – 1 file(s) modified
Get data from warehouse table.

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

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

manish.sharma — Fri, 23 Aug 2013 12:03:17 +0530

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

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

Rev 8009 – minor changes related to migration.

amit.gupta — Fri, 23 Aug 2013 11:32:32 +0530

amit.gupta – 2 file(s) modified
minor changes related to migration.

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

Rev 8008 – Added another field of client in recharge sheet to be ...

anupam.singh — Thu, 22 Aug 2013 18:18:40 +0530

anupam.singh – 6 file(s) modified
Added another field of client in recharge sheet to be uploaded. Added a new pay method - "cheque"

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/auxiliary/BulkRechargeRunnable.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/BulkRechargeController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/bulk-recharge-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PayMethod.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8007 – Made changes to send MIS for balance mismatch.

rajveer — Thu, 22 Aug 2013 18:10:49 +0530

rajveer – 1 file(s) modified
Made changes to send MIS for balance mismatch.

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

Rev 8006 – Added attributes for clone order also.

rajveer — Thu, 22 Aug 2013 17:35:16 +0530

rajveer – 1 file(s) modified
Added attributes for clone order also.

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

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

manish.sharma — Thu, 22 Aug 2013 17:14:58 +0530

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

~ /trunk/ShipDEWebServiceClient/src/main/java/com/ShipWebServiceClient.java

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

manish.sharma — Thu, 22 Aug 2013 16:18:53 +0530

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

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

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

manish.sharma — Thu, 22 Aug 2013 15:43:38 +0530

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

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

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

manish.sharma — Thu, 22 Aug 2013 15:24:09 +0530

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

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

Rev 8001 – Reship order should copy amazon order if require.

rajveer — Thu, 22 Aug 2013 13:19:06 +0530

rajveer – 1 file(s) modified
Reship order should copy amazon order if require.

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

Rev 8000 – Step 6 migration.

amit.gupta — Thu, 22 Aug 2013 13:09:43 +0530

amit.gupta – 1 file(s) modified
Step 6 migration.

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

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

manish.sharma — Thu, 22 Aug 2013 13:03:26 +0530

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

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

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

manish.sharma — Thu, 22 Aug 2013 11:01:50 +0530

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

~ /trunk/HotspotDashboard/src/main/resources/fedex/barcode.TTF

Rev 7997 – Step 6 migration.

amit.gupta — Thu, 22 Aug 2013 09:08:00 +0530

amit.gupta – 9 file(s) modified
Step 6 migration.

~ /trunk/ContentStore/src/jython/irdatarules/cameras/resolution.py
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/Feature.java
~ /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/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 7996 – Created a bulk recharge facility. Streamlined initialization of controller classes.

anupam.singh — Thu, 22 Aug 2013 04:00:21 +0530

anupam.singh – 11 file(s) modified
Created a bulk recharge facility. Streamlined initialization of controller classes.

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/auxiliary (copied from /RechargeDashboard/src/main/java/in/shop2020/recharge/service@7546)
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/auxiliary/BulkRechargeInfo.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/auxiliary/BulkRechargeRunnable.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/BaseController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/BulkRechargeController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
x /RechargeDashboard/src/main/java/in/shop2020/recharge/service
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/bulk-recharge-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py

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

manish.sharma — Wed, 21 Aug 2013 19:54:01 +0530

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

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

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

manish.sharma — Wed, 21 Aug 2013 19:52:56 +0530

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

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

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

manish.sharma — Wed, 21 Aug 2013 19:50:35 +0530

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

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

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

manish.sharma — Wed, 21 Aug 2013 19:09:04 +0530

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

~ /trunk/ShipDEWebServiceClient/src/main/java/com/ShipWebServiceClient.java

Rev 7991 – Removed konka added. lenovo brand.

amit.gupta — Tue, 20 Aug 2013 16:07:28 +0530

amit.gupta – 1 file(s) modified
Removed konka added. lenovo brand.

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

Rev 7990 – Email to field accepts list of strings

anupam.singh — Tue, 20 Aug 2013 14:07:36 +0530

anupam.singh – 1 file(s) modified
Email to field accepts list of strings

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

Rev 7989 –

amit.gupta — Tue, 20 Aug 2013 12:31:14 +0530

amit.gupta – 1 file(s) modified

+ /trunk/runutils/generate-partner-content.sh

Rev 7988 –

amit.gupta — Tue, 20 Aug 2013 12:30:40 +0530

amit.gupta – 1 file(s) modified

+ /trunk/runutils/weekly-content-generation.sh

Rev 7987 – Added promotion id to Promotion Tracker as well.

amit.gupta — Tue, 20 Aug 2013 11:52:01 +0530

amit.gupta – 2 file(s) modified
Added promotion id to Promotion Tracker as well.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 7986 – Changing the recipient of "no recharge done" mail

anupam.singh — Mon, 19 Aug 2013 23:44:29 +0530

anupam.singh – 1 file(s) modified
Changing the recipient of "no recharge done" mail

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

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