SmartDukaan – /trunk/CRMService/src/

Rev 35735 – Remove AlertClient dependency from CRMServiceHandler

amit — Wed, 11 Feb 2026 15:31:28 +0530

amit – 1 file(s) modified
Remove AlertClient dependency from CRMServiceHandler

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 33497 – Fixed db

amit.gupta — Thu, 27 Jun 2024 16:48:35 +0530

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

~ /trunk/CRMService/src/main/resources/jdbc.properties

Rev 30541 –

amit.gupta — Tue, 31 May 2022 16:01:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/resources/jdbc.properties

Rev 21922 – All unverified counters need to be verified

amit.gupta — Thu, 13 Jul 2017 12:11:15 +0530

amit.gupta – 1 file(s) modified
All unverified counters need to be verified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

Rev 21892 –

amit.gupta — Mon, 10 Jul 2017 16:58:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 21891 –

amit.gupta — Mon, 10 Jul 2017 16:55:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 21890 –

amit.gupta — Mon, 10 Jul 2017 16:53:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 21888 –

amit.gupta — Mon, 10 Jul 2017 14:49:36 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 21887 –

amit.gupta — Mon, 10 Jul 2017 13:49:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 21885 –

amit.gupta — Mon, 10 Jul 2017 13:32:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 21884 –

amit.gupta — Mon, 10 Jul 2017 13:25:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 21882 –

amit.gupta — Mon, 10 Jul 2017 12:53:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 20356 – Fixed ticket issue

amit.gupta — Wed, 07 Sep 2016 13:16:33 +0530

amit.gupta – 2 file(s) modified
Fixed ticket issue

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java

Rev 20296 –

kshitij.sood — Fri, 12 Aug 2016 15:24:45 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

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 18461 – Committed by Manish Sharma for Removing Ritesh Id from escalation ...

manish.sharma — Mon, 01 Feb 2016 19:21:44 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Removing Ritesh Id from escalation on Feb-01-2016

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java

Rev 18203 – Fixed fetched payments

amit.gupta — Fri, 08 Jan 2016 13:33:29 +0530

amit.gupta – 1 file(s) modified
Fixed fetched payments

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java

Rev 16244 – Committed by Manish Sharma for Profit Mandi Shopclues Scraping on ...

manish.sharma — Wed, 29 Jul 2015 15:12:23 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for Profit Mandi Shopclues Scraping on 29-Jul-2015

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 16208 – Committed by Manish Sharma for ProfitMandi CRM Changes on 27-Jul-2015

manish.sharma — Mon, 27 Jul 2015 20:09:07 +0530

manish.sharma – 7 file(s) modified
Committed by Manish Sharma for ProfitMandi CRM Changes on 27-Jul-2015

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 16207 – Committed by Manish Sharma for Change in Failed Payment Ticket ...

manish.sharma — Mon, 27 Jul 2015 16:11:36 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change in Failed Payment Ticket Generator on 27-Jul-2015

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java

Rev 14926 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 22-Apr-2015

manish.sharma — Wed, 22 Apr 2015 10:59:34 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 22-Apr-2015

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 14910 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015

manish.sharma — Tue, 21 Apr 2015 20:37:08 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015

~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 14909 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015

manish.sharma — Tue, 21 Apr 2015 20:26:27 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015

~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 14908 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015

manish.sharma — Tue, 21 Apr 2015 20:18:51 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 21-Apr-2015

~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 14907 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 20:14:02 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 14902 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 19:28:27 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 14901 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 19:10:41 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java

Rev 14900 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 19:04:25 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 14899 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 18:57:02 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 14898 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 18:50:56 +0530

manish.sharma – 9 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 14882 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Mon, 20 Apr 2015 17:05:59 +0530

manish.sharma – 18 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

Rev 14226 –

kshitij.sood — Fri, 27 Feb 2015 18:08:39 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java

Rev 14067 –

kshitij.sood — Mon, 23 Feb 2015 15:53:03 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

Rev 11950 –

kshitij.sood — Mon, 07 Jul 2014 12:47:57 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java

Rev 11942 – More changes related to bulk enquriy

kshitij.sood — Fri, 04 Jul 2014 17:35:11 +0530

kshitij.sood – 1 file(s) modified
More changes related to bulk enquriy

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java

Rev 11890 – Crm changes related to bulk order enquiry & private deals.

kshitij.sood — Thu, 03 Jul 2014 17:23:48 +0530

kshitij.sood – 25 file(s) modified
Crm changes related to bulk order enquiry & private deals.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/util/BulkOrderEmailReader.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
+ /trunk/Crm/src/main/java/in/shop2020/util/DesEncrypter.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/orders-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.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/crm/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/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 9338 – Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse ...

manish.sharma — Thu, 09 Jan 2014 16:14:25 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse on Jan-09-2014

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java
~ /trunk/Common/src/main/java/in/shop2020/utils/FedExShipAccountInfo.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReshipOrderHandler.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.py
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FedExUpdatesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 8384 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Fri, 11 Oct 2013 18:01:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Oct-11-2013

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 8381 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Fri, 11 Oct 2013 16:45:40 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Oct-11-2013

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 8371 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Fri, 11 Oct 2013 11:30:19 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Oct-11-2013

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java