BlueGrey
calm
Elegant
Català-Valencià – Catalan
中文 – Chinese (Simplified)
中文 – Chinese (Traditional)
Česky – Czech
Dansk – Danish
Nederlands – Dutch
English – English
Suomi – Finnish
Français – French
Deutsch – German
עברית – Hebrew
हिंदी – Hindi
Magyar – Hungarian
Bahasa Indonesia – Indonesian
Italiano – Italian
日本語 – Japanese
한국어 – Korean
Македонски – Macedonian
मराठी – Marathi
Norsk – Norwegian
Polski – Polish
Português – Portuguese
Português – Portuguese (Brazil)
Русский – Russian
Slovenčina – Slovak
Slovenščina – Slovenian
Español – Spanish
Svenska – Swedish
Türkçe – Turkish
Українська – Ukrainian
Oëzbekcha – Uzbek
Subversion Repositories
SmartDukaan
(root)
/
trunk
/
Crm
/
src
/
main
/
webapp
/
WEB-INF
/
content
/
user-orders-index.vm
– Rev 18583
Rev
Hide changed files
|
Details
|
Compare with Previous
|
Blame
|
RSS feed
Filtering Options
From rev
To rev
Max revs
Search history for
Show All
Rev
Age
Author
Path
Log message
Diff
Changes
18583
3724 d 3 h
amit.gupta
/trunk/Crm/src/main/webapp/
Fixed Quantity
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/js/common.js
18341
3742 d 17 h
amit.gupta
/trunk/Crm/src/main/
Some changes to handle cod verification
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
18308
3743 d 17 h
amit.gupta
/trunk/Crm/src/main/webapp/
Fixed index N js
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/js/common.js
4241
5229 d 1 h
anupam.singh
/trunk/
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/src/main/java/in/shop2020/util/EmailUtils.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/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/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/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
4192
5246 d 2 h
anupam.singh
/trunk/
TracId : #676
Reviewer : Mandeep
In user order info view one can see the new orderId corresponding to older id when an order is reshipped. Refund timestamp is also visible now.
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
/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/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
4142
5257 d 5 h
mandeep.dhir
/trunk/
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/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/webapp/WEB-INF/content/user-communication-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-communications-index.vm
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
/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
/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/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
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
3996
5281 d 5 h
mandeep.dhir
/trunk/
Trac#629 Minor enhancements to CRM - Adding promised delivery date
/trunk/CRMService/src/main/resources/log4j.properties
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
3853
5295 d 1 h
mandeep.dhir
/trunk/
Trac#582 Truncating test when no. of rows on one page in datatables change
/trunk/CRMService/src/main/java/in/shop2020/crm/service/CRMServer.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/index.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/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
3499
5316 d 1 h
mandeep.dhir
/trunk/
Trac#504 Added functionality to help CRM agents to verify COD orders
/trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
/trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
2730
5381 d 2 h
vikas
/trunk/Crm/src/main/webapp/
cosmetic changes.
/trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
/trunk/Crm/src/main/webapp/css/common.css
2714
5381 d 21 h
vikas
/trunk/Crm/src/main/
Added cart details in CRM.
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/OrderCustomerInputController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/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
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
2674
5385 d 23 h
vikas
/trunk/Crm/
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/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
/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/Sorting icons.psd
/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/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