SmartDukaan – /

Rev 8951 – Made changed for new tids in hdfc payment gateway.

rajveer — Wed, 04 Dec 2013 17:25:54 +0530

rajveer – 9 file(s) modified
Made changed for new tids in hdfc payment gateway.

~ /trunk/PaymentService/src/main/resources/hdfc-emi/production/5/resource.cgn
+ /trunk/PaymentService/src/main/resources/hdfc-emi/production/5/resource_old.cgn (copied from /trunk/PaymentService/src/main/resources/hdfc-emi/production/5/resource.cgn@8906)
~ /trunk/PaymentService/src/main/resources/hdfc-emi/production/10/resource.cgn
+ /trunk/PaymentService/src/main/resources/hdfc-emi/production/10/resource_old.cgn (copied from /trunk/PaymentService/src/main/resources/hdfc-emi/production/10/resource.cgn@8906)
~ /trunk/PaymentService/src/main/resources/hdfc-emi/production/11/resource.cgn
+ /trunk/PaymentService/src/main/resources/hdfc-emi/production/11/resource_old.cgn (copied from /trunk/PaymentService/src/main/resources/hdfc-emi/production/11/resource.cgn@8906)
~ /trunk/PaymentService/src/main/resources/hdfc-emi/production/12/resource.cgn
+ /trunk/PaymentService/src/main/resources/hdfc-emi/production/12/resource_old.cgn (copied from /trunk/PaymentService/src/main/resources/hdfc-emi/production/12/resource.cgn@8906)
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 8950 – Added implementation to new RBI Guidelines related to EMI

amit.gupta — Tue, 03 Dec 2013 23:12:41 +0530

amit.gupta – 2 file(s) modified
Added implementation to new RBI Guidelines related to EMI

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

Rev 8949 – Added implementation to new RBI Guidelines related to EMI

amit.gupta — Tue, 03 Dec 2013 19:17:51 +0530

amit.gupta – 1 file(s) modified
Added implementation to new RBI Guidelines related to EMI

~ /trunk/Website/src/main/webapp/js/entity.js

Rev 8948 – Added implementation to new RBI Guidelines related to EMI

amit.gupta — Tue, 03 Dec 2013 19:13:36 +0530

amit.gupta – 4 file(s) modified
Added implementation to new RBI Guidelines related to EMI

~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 8947 – Change for receiving Non Serialized inventory transferred from our warehouse ...

amar.kumar — Tue, 03 Dec 2013 17:12:20 +0530

amar.kumar – 1 file(s) modified
Change for receiving Non Serialized inventory transferred from our warehouse to our warehouse

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 8946 – Changed EMI front-end logic.

amit.gupta — Tue, 03 Dec 2013 16:36:28 +0530

amit.gupta – 2 file(s) modified
Changed EMI front-end logic.

~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 8945 – Checking null/Empty check for serial number for Non Serialized inventory

amar.kumar — Tue, 03 Dec 2013 16:24:48 +0530

amar.kumar – 1 file(s) modified
Checking null/Empty check for serial number for Non Serialized inventory

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 8944 –

amar.kumar — Tue, 03 Dec 2013 15:55:20 +0530

amar.kumar – 1 file(s) modified

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 8943 – change for marking rto received orders as refunded for Snapdeal ...

amar.kumar — Tue, 03 Dec 2013 14:26:24 +0530

amar.kumar – 1 file(s) modified
change for marking rto received orders as refunded for Snapdeal and Ebay Orders

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

Rev 8942 – Made changes as per new EMI guidelines of RBI.

rajveer — Tue, 03 Dec 2013 12:09:40 +0530

rajveer – 15 file(s) modified
Made changes as per new EMI guidelines of RBI.

~ /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/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiScheme.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/InnovitiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java

Rev 8941 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Tue, 03 Dec 2013 10:56:21 +0530

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

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

Rev 8940 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Tue, 03 Dec 2013 10:54:41 +0530

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

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

Rev 8939 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Tue, 03 Dec 2013 10:53:38 +0530

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

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

Rev 8938 – Added Wi-Fi router changes

amit.gupta — Tue, 03 Dec 2013 10:50:50 +0530

amit.gupta – 7 file(s) modified
Added Wi-Fi router changes

+ /trunk/ContentStore/src/jython/irdatarules/mobiletype.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 8937 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Tue, 03 Dec 2013 10:49:44 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Dec-03-2013

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

Rev 8936 – Added track event with analytics code and side banner change.

kshitij.sood — Mon, 02 Dec 2013 16:43:27 +0530

kshitij.sood – 9 file(s) modified
Added track event with analytics code and side banner change.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
+ /trunk/Website/src/main/webapp/images/Why-Saholic-New.png
~ /trunk/Website/src/main/webapp/js/common.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 8935 – entities-saholic has been removed twice.

amit.gupta — Mon, 02 Dec 2013 15:58:37 +0530

amit.gupta – 1 file(s) modified
entities-saholic has been removed twice.

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

Rev 8934 – Hdfc emi removed.

kshitij.sood — Mon, 02 Dec 2013 15:23:19 +0530

kshitij.sood – 1 file(s) modified
Hdfc emi removed.

~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 8933 – Updating correct warehouseId in InventoryItem and currentInventorySnapshot while receiving item ...

