SmartDukaan – /

Rev 7863 – Fixed delivery estimate problem.

rajveer — Tue, 30 Jul 2013 15:16:24 +0530

rajveer – 1 file(s) modified
Fixed delivery estimate problem.

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

Rev 7862 – Facilitating whole payment by coupon.

anupam.singh — Tue, 30 Jul 2013 15:10:21 +0530

anupam.singh – 6 file(s) modified
Facilitating whole payment by coupon.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/CouponPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 7861 – Updating Brand and Model on changing itemId for Freebie Order

amar.kumar — Tue, 30 Jul 2013 14:52:32 +0530

amar.kumar – 1 file(s) modified
Updating Brand and Model on changing itemId for Freebie Order

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

Rev 7860 – Transaction client is pointing to Service at support

amit.gupta — Tue, 30 Jul 2013 14:43:16 +0530

amit.gupta – 1 file(s) modified
Transaction client is pointing to Service at support

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java

Rev 7859 – Fixed delivery estimate problem.

rajveer — Tue, 30 Jul 2013 14:37:33 +0530

rajveer – 1 file(s) modified
Fixed delivery estimate problem.

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

Rev 7858 – Change in Redirect Url for facebook login

amar.kumar — Tue, 30 Jul 2013 13:41:38 +0530

amar.kumar – 2 file(s) modified
Change in Redirect Url for facebook login

~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 7857 – Logistics estimate according to location.

rajveer — Tue, 30 Jul 2013 13:08:31 +0530

rajveer – 1 file(s) modified
Logistics estimate according to location.

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

Rev 7856 – Separate Order processing and acknowledgement

vikram.raghav — Tue, 30 Jul 2013 13:06:56 +0530

vikram.raghav – 3 file(s) modified
Separate Order processing and acknowledgement

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CheckFeedSubmission.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java

Rev 7855 – Sending Freebie Item Id in call to getLogisticsInfo in SplitFreebieOrder ...

amar.kumar — Tue, 30 Jul 2013 12:59:32 +0530

amar.kumar – 1 file(s) modified
Sending Freebie Item Id in call to getLogisticsInfo in SplitFreebieOrder method

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

Rev 7854 – Incorporating changes made by rajveer

amit.gupta — Tue, 30 Jul 2013 12:38:45 +0530

amit.gupta – 1 file(s) modified
Incorporating changes made by rajveer

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 7853 – EMI will now be displayed at product page as well.

amit.gupta — Tue, 30 Jul 2013 12:33:56 +0530

amit.gupta – 9 file(s) modified
EMI will now be displayed at product page as well.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/CMPJythonWrapper.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 7852 – Rollback from the changes.

rajveer — Mon, 29 Jul 2013 19:38:25 +0530

rajveer – 1 file(s) modified
Rollback from the changes.

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 7851 – added know more for cod deliveries.

rajveer — Mon, 29 Jul 2013 18:09:40 +0530

rajveer – 1 file(s) modified
added know more for cod deliveries.

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 7850 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 18:08:33 +0530

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

~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 7849 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 17:57:12 +0530

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

~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 7848 – Committed by Manish Sharma for Making changes in case of ...

manish.sharma — Mon, 29 Jul 2013 17:43:28 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Making changes in case of Orders dispatched from Bhiwandi Warehouse on 29-Jul-2013

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

Rev 7847 – Start logistics service on support also.

rajveer — Mon, 29 Jul 2013 15:00:36 +0530

rajveer – 1 file(s) modified
Start logistics service on support also.

~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 7846 – Start logistics service on support also.

rajveer — Mon, 29 Jul 2013 15:00:19 +0530

rajveer – 1 file(s) modified
Start logistics service on support also.

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

Rev 7845 – Start logistics service on support also.

rajveer — Mon, 29 Jul 2013 14:35:40 +0530

rajveer – 3 file(s) modified
Start logistics service on support also.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 7844 – Allowing login to facebook if user is not logged in ...

amar.kumar — Mon, 29 Jul 2013 14:23:53 +0530

amar.kumar – 2 file(s) modified
Allowing login to facebook if user is not logged in already

~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7843 – Start logistics service on support also.

rajveer — Mon, 29 Jul 2013 13:55:17 +0530

rajveer – 1 file(s) modified
Start logistics service on support also.

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

Rev 7842 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 13:14:45 +0530

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

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

Rev 7841 – Committed by Manish Sharma for Multiple Pincode Updation on 29-Jul-2013

manish.sharma — Mon, 29 Jul 2013 12:57:11 +0530

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

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

Rev 7840 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 12:52:13 +0530

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

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

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