Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
20873 3267 d 11 h kshitij.sood /trunk/ Wallet changes order & payment  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/WalletPaymentService.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/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/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/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/Cart.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
20825 3277 d 2 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ attempt to fix Velocity issue  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/PageLoaderHandler.java
20653 3306 d 6 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ Fixed Amount go live  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
20632 3311 d 23 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ Added  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
20631 3312 d 0 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ removed comments  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
20630 3312 d 0 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
20425 3387 d 12 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ Fixed filterable facets.  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/SolrSearchService.java
20337 3432 d 10 h aman.kumar /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ bug fix  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/EbsPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/PayuPaymentService.java
20278 3452 d 11 h aman.kumar /trunk/ Activating Payu option for Credit card, Debit Card and Netbanking. Change in EMI schemes. Addition of American Express Card in Credit Card section and RuPay Card in Debit Card Section. Removal of Credit Card Outside India Option in Mobilesite  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/PaymentUtils.java
/trunk/MobileWebsiteApi/src/main/webapp/images/payment/amexlogo.jpg
/trunk/MobileWebsiteApi/src/main/webapp/images/payment/rupaylogo.jpg
/trunk/Website/src/main/webapp/images/amexlogo.jpg
/trunk/Website/src/main/webapp/images/rupaylogo.jpg
/trunk/Website/src/main/webapp/unversioned/images/amexlogo.jpg
/trunk/Website/src/main/webapp/unversioned/images/rupaylogo.jpg
/trunk/MobileSite/application/widgets/checkout/views/payment_process.php
/trunk/MobileSite/assets/css/recharge.less
/trunk/MobileSite/assets/css/shipping.less
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EmiSchemesController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RechargePaymentController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CapitalFloatPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CodPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CouponPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/EbsPaymentService.java
/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/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/IPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/InnovitiPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/PayuPaymentService.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/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CouponPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/InnovitiPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PayuPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/PaymentUtils.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm
/trunk/Website/src/main/webapp/js/proceed-to-pay.js
20172 3478 d 7 h aman.kumar /trunk/ added kushal.bhatia@saholic.com where rajneesh.arora@saholic.com is present and replaced manoj.kumar@saholic.com with ritesh.chauhan@saholic.com at some places  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
/trunk/PyDTR/src/dtr/main.py
/trunk/PyDTR/src/dtr/reports/AppApprovedTransactionData.py
/trunk/PyDTR/src/dtr/reports/acquisition/crmacqreport.py
/trunk/PyDTR/src/dtr/reports/acquisition/dtrcohortanalysis.py
/trunk/PyDTR/src/dtr/reports/affiliatereco.py
/trunk/PyDTR/src/dtr/reports/crmoutbound.py
/trunk/PyDTR/src/dtr/reports/usersegmentation.py
/trunk/PyDTR/src/dtr/sources/spice.py
/trunk/PyDTR/src/dtr/storage/Mongo.py
/trunk/PyDTR/src/dtr/utils/DealSheet.py
/trunk/PyDTR/src/dtr/utils/UserSpecificDeals.py
/trunk/PyDTR/src/scripts/ActivityReport.py
/trunk/PyDTR/src/scripts/AmazonBestSellers.py
/trunk/PyDTR/src/scripts/FlipkartBestSeller.py
/trunk/PyDTR/src/scripts/FreeBOfferFetcher.py
/trunk/PyDTR/src/scripts/HomeShopBestSellers.py
/trunk/PyDTR/src/scripts/IgnorePricingItems.py
/trunk/PyDTR/src/scripts/NegativeItems.py
/trunk/PyDTR/src/scripts/NoNlcAlert.py
/trunk/PyDTR/src/scripts/PaytmBestSellers.py
/trunk/PyDTR/src/scripts/SaholicBestSellers.py
/trunk/PyDTR/src/scripts/ShopCluesBestSellers.py
/trunk/PyDTR/src/scripts/SnapdealBestSellers.py
/trunk/PyDTR/src/scripts/UserInviteCode.py
/trunk/PyDTR/src/scripts/walletrefundreport.py
/trunk/PyProj/src/shop2020/model/v1/order/script/DTRReports.py
/trunk/PyProj/src/shop2020/model/v1/order/script/HighVolumeCustomerRecharge.py
/trunk/PyProj/src/shop2020/model/v1/order/script/InsuranceDeclaration.py
/trunk/PyProj/src/shop2020/model/v1/order/script/OneAssistData.py
/trunk/PyProj/src/shop2020/model/v1/order/script/RechargeUnknownReport.py
/trunk/PyProj/src/shop2020/model/v1/order/script/SourceWiseItemReturnReportExceptMobilesTab.py
/trunk/PyProj/src/shop2020/model/v1/order/script/SourceWiseSaleReturn.py
/trunk/PyProj/src/shop2020/purchase/main/script/PendingPurchaseOrderReport.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
18976 3613 d 12 h manish.sharma /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ Committed by Manish Sharma for Creditor Associate Process Implementation on Mar-02-2016  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CapitalFloatPaymentService.java
18634 3634 d 5 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
17782 3702 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
17470 3720 d 16 h manish.sharma /trunk/ Committed by Manish Sharma for Bulk Order Creation and Shipping Charges Implementation on 16-Nov-2015  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
/trunk/MobileSite/application/widgets/cart/views/carts.php
/trunk/MobileSite/application/widgets/checkout/views/shipping_process.php
/trunk/MobileSite/application/widgets/productinfo/views/product_details_b.php
/trunk/MobileSite/application/widgets/productinfo/views/product_details_d.php
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.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/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/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.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/ThriftGen/thriftsrc/OrderService/OrderService.thrift
16639 3797 d 2 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ Added Mysql  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/Mysql.java
13521 4032 d 12 h amit.gupta /trunk/ 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
13286 4061 d 9 h amit.gupta /trunk/ Added PayU for mobile API + PayU implementation to Payment Service.  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayResponseController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/PayuPayPojo.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PayuPaymentHandler.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EbsPayResponseController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RechargePaymentController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/EbsPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/IPaymentService.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/PayuPaymentService.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
13160 4073 d 7 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/interceptors/UserInterceptor.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/UserSessionInfo.java
12788 4136 d 3 h amit.gupta /trunk/ Added Website  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
12150 4203 d 8 h amit.gupta /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/SolrSearchService.java

←Prev12Next→

Show All