SmartDukaan – /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/

Rev 13818 – fixed logic for applied once.

amit.gupta — Fri, 13 Feb 2015 16:11:57 +0530

amit.gupta – 1 file(s) modified
fixed logic for applied once.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 13205 – Added

amit.gupta — Wed, 03 Dec 2014 17:55:13 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 13170 –

amit.gupta — Mon, 01 Dec 2014 08:26:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 13169 – Added to

amit.gupta — Mon, 01 Dec 2014 08:26:15 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 13155 – Added Dealer specific flag to avoid coupon application on already ...

amit.gupta — Fri, 28 Nov 2014 16:15:08 +0530

amit.gupta – 2 file(s) modified
Added Dealer specific flag to avoid coupon application on already discounted price

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 12790 – Changed details for user

amit.gupta — Sat, 27 Sep 2014 07:54:49 +0530

amit.gupta – 4 file(s) modified
Changed details for user

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.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

Rev 12743 – Order related changes

amit.gupta — Thu, 25 Sep 2014 08:01:11 +0530

amit.gupta – 3 file(s) modified
Order related changes

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 12739 – Added 200 discount for first time dealer

amit.gupta — Wed, 24 Sep 2014 23:37:04 +0530

amit.gupta – 1 file(s) modified
Added 200 discount for first time dealer

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 12733 – Added user.

amit.gupta — Wed, 24 Sep 2014 15:53:42 +0530

amit.gupta – 2 file(s) modified
Added user.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.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 11915 – Changed dealtext and moved it to order creation.

amit.gupta — Fri, 04 Jul 2014 08:11:00 +0530

amit.gupta – 2 file(s) modified
Changed dealtext and moved it to order creation.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11869 – a

amit.gupta — Wed, 02 Jul 2014 21:05:46 +0530

amit.gupta – 1 file(s) modified
a

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11868 –

amit.gupta — Wed, 02 Jul 2014 19:54:07 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11863 –

amit.gupta — Wed, 02 Jul 2014 16:29:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11848 –

amit.gupta — Tue, 01 Jul 2014 22:38:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11841 – Added * for all items

amit.gupta — Tue, 01 Jul 2014 11:34:06 +0530

amit.gupta – 1 file(s) modified
Added * for all items

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 11823 –

amit.gupta — Sat, 28 Jun 2014 23:52:28 +0530

amit.gupta – 3 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java

Rev 11822 –

amit.gupta — Sat, 28 Jun 2014 22:25:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11669 – Added quantity + freebie

amit.gupta — Fri, 13 Jun 2014 14:54:37 +0530

amit.gupta – 2 file(s) modified
Added quantity + freebie

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11666 –

amit.gupta — Fri, 13 Jun 2014 08:55:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11665 –

amit.gupta — Fri, 13 Jun 2014 08:52:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11664 –

amit.gupta — Fri, 13 Jun 2014 08:51:22 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11663 –

amit.gupta — Fri, 13 Jun 2014 08:50:18 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11662 –

amit.gupta — Fri, 13 Jun 2014 08:41:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11660 –

amit.gupta — Thu, 12 Jun 2014 19:00:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11659 –

amit.gupta — Thu, 12 Jun 2014 18:56:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11658 –

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

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.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 9168 – Added appliedOnce

amit.gupta — Thu, 19 Dec 2013 16:59:28 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 9141 – Added brand to criteria

amit.gupta — Mon, 16 Dec 2013 14:45:19 +0530

amit.gupta – 1 file(s) modified
Added brand to criteria

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 9140 – Added brand to criteria

amit.gupta — Mon, 16 Dec 2013 14:07:35 +0530

amit.gupta – 1 file(s) modified
Added brand to criteria

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 8456 – Discount is always rounded off to a digit.

amit.gupta — Wed, 16 Oct 2013 11:45:57 +0530

amit.gupta – 1 file(s) modified
Discount is always rounded off to a digit.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py

Rev 8203 – both emails are converted to lower case before compared with ...

amit.gupta — Wed, 25 Sep 2013 15:25:22 +0530

amit.gupta – 1 file(s) modified
both emails are converted to lower case before compared with each other.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py

Rev 7781 – Added banks and corrected the logic of max discount.

amit.gupta — Fri, 19 Jul 2013 19:54:19 +0530

amit.gupta – 10 file(s) modified
Added banks and corrected the logic of max discount.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
+ /trunk/Website/src/main/webapp/images/banks-boi.png
+ /trunk/Website/src/main/webapp/images/banks-cub.png
+ /trunk/Website/src/main/webapp/images/banks-overseas.png
+ /trunk/Website/src/main/webapp/images/banks-ubi.png
+ /trunk/Website/src/main/webapp/images/banks-uboi.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 7475 – Fixed a bug in applying coupon where insurance amount was ...

anupam.singh — Wed, 12 Jun 2013 19:59:22 +0530

anupam.singh – 1 file(s) modified
Fixed a bug in applying coupon where insurance amount was not being considered

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py

Rev 6921 – Validate cart now applies insurance. Rule for emi coupon updated ...

anupam.singh — Fri, 01 Mar 2013 19:37:33 +0530

anupam.singh – 11 file(s) modified
Validate cart now applies insurance.
Rule for emi coupon updated to handle insurance amount
Signature for get insuranceAmount changed
JS validation for insuranceDetails updated
In case of discounts (not GV's) we reduce the price of insurance also
Added new Terms & conditions to policy doc

~ /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/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.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/CatalogService.py
~ /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/CartController.java
~ /trunk/Website/src/main/webapp/js/cart-details.js

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 6822 – handling for all items

amit.gupta — Thu, 14 Feb 2013 15:57:37 +0530

amit.gupta – 1 file(s) modified
handling for all items

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py

Rev 6820 – handling for all items

amit.gupta — Thu, 14 Feb 2013 15:52:12 +0530

amit.gupta – 1 file(s) modified
handling for all items

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py

Rev 6819 – handling for all items

amit.gupta — Thu, 14 Feb 2013 15:39:27 +0530

amit.gupta – 1 file(s) modified
handling for all items

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py