SmartDukaan – /

Rev 7695 – Handled exceptions while getting logistic and price estimates

anupam.singh — Thu, 04 Jul 2013 20:24:22 +0530

anupam.singh – 13 file(s) modified
Handled exceptions while getting logistic and price estimates

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
x /StoreWebsite/src/main/webapp/js/entity_20130608.js
+ /StoreWebsite/src/main/webapp/js/entity_20130704.js (copied from /StoreWebsite/src/main/webapp/js/entity_20130608.js@7546)
x /StoreWebsite/src/main/webapp/js/storewebsite_20130611.js
+ /StoreWebsite/src/main/webapp/js/storewebsite_20130704.js (copied from /StoreWebsite/src/main/webapp/js/storewebsite_20130611.js@7546)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/error-result.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7694 –

vikram.raghav — Thu, 04 Jul 2013 19:08:15 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7693 –

vikram.raghav — Thu, 04 Jul 2013 19:05:08 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7692 –

vikram.raghav — Thu, 04 Jul 2013 18:38:44 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeedAndFetchResults.java

Rev 7691 –

vikram.raghav — Thu, 04 Jul 2013 18:37:20 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeedAndFetchResults.java

Rev 7690 –

vikram.raghav — Thu, 04 Jul 2013 17:30:27 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7689 –

vikram.raghav — Thu, 04 Jul 2013 17:27:45 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7688 –

vikram.raghav — Thu, 04 Jul 2013 17:26:45 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7687 – Feed success results to be sent only in case of ...

vikram.raghav — Thu, 04 Jul 2013 16:58:45 +0530

vikram.raghav – 3 file(s) modified
Feed success results to be sent only in case of Failures

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeedAndFetchResults.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeedAndFetchResults.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeedAndFetchResults.java

Rev 7686 – Fulfillment feed send logic changed

vikram.raghav — Thu, 04 Jul 2013 16:55:12 +0530

vikram.raghav – 1 file(s) modified
Fulfillment feed send logic changed

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7685 –

vikram.raghav — Thu, 04 Jul 2013 16:54:21 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 7684 –

vikram.raghav — Thu, 04 Jul 2013 16:53:58 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 7683 – Fulfillment feed send logic changed

vikram.raghav — Thu, 04 Jul 2013 16:53:40 +0530

vikram.raghav – 2 file(s) modified
Fulfillment feed send logic changed

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

Rev 7682 – Send Negative acknowledgement in case of Location non serviceable and ...

vikram.raghav — Thu, 04 Jul 2013 16:52:36 +0530

vikram.raghav – 1 file(s) modified
Send Negative acknowledgement in case of Location non serviceable and send mail when orders are created in our system

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

Rev 7681 – Fulfillment feed send logic changed

vikram.raghav — Thu, 04 Jul 2013 16:50:31 +0530

vikram.raghav – 2 file(s) modified
Fulfillment feed send logic changed

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeed.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeedAndFetchResults.java

Rev 7680 – Remove kotak from the list of emi provider banks.

rajveer — Thu, 04 Jul 2013 14:08:52 +0530

rajveer – 1 file(s) modified
Remove kotak from the list of emi provider banks.

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

Rev 7679 – Corrected a link to home page

anupam.singh — Thu, 04 Jul 2013 12:09:01 +0530

anupam.singh – 1 file(s) modified
Corrected a link to home page

~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm

