Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
13440 4041 d 5 h amit.gupta /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Added PaymentGateway info  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
7390 4608 d 7 h manish.sharma /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Commited by Manish Sharma for Hiding wallet amount at Recharge Order Page on June-05-2013  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
7049 4679 d 5 h anupam.singh /trunk/ Added a method in Payment service that returns Payment where isDigital = 1  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentMapper.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
6534 4771 d 6 h anupam.singh /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Refund on successful recharge should not be allowed  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
6509 4777 d 5 h anupam.singh /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Accounting for coupon amount as well.  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
6508 4777 d 6 h anupam.singh /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Refund button should not be visible in case of wallet only payment.  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
6507 4777 d 9 h anupam.singh /trunk/ Added a method in order service for refunding orders. Gave a handle in crm for the same.  
/trunk/Crm/src/main/webapp/WEB-INF/content/refund-failed.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/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/RechargeOrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
6462 4789 d 3 h rajveer /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ Recharge order details.  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrdersController.java
6153 4846 d 4 h anupam.singh /trunk/Crm/src/main/ Cosmetic fixes for CRM  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
6111 4847 d 8 h anupam.singh /trunk/ Added CRM support for recharge orders. Also added myWallet and myRecharges page.  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrdersController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyWalletController.java
/trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-wallet.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
/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/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/Website/src/main/resources/templates/personaldetails.vm
/trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
/trunk/Website/src/main/webapp/js/recharge.js