SmartDukaan – /trunk/Crm/src/main/java/in/shop2020/util/

Rev 23839 – changed mail domain profitmandi.com -> smartdukaan.com

amit.gupta — Tue, 03 Jul 2018 11:15:44 +0530

amit.gupta – 30 file(s) modified
changed mail domain profitmandi.com -> smartdukaan.com

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Warehouse.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/PyDTR/src/scripts/AmazonBestSellers.py
~ /trunk/PyDTR/src/scripts/FlipkartBestSeller.py
~ /trunk/PyDTR/src/scripts/HomeShopBestSellers.py
~ /trunk/PyDTR/src/scripts/PaytmBestSellers.py
~ /trunk/PyDTR/src/scripts/ProfitMandiUserDataUpdationRequest.py
~ /trunk/PyDTR/src/scripts/SaholicBestSellers.py
~ /trunk/PyDTR/src/scripts/ShopCluesBestSellers.py
~ /trunk/PyDTR/src/scripts/SnapdealBestSellers.py
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/EcomAwbUpdater.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/EcomExpressLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProfitMandiSalesAssociate.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/RQuickLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/PendingPurchaseOrderReport.py
~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 21881 –

amit.gupta — Mon, 10 Jul 2017 12:08:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.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 20305 – removed shailesh added ritesh and amit.gupta

amit.gupta — Fri, 19 Aug 2016 13:00:57 +0530

amit.gupta – 1 file(s) modified
removed shailesh
added ritesh and amit.gupta

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

Rev 20295 –

kshitij.sood — Fri, 12 Aug 2016 13:25:09 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20167 – new category delivery attempt failed added. Shipping charge re-evaluation after ...

aman.kumar — Wed, 13 Jul 2016 20:26:19 +0530

aman.kumar – 6 file(s) modified
new category delivery attempt failed added. Shipping charge re-evaluation after order cancellation

~ /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/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 20152 – Sending email to logistic provider in case of undelivered category ...

aman.kumar — Fri, 08 Jul 2016 11:42:58 +0530

aman.kumar – 4 file(s) modified
Sending email to logistic provider in case of undelivered category based on action chosen by crm agent.

~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.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/WEB-INF/content/tickets-edit.vm

Rev 20087 – changed escalation matrix from sachin sachdeva(18) to himanshu pandey(65)

aman.kumar — Fri, 24 Jun 2016 15:02:24 +0530

aman.kumar – 1 file(s) modified
changed escalation matrix from sachin sachdeva(18) to himanshu pandey(65)

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

Rev 18456 – Committed by Manish Sharma for Removing Ritesh Id from escalation ...

manish.sharma — Mon, 01 Feb 2016 17:56:23 +0530

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

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

Rev 16530 – Committed by Manish Sharma for Profit Mandi Ticket Mail Sender ...

manish.sharma — Tue, 25 Aug 2015 15:38:11 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for Profit Mandi Ticket Mail Sender on 25-Aug-2015

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/SendGrid.java
+ /trunk/Crm/src/main/java/in/shop2020/util/SMTPAPI.java

Rev 16527 – Committed by Manish Sharma for Profit Mandi Ticket Mail Sender ...

manish.sharma — Tue, 25 Aug 2015 14:49:19 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Profit Mandi Ticket Mail Sender on 25-Aug-2015

~ /trunk/Crm/pom.xml
~ /trunk/Crm/src/main/java/in/shop2020/util/SendGrid.java

Rev 16526 – Committed by Manish Sharma for Profit Mandi Ticket Mail Sender ...

manish.sharma — Tue, 25 Aug 2015 14:09:50 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Profit Mandi Ticket Mail Sender on 25-Aug-2015

+ /trunk/Crm/src/main/java/in/shop2020/util/SendGrid.java
+ /trunk/Crm/src/main/java/in/shop2020/util/SendGridException.java

Rev 16348 – Committed by Manish Sharma for Change in assignee id on ...

manish.sharma — Tue, 11 Aug 2015 13:11:29 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change in assignee id on 11 Aug 2015

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java

Rev 16335 – Committed by Manish Sharma for Change in assignee id on ...

manish.sharma — Mon, 10 Aug 2015 12:51:37 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change in assignee id on 10 Aug 2015

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.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 16215 – Committed by Manish Sharma for ProfitMandi CRM Changes on 27-Jul-2015

manish.sharma — Tue, 28 Jul 2015 12:05:55 +0530

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

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

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 15005 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 29-Apr-2015

