SmartDukaan – /

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.

~ /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/DataAcessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Banner.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BannerUriMapping.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Campaign.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

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

Rev 8576 – Content Updation wont run if catalog generation fails at any ...

amit.gupta — Fri, 25 Oct 2013 13:24:51 +0530

amit.gupta – 2 file(s) modified
Content Updation wont run if catalog generation fails at any point of time.

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

Rev 8575 – Made changes in courier allocation logic to assign more packets ...

rajveer — Fri, 25 Oct 2013 12:41:45 +0530

rajveer – 1 file(s) modified
Made changes in courier allocation logic to assign more packets to Fedex.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 8574 – Change for 1) accomodating New courier partner Dotzot for ...

amar.kumar — Fri, 25 Oct 2013 12:05:11 +0530

amar.kumar – 2 file(s) modified
Change for
1) accomodating New courier partner Dotzot for Ebay
2) Adding Snapdeal Reference Code for Invoices generated for Snapdeal Source

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java

Rev 8573 – Logging and continuing in case of Unknown logistics Provider

amar.kumar — Fri, 25 Oct 2013 11:44:04 +0530

amar.kumar – 1 file(s) modified
Logging and continuing in case of Unknown logistics Provider

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

Rev 8572 –

vikram.raghav — Thu, 24 Oct 2013 19:06:00 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8571 –

vikram.raghav — Thu, 24 Oct 2013 19:02:22 +0530

vikram.raghav – 1 file(s) modified

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

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

manish.sharma — Thu, 24 Oct 2013 18:19:39 +0530

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

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

Rev 8569 – Change to add 1) PaisapayId and SalesrecordNumber to Ebay ...

amar.kumar — Thu, 24 Oct 2013 18:06:48 +0530

amar.kumar – 3 file(s) modified
Change to add
1) PaisapayId and SalesrecordNumber to Ebay Order's lineitem extra_info field
2) SubOrderId and ReferenceCode to Snapdeal Order's lineitem extra_info field
3) Making address2 field as non-mandatory for Our Shipping Orders with Ebay source

~ /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/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java

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

manish.sharma — Thu, 24 Oct 2013 17:11:46 +0530

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

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java

Rev 8567 – Added source to when a user is created

vikram.raghav — Thu, 24 Oct 2013 16:29:45 +0530

vikram.raghav – 1 file(s) modified
Added source to when a user is created

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

Rev 8566 – Changed project name to SeleniumTests

vikram.raghav — Thu, 24 Oct 2013 15:47:58 +0530

vikram.raghav – 2 file(s) modified
Changed project name to SeleniumTests

+ /trunk/SeleniumTests (copied from /trunk/Seleniumtests@8565)
x /trunk/Seleniumtests

Rev 8565 – Changes related to billing of Non Serialized Inventory and bad_sale

amar.kumar — Thu, 24 Oct 2013 15:20:39 +0530

amar.kumar – 10 file(s) modified
Changes related to billing of Non Serialized Inventory and bad_sale

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 8564 – Category removal.

amit.gupta — Thu, 24 Oct 2013 15:11:06 +0530

amit.gupta – 2 file(s) modified
Category removal.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java

Rev 8563 – Category Restructuring

amit.gupta — Thu, 24 Oct 2013 13:02:53 +0530

amit.gupta – 1 file(s) modified
Category Restructuring

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

Rev 8562 – Fixed in case category and preferred vendor are not set

vikram.raghav — Thu, 24 Oct 2013 12:21:36 +0530

vikram.raghav – 2 file(s) modified
Fixed in case category and preferred vendor are not set

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendExceptMobilesTabletsFBAStockEstimation.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendMobilesTabletsFBAStockEstimation.java

Rev 8561 – Category Restructuring

amit.gupta — Thu, 24 Oct 2013 12:02:27 +0530

amit.gupta – 3 file(s) modified
Category Restructuring

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 8560 –

vikram.raghav — Thu, 24 Oct 2013 12:00:00 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8559 –

vikram.raghav — Thu, 24 Oct 2013 11:46:55 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8558 –

vikram.raghav — Thu, 24 Oct 2013 11:42:39 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8557 –

vikram.raghav — Thu, 24 Oct 2013 11:19:36 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8556 –

vikram.raghav — Thu, 24 Oct 2013 11:13:14 +0530

vikram.raghav – 1 file(s) modified

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

Rev 8555 –

amit.gupta — Thu, 24 Oct 2013 11:10:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 8554 – Permanent redirect to all mobile categories to new mobile category ...

amit.gupta — Thu, 24 Oct 2013 10:55:47 +0530

amit.gupta – 1 file(s) modified
Permanent redirect to all mobile categories to new mobile category 10006

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

Rev 8553 – Updated tax amount field

kshitij.sood — Wed, 23 Oct 2013 17:30:10 +0530

kshitij.sood – 1 file(s) modified
Updated tax amount field

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

Rev 8552 – Added stdout to check response and request.

kshitij.sood — Wed, 23 Oct 2013 13:03:55 +0530

kshitij.sood – 1 file(s) modified
Added stdout to check response and request.

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

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

manish.sharma — Wed, 23 Oct 2013 12:51:33 +0530

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

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