SmartDukaan – /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 16208 – Committed by Manish Sharma for ProfitMandi CRM Changes on 27-Jul-2015

manish.sharma — Mon, 27 Jul 2015 20:09:07 +0530

manish.sharma – 7 file(s) modified
Committed by Manish Sharma for ProfitMandi CRM Changes on 27-Jul-2015

~ /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/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 14882 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Mon, 20 Apr 2015 17:05:59 +0530

manish.sharma – 18 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

Rev 13324 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Fri, 12 Dec 2014 19:24:29 +0530

manish.sharma – 5 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 12-Dec-2014

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /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-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 11890 – Crm changes related to bulk order enquiry & private deals.

kshitij.sood — Thu, 03 Jul 2014 17:23:48 +0530

kshitij.sood – 25 file(s) modified
Crm changes related to bulk order enquiry & private deals.

Rev 7616 – Committed by Manish Sharma for Creating a new Ticket: Category- ...

manish.sharma — Mon, 24 Jun 2013 19:14:13 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for Creating a new Ticket: Category- RTO Refund on 24-Jun-2013

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 7599 – Committed by Manish Sharma for Searching Tickets/Activities using Mobile ...

kshitij.sood — Fri, 21 Jun 2013 17:11:07 +0530

kshitij.sood – 1 file(s) modified
Committed by Manish Sharma for Searching Tickets/Activities using Mobile No. on 21-Jun-2013

~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 7572 – Added option to search by amazon order id. Also modified ...

anupam.singh — Wed, 19 Jun 2013 01:40:15 +0530

anupam.singh – 11 file(s) modified
Added option to search by amazon order id. Also modified "search by mobile number" to fetch orders with given mobile number and not the orders by user associated with that mobile number .

Rev 7372 – Added low inventory cancelled order category.

kshitij.sood — Thu, 30 May 2013 18:29:31 +0530

kshitij.sood – 10 file(s) modified
Added low inventory cancelled order category.

Rev 6111 – Added CRM support for recharge orders. Also added myWallet and ...

anupam.singh — Tue, 09 Oct 2012 13:55:20 +0530

anupam.singh – 23 file(s) modified
Added CRM support for recharge orders. Also added myWallet and myRecharges page.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrdersController.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/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyWalletController.java
~ /trunk/Website/src/main/resources/templates/personaldetails.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/my-wallet.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 5909 – Changes for new page in Crm for showing ticket category ...

amar.kumar — Wed, 29 Aug 2012 17:44:02 +0530

amar.kumar – 13 file(s) modified
Changes for new page in Crm for showing ticket category with open ticket count
Reviewed by : Anupam Singh

~ /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/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/Crm/src/main/webapp/WEB-INF/content/tickets-open.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.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/TicketMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 5884 – Adding restriction to viewing of Store Pickup tickets, so that ...

amar.kumar — Fri, 24 Aug 2012 12:58:29 +0530

amar.kumar – 2 file(s) modified
Adding restriction to viewing of Store Pickup tickets, so that it can be only viewed by Outbound team

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 5858 – Change to show open ticket count for store Pickup category ...

amar.kumar — Wed, 22 Aug 2012 01:12:40 +0530

amar.kumar – 3 file(s) modified
Change to show open ticket count for store Pickup category in sidebar

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.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 4751 – Reveiwer : Amar Tickets created when cancellation request is ...

anupam.singh — Tue, 20 Mar 2012 00:49:12 +0530

anupam.singh – 6 file(s) modified
Reveiwer : Amar

Tickets created when cancellation request is raised were not visible to Outbound team as they were being assigned to admin.

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 4142 – Trac#686 UI Enhancements in Crm - Revamped Order info ...

mandeep.dhir — Mon, 28 Nov 2011 11:46:29 +0530

mandeep.dhir – 24 file(s) modified
Trac#686 UI Enhancements in Crm
- Revamped Order info page
- Cleaned up code to access the model objects directly in vm files
- Added advanced search options for ticket category and activity type
- Removed code related to UserCommunications
- Improved CartPageController and vm files
- Changed ticket edit page to reflect first orders and then tickets

~ /trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.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/UserCartController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationInfoController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationsController.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/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-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-cart-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-communication-info-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-communications-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/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml

Rev 4065 – Trac#651 Autorefresh page, Alert confirmation in case agent tries to ...

mandeep.dhir — Wed, 16 Nov 2011 09:56:01 +0530

mandeep.dhir – 7 file(s) modified
Trac#651 Autorefresh page, Alert confirmation in case agent tries to cancel an order.

~ /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/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.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 3711 – Trac#565 Added link to access relevant unread activities for an ...

mandeep.dhir — Mon, 17 Oct 2011 15:04:59 +0530

mandeep.dhir – 8 file(s) modified
Trac#565 Added link to access relevant unread activities for an agent
Added Expected delivery column in Order table listed on COD_VERIFICATION ticket

