Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
12859 4119 d 7 h kshitij.sood /trunk/Website/src/main/ Captcha in contact us  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/UserMessage.java
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
/trunk/Website/src/main/webapp/css/contactus.css
/trunk/Website/src/main/webapp/js/contact-us.js
11943 4214 d 8 h kshitij.sood /trunk/Website/src/main/ Bulk enquiry in Contact us  
/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
6181 4841 d 14 h rajveer /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Removed unused imports.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.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
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
5170 4995 d 9 h amar.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ changing default assigneeId to 17 for Order Cancellation Tickets  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
5158 4995 d 23 h amar.kumar /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Ticket Id: #1227

Change to directly assign Order Cancellation tickets to Suraj		  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
4378 5105 d 14 h mandeep.dhir /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Validating communication type  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
4377 5105 d 14 h mandeep.dhir /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Validating communication type  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
4277 5128 d 8 h anupam.singh /trunk/ Trac#809

Reviewer : Mandeep Dhir

When user requests for order cancellation a ticket is generated for the same in CRM and order goes into "cancel_request_recieved" state.
Outbound team in CRM should have an option to confirm or deny the request which should mark the order as cancelled or to its previous state respectively.		  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
4160 5161 d 8 h mandeep.dhir /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Trac#669 Creating activity with type received_email_from_customer for cases  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
3952 5191 d 13 h mandeep.dhir /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Making default communication type as OTHER  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
3499 5222 d 11 h mandeep.dhir /trunk/ Trac#504 Added functionality to help CRM agents to verify COD orders  
/trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
/trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
/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/serving/controllers/UserInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.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/tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/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-remote
/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/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.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
3272 5240 d 10 h mandeep.dhir /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Trac#488 Each user-communication will log a ticket going forward  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
3126 5252 d 6 h rajveer /trunk/Website/src/main/java/in/shop2020/serving/ Side effect of name changing of clients.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CompletedOrdersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EmailAvailabilityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ForgotPasswordController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginDetailsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PersonalDetailsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/CreateUserInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
/trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
2944 5267 d 14 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Changed printStackTrace to logger.error  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
2148 5334 d 8 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Removed some unused variables. Used some others.  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ExceptionController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/StaticController.java
2145 5334 d 8 h chandranshu /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Removed unused imports and some unused variables  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/AflUpdatesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PersonalDetailsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/TestController.java
1876 5357 d 14 h varun.gupta /trunk/Website/src/main/ Links added to load Contact Form with a particular query type.  
/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/WEB-INF/content/terms-conditions.vm
1600 5376 d 14 h varun.gupta /trunk/Website/src/main/java/in/shop2020/serving/controllers/ Added handling of the case where Order ID is not supplied  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java

←Prev12Next→

Show All