SmartDukaan – /

Rev 8616 – Snapdeal Integration for Pricing Inventory and Orders

vikram.raghav — Wed, 30 Oct 2013 16:50:11 +0530

vikram.raghav – 31 file(s) modified
Snapdeal Integration for Pricing Inventory and Orders

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.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/SnapDealFeeds/.classpath
+ /trunk/SnapDealFeeds/.project
+ /trunk/SnapDealFeeds/pom.xml
+ /trunk/SnapDealFeeds/src
+ /trunk/SnapDealFeeds/src/main
+ /trunk/SnapDealFeeds/src/main/java
+ /trunk/SnapDealFeeds/src/main/java/in
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealPricingFeed.java
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java
+ /trunk/SnapDealFeeds/src/main/java/inventory
+ /trunk/SnapDealFeeds/src/main/java/inventory/ObjectFactory.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/order
+ /trunk/SnapDealFeeds/src/main/java/order/ObjectFactory.java
+ /trunk/SnapDealFeeds/src/main/java/order/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/pricing
+ /trunk/SnapDealFeeds/src/main/java/pricing/ObjectFactory.java
+ /trunk/SnapDealFeeds/src/main/java/pricing/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/utilities
+ /trunk/SnapDealFeeds/src/main/java/utilities/ScpService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8615 – Added controller to process snapdeal orders

vikram.raghav — Wed, 30 Oct 2013 16:40:37 +0530

vikram.raghav – 2 file(s) modified
Added controller to process snapdeal orders

~ /trunk/Support/pom.xml
/trunk/Support/src/main/java/in/shop2020/support/controllers/FileUploadController.java (copied from /trunk/Support/src/main/java/in/shop2020/support/controllers/FileUploadController.java@8614)

Rev 8614 –

kshitij.sood — Wed, 30 Oct 2013 15:24:01 +0530

kshitij.sood – 36 file(s) modified

+ /trunk/SeleniumTests/.classpath
+ /trunk/SeleniumTests/.project
+ /trunk/SeleniumTests/build.xml
+ /trunk/SeleniumTests/pom.xml
+ /trunk/SeleniumTests/src
+ /trunk/SeleniumTests/src/main
+ /trunk/SeleniumTests/src/main/java
+ /trunk/SeleniumTests/src/main/java/com
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_Accessories.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_Camera.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_clearance.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_Laptops.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_Mobiles.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_Pickup.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_Recharge.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_specialdeals.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonprod_Tablets.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_Accessories.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_Camera.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_clearance.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_Laptops.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_Mobiles.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_Pickup.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_Recharge.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_specialdeals.java
+ /trunk/SeleniumTests/src/main/java/com/Buyproductonshop2020_Tablets.java
+ /trunk/SeleniumTests/src/main/java/com/fakeorders.java
+ /trunk/SeleniumTests/src/main/java/com/Testdashboard.java
+ /trunk/SeleniumTests/src/main/java/com/Test_doa.java
+ /trunk/SeleniumTests/src/main/java/com/Test_return.java
+ /trunk/SeleniumTests/src/testing.xml
+ /trunk/SeleniumTests/testing.xml
+ /trunk/SeleniumTests/testng-customsuite.xml
+ /trunk/SeleniumTests/testng-customsuiteshop2020.xml

Rev 8613 – Initial import.

kshitij.sood — Wed, 30 Oct 2013 15:22:25 +0530

kshitij.sood – 1 file(s) modified
Initial import.

+ /trunk/SeleniumTests

Rev 8612 –

vikram.raghav — Wed, 30 Oct 2013 15:06:46 +0530

vikram.raghav – 1 file(s) modified

x /trunk/SeleniumTests

Rev 8611 – Adding Order Source in Crm

amar.kumar — Wed, 30 Oct 2013 13:39:47 +0530

amar.kumar – 1 file(s) modified
Adding Order Source in Crm

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 8610 – Added Shrawan and Ritesh to "Shipping & Delivery" and "Delivery ...

anupam.singh — Wed, 30 Oct 2013 12:57:21 +0530

anupam.singh – 1 file(s) modified
Added Shrawan and Ritesh to "Shipping & Delivery" and "Delivery Problem" escalation categories.

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

Rev 8609 – Committed by Manish Sharma for Fedex Tracking and shipment Creation ...

manish.sharma — Wed, 30 Oct 2013 12:33:55 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Tracking and shipment Creation on Oct-30-2013

~ /trunk/runutils/init.d/crm-server

Rev 8608 – Simple code to post file to our server.

kshitij.sood — Wed, 30 Oct 2013 12:23:32 +0530

kshitij.sood – 1 file(s) modified
Simple code to post file to our server.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/FileUploadController.java

Rev 8607 – Initial import Snapdeal feeds and Orders

vikram.raghav — Wed, 30 Oct 2013 11:54:05 +0530

vikram.raghav – 1 file(s) modified
Initial import Snapdeal feeds and Orders

+ /trunk/SnapDealFeeds

Rev 8606 – Adding Order Source in Crm

amar.kumar — Wed, 30 Oct 2013 11:53:16 +0530

amar.kumar – 2 file(s) modified
Adding Order Source in Crm

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 8605 – Pattern matching to remove unwanted characters from customer name.

kshitij.sood — Tue, 29 Oct 2013 18:26:20 +0530

kshitij.sood – 1 file(s) modified
Pattern matching to remove unwanted characters from customer name.

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

Rev 8604 – Get Payment method should work fine.

rajveer — Tue, 29 Oct 2013 17:52:07 +0530

rajveer – 2 file(s) modified
Get Payment method should work fine.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentHandler.java
~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml

Rev 8603 – Change in query for getting current non serialized inventory

amar.kumar — Tue, 29 Oct 2013 16:29:44 +0530

