Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
6597 4762 d 6 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ set refund timestamp to null initially.  
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
6591 4763 d 1 h anupam.singh /trunk/ Added ip address recognition and blocking of malicious ip addresses for rechargeOrders. Also started to log addresses which are blocked.  
/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/order/impl/model/BaseOrder.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
6515 4777 d 5 h anupam.singh /trunk/ Added refund timestamp to baseorder.  
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
6443 4791 d 9 h anupam.singh /trunk/ Bug Fixes.
1) Even After applying Coupon full amount is being charged at the gateway
2) In case of applying incorrect coupon there is no way to retry appying a coupon.
3) Limit of 2 coupon applications per user is not there, can apply more than 2 times.		  
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
6433 4791 d 23 h anupam.singh /trunk/ Added support for recharge coupons  
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.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/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
/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/order/RechargeOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/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/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
/trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
/trunk/Website/src/main/webapp/js/recharge.js
6147 4847 d 5 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/ Fixed small bugs.  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/DigitalTransaction.py
6031 4867 d 3 h rajveer /trunk/ Created infrastructure to support mobile/dth recharge through our website.  
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/DigitalTransaction.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/UserWallet.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/UserWalletHistory.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWallet.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWalletHistory.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/model/v1/order/impl/model/BaseOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/DTHRechargeOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/ImmediateConsumedOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/MobileRechargeOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeOrder.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
6000 4875 d 3 h mandeep.dhir /trunk/ Spicedeck backend interfaces and model objects  
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/DTHRechargeOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/DigitalOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/DownloadableOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/ImmediateConsumedOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/MobileRechargeOrder.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeOrder.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeCoupon.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeCouponStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeResponse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeType.java
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/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-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift