Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
18634 3745 d 4 h manish.sharma /trunk/ Committed by Manish Sharma for Creditor Associate Process Implementation on Feb-09-2016  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CapitalFloatPaymentService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LoanHistory.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/AddressController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/IPaymentService.java
/trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/address-index.vm
/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
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CreditHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CreditTxnType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserSanction.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/CounterOnlineInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
18578 3747 d 13 h manish.sharma /trunk/ Committed by Manish Sharma for Creditor Associate Process Implementation on Feb-08-2016  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CreditHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CreditTxnType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Creditor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReceivedReturnType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RefundType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReplacementShippingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnAction.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnBehaviour.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnOrderInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnPickupRequest.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnPickupRequst.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnPickupType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnTransaction.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnTransactionStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnTxnPickupStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnTxnResolutionStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserSanction.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
18577 3747 d 14 h manish.sharma /trunk/ Committed by Manish Sharma for Creditor Associate Process Implementation on Feb-08-2016  
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/CreditHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/CreditTxnType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Creditor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/UserSanction.java
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentStatus.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
17782 3813 d 8 h amit.gupta /trunk/ Added validateCartNew  
/trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/address-serviceable.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/ItemQuantity.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/cache/EhcacheWrapper.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/AddressController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/interceptors/UserInterceptor.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/LogisticsService.java
/trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/pay-options-index.vm
/trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm
/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/UserContextSerivceHandler.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/model/v1/user/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
13441 4158 d 7 h amit.gupta /trunk/ Added new payment options  
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
13421 4160 d 16 h amit.gupta /trunk/ThriftGen/thriftsrc/PaymentService/  
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
10269 4438 d 8 h amit.gupta /trunk/ Adding Payment urls in case of mobile  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/HdfcEmiPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/HdfcPaymentService.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
10040 4453 d 7 h amit.gupta /trunk/ Added dhanlaxmi bank  
/trunk/Website/src/main/webapp/images/banks-dhanlaxmi.jpg
/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/java/in/shop2020/serving/controllers/CategoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
9506 4496 d 9 h amit.gupta /trunk/ Added Innoviti Citi EMI based paymethods  
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
8914 4549 d 12 h rajveer /trunk/ Changed method to return gateway status for a payment.  
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/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
8907 4550 d 7 h rajveer /trunk/ Made the changed in payment service to handle hdfc payment validation.  
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
8274 4605 d 9 h amit.gupta /trunk/ Added new banks for netbanking and added support urls for Brands in My Purchases.  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
/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/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/webapp/WEB-INF/content/giftvoucher-offer.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
7948 4663 d 6 h amit.gupta /trunk/ Added new emi codes for HSBC 9 month and 12 month.  
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
7781 4681 d 5 h amit.gupta /trunk/ Added banks and corrected the logic of max discount.  
/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/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/WEB-INF/content/proceed-to-pay-index.vm
7330 4739 d 5 h amit.gupta /trunk/ State is also considered now while calculating vat rates.  
/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/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/catalog/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
7049 4796 d 7 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
6978 4811 d 9 h amit.gupta /trunk/ Added new payment modes.  
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
6503 4895 d 10 h rajveer /trunk/ Set refund amount in case of refund of a payment.  
/trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcEmiPaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.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.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Payment.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
6486 4900 d 10 h rajveer /trunk/ Added new method to payment service to refund for hdfc.  
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/IPaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/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
6482 4901 d 9 h rajveer /trunk/ Added support of refund in hdfc.  
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentStatus.java
/trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

←Prev12Next→

Show All