Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
20172 3472 d 8 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
11950 4211 d 14 h kshitij.sood /trunk/CRMService/src/main/java/in/shop2020/crm/util/  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
11942 4214 d 9 h kshitij.sood /trunk/CRMService/src/main/java/in/shop2020/crm/util/ More changes related to bulk enquriy  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
11890 4215 d 9 h kshitij.sood /trunk/ Crm changes related to bulk order enquiry & private deals.  
/trunk/Crm/src/main/java/in/shop2020/util/BulkOrderEmailReader.java
/trunk/Crm/src/main/java/in/shop2020/util/DesEncrypter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.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/UserInfoController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
/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/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/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/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.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
6811 4720 d 12 h anupam.singh /trunk/CRMService/src/main/java/in/shop2020/crm/util/ Changed a comment  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
6667 4750 d 12 h amar.kumar /trunk/ Changing AgentId for certain types of tickets  
/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
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
6176 4844 d 6 h amit.gupta /trunk/ Contact us extended for recharge.  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UncertainRechargeProcessorTask.java
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/css/contactus.css
/trunk/Website/src/main/webapp/js/contact-us.js
5435 4962 d 21 h amar.kumar /trunk/CRMService/src/main/java/in/shop2020/crm/util/ Changes to avoid deletion of user-communication entry if corresponding ticket has not been created  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
5407 4965 d 23 h amar.kumar /trunk/ Ticket Id : #1352 #1372 #1373
Changes for
1) Adding new ticket category
2) Showing trust level while COD verification
3) Creating tickets from UserCommunication table
4) Adding dummy vm file for AddressController

Reviewed By : Anupam Singh		  
/trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
/trunk/Website/src/main/webapp/WEB-INF/content/address.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/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/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/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/crm/TicketCategory.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
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java