SmartDukaan – /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/

Rev 23385 –

amit.gupta — Thu, 22 Feb 2018 17:53:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 22306 – Fixed validation

amit.gupta — Thu, 24 Aug 2017 21:12:18 +0530

amit.gupta – 1 file(s) modified
Fixed validation

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java

Rev 21845 –

amit.gupta — Mon, 03 Jul 2017 15:33:21 +0530

amit.gupta – 4 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/ClicksController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py

Rev 21423 – Added selfpickup flag

amit.gupta — Tue, 09 May 2017 18:36:25 +0530

amit.gupta – 1 file(s) modified
Added selfpickup flag

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java

Rev 21142 – added profittill2

amit.gupta — Wed, 29 Mar 2017 18:02:30 +0530

amit.gupta – 1 file(s) modified
added profittill2

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/ClicksController.java

Rev 21047 –

kshitij.sood — Tue, 07 Mar 2017 12:45:32 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java

Rev 21045 –

kshitij.sood — Mon, 06 Mar 2017 20:42:06 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java

Rev 21044 –

kshitij.sood — Mon, 06 Mar 2017 20:30:20 +0530

kshitij.sood – 9 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 21004 – Fixed total amount in case of accessories

amit.gupta — Mon, 27 Feb 2017 21:24:39 +0530

amit.gupta – 1 file(s) modified
Fixed total amount in case of accessories

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayOptionsController.java

Rev 20987 –

amit.gupta — Thu, 23 Feb 2017 10:34:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java

Rev 20986 –

amit.gupta — Wed, 22 Feb 2017 22:09:31 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java

Rev 20984 –

amit.gupta — Wed, 22 Feb 2017 11:11:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java

Rev 20983 –

amit.gupta — Wed, 22 Feb 2017 10:32:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java

Rev 20979 – added categoryName to cart

amit.gupta — Wed, 22 Feb 2017 09:51:56 +0530

amit.gupta – 2 file(s) modified
added categoryName to cart

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/PojoPopulator.java

Rev 20955 –

kshitij.sood — Sun, 19 Feb 2017 17:47:02 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/MyRechargesController.java

Rev 20886 –

kshitij.sood — Mon, 13 Feb 2017 15:54:51 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java

Rev 20880 –

kshitij.sood — Sun, 12 Feb 2017 16:51:22 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayOptionsController.java

Rev 20879 –

kshitij.sood — Sun, 12 Feb 2017 16:47:16 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayOptionsController.java

Rev 20878 –

kshitij.sood — Sun, 12 Feb 2017 16:39:47 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayOptionsController.java

Rev 20873 – Wallet changes order & payment

kshitij.sood — Sat, 11 Feb 2017 13:39:40 +0530

kshitij.sood – 21 file(s) modified
Wallet changes order & payment

~ /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/java/in/shop2020/mobileapi/serving/services/WalletPaymentService.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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.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

Rev 20866 – Added wallet amount

amit.gupta — Thu, 09 Feb 2017 11:57:47 +0530

amit.gupta – 1 file(s) modified
Added wallet amount

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/AddressController.java

Rev 20629 –

amit.gupta — Thu, 29 Dec 2016 00:11:10 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20628 –

amit.gupta — Wed, 28 Dec 2016 21:00:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20627 –

amit.gupta — Wed, 28 Dec 2016 20:57:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20626 – fixed amount to 2 for testing purpose

amit.gupta — Wed, 28 Dec 2016 20:50:51 +0530

amit.gupta – 1 file(s) modified
fixed amount to 2 for testing purpose

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20625 – Fixed shipping price as discussed

amit.gupta — Wed, 28 Dec 2016 20:35:55 +0530

amit.gupta – 1 file(s) modified
Fixed shipping price as discussed

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayOptionsController.java

Rev 20608 –

amit.gupta — Mon, 26 Dec 2016 15:24:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 20607 –

amit.gupta — Mon, 26 Dec 2016 15:04:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 20606 –

amit.gupta — Mon, 26 Dec 2016 14:58:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 20600 – Added flag handling for sales

amit.gupta — Mon, 26 Dec 2016 11:54:54 +0530

amit.gupta – 2 file(s) modified
Added flag handling for sales

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java

Rev 20336 – added log

aman.kumar — Tue, 30 Aug 2016 14:57:14 +0530

aman.kumar – 1 file(s) modified
added log

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java

Rev 20335 – bug fix

aman.kumar — Tue, 30 Aug 2016 13:02:16 +0530

aman.kumar – 1 file(s) modified
bug fix

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java

Rev 20278 – Activating Payu option for Credit card, Debit Card and Netbanking. ...

aman.kumar — Wed, 10 Aug 2016 13:31:30 +0530

aman.kumar – 43 file(s) modified
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/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/InnovitiPaymentService.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/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/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/InnovitiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.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/images/amexlogo.jpg
+ /trunk/Website/src/main/webapp/images/rupaylogo.jpg
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
+ /trunk/Website/src/main/webapp/unversioned/images/amexlogo.jpg
+ /trunk/Website/src/main/webapp/unversioned/images/rupaylogo.jpg
~ /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

Rev 20172 – added kushal.bhatia@saholic.com where rajneesh.arora@saholic.com is present and replaced manoj.kumar@saholic.com with ...

aman.kumar — Fri, 15 Jul 2016 17:57:20 +0530

aman.kumar – 39 file(s) modified
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/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.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/acquisition/crmacqreport.py
~ /trunk/PyDTR/src/dtr/reports/acquisition/dtrcohortanalysis.py
~ /trunk/PyDTR/src/dtr/reports/affiliatereco.py
~ /trunk/PyDTR/src/dtr/reports/AppApprovedTransactionData.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

Rev 19915 – Changes for settlement

manas — Mon, 06 Jun 2016 22:15:32 +0530

manas – 2 file(s) modified
Changes for settlement

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 19914 – Adding exeption logs

manas — Mon, 06 Jun 2016 22:01:10 +0530

manas – 1 file(s) modified
Adding exeption logs

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java

Rev 19913 – Adding exeption logs

manas — Mon, 06 Jun 2016 21:52:51 +0530

manas – 1 file(s) modified
Adding exeption logs

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java

Rev 19912 – Changes related to settlement

manas — Mon, 06 Jun 2016 21:45:44 +0530

manas – 8 file(s) modified
Changes related to settlement

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java
~ /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/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19901 – Checking logs for settlement

manas — Mon, 06 Jun 2016 15:17:13 +0530

manas – 1 file(s) modified
Checking logs for settlement

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java

Rev 19900 – Checking logs for settlement

manas — Mon, 06 Jun 2016 15:11:38 +0530

manas – 1 file(s) modified
Checking logs for settlement

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java