SmartDukaan – /

Rev 7839 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 12:47:29 +0530

rajveer – 2 file(s) modified
Improved Estimate controller logic.

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

Rev 7838 – Change in logic of calculating inventory age so that first ...

amar.kumar — Mon, 29 Jul 2013 12:11:31 +0530

amar.kumar – 1 file(s) modified
Change in logic of calculating inventory age so that first scan is used for calculating inventory age instead of latest scan.

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

Rev 7837 – Availability of the items is now decided by riskypaused items.

amit.gupta — Sat, 27 Jul 2013 17:48:29 +0530

amit.gupta – 1 file(s) modified
Availability of the items is now decided by riskypaused items.

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

Rev 7836 – Handling case where logisticsProvider is 0

anupam.singh — Fri, 26 Jul 2013 18:28:24 +0530

anupam.singh – 2 file(s) modified
Handling case where logisticsProvider is 0

~ /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 7835 – Change to allow item change for split freebie order even ...

amar.kumar — Fri, 26 Jul 2013 16:23:36 +0530

amar.kumar – 1 file(s) modified
Change to allow item change for split freebie order even if catalog item id for new and old items are different

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

Rev 7834 –

vikram.raghav — Fri, 26 Jul 2013 15:44:08 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm

Rev 7833 –

vikram.raghav — Fri, 26 Jul 2013 15:43:50 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7832 – Correcting EventType for Alert Service in case of Delivered At ...

amar.kumar — Fri, 26 Jul 2013 12:59:14 +0530

amar.kumar – 1 file(s) modified
Correcting EventType for Alert Service in case of Delivered At Store

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

Rev 7831 – Remove cod and otg hardcoding.

rajveer — Fri, 26 Jul 2013 12:34:23 +0530

rajveer – 1 file(s) modified
Remove cod and otg hardcoding.

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

Rev 7830 – Thrift doesn't allow returning null object. Handling exceptions and null ...

anupam.singh — Thu, 25 Jul 2013 23:43:55 +0530

anupam.singh – 3 file(s) modified
Thrift doesn't allow returning null object.
Handling exceptions and null cases

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 7829 – Checking in filter for facebook-login and modification in threshold for ...

amar.kumar — Thu, 25 Jul 2013 18:25:04 +0530

amar.kumar – 2 file(s) modified
Checking in filter for facebook-login
and modification in threshold for FirstDeliveryAttempt Event.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Website/src/main/filters/prod/filters.properties

Rev 7828 – Committed by Manish Sharma for Multiple Pincode Updation on 22-Jul-2013

manish.sharma — Thu, 25 Jul 2013 17:46:58 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Multiple Pincode Updation on 22-Jul-2013

~ /trunk/Support/src/main/webapp/Docs/DataUpdationSheet.xls

Rev 7827 – Committed by Manish Sharma for Displaying Logistics Provider Name and ...

manish.sharma — Thu, 25 Jul 2013 16:33:44 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Logistics Provider Name and Amazon Order Id on 25-Jul-2013

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

Rev 7826 – Committed by Manish Sharma for Displaying Logistics Provider Name and ...

manish.sharma — Thu, 25 Jul 2013 16:33:01 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Logistics Provider Name and Amazon Order Id on 25-Jul-2013

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java

Rev 7825 – Changes for Facebook Login

amar.kumar — Thu, 25 Jul 2013 16:27:50 +0530

amar.kumar – 19 file(s) modified
Changes for Facebook Login

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/UserMessage.java
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/signinsignup.css
~ /trunk/Website/src/main/webapp/js/facebook.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7824 – Formatting correction.

rajveer — Thu, 25 Jul 2013 15:03:27 +0530

rajveer – 1 file(s) modified
Formatting correction.

~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-topup-authsuccess.vm

Rev 7823 – Recharge for spice online retail.

rajveer — Thu, 25 Jul 2013 15:02:26 +0530

rajveer – 1 file(s) modified
Recharge for spice online retail.

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

Rev 7822 – Adding option to change freebie Item for order and updating ...

amar.kumar — Thu, 25 Jul 2013 13:37:56 +0530

amar.kumar – 14 file(s) modified
Adding option to change freebie Item for order and updating alert thresholds for monitoring

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeFreebieItemEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeFreebieItemEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChangeFreebieItemBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChangeFreebieItemHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeFreebieItemRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeFreebieItemResponse.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7821 – Spice Online Retail MIS Reconciliation.

rajveer — Thu, 25 Jul 2013 12:03:37 +0530

rajveer – 1 file(s) modified
Spice Online Retail MIS Reconciliation.

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

Rev 7820 – Updating allowedwarehouses in session only if necessary

amar.kumar — Wed, 24 Jul 2013 19:20:17 +0530

amar.kumar – 1 file(s) modified
Updating allowedwarehouses in session only if necessary

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