manish.sharma — Wed, 29 Apr 2015 11:02:11 +0530

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

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

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 14025 – Committed by Manish Sharma for Removing Shrawan Id from Escalation ...

manish.sharma — Fri, 20 Feb 2015 17:35:08 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Removing Shrawan Id from Escalation Matrix on 20-Feb-2015

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

Rev 13438 –

amit.gupta — Wed, 24 Dec 2014 15:31:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 13211 –

kshitij.sood — Fri, 05 Dec 2014 12:32:46 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.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 9693 – Committed by Manish Sharma for reassign the bulk _deal ...

manish.sharma — Wed, 29 Jan 2014 17:48:32 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for reassign the bulk _deal category tickets on Jan-29-2014

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

Rev 8610 – Added Shrawan and Ritesh to "Shipping & Delivery" and "Delivery ...

anupam.singh — Wed, 30 Oct 2013 12:57:21 +0530

anupam.singh – 1 file(s) modified
Added Shrawan and Ritesh to "Shipping & Delivery" and "Delivery Problem" escalation categories.

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

Rev 8228 – Removing "saholic.escalation" agent from escalation matrix.

anupam.singh — Fri, 27 Sep 2013 14:23:18 +0530

anupam.singh – 1 file(s) modified
Removing "saholic.escalation" agent from escalation matrix.

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

Rev 8126 – Committed by Manish Sharma for Change agent id in CRM ...

manish.sharma — Wed, 11 Sep 2013 16:19:57 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change agent id in CRM Escalation Matrix on Sep-11-2013

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

Rev 7956 – Adding refund reason "Flagged by gateway"

anupam.singh — Thu, 08 Aug 2013 14:44:15 +0530

anupam.singh – 1 file(s) modified
Adding refund reason "Flagged by gateway"

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

Rev 7297 – Upon encountering an Exception we mark that mail as processed

anupam.singh — Fri, 17 May 2013 16:59:26 +0530

anupam.singh – 1 file(s) modified
Upon encountering an Exception we mark that mail as processed

~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java

Rev 7262 – Adding AgentId "45" to Escalation Matrix

amar.kumar — Fri, 10 May 2013 12:18:22 +0530

amar.kumar – 1 file(s) modified
Adding AgentId "45" to Escalation Matrix

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

Rev 7162 –

kshitij.sood — Tue, 16 Apr 2013 17:36:58 +0530

kshitij.sood – 4 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.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

Rev 7064 – Added to Shrawan and Ritesh to some categories

anupam.singh — Fri, 29 Mar 2013 14:58:16 +0530

anupam.singh – 1 file(s) modified
Added to Shrawan and Ritesh to some categories

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

Rev 6960 – Changed Ticket assignees on escalation as per Amit

anupam.singh — Wed, 06 Mar 2013 14:44:17 +0530

anupam.singh – 2 file(s) modified
Changed Ticket assignees on escalation as per Amit

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 6677 – Changes for Adding new TicketCategory for ON_TIME_GUARANTEE

amar.kumar — Mon, 14 Jan 2013 20:02:01 +0530

amar.kumar – 3 file(s) modified
Changes for Adding new TicketCategory for ON_TIME_GUARANTEE

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 6667 – Changing AgentId for certain types of tickets

amar.kumar — Mon, 14 Jan 2013 14:24:36 +0530

amar.kumar – 4 file(s) modified
Changing AgentId for certain types of tickets

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/FlaggedPaymentProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UncertainRechargeProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java

Rev 6647 – Added amit sirohi to escalation mails instead of suraj sharma.

anupam.singh — Fri, 11 Jan 2013 12:49:06 +0530

anupam.singh – 1 file(s) modified
Added amit sirohi to escalation mails instead of suraj sharma.

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

Rev 6543 – One more cancellation reason - "customer denied placing order on ...

anupam.singh — Thu, 27 Dec 2012 15:45:53 +0530

anupam.singh – 1 file(s) modified
One more cancellation reason - "customer denied placing order on our site"

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

Rev 6304 – Changing Assignee in case of Failed Payment, COD-Verification and COD ...

amar.kumar — Tue, 06 Nov 2012 12:51:58 +0530

amar.kumar – 3 file(s) modified
Changing Assignee in case of Failed Payment, COD-Verification and COD Verification escalation tickets (Gaurabh to Shrawan)

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

Rev 5735 – Changing default Assignee for COD Verification to Gaurabh

amar.kumar — Mon, 06 Aug 2012 13:36:45 +0530

amar.kumar – 1 file(s) modified
Changing default Assignee for COD Verification to Gaurabh

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