amar.kumar — Sun, 01 Dec 2013 23:45:46 +0530

amar.kumar – 1 file(s) modified
Updating correct warehouseId in InventoryItem and currentInventorySnapshot while receiving item from Amazon

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 8932 – Payment Successful recharges should not have a "Refund" button

anupam.singh — Sun, 01 Dec 2013 14:39:51 +0530

anupam.singh – 1 file(s) modified
Payment Successful recharges should not have a "Refund" button

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 8931 – Change to set received-return timestamp for Ebay/Snapdeal Orders cancelled after ...

amar.kumar — Fri, 29 Nov 2013 17:33:15 +0530

amar.kumar – 1 file(s) modified
Change to set received-return timestamp for Ebay/Snapdeal Orders cancelled after billing

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

Rev 8930 – Change to show transfer-lots for past 3 months

amar.kumar — Fri, 29 Nov 2013 17:21:21 +0530

amar.kumar – 1 file(s) modified
Change to show transfer-lots for past 3 months

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

Rev 8929 – Committed by Manish Sharma for Physical Refund Details Display on ...

manish.sharma — Fri, 29 Nov 2013 13:13:30 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Physical Refund Details Display on Nov-29-2013

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

Rev 8928 – Avoiding Inventory changes in CurrentInventorySnapshot and CurrentReservationSnapshot for Bad Inventory ...

amar.kumar — Fri, 29 Nov 2013 12:37:31 +0530

amar.kumar – 1 file(s) modified
Avoiding Inventory changes in CurrentInventorySnapshot and CurrentReservationSnapshot for Bad Inventory Orders

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

Rev 8927 – Updating reservation only when Order billed is good order

amar.kumar — Fri, 29 Nov 2013 12:24:29 +0530

amar.kumar – 1 file(s) modified
Updating reservation only when Order billed is good order

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

Rev 8926 – removed buy now buttons

anupam.singh — Fri, 29 Nov 2013 12:18:20 +0530

anupam.singh – 1 file(s) modified
removed buy now buttons

~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm

Rev 8925 – Changes for 1) Marking order as bad while creating bulk ...

amar.kumar — Fri, 29 Nov 2013 11:55:45 +0530

amar.kumar – 6 file(s) modified
Changes for
1) Marking order as bad while creating bulk order
2) Changes for Date parsing for Ebay Order
3) Changes for setting airway bill number for Our-shipping Ebay orders

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm

Rev 8924 –

vikram.raghav — Thu, 28 Nov 2013 17:13:02 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/AmazonOrder.java

Rev 8923 – Corrected spelling mistake

anupam.singh — Thu, 28 Nov 2013 16:58:32 +0530

anupam.singh – 1 file(s) modified
Corrected spelling mistake

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

Rev 8922 – added options to spiceTransactionHistory table

anupam.singh — Thu, 28 Nov 2013 16:49:49 +0530

anupam.singh – 1 file(s) modified
added options to spiceTransactionHistory table

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

Rev 8921 – Added a table to keep recharge transactions as per returned ...

anupam.singh — Thu, 28 Nov 2013 16:18:03 +0530

anupam.singh – 1 file(s) modified
Added a table to keep recharge transactions as per returned by spiceDeck/MobiSoc

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

Rev 8920 – Update the txn id .

rajveer — Thu, 28 Nov 2013 15:15:04 +0530

rajveer – 1 file(s) modified
Update the txn id .

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java

Rev 8919 – Fixed onload event.

kshitij.sood — Thu, 28 Nov 2013 14:57:03 +0530

kshitij.sood – 1 file(s) modified
Fixed onload event.

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

Rev 8918 – Adding softlink to campaign images in export dir.

kshitij.sood — Thu, 28 Nov 2013 14:09:14 +0530

kshitij.sood – 1 file(s) modified
Adding softlink to campaign images in export dir.

~ /trunk/runutils/deploy-everything.sh

Rev 8917 – Changes in controllers and vm's for banner implementation.

kshitij.sood — Thu, 28 Nov 2013 14:07:27 +0530

kshitij.sood – 27 file(s) modified
Changes in controllers and vm's for banner implementation.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/js/common.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm
~ /trunk/Website/src/production/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/production/resources/templates/commonjsfiles.vm

Rev 8916 – Service changes for replacing openx.

kshitij.sood — Thu, 28 Nov 2013 14:06:11 +0530

kshitij.sood – 1 file(s) modified
Service changes for replacing openx.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 8915 – Service changes for replacing openx.

kshitij.sood — Thu, 28 Nov 2013 14:04:44 +0530

kshitij.sood – 4 file(s) modified
Service changes for replacing openx.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Banner.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8914 – Changed method to return gateway status for a payment.

rajveer — Thu, 28 Nov 2013 12:06:38 +0530

rajveer – 6 file(s) modified
Changed method to return gateway status for a payment.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 8913 – Fixed summary media. Default should always be used.

amit.gupta — Thu, 28 Nov 2013 11:54:31 +0530

amit.gupta – 2 file(s) modified
Fixed summary media. Default should always be used.

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

Rev 8912 – Added enum

amit.gupta — Thu, 28 Nov 2013 11:28:01 +0530

amit.gupta – 1 file(s) modified
Added enum

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