Rev 7819 – Adding meta tags to avoid caching of login.html. This hindered ...

amar.kumar — Wed, 24 Jul 2013 19:18:23 +0530

amar.kumar – 1 file(s) modified
Adding meta tags to avoid caching of login.html.
This hindered in logging out of users as instead of sending logout request to server, browser used login page from cache

~ /trunk/InventoryManager/src/main/webapp/login.html

Rev 7818 – Adding meta tags to avoid caching of login.html. This hindered ...

amar.kumar — Wed, 24 Jul 2013 19:01:25 +0530

~ /trunk/InventoryManager/src/main/webapp/login.html

Rev 7817 – Adding meta tags to avoid caching of login.html. This hindered ...

amar.kumar — Wed, 24 Jul 2013 18:03:54 +0530

~ /trunk/InventoryManager/src/main/webapp/login.html

Rev 7816 – Fulfillment feed to fetch result and update status only for ...

vikram.raghav — Wed, 24 Jul 2013 17:45:25 +0530

vikram.raghav – 2 file(s) modified
Fulfillment feed to fetch result and update status only for success

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

Rev 7815 – Changed customer care number.

rajveer — Wed, 24 Jul 2013 16:15:52 +0530

rajveer – 1 file(s) modified
Changed customer care number.

~ /trunk/Website/src/main/resources/templates/Saholic-address.vm

Rev 7814 – templates for generation of store content has been separated.

amit.gupta — Wed, 24 Jul 2013 15:17:04 +0530

amit.gupta – 8 file(s) modified
templates for generation of store content has been separated.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
+ /trunk/ContentStore/src/velocity/store
+ /trunk/ContentStore/src/velocity/store/CategorySnippet.vm
+ /trunk/ContentStore/src/velocity/store/HomeSnippet.vm
+ /trunk/ContentStore/src/velocity/store/ProductDetail.vm
+ /trunk/ContentStore/src/velocity/store/SearchSnippet.vm
+ /trunk/ContentStore/src/velocity/store/SlideGuide.vm

Rev 7813 – Adding logs

anupam.singh — Wed, 24 Jul 2013 14:44:54 +0530

anupam.singh – 1 file(s) modified
Adding logs

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

Rev 7812 –

kshitij.sood — Wed, 24 Jul 2013 14:05:56 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7811 – Bug fixes for courier report

anupam.singh — Tue, 23 Jul 2013 19:49:04 +0530

anupam.singh – 2 file(s) modified
Bug fixes for courier report

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java

Rev 7810 – Display widget for cod.

rajveer — Tue, 23 Jul 2013 17:01:27 +0530

rajveer – 2 file(s) modified
Display widget for cod.

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

Rev 7809 – Display widget for cod.

rajveer — Tue, 23 Jul 2013 16:37:26 +0530

rajveer – 3 file(s) modified
Display widget for cod.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 7808 – Removed WarehouseLocation from logisticService and corrected WarehouseLocation in InventoryService

anupam.singh — Tue, 23 Jul 2013 15:34:44 +0530

anupam.singh – 10 file(s) modified
Removed WarehouseLocation from logisticService and corrected WarehouseLocation in InventoryService

~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 7807 – Correcting Rajveer's error

amar.kumar — Tue, 23 Jul 2013 14:36:22 +0530

amar.kumar – 1 file(s) modified
Correcting Rajveer's error

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

Rev 7806 – Correcting Anupam's error

amar.kumar — Tue, 23 Jul 2013 14:33:02 +0530

amar.kumar – 1 file(s) modified
Correcting Anupam's error

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

Rev 7805 – Correcting Anupam's error

amar.kumar — Tue, 23 Jul 2013 14:31:43 +0530

amar.kumar – 1 file(s) modified
Correcting Anupam's error

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

Rev 7804 – Correcting Anupam's error

amar.kumar — Tue, 23 Jul 2013 14:27:36 +0530

amar.kumar – 1 file(s) modified
Correcting Anupam's error

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

Rev 7803 – Addind } before catch block

amar.kumar — Tue, 23 Jul 2013 14:21:21 +0530

amar.kumar – 1 file(s) modified
Addind } before catch block

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

Rev 7802 – Removing Amazon Inventory from Inventory Age REport

amar.kumar — Tue, 23 Jul 2013 13:02:40 +0530

amar.kumar – 1 file(s) modified
Removing Amazon Inventory from Inventory Age REport

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

Rev 7801 – Changing field name

anupam.singh — Tue, 23 Jul 2013 12:56:03 +0530

anupam.singh – 1 file(s) modified
Changing field name

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

Rev 7800 –

kshitij.sood — Tue, 23 Jul 2013 12:50:59 +0530

kshitij.sood – 5 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
+ /trunk/Support/src/main/webapp/images/active.ico
+ /trunk/Support/src/main/webapp/images/inactive.ico
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm