SmartDukaan – /trunk/Crm/src/main/java/

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 23648 –

amit.gupta — Wed, 16 May 2018 14:01:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java

Rev 23647 – Added static maps to minimise service calls.

amit.gupta — Wed, 16 May 2018 13:24:57 +0530

amit.gupta – 1 file(s) modified
Added static maps to minimise service calls.

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java

Rev 23243 –

amit.gupta — Fri, 19 Jan 2018 14:49:25 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java

Rev 23242 –

amit.gupta — Fri, 19 Jan 2018 14:38:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java

Rev 22363 – Verify Retailer Feature

ashik.ali — Thu, 31 Aug 2017 17:43:15 +0530

ashik.ali – 5 file(s) modified
Verify Retailer Feature

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/VerifyDocController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/verify-doc-index.vm

Rev 22350 –

ashik.ali — Thu, 31 Aug 2017 12:49:41 +0530

ashik.ali – 4 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm

Rev 21964 –

amit.gupta — Fri, 14 Jul 2017 11:57:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/VerifyDocController.java

Rev 21963 – Fixed crm registration approval.

amit.gupta — Fri, 14 Jul 2017 11:31:31 +0530

amit.gupta – 6 file(s) modified
Fixed crm registration approval.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/DtrPricing.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 21935 –

amit.gupta — Thu, 13 Jul 2017 22:37:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/VerifyDocController.java

Rev 21934 – Added user verification(b2b)

amit.gupta — Thu, 13 Jul 2017 22:25:26 +0530

amit.gupta – 6 file(s) modified
Added user verification(b2b)

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/VerifyDocController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/verify-doc-index.vm

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 20992 –

kshitij.sood — Mon, 27 Feb 2017 14:53:14 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ReturnTransactionsController.java

Rev 20991 –

kshitij.sood — Mon, 27 Feb 2017 14:11:20 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ReturnTransactionsController.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 20307 – Added ritesh removed shailesh

amit.gupta — Fri, 19 Aug 2016 13:28:17 +0530

amit.gupta – 2 file(s) modified
Added ritesh
removed shailesh

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

kshitij.sood — Fri, 22 Jul 2016 19:45:26 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ReturnTransactionsController.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 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 20110 – Return Transaction Crm

kshitij.sood — Wed, 29 Jun 2016 14:49:05 +0530

kshitij.sood – 24 file(s) modified
Return Transaction Crm

~ /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/ReturnTransactionsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/interceptors
+ /trunk/Crm/src/main/java/in/shop2020/serving/interceptors/ReturnTransactionsInterceptor.java
~ /trunk/Crm/src/main/resources/struts.xml
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/images/add_button.png
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/WEB-INF/content/confirm-return-transaction.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/defective-view.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/pick-up-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/pickup-view.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/result.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/return-transaction-all.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/return-transaction-result-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/return-transactions-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/return-transactions-view.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/view-return-order.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/view-return-transaction.vm

Rev 20091 –

kshitij.sood — Fri, 24 Jun 2016 18:14:44 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

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 19765 – Committed by Manish Sharma for Return Process Implementation on May-16-2016

manish.sharma — Mon, 16 May 2016 16:39:11 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Return Process Implementation on May-16-2016

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 19072 – Committed by Manish Sharma for Cancel and Verify Transaction Changes ...

manish.sharma — Wed, 09 Mar 2016 16:52:09 +0530

manish.sharma – 4 file(s) modified
Committed by Manish Sharma for Cancel and Verify Transaction Changes on Mar-09-2016

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

Rev 18929 – Showing Tickets for all ProfitMandi Categories.

amit.gupta — Mon, 29 Feb 2016 12:06:07 +0530

amit.gupta – 1 file(s) modified
Showing Tickets for all ProfitMandi Categories.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 18709 – Changes related to crm ticket generation process

manas — Tue, 16 Feb 2016 15:53:47 +0530

manas – 8 file(s) modified
Changes related to crm ticket generation process

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/PyDTR/src/dtr/api/Routing.py
~ /trunk/PyDTR/src/dtr/api/Service.py
~ /trunk/PyDTR/src/dtr/utils/utils.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

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

manish.sharma — Mon, 01 Feb 2016 19:22:44 +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/serving/controllers/UserOrderInfoController.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 18343 –

amit.gupta — Thu, 21 Jan 2016 00:04:03 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 18342 –

amit.gupta — Wed, 20 Jan 2016 23:31:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 18341 – Some changes to handle cod verification

amit.gupta — Wed, 20 Jan 2016 23:09:01 +0530

amit.gupta – 3 file(s) modified
Some changes to handle cod verification

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm

Rev 18171 – Committed by Manish Sharma for Changing Assignee Id for Low ...

manish.sharma — Tue, 05 Jan 2016 15:17:19 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Changing Assignee Id for Low Inventory Cancellation on Jan-05-2015

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

Rev 18071 – Committed by Manish Sharma for Address Change Issue on Dec-23-2015

manish.sharma — Wed, 23 Dec 2015 13:42:07 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Address Change Issue on Dec-23-2015

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

Rev 18070 – Committed by Manish Sharma for Address Change Issue on Dec-23-2015

manish.sharma — Wed, 23 Dec 2015 13:41:23 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Address Change Issue on Dec-23-2015

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

Rev 17274 – Committed by Manish Sharma for Adding one more category in ...

manish.sharma — Fri, 16 Oct 2015 14:46:54 +0530

manish.sharma – 4 file(s) modified
Committed by Manish Sharma for Adding one more category in CRM Category List on 16-Oct-2015

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 17198 – Committed by Manish Sharma for New Email Alert for Received ...

manish.sharma — Wed, 07 Oct 2015 11:12:19 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for New Email Alert for Received Call from Customer Activity 07-Oct-2015

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 17197 – Committed by Manish Sharma for New Email Alert for Received ...

manish.sharma — Wed, 07 Oct 2015 11:11:59 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for New Email Alert for Received Call from Customer Activity 07-Oct-2015

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java