~ /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/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/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

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 3519 – Trac#485 Using CKEditor for converting test/plain to text/html before sending ...

mandeep.dhir — Mon, 03 Oct 2011 17:17:05 +0530

mandeep.dhir – 257 file(s) modified
Trac#485 Using CKEditor for converting test/plain to text/html before sending email to users through CRM.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
+ /trunk/Crm/src/main/webapp/ckeditor
+ /trunk/Crm/src/main/webapp/ckeditor/.htaccess
+ /trunk/Crm/src/main/webapp/ckeditor/adapters
+ /trunk/Crm/src/main/webapp/ckeditor/adapters/jquery.js
+ /trunk/Crm/src/main/webapp/ckeditor/ckeditor.js
+ /trunk/Crm/src/main/webapp/ckeditor/config.js
+ /trunk/Crm/src/main/webapp/ckeditor/contents.css
+ /trunk/Crm/src/main/webapp/ckeditor/images
+ /trunk/Crm/src/main/webapp/ckeditor/images/spacer.gif
+ /trunk/Crm/src/main/webapp/ckeditor/lang
+ /trunk/Crm/src/main/webapp/ckeditor/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/a11yhelp/lang/he.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about/dialogs/about.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/about/dialogs/logo_ckeditor.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/adobeair
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/adobeair/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/ajax
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/ajax/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/autogrow
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/autogrow/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/bbcode
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/bbcode/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/clipboard
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/clipboard/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/clipboard/dialogs/paste.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/colordialog
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/colordialog/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/colordialog/dialogs/colordialog.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/devtools/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/dialog
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/dialog/dialogDefinition.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/div
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/div/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/div/dialogs/div.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops/dialogs/docprops.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/docprops/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/find
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/find/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/find/dialogs/find.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/dialogs/flash.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/flash/images/placeholder.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/button.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/checkbox.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/form.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/hiddenfield.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/radio.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/select.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/textarea.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/dialogs/textfield.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/forms/images/hiddenfield.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/dialogs/iframe.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframe/images/placeholder.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframedialog
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/iframedialog/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/image
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/image/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/image/dialogs/image.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/dialogs/anchor.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/dialogs/link.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/link/images/anchor.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/liststyle
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/liststyle/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/liststyle/dialogs/liststyle.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pagebreak
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pagebreak/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pagebreak/images/pagebreak.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastefromword
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastefromword/filter
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastefromword/filter/default.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastetext
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastetext/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/pastetext/dialogs/pastetext.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/dialogs/placeholder.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/lang/he.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/placeholder.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/placeholder/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt/dialogs/options.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/scayt/dialogs/toolbar.css
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_address.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_blockquote.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_div.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h1.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h2.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h3.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h4.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h5.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_h6.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_p.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/showblocks/images/block_pre.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/dialogs/smiley.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/angel_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/angry_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/broken_heart.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/confused_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/cry_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/devil_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/embaressed_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/envelope.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/heart.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/kiss.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/lightbulb.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/omg_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/regular_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/sad_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/shades_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/teeth_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/thumbs_down.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/thumbs_up.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/tounge_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/smiley/images/wink_smile.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/dialogs/specialchar.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/specialchar/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/styles
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/styles/styles
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/styles/styles/default.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/stylesheetparser
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/stylesheetparser/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/table
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/table/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/table/dialogs/table.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tableresize
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tableresize/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tabletools
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tabletools/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/tabletools/dialogs/tableCell.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/dialogs/templates.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/default.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images/template1.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images/template2.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/templates/templates/images/template3.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/dialogs/uicolor.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/lang
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/lang/en.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/lang/he.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/uicolor.gif
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/assets/yui.css
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/uicolor/yui/yui.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/ciframe.html
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/wsc.css
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/wsc/dialogs/wsc.js
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/xml
+ /trunk/Crm/src/main/webapp/ckeditor/plugins/xml/plugin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/dialog.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/editor.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/icons.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/icons_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/dialog_sides.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/dialog_sides.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/dialog_sides_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/mini.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/noimage.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/sprites.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/sprites_ie6.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/images/toolbar_start.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/skin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins/kama/templates.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/dialog.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/editor.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/icons.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/icons_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/dialog_sides.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/dialog_sides.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/dialog_sides_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/mini.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/noimage.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/sprites.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/images/sprites_ie6.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/skin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins/office2003/templates.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/dialog.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/editor.css
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/icons.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/icons_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/dialog_sides.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/dialog_sides.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/dialog_sides_rtl.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/mini.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/noimage.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/sprites.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/sprites_ie6.png
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/images/toolbar_start.gif
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/skin.js
+ /trunk/Crm/src/main/webapp/ckeditor/skins/v2/templates.css
+ /trunk/Crm/src/main/webapp/ckeditor/themes
+ /trunk/Crm/src/main/webapp/ckeditor/themes/default
+ /trunk/Crm/src/main/webapp/ckeditor/themes/default/theme.js
~ /trunk/Crm/src/main/webapp/css/common.css
~ /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/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

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 3422 – Trac#485 Adding feature to enable search for tickets for unregistered ...

