SmartDukaan – /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java

Rev 5845 – Displaying store address

mandeep.dhir — Mon, 20 Aug 2012 11:10:59 +0530

mandeep.dhir – 2 file(s) modified
Displaying store address

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 5303 – Delhivery tracking in crm

phani.kumar — Tue, 29 May 2012 11:29:48 +0530

phani.kumar – 1 file(s) modified
Delhivery tracking in crm

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java

Rev 4753 – Orders whose status is Payment_Flagged should not be cancellable

anupam.singh — Tue, 20 Mar 2012 17:17:58 +0530

anupam.singh – 1 file(s) modified
Orders whose status is Payment_Flagged should not be cancellable

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java

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 4710 – Enabling Aramex shipment updates in CRM. Reviewer : Phani Kumar

anupam.singh — Tue, 13 Mar 2012 20:03:31 +0530

anupam.singh – 3 file(s) modified
Enabling Aramex shipment updates in CRM.
Reviewer : Phani Kumar

+ /trunk/Common/src/main/java/in/shop2020/serving/services/AramexTrackingService.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
x /trunk/Website/src/main/java/in/shop2020/serving/services/AramexTrackingService.java

Rev 4696 – COD verification pending orders should only be cancelled from ticket-info ...

anupam.singh — Tue, 13 Mar 2012 13:13:34 +0530

anupam.singh – 1 file(s) modified
COD verification pending orders should only be cancelled from ticket-info page and not form order info page

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java

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 4663 – Changed enum name from INIT to COD_VERIFICATION_PENDING

rajveer — Fri, 09 Mar 2012 11:35:55 +0530

rajveer – 3 file(s) modified
Changed enum name from INIT to COD_VERIFICATION_PENDING

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

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 4416 – Not displaying bluedart shipping details in case its down or ...

mandeep.dhir — Wed, 01 Feb 2012 16:25:12 +0530

mandeep.dhir – 1 file(s) modified
Not displaying bluedart shipping details in case its down or too slow

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.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 4146 – Trac#686 Displaying color only when it is available

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

mandeep.dhir – 3 file(s) modified
Trac#686 Displaying color only when it is available

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 4105 – Adding few fields like Billed by, promised shipping date. Displaying ...

mandeep.dhir — Tue, 22 Nov 2011 11:04:40 +0530

mandeep.dhir – 3 file(s) modified
Adding few fields like Billed by, promised shipping date. Displaying orders above tickets in COD-verification tickets

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /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 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 3996 – Trac#629 Minor enhancements to CRM - Adding promised delivery date

mandeep.dhir — Fri, 04 Nov 2011 10:51:11 +0530

mandeep.dhir – 7 file(s) modified
Trac#629 Minor enhancements to CRM - Adding promised delivery date

~ /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/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/log4j.properties

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 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 3128 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:16:54 +0530

rajveer – 9 file(s) modified
Side effect of name changing of clients.

~ /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/UserCartController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationsController.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/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java

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

~ /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/UserOrderInfoController.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/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-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/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/ActivityHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ContactMedium.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

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 2728 – Add payment gateway and paymethod.

vikas — Wed, 27 Jul 2011 13:44:01 +0530

vikas – 3 file(s) modified
Add payment gateway and paymethod.

Rev 2714 – Added cart details in CRM.

vikas — Tue, 26 Jul 2011 19:17:53 +0530

vikas – 10 file(s) modified
Added cart details in CRM.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/OrderCustomerInputController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.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/order-customer-input-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

Rev 2674 – CRM.

vikas — Fri, 22 Jul 2011 17:39:31 +0530

vikas – 54 file(s) modified
CRM.

+ /trunk/Crm
+ /trunk/Crm/.classpath
+ /trunk/Crm/.project
+ /trunk/Crm/.settings
+ /trunk/Crm/.settings/org.eclipse.jdt.core.prefs
+ /trunk/Crm/.settings/org.maven.ide.eclipse.prefs
+ /trunk/Crm/pom.xml
+ /trunk/Crm/src
+ /trunk/Crm/src/main
+ /trunk/Crm/src/main/java
+ /trunk/Crm/src/main/java/in
+ /trunk/Crm/src/main/java/in/shop2020
+ /trunk/Crm/src/main/java/in/shop2020/serving
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers
+ /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/OrderCustomerInputController.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/resources
+ /trunk/Crm/src/main/resources/log4j.properties
+ /trunk/Crm/src/main/resources/struts.xml
+ /trunk/Crm/src/main/resources/velocity.properties
+ /trunk/Crm/src/main/webapp
+ /trunk/Crm/src/main/webapp/css
+ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/demo_table.css
+ /trunk/Crm/src/main/webapp/images
+ /trunk/Crm/src/main/webapp/images/back_disabled.jpg
+ /trunk/Crm/src/main/webapp/images/back_enabled.jpg
+ /trunk/Crm/src/main/webapp/images/favicon.ico
+ /trunk/Crm/src/main/webapp/images/forward_disabled.jpg
+ /trunk/Crm/src/main/webapp/images/forward_enabled.jpg
+ /trunk/Crm/src/main/webapp/images/Sorting icons.psd
+ /trunk/Crm/src/main/webapp/images/sort_asc.png
+ /trunk/Crm/src/main/webapp/images/sort_asc_disabled.png
+ /trunk/Crm/src/main/webapp/images/sort_both.png
+ /trunk/Crm/src/main/webapp/images/sort_desc.png
+ /trunk/Crm/src/main/webapp/images/sort_desc_disabled.png
+ /trunk/Crm/src/main/webapp/js
+ /trunk/Crm/src/main/webapp/js/common.js
+ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/jquery.dataTables.min.js
+ /trunk/Crm/src/main/webapp/js/jquery.js
+ /trunk/Crm/src/main/webapp/WEB-INF
+ /trunk/Crm/src/main/webapp/WEB-INF/content
+ /trunk/Crm/src/main/webapp/WEB-INF/content/exception.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/order-customer-input-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/web.xml