Rev 7678 – Change in logic to get inventory count (accomodating changes due ...

amar.kumar — Thu, 04 Jul 2013 11:55:52 +0530

amar.kumar – 1 file(s) modified
Change in logic to get inventory count (accomodating changes due to transfer and adjustment scans)

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

Rev 7677 – Changing path for store website content

anupam.singh — Wed, 03 Jul 2013 17:47:01 +0530

anupam.singh – 3 file(s) modified
Changing path for store website content

~ /StoreWebsite/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/helpers/test/Test.py

Rev 7676 – Change to give option of selecting warehouse at the time ...

amar.kumar — Wed, 03 Jul 2013 15:31:35 +0530

amar.kumar – 14 file(s) modified
Change to give option of selecting warehouse at the time of getting stock sheet
and option to set nlc at the time of adding a new item for creating a Purchase-order

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/FbaSheetGeneratorController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryReaderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/webapp/js/common.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /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/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 7675 –

vikram.raghav — Wed, 03 Jul 2013 12:43:01 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7674 – - Fixed alignment issues when width of the browser goes ...

anupam.singh — Tue, 02 Jul 2013 15:03:20 +0530

anupam.singh – 4 file(s) modified
- Fixed alignment issues when width of the browser goes below 900px

~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7673 – Changed Type Integer to Long

amit.gupta — Tue, 02 Jul 2013 14:17:58 +0530

amit.gupta – 1 file(s) modified
Changed Type Integer to Long

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 7672 – Changes made to add nlc.

rajveer — Tue, 02 Jul 2013 12:26:47 +0530

rajveer – 28 file(s) modified
Changes made to add nlc.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/RevisionedPurchaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 7671 – UI was not aligned properly due to longer than ...

anupam.singh — Tue, 02 Jul 2013 12:00:50 +0530

anupam.singh – 1 file(s) modified
UI was not aligned properly due to longer than expected text.

~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm

Rev 7670 – Now only paused by risk items need to be looked ...

amit.gupta — Mon, 01 Jul 2013 10:34:20 +0530

amit.gupta – 2 file(s) modified
Now only paused by risk items need to be looked at to figure out the availability of items.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java

Rev 7669 – Send storecode in optional2 parameter.

rajveer — Fri, 28 Jun 2013 18:32:19 +0530

rajveer – 2 file(s) modified
Send storecode in optional2 parameter.

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

Rev 7668 – Proper message in case of reship.

rajveer — Fri, 28 Jun 2013 17:37:07 +0530

rajveer – 4 file(s) modified
Proper message in case of reship.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChooseColorBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReshipOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReshipOrderResponse.java

Rev 7667 – only paused by risk products are required.

amit.gupta — Fri, 28 Jun 2013 16:59:26 +0530

amit.gupta – 1 file(s) modified
only paused by risk products are required.

~ /trunk/runutils/popularity.sh

Rev 7666 – Return order to send proper message.

rajveer — Fri, 28 Jun 2013 15:51:20 +0530

rajveer – 1 file(s) modified
Return order to send proper message.

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

Rev 7665 – added availability as well.

amit.gupta — Fri, 28 Jun 2013 15:25:59 +0530

amit.gupta – 1 file(s) modified
added availability as well.

~ /trunk/runutils/popularity.sh

Rev 7664 – Activating the option to transfer-out items while scanning for purchase

amar.kumar — Fri, 28 Jun 2013 15:22:36 +0530

amar.kumar – 1 file(s) modified
Activating the option to transfer-out items while scanning for purchase

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 7663 – Changes for refund and reship.

anupam.singh — Fri, 28 Jun 2013 15:16:31 +0530

anupam.singh – 1 file(s) modified
Changes for refund and reship.

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

Rev 7662 – improved populateentityiditemmap

amit.gupta — Fri, 28 Jun 2013 14:51:51 +0530

amit.gupta – 4 file(s) modified
improved populateentityiditemmap

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/WeeklyContentCreation.java
~ /trunk/ContentStore/src/velocity/SlideGuide.vm

Rev 7661 – poi dependency

kshitij.sood — Fri, 28 Jun 2013 14:35:52 +0530

kshitij.sood – 1 file(s) modified
poi dependency

~ /trunk/AmazonFeeds/pom.xml

Rev 7660 –

kshitij.sood — Fri, 28 Jun 2013 14:33:13 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateNonFBAInventoryAndPricingFlatFile.java (copied from /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/mfnSheet.java@7659)

Rev 7659 –

kshitij.sood — Fri, 28 Jun 2013 14:23:15 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/mfnSheet.java

Rev 7658 –

kshitij.sood — Fri, 28 Jun 2013 14:18:51 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/mfnSheet.java

Rev 7657 – retrying clause

kshitij.sood — Fri, 28 Jun 2013 13:55:03 +0530

kshitij.sood – 1 file(s) modified
retrying clause

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/mfnSheet.java

Rev 7656 – Excel file generation for mfn

kshitij.sood — Fri, 28 Jun 2013 13:41:57 +0530

kshitij.sood – 1 file(s) modified
Excel file generation for mfn

+ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/mfnSheet.java