SmartDukaan – /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4793 – Ticket ID : #1010 Reviewed by : Anupam Singh

amar.kumar — Sun, 25 Mar 2012 00:25:05 +0530

amar.kumar – 21 file(s) modified
Ticket ID : #1010
Reviewed by : Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.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/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /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/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4681 – Trac ID : #901, #961 Reviewed By : Anupam Singh

amar.kumar — Mon, 12 Mar 2012 18:42:41 +0530

amar.kumar – 9 file(s) modified
Trac ID : #901, #961
Reviewed By : Anupam Singh

~ /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/css/common.css
~ /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
~ /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 4490 – Added DOA Request and return request raised handling in CRM. ...

anupam.singh — Mon, 13 Feb 2012 13:45:46 +0530

anupam.singh – 15 file(s) modified
Added DOA Request and return request raised handling in CRM. On ticket info page clicking on activity now shows attachments as well.

Trac #894, #862, #863

Reviewer : Mandeep Dhir

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.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/serving/controllers/UserOrderInfoController.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/tickets-edit.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4267 – Trac#805 Task to generate tickets for flagged payments. Ability ...

anupam.singh — Fri, 30 Dec 2011 12:09:08 +0530

anupam.singh – 11 file(s) modified
Trac#805

Task to generate tickets for flagged payments.
Ability to allow or block such payments in CRM.

Reviewer : Mandeep Dhir

Rev 4241 – TracId : #684, #740 Reviewer : Mandeep Dhir 1. ...

anupam.singh — Mon, 26 Dec 2011 15:36:39 +0530

anupam.singh – 25 file(s) modified
TracId : #684, #740
Reviewer : Mandeep Dhir

1. Provided a selection list to choose a category for the reason of COD order cancellation.
2. In ticket edit view, showed links to view activity description.
3. Generating activity for bounced mail from send-grid now possible.
4. Column width of tables now different for different columns
5. Files attached in emails from users to CRM agents now visible in the UI.
6. UI enhancements.

~ /trunk/Crm/.project
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.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/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
+ /trunk/Crm/src/main/java/in/shop2020/util/EmailUtils.java
~ /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/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-cart-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/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4020 – Trac#647 Built Escalation matrix and also allowing agents to voluntarily ...

mandeep.dhir — Fri, 11 Nov 2011 11:40:16 +0530

mandeep.dhir – 8 file(s) modified
Trac#647 Built Escalation matrix and also allowing agents to voluntarily assign themselves to unassigned tickets

~ /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/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4008 – Trac#595 Robust handling of Failed payments, COD transactions and delayed ...

mandeep.dhir — Wed, 09 Nov 2011 14:08:53 +0530

mandeep.dhir – 38 file(s) modified
Trac#595 Robust handling of Failed payments, COD transactions and delayed orders by CRM. TransacitonService and PaymentService now persist relevant transactions, payments to their own database. Then CRM polls these new tables and processes them (creation of tickets essentially)

~ /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/webapp/js/events.js
~ /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/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/CODTransactionProcessorTask.java
x /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTxnProcessor.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java
x /trunk/CRMService/src/main/java/in/shop2020/crm/util/FailedPaymentsProcessor.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java
+ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentRequiringExtraProcessingHandler.java
+ /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
+ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentRequiringExtraProcessingMapper.xml
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.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/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraTransactionProcessingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/ExtraPaymentProcessingType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 3578 – Trac#508 Adding functionality in CRM to help agents reach users ...

mandeep.dhir — Tue, 11 Oct 2011 15:43:34 +0530

mandeep.dhir – 18 file(s) modified
Trac#508 Adding functionality in CRM to help agents reach users that failed to make payments for transactions
Invoking refundOrder and verifyOrder methods in TransactionService (as suggested by Chandranshu)

Rev 3546 – Trac#511 Changes related to COD orders verification

mandeep.dhir — Fri, 07 Oct 2011 16:28:14 +0530

mandeep.dhir – 27 file(s) modified
Trac#511 Changes related to COD orders verification

+ /trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.java
~ /trunk/Crm/pom.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/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /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/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-order-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /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/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3530 – Trac#504 Making calls to userclient and crmclient async and also ...

mandeep.dhir — Tue, 04 Oct 2011 17:54:51 +0530

mandeep.dhir – 10 file(s) modified
Trac#504 Making calls to userclient and crmclient async and also making transactionservice unaffected due to any failures happening inside CRMService or usercontextservice.

~ /trunk/Crm/pom.xml
~ /trunk/CRMService/pom.xml
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.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 3499 – Trac#504 Added functionality to help CRM agents to verify COD ...

mandeep.dhir — Fri, 30 Sep 2011 15:17:56 +0530

mandeep.dhir – 42 file(s) modified
Trac#504 Added functionality to help CRM agents to verify COD orders

~ /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/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /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/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/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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.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
x /trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
x /trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java

Rev 3405 – Trac#488 Made Tickets and activities non-user specific

mandeep.dhir — Fri, 23 Sep 2011 11:08:39 +0530

mandeep.dhir – 29 file(s) modified
Trac#488 Made Tickets and activities non-user specific

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.java (copied from /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java@3390)
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/resources/shiro.ini
~ /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/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 (copied from /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm@3397)
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm (copied from /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm@3397)
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm
~ /trunk/CRMService/pom.xml
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3390 – Trac#488 - Added few more fields customer name etc. ...

mandeep.dhir — Wed, 21 Sep 2011 12:30:20 +0530

mandeep.dhir – 41 file(s) modified
Trac#488
- Added few more fields customer name etc. to activity and tickets
- Made thrift model objects enriched with creator and assignee objects
- Added search filter to query tickets, activities, agents from CRM with single method

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java
~ /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/serving/controllers/LoginController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.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/activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
+ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/ActivityMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/CRMService/src/main/resources/mybatis-config.xml
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/TicketHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /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/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3374 – Added GenericService and isAlive call in this service. Extended other ...

rajveer — Tue, 20 Sep 2011 13:06:51 +0530

rajveer – 21 file(s) modified
Added GenericService and isAlive call in this service. Extended other services from this service.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/GenericService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
+ /trunk/ThriftGen/thriftsrc/GenericService
+ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 3339 – Trac#488 - Added support for Inbox scan of ...

mandeep.dhir — Fri, 16 Sep 2011 12:17:21 +0530

mandeep.dhir – 35 file(s) modified
Trac#488
- Added support for Inbox scan of help@shop2020.in account and creating tickets for them
- Added support for creating tickets/activities for unregistered users

+ /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/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /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/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /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/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/ActivityHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/ActivityMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.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

Rev 3271 – Trac#488 Fixed spellings

mandeep.dhir — Mon, 12 Sep 2011 16:15:37 +0530

mandeep.dhir – 2 file(s) modified
Trac#488 Fixed spellings

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3269 – Trac#488 Making customer "not mandatory to be a registered user" ...

mandeep.dhir — Mon, 12 Sep 2011 15:21:00 +0530

mandeep.dhir – 22 file(s) modified
Trac#488 Making customer "not mandatory to be a registered user" for ticket and activity creation

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/TicketHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3206 – Trac#488 Added support to mail a customer from CRM as ...

mandeep.dhir — Tue, 06 Sep 2011 10:53:03 +0530

mandeep.dhir – 38 file(s) modified
Trac#488 Added support to mail a customer from CRM as part of an activity done on a ticket

~ /trunk/Crm/pom.xml
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java (copied from /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java@3177)
x /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/java/in/shop2020/util
+ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/resources/shiro.ini
+ /trunk/Crm/src/main/webapp/css/colorbox.css
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/images
+ /trunk/Crm/src/main/webapp/css/images/border.png
+ /trunk/Crm/src/main/webapp/css/images/controls.png
+ /trunk/Crm/src/main/webapp/css/images/loading.gif
+ /trunk/Crm/src/main/webapp/css/images/loading_background.png
~ /trunk/Crm/src/main/webapp/images/ajax-loader.gif
~ /trunk/Crm/src/main/webapp/js/common.js
+ /trunk/Crm/src/main/webapp/js/dataTables.fnDisplayRow.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/jquery.colorbox-min.js
~ /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/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/log4j.properties
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 3168 – Trac#488 Updating the thrift file for optional fields Made relevant ...

mandeep.dhir — Fri, 02 Sep 2011 12:37:48 +0530

mandeep.dhir – 13 file(s) modified
Trac#488 Updating the thrift file for optional fields
Made relevant changes to velocity templates to use isset* methods from thrift model objects

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /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-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3137 – Trac#488 - New pages for viewing open, assigned, unassigned etc. ...

mandeep.dhir — Thu, 01 Sep 2011 11:19:36 +0530

mandeep.dhir – 16 file(s) modified
Trac#488 - New pages for viewing open, assigned, unassigned etc. tickets

~ /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/UserTicketsController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3106 – Trac#488 - Added ActivityType and remodelled ticket/activity a bit. ...

mandeep.dhir — Wed, 31 Aug 2011 13:29:30 +0530

mandeep.dhir – 28 file(s) modified
Trac#488
- Added ActivityType and remodelled ticket/activity a bit.
- Made hyperlinks to go to ticket details from activity page
- Clicking on 'Saholic URL', the header will go to home page
- Added styling over HTML tables displaying shipment updates and activities for a ticket
- Removed unnecessary columns from the UI

Rev 3087 – Trac#488 Adding New methods for easy data retrieval regarding agents, ...

mandeep.dhir — Tue, 30 Aug 2011 11:14:01 +0530

mandeep.dhir – 2 file(s) modified
Trac#488 Adding New methods for easy data retrieval regarding agents, tickets from CRM.
Also, added a method to update password of an agent

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3026 – Trac#488 Adding thrift file for CRMService Adding a new method ...

mandeep.dhir — Thu, 25 Aug 2011 10:45:38 +0530

mandeep.dhir – 3 file(s) modified
Trac#488
Adding thrift file for CRMService
Adding a new method in UserContextService for get User given a mobile number

+ /trunk/ThriftGen/thriftsrc/CRMService
+ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift