SmartDukaan – /

Rev 8649 –

vikram.raghav — Thu, 31 Oct 2013 19:28:23 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java

Rev 8648 –

vikram.raghav — Thu, 31 Oct 2013 19:12:53 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java

Rev 8647 – Refactoring code for scanning freebie

anupam.singh — Thu, 31 Oct 2013 19:03:55 +0530

anupam.singh – 1 file(s) modified
Refactoring code for scanning freebie

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

Rev 8646 –

vikram.raghav — Thu, 31 Oct 2013 19:00:29 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java

Rev 8645 –

vikram.raghav — Thu, 31 Oct 2013 18:48:04 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java

Rev 8644 – Added Fedex in the cod reconciliation list.

rajveer — Thu, 31 Oct 2013 18:41:36 +0530

rajveer – 1 file(s) modified
Added Fedex in the cod reconciliation list.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 8643 – Changed logic for billing freebie

anupam.singh — Thu, 31 Oct 2013 18:37:47 +0530

anupam.singh – 1 file(s) modified
Changed logic for billing freebie

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

Rev 8642 –

vikram.raghav — Thu, 31 Oct 2013 18:22:07 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java

Rev 8641 –

vikram.raghav — Thu, 31 Oct 2013 17:09:52 +0530

vikram.raghav – 2 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java
~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealPricingFeed.java

Rev 8640 – Change in scanning logic for Freebie

amar.kumar — Thu, 31 Oct 2013 17:03:13 +0530

amar.kumar – 1 file(s) modified
Change in scanning logic for
Freebie

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

Rev 8639 – Small change

kshitij.sood — Thu, 31 Oct 2013 16:29:21 +0530

kshitij.sood – 2 file(s) modified
Small change

+ /trunk/Support/src/main/webapp/images/ajax_loader_blue.gif
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm

Rev 8638 –

vikram.raghav — Thu, 31 Oct 2013 16:10:46 +0530

vikram.raghav – 2 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java
~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealPricingFeed.java

Rev 8637 –

vikram.raghav — Thu, 31 Oct 2013 16:08:07 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/utilities/ScpService.java

Rev 8636 –

vikram.raghav — Thu, 31 Oct 2013 15:38:25 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/pom.xml

Rev 8635 –

vikram.raghav — Thu, 31 Oct 2013 15:33:33 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/pom.xml

Rev 8634 –

vikram.raghav — Thu, 31 Oct 2013 15:31:23 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/pom.xml

Rev 8633 –

vikram.raghav — Thu, 31 Oct 2013 15:07:37 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/pom.xml

Rev 8632 –

vikram.raghav — Thu, 31 Oct 2013 14:53:26 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/pom.xml

Rev 8631 –

vikram.raghav — Thu, 31 Oct 2013 14:43:39 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/utilities/ScpService.java

Rev 8630 – Change for Inventory Aging report to ignore in transit inventory ...

amar.kumar — Thu, 31 Oct 2013 12:46:36 +0530

amar.kumar – 1 file(s) modified
Change for Inventory Aging report to ignore in transit inventory and to include non serialized inventory

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

Rev 8629 – Made the changes.

rajveer — Thu, 31 Oct 2013 12:40:18 +0530

rajveer – 1 file(s) modified
Made the changes.

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

Rev 8628 – Change for Inventory Aging report to ignore in transit inventory ...

amar.kumar — Thu, 31 Oct 2013 12:39:51 +0530

amar.kumar – 1 file(s) modified
Change for Inventory Aging report to ignore in transit inventory and to include non serialized inventory

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

Rev 8627 –

vikram.raghav — Thu, 31 Oct 2013 12:37:52 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java

Rev 8626 – Change for Inventory Aging report to ignore in transit inventory ...

amar.kumar — Thu, 31 Oct 2013 12:24:55 +0530

amar.kumar – 4 file(s) modified
Change for Inventory Aging report to ignore in transit inventory and to include non serialized inventory

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAge.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 8625 – Change for Inventory Aging report to ignore in transit inventory ...

amar.kumar — Thu, 31 Oct 2013 11:47:06 +0530

amar.kumar – 1 file(s) modified
Change for Inventory Aging report to ignore in transit inventory and to include non serialized inventory

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

Rev 8624 – Setting customer name for Ebay Order only through sheet, not ...

amar.kumar — Thu, 31 Oct 2013 11:27:09 +0530

amar.kumar – 1 file(s) modified
Setting customer name for Ebay Order only through sheet, not through previously created user's info

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

Rev 8623 –

vikram.raghav — Thu, 31 Oct 2013 10:40:25 +0530

vikram.raghav – 2 file(s) modified

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendFBASalesReportExceptForMobilesTablets.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendFBASalesReportForMobilesTablets.java

Rev 8622 – added snapdeal to pom

vikram.raghav — Wed, 30 Oct 2013 18:27:50 +0530

vikram.raghav – 1 file(s) modified
added snapdeal to pom

~ /trunk/pom.xml

Rev 8621 – Returing amazon fba inventory 0 if itemid not present.

kshitij.sood — Wed, 30 Oct 2013 18:07:57 +0530

kshitij.sood – 1 file(s) modified
Returing amazon fba inventory 0 if itemid not present.

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

Rev 8620 – Amazon dashboard changes, bulk upload change and asin uploader.

kshitij.sood — Wed, 30 Oct 2013 18:06:18 +0530

kshitij.sood – 7 file(s) modified
Amazon dashboard changes, bulk upload change and asin uploader.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-asin-upload.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-item-table.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/asinjob.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/options.vm

Rev 8619 – Service changes for amazon.

kshitij.sood — Wed, 30 Oct 2013 18:04:27 +0530

kshitij.sood – 9 file(s) modified
Service changes for amazon.

Rev 8618 – Added isDigital field while capturing payment for ebs

rajveer — Wed, 30 Oct 2013 17:37:36 +0530

rajveer – 8 file(s) modified
Added isDigital field while capturing payment for ebs

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentCapturer.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java

Rev 8617 – Adding Checks while updating hold inventory during order creation or ...

amar.kumar — Wed, 30 Oct 2013 17:03:56 +0530

amar.kumar – 1 file(s) modified
Adding Checks while updating hold inventory during order creation or movement of warehouse for Order

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

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