amar.kumar – 1 file(s) modified
Change in query for getting current non serialized inventory

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

Rev 8602 – Added new mobile category.

amit.gupta — Tue, 29 Oct 2013 16:13:11 +0530

amit.gupta – 1 file(s) modified
Added new mobile category.

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

Rev 8601 – Change for Checks while transferring in items for a transfer ...

amar.kumar — Tue, 29 Oct 2013 15:33:37 +0530

amar.kumar – 1 file(s) modified
Change for Checks while transferring in items for a transfer lot

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

Rev 8600 – Change for Checks while transferring in items for a transfer ...

amar.kumar — Tue, 29 Oct 2013 15:24:43 +0530

amar.kumar – 1 file(s) modified
Change for Checks while transferring in items for a transfer lot

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

Rev 8599 – Modified method to process cmd line args containing order ids ...

kshitij.sood — Tue, 29 Oct 2013 12:59:38 +0530

kshitij.sood – 1 file(s) modified
Modified method to process cmd line args containing order ids in order to submit specific order ids

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

Rev 8598 – Added Android kitkat

amit.gupta — Tue, 29 Oct 2013 10:54:44 +0530

amit.gupta – 2 file(s) modified
Added Android kitkat

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 8597 – Change for getting vatRate for External billing in purchase Report

amar.kumar — Mon, 28 Oct 2013 14:56:32 +0530

amar.kumar – 1 file(s) modified
Change for getting vatRate for External billing in purchase Report

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

Rev 8596 – Change for getting vatRate for External billing in purchase Report

amar.kumar — Mon, 28 Oct 2013 14:48:38 +0530

amar.kumar – 1 file(s) modified
Change for getting vatRate for External billing in purchase Report

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

Rev 8595 – Improving logging while getting vatrate

amar.kumar — Mon, 28 Oct 2013 12:53:56 +0530

amar.kumar – 1 file(s) modified
Improving logging while getting vatrate

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

Rev 8594 – Improving logging while getting vatrate

amar.kumar — Mon, 28 Oct 2013 12:40:44 +0530

amar.kumar – 1 file(s) modified
Improving logging while getting vatrate

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

Rev 8593 – Improving logging while getting vatrate

amar.kumar — Mon, 28 Oct 2013 12:32:26 +0530

amar.kumar – 1 file(s) modified
Improving logging while getting vatrate

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

Rev 8592 – Improving logging while getting vatrate

amar.kumar — Mon, 28 Oct 2013 12:05:13 +0530

amar.kumar – 1 file(s) modified
Improving logging while getting vatrate

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

Rev 8591 – Improving logging while getting vatrate

amar.kumar — Mon, 28 Oct 2013 12:04:37 +0530

amar.kumar – 1 file(s) modified
Improving logging while getting vatrate

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

Rev 8590 – Minor updates.

kshitij.sood — Mon, 28 Oct 2013 11:40:51 +0530

kshitij.sood – 11 file(s) modified
Minor updates.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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/BannerCongregate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /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/user-image-index.vm

Rev 8589 – Improving logging while getting vatrate

amar.kumar — Mon, 28 Oct 2013 11:24:23 +0530

amar.kumar – 1 file(s) modified
Improving logging while getting vatrate

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

Rev 8588 –

amar.kumar — Mon, 28 Oct 2013 11:16:39 +0530

amar.kumar – 1 file(s) modified

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

Rev 8587 –

amar.kumar — Sun, 27 Oct 2013 15:52:18 +0530

amar.kumar – 1 file(s) modified

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

Rev 8586 – Setting logic for vatRate in case of exception

amar.kumar — Sun, 27 Oct 2013 13:30:31 +0530

amar.kumar – 1 file(s) modified
Setting logic for vatRate in case of exception

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

Rev 8585 – Setting logic for vatRate in case of exception

amar.kumar — Sun, 27 Oct 2013 13:19:38 +0530

amar.kumar – 1 file(s) modified
Setting logic for vatRate in case of exception

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

Rev 8584 – Tarita can assign.

amit.gupta — Sat, 26 Oct 2013 11:20:01 +0530

amit.gupta – 1 file(s) modified
Tarita can assign.

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

Rev 8583 – Removed filtering out of GV payments

anupam.singh — Fri, 25 Oct 2013 19:47:47 +0530

anupam.singh – 1 file(s) modified
Removed filtering out of GV payments

~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml

Rev 8582 –

kshitij.sood — Fri, 25 Oct 2013 16:58:05 +0530

kshitij.sood – 1 file(s) modified

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

Rev 8581 – Added laptop stand.

amit.gupta — Fri, 25 Oct 2013 16:37:23 +0530

amit.gupta – 5 file(s) modified
Added laptop stand.

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

Rev 8580 – Option to add vat in Purchase Report

amar.kumar — Fri, 25 Oct 2013 16:27:16 +0530

amar.kumar – 5 file(s) modified
Option to add vat in Purchase Report

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 8579 – Banner Implementation uri based.

kshitij.sood — Fri, 25 Oct 2013 16:20:09 +0530

kshitij.sood – 11 file(s) modified
Banner Implementation uri based.

Rev 8578 – Uri based banners implementation.

kshitij.sood — Fri, 25 Oct 2013 16:14:52 +0530

kshitij.sood – 12 file(s) modified
Uri based banners implementation.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/ScpService.java
+ /trunk/Website/src/main/webapp/images/active.ico
+ /trunk/Website/src/main/webapp/images/inactive.ico
+ /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/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

Rev 8577 – Adding Fontsize for Ebay-Dotzot provider

amar.kumar — Fri, 25 Oct 2013 15:56:42 +0530

amar.kumar – 1 file(s) modified
Adding Fontsize for Ebay-Dotzot provider

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