SmartDukaan – //trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 15251 – Committed by Manish Sharma for Providing Access Token to ProfitMandi ...

manish.sharma — Fri, 22 May 2015 12:00:11 +0530

manish.sharma – 10 file(s) modified
Committed by Manish Sharma for Providing Access Token to ProfitMandi User on 22-May-2015

Rev 13521 – Added changes related to No Captcha for Private Deal User

amit.gupta — Thu, 08 Jan 2015 12:29:35 +0530

amit.gupta – 12 file(s) modified
Added changes related to No Captcha for Private Deal User

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ClearItemAvailabilityCache.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 13400 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Fri, 19 Dec 2014 10:49:28 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 19-Dec-2014

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 13399 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Fri, 19 Dec 2014 10:48:54 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 19-Dec-2014

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 13398 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Fri, 19 Dec 2014 10:47:50 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 19-Dec-2014

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 13146 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Thu, 27 Nov 2014 18:10:59 +0530

manish.sharma – 41 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 27-Nov-2014

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptPackageOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptPackageOrderEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AcceptOrderConfirmationBox.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/JacketInfoBox.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/AcceptPackageOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptPackageOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptPackageOrderResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AwbUploadController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/awb-upload-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 13139 –

amit.gupta — Wed, 26 Nov 2014 16:25:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 13136 – Added changes related to counter coupon.

amit.gupta — Wed, 26 Nov 2014 16:08:19 +0530

amit.gupta – 8 file(s) modified
Added changes related to counter coupon.

Rev 12730 –

amit.gupta — Wed, 24 Sep 2014 15:09:14 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 12725 – Query logging is off.

amit.gupta — Wed, 24 Sep 2014 11:30:38 +0530

amit.gupta – 1 file(s) modified
Query logging is off.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 12722 – Added user search api

amit.gupta — Tue, 23 Sep 2014 19:18:23 +0530

amit.gupta – 13 file(s) modified
Added user search api

+ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java
~ /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/model/v1/user/promotionrules/rule_private_deals.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 12697 – Added bool

amit.gupta — Mon, 22 Sep 2014 12:06:27 +0530

amit.gupta – 1 file(s) modified
Added bool

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 12696 – Added Counter Registration logic

amit.gupta — Mon, 22 Sep 2014 10:36:26 +0530

amit.gupta – 26 file(s) modified
Added Counter Registration logic

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/ForgotPasswordController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/NotificationPojo.java
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.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/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuth.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuthRole.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Location.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 11657 – Added short names to table.

amit.gupta — Thu, 12 Jun 2014 18:41:08 +0530

amit.gupta – 1 file(s) modified
Added short names to table.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 11653 – Added private deals coupon application logic

amit.gupta — Thu, 12 Jun 2014 18:13:53 +0530

amit.gupta – 14 file(s) modified
Added private deals coupon application logic

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/CouponCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java

Rev 9300 – Service changes for one assist

kshitij.sood — Mon, 06 Jan 2014 15:48:41 +0530

kshitij.sood – 1 file(s) modified
Service changes for one assist

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 8707 – Changes commited by Manish Sharma for User Coupon Generation on ...

manish.sharma — Tue, 05 Nov 2013 16:13:57 +0530

manish.sharma – 13 file(s) modified
Changes commited by Manish Sharma for User Coupon Generation on Nov-05-2013

Rev 8201 – Add source to the user table.

rajveer — Wed, 25 Sep 2013 14:40:56 +0530

rajveer – 7 file(s) modified
Add source to the user table.

~ /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/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 7987 – Added promotion id to Promotion Tracker as well.

amit.gupta — Tue, 20 Aug 2013 11:52:01 +0530

amit.gupta – 2 file(s) modified
Added promotion id to Promotion Tracker as well.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 7883 – Added facebook user.

rajveer — Wed, 31 Jul 2013 15:50:05 +0530

rajveer – 4 file(s) modified
Added facebook user.

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 7039 – Removing all changes related to facebook login because i dont ...

anupam.singh — Sun, 24 Mar 2013 16:35:03 +0530

anupam.singh – 18 file(s) modified
Removing all changes related to facebook login because i dont like them ;)

~ /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/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
~ /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/webapp/css/common.css
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7007 – Changes to allow login through facebook and storing user's facebook ...

amar.kumar — Wed, 20 Mar 2013 17:05:22 +0530

amar.kumar – 21 file(s) modified
Changes to allow login through facebook and storing user's facebook credentials to be able to post on user's behalf on facebook

~ /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/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/filters/prod/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/webapp/channel.html
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/images/facebooklogin.png
+ /trunk/Website/src/main/webapp/js/facebook.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 6903 – Insurance feature for our website

anupam.singh — Thu, 28 Feb 2013 01:15:01 +0530

