SmartDukaan – /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 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 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

Rev 5546 – trac # 1463 Added Manoj to Shipping and Delivery Escalation ...

anupam.singh — Wed, 04 Jul 2012 17:54:39 +0530

anupam.singh – 1 file(s) modified
trac # 1463
Added Manoj to Shipping and Delivery Escalation mailing list.

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

Rev 5203 – Ticket Id : #1265 #1277 Reviewed by : Anupam Singh ...

amar.kumar — Thu, 17 May 2012 18:57:54 +0530

amar.kumar – 6 file(s) modified
Ticket Id : #1265 #1277
Reviewed by : Anupam Singh

Enhancements in Activity creation/display and ticket/activity reports.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.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/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm

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 4689 – Trac # 960, 911 Reveiwer : Rajveer 1.) Cancellation ...

anupam.singh — Tue, 13 Mar 2012 12:11:25 +0530

anupam.singh – 9 file(s) modified
Trac # 960, 911
Reveiwer : Rajveer

1.) Cancellation flow initiated from CRM.
2.) Agents can assign tickets at the time of creation.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.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/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/Crm/src/main/webapp/WEB-INF/content/tickets-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 4682 – Removed option to cancel from OM dashboard. Changed CANCELED ...

rajveer — Mon, 12 Mar 2012 18:50:11 +0530

rajveer – 8 file(s) modified
Removed option to cancel from OM dashboard. Changed CANCELED status to COD_VERIFICATION_FAILED. Changed REFUNDED status to CANCELLED_DUE_TO_LOW_INVENTORY.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.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 4605 – Trac # 931 Tables now display 10 rows by default. ...

anupam.singh — Fri, 02 Mar 2012 17:05:58 +0530

anupam.singh – 2 file(s) modified
Trac # 931
Tables now display 10 rows by default. Activity and Ticket description length quadrupled to 8192 bytes.

Reviewer : Mandeep Dhir

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

Rev 4484 – Changed the name of various order statuses.

rajveer — Fri, 10 Feb 2012 13:57:32 +0530

rajveer – 13 file(s) modified
Changed the name of various order statuses.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4452 – Changed the name of various statuses.

rajveer — Tue, 07 Feb 2012 19:23:07 +0530

rajveer – 13 file(s) modified
Changed the name of various statuses.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4314 – Added one more cancelation reason : user wants early delivery ...

anupam.singh — Fri, 13 Jan 2012 14:41:44 +0530

anupam.singh – 2 file(s) modified
Added one more cancelation reason : user wants early delivery
Reviewer : Mandeep

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

Rev 4250 – Added "CUSTOMER_NOT_RESPONDING" as another possible reason for COD Cancellation. ...

anupam.singh — Tue, 27 Dec 2011 12:57:45 +0530

anupam.singh – 1 file(s) modified
Added "CUSTOMER_NOT_RESPONDING" as another possible reason for COD Cancellation.

Reviewer : Mandeep Dhir

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

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 4216 – Changed escalation matrix (with new receipients) as discussed with Suraj

mandeep.dhir — Fri, 16 Dec 2011 18:50:21 +0530

mandeep.dhir – 1 file(s) modified
Changed escalation matrix (with new receipients) as discussed with Suraj

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

Rev 4215 – Changed escalation matrix (with new receipients) as discussed with Suraj

mandeep.dhir — Fri, 16 Dec 2011 18:36:48 +0530

mandeep.dhir – 1 file(s) modified
Changed escalation matrix (with new receipients) as discussed with Suraj

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

Rev 4206 – Reducing activity size in case it grows beyond a limit

mandeep.dhir — Thu, 15 Dec 2011 10:58:36 +0530

mandeep.dhir – 3 file(s) modified
Reducing activity size in case it grows beyond a limit

Rev 4034 – Enhancing the escalation matrix. Displaying delay reason and expected shipping ...

mandeep.dhir — Fri, 11 Nov 2011 22:37:26 +0530

mandeep.dhir – 4 file(s) modified
Enhancing the escalation matrix. Displaying delay reason and expected shipping time.

~ /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/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 4027 – Enhancing the escalation matrix

mandeep.dhir — Fri, 11 Nov 2011 14:12:19 +0530

mandeep.dhir – 3 file(s) modified
Enhancing the escalation matrix

~ /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/tickets-edit.vm

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