mandeep.dhir — Mon, 26 Sep 2011 14:36:26 +0530

mandeep.dhir – 8 file(s) modified
Trac#485 Adding feature to enable search for tickets for unregistered users

~ /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/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-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm

Rev 3397 – Trac#488 Adding advanced search box

mandeep.dhir — Thu, 22 Sep 2011 10:19:20 +0530

mandeep.dhir – 11 file(s) modified
Trac#488 Adding advanced search box

~ /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/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/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-activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm

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 3234 – Trac#488 Added support to export data tables in various formats

mandeep.dhir — Thu, 08 Sep 2011 13:05:23 +0530

mandeep.dhir – 39 file(s) modified
Trac#488 Added support to export data tables in various formats

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/webapp/as3
+ /trunk/Crm/src/main/webapp/as3/lib
+ /trunk/Crm/src/main/webapp/as3/lib/AlivePDF.swc
+ /trunk/Crm/src/main/webapp/as3/ZeroClipboard.as
+ /trunk/Crm/src/main/webapp/as3/ZeroClipboardPdf.as
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/TableTools.css
+ /trunk/Crm/src/main/webapp/css/TableTools_JUI.css
+ /trunk/Crm/src/main/webapp/images/background.png
+ /trunk/Crm/src/main/webapp/images/collection.png
+ /trunk/Crm/src/main/webapp/images/collection_hover.png
+ /trunk/Crm/src/main/webapp/images/copy.png
+ /trunk/Crm/src/main/webapp/images/copy document.psd
+ /trunk/Crm/src/main/webapp/images/copy_hover.png
+ /trunk/Crm/src/main/webapp/images/csv.png
+ /trunk/Crm/src/main/webapp/images/csv_hover.png
+ /trunk/Crm/src/main/webapp/images/file_types.psd
+ /trunk/Crm/src/main/webapp/images/pdf.png
+ /trunk/Crm/src/main/webapp/images/pdf_hover.png
+ /trunk/Crm/src/main/webapp/images/print.png
+ /trunk/Crm/src/main/webapp/images/printer.psd
+ /trunk/Crm/src/main/webapp/images/print_hover.png
+ /trunk/Crm/src/main/webapp/images/psd
+ /trunk/Crm/src/main/webapp/images/psd/collection.psd
+ /trunk/Crm/src/main/webapp/images/psd/copy document.psd
+ /trunk/Crm/src/main/webapp/images/psd/file_types.psd
+ /trunk/Crm/src/main/webapp/images/psd/printer.psd
+ /trunk/Crm/src/main/webapp/images/xls.png
+ /trunk/Crm/src/main/webapp/images/xls_hover.png
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/TableTools.min.js
+ /trunk/Crm/src/main/webapp/swf
+ /trunk/Crm/src/main/webapp/swf/copy_cvs_xls.swf
+ /trunk/Crm/src/main/webapp/swf/copy_cvs_xls_pdf.swf
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

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 3151 – Trac#488 Added a ajax-loading image

mandeep.dhir — Thu, 01 Sep 2011 15:18:01 +0530

mandeep.dhir – 7 file(s) modified
Trac#488 Added a ajax-loading image

~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/images/ajax-loader.gif
~ /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

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 3096 – Trac#488 Added feature to search tickets by Id

mandeep.dhir — Tue, 30 Aug 2011 13:34:25 +0530

mandeep.dhir – 5 file(s) modified
Trac#488 Added feature to search tickets by Id

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

Rev 3090 – Trac#488 Added ticket and activity management UIs. Also, added authentication ...

mandeep.dhir — Tue, 30 Aug 2011 11:21:39 +0530

mandeep.dhir – 30 file(s) modified
Trac#488 Added ticket and activity management UIs.
Also, added authentication and authorization related features.
Logistics' shipment updates are displayed now for every order.

~ /trunk/Crm/pom.xml
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth/VerboseFilter.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/UserActivityController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/resources/log4j.properties
+ /trunk/Crm/src/main/resources/shiro.ini
+ /trunk/Crm/src/main/webapp/change-password.html
~ /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/js/jquery.truncate.min.js
+ /trunk/Crm/src/main/webapp/js/jquery.validate.js
+ /trunk/Crm/src/main/webapp/login.html
~ /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-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-order-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/Crm/src/main/webapp/WEB-INF/web.xml

Rev 2724 – Clean up the flow.

vikas — Wed, 27 Jul 2011 13:07:24 +0530

vikas – 6 file(s) modified
Clean up the flow.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/OrderCustomerInputController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/order-customer-input-index.vm