anupam.singh – 59 file(s) modified
Insurance feature for our website

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /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/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /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/promotionrules/rule_discount_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/resources/templates/thinheader.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/shipping.css
+ /trunk/Website/src/main/webapp/images/insurance.png
+ /trunk/Website/src/main/webapp/images/insuredStamp.png
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-result.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 6389 – Adding infrastructure for EMI charging.

rajveer — Thu, 29 Nov 2012 19:02:41 +0530

rajveer – 20 file(s) modified
Adding infrastructure for EMI charging.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.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/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiChargeType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiScheme.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 6367 – added promotiontype to promotion table

amit.gupta — Wed, 21 Nov 2012 18:39:03 +0530

amit.gupta – 10 file(s) modified
added promotiontype to promotion table

Rev 5555 – Implementation of Instore pickup interfaces.

rajveer — Mon, 09 Jul 2012 15:35:02 +0530

rajveer – 12 file(s) modified
Implementation of Instore pickup interfaces.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /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

Rev 5469 – Added infrastructure to generate, store, issue and activate voucher of ...

rajveer — Thu, 21 Jun 2012 18:32:15 +0530

rajveer – 13 file(s) modified
Added infrastructure to generate, store, issue and activate voucher of spicedeck.com.
Reviewer: Mandeep

Rev 5326 – Removed unused objects and methods from user service. Creation of ...

rajveer — Wed, 30 May 2012 17:47:43 +0530

rajveer – 16 file(s) modified
Removed unused objects and methods from user service.
Creation of user and cart made transactional.
Removed reference of user from cart object.
Merged UserState with User object.
Reviewer# Amar and Anupam

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /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/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java

Rev 5283 – Making Max-Overflow size as double to 20

mandeep.dhir — Sat, 26 May 2012 16:43:46 +0530

mandeep.dhir – 1 file(s) modified
Making Max-Overflow size as double to 20

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py

Rev 3554 – Discounts now being managed in Discount table.

varun.gupta — Mon, 10 Oct 2011 14:47:04 +0530

varun.gupta – 11 file(s) modified
Discounts now being managed in Discount table.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /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/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3499 – Trac#504 Added functionality to help CRM agents to verify COD ...

mandeep.dhir — Fri, 30 Sep 2011 15:17:56 +0530

mandeep.dhir – 42 file(s) modified
Trac#504 Added functionality to help CRM agents to verify COD orders

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /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/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
x /trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
x /trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java

Rev 3378 – Get rid of string column to store the event type.

vikas — Tue, 20 Sep 2011 13:13:41 +0530

vikas – 13 file(s) modified
Get rid of string column to store the event type.

~ /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/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java

Rev 3187 – Made database hostname configurable.

rajveer — Mon, 05 Sep 2011 15:10:15 +0530

rajveer – 23 file(s) modified
Made database hostname configurable.

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServer.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/LogisticsServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/CatalogServer.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/TransactionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.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/model/v1/user/PromotionServer.py
~ /trunk/PyProj/src/shop2020/model/v1/user/UserContextServer.py
~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
~ /trunk/PyProj/src/shop2020/warehouse/main/WarehouseServer.py

Rev 2981 – Removed Widget and WidgetItem and Added a table called UserWidgetItem. ...

rajveer — Thu, 18 Aug 2011 19:45:15 +0530

rajveer – 18 file(s) modified
Removed Widget and WidgetItem and Added a table called UserWidgetItem. Now all browse history and my research data for a user will come from this single table. This effort will help to reduct query time for some slow queries related to widgets, as we will always use index.

~ /trunk/PyProj/.pydevproject
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionRuleDataUtilities.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
x /trunk/PyProj/src/shop2020/model/v1/user/impl/WidgetConverters.py
x /trunk/PyProj/src/shop2020/model/v1/user/impl/WidgetDataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/user/test/UserTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserWidgetItem.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Widget.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/WidgetItem.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 2815 – Save session source, session start time and first source time.

vikas — Wed, 03 Aug 2011 13:52:52 +0530

vikas – 12 file(s) modified
Save session source, session start time and first source time.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /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/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 2717 – Slide key changed from SlideId (Long) to SlideName (String)

varun.gupta — Tue, 26 Jul 2011 19:34:06 +0530

varun.gupta – 10 file(s) modified
Slide key changed from SlideId (Long) to SlideName (String)

Rev 2641 – Service backend for 'My Notes' feature

varun.gupta — Tue, 19 Jul 2011 18:05:29 +0530

varun.gupta – 4 file(s) modified
Service backend for 'My Notes' feature

Rev 2020 – Add source column to user table.

vikas — Wed, 01 Jun 2011 13:19:42 +0530

vikas – 6 file(s) modified
Add source column to user table.

~ /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/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

Rev 2004 – Fix Tracker definition.

vikas — Tue, 31 May 2011 18:31:12 +0530

vikas – 1 file(s) modified
Fix Tracker definition.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py