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
/
css
/
common.css
– Rev 20110
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
20110
3487 d 10 h
kshitij.sood
/trunk/Crm/src/main/
Return Transaction Crm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ReturnTransactionsController.java
/trunk/Crm/src/main/java/in/shop2020/serving/interceptors
/trunk/Crm/src/main/java/in/shop2020/serving/interceptors/ReturnTransactionsInterceptor.java
/trunk/Crm/src/main/webapp/WEB-INF/content/confirm-return-transaction.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/defective-view.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/pick-up-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/pickup-view.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/result.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transaction-all.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transaction-result-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transactions-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/return-transactions-view.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/view-return-order.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/view-return-transaction.vm
/trunk/Crm/src/main/webapp/images/add_button.png
/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/UserOrderInfoController.java
/trunk/Crm/src/main/resources/struts.xml
/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/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
7572
4593 d 23 h
anupam.singh
/trunk/
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 .
/trunk/Crm/src/main/webapp/WEB-INF/content/orders-index.vm
/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/UserOrderInfoController.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/input.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7393
4607 d 8 h
anupam.singh
/
Added options in CRM to cancel storeWebsite orders
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-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/Convertors.py
/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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StoreOrderDetail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
6153
4845 d 7 h
anupam.singh
/trunk/Crm/src/main/
Cosmetic fixes for CRM
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
/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/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
5203
4991 d 6 h
amar.kumar
/trunk/Crm/src/main/
Ticket Id : #1265 #1277
Reviewed by : Anupam Singh
Enhancements in Activity creation/display and ticket/activity reports.
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
5022
5020 d 7 h
anupam.singh
/trunk/Crm/src/main/webapp/
Showing cancellation reason for orders wherever applicable
Reviewer : Amar Kumar
Trac#1147
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/css/common.css
4793
5045 d 1 h
amar.kumar
/trunk/
Ticket ID : #1010
Reviewed by : Anupam Singh
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.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/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.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/WEB-INF/content/input.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/Agent.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
4681
5057 d 6 h
amar.kumar
/trunk/
Trac ID : #901, #961
Reviewed By : Anupam Singh
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.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/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
4280
5126 d 12 h
anupam.singh
/trunk/Crm/src/main/webapp/
Aligning buttons centrally
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/webapp/css/common.css
4241
5134 d 10 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
4142
5162 d 13 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
5186 d 14 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
5200 d 10 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
3711
5204 d 10 h
mandeep.dhir
/trunk/
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/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/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/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.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
3578
5210 d 9 h
mandeep.dhir
/trunk/
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)
/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/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/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
/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/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
3546
5214 d 9 h
mandeep.dhir
/trunk/
Trac#511 Changes related to COD orders verification
/trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.java
/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/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/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/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/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
3519
5218 d 8 h
mandeep.dhir
/trunk/Crm/src/main/
Trac#485 Using CKEditor for converting test/plain to text/html before sending email to users through CRM.
/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/java/in/shop2020/serving/controllers/ActivityController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.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/tickets-edit.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/js/common.js
3499
5221 d 10 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
3411
5228 d 13 h
mandeep.dhir
/trunk/Crm/src/main/webapp/
Trac#488 Adding a few CSS properties
/trunk/Crm/src/main/webapp/WEB-INF/content/activity-info-index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
/trunk/Crm/src/main/webapp/css/common.css
3409
5228 d 13 h
mandeep.dhir
/trunk/Crm/src/main/webapp/css/
Trac#488 Adding css styles to make activity content more readable
/trunk/Crm/src/main/webapp/css/common.css
←Prev
1
2
Next→
Show All