SmartDukaan – /

Rev 8974 –

vikram.raghav — Thu, 05 Dec 2013 11:57:41 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8973 – Added Buyer name from flipkart to order attributes.

vikram.raghav — Thu, 05 Dec 2013 11:37:58 +0530

vikram.raghav – 3 file(s) modified
Added Buyer name from flipkart to order attributes.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm

Rev 8972 – Changed Order status to submitted for processing (flipkart)

vikram.raghav — Thu, 05 Dec 2013 08:09:50 +0530

vikram.raghav – 1 file(s) modified
Changed Order status to submitted for processing (flipkart)

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

Rev 8971 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 23:50:57 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8970 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 23:32:12 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8969 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 23:30:29 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8968 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:59:49 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8967 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:54:50 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8966 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:49:21 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8965 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 22:15:21 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8964 – flipkart order creation

vikram.raghav — Wed, 04 Dec 2013 21:21:51 +0530

vikram.raghav – 1 file(s) modified
flipkart order creation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8963 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:14:11 +0530

vikram.raghav – 1 file(s) modified
Changes to create Flipkart Order.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8962 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:11:53 +0530

vikram.raghav – 1 file(s) modified
Changes to create Flipkart Order.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 8961 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:03:46 +0530

vikram.raghav – 14 file(s) modified
Changes to create Flipkart Order.

~ /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/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/Support/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-upload-orders.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8960 – Made the changes

rajveer — Wed, 04 Dec 2013 19:44:34 +0530

rajveer – 1 file(s) modified
Made the changes

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

Rev 8959 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:42:36 +0530

vikram.raghav – 1 file(s) modified
Added held inventory logic for amazon inventory feeds

~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 8958 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:40:55 +0530

vikram.raghav – 1 file(s) modified
Added held inventory logic for amazon inventory feeds

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java

Rev 8957 – Made the changes

rajveer — Wed, 04 Dec 2013 19:40:04 +0530

rajveer – 1 file(s) modified
Made the changes

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

Rev 8956 – Made the changes

rajveer — Wed, 04 Dec 2013 19:38:21 +0530

rajveer – 1 file(s) modified
Made the changes

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

Rev 8955 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:36:52 +0530

vikram.raghav – 2 file(s) modified
Added held inventory logic for amazon inventory feeds

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py

Rev 8954 – Added held inventory logic for amazon inventory feeds

vikram.raghav — Wed, 04 Dec 2013 19:28:43 +0530

vikram.raghav – 2 file(s) modified
Added held inventory logic for amazon inventory feeds

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

Rev 8953 – EMI related changes made.

rajveer — Wed, 04 Dec 2013 19:04:12 +0530

rajveer – 1 file(s) modified
EMI related changes made.

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

Rev 8952 – EMI related changes made.

rajveer — Wed, 04 Dec 2013 19:03:45 +0530

rajveer – 1 file(s) modified
EMI related changes made.

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

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