SmartDukaan – /trunk/Crm/src/main/webapp/js/common.js

Rev 7732 – Wrong variable name

anupam.singh — Wed, 10 Jul 2013 20:11:26 +0530

anupam.singh – 1 file(s) modified
Wrong variable name

~ /trunk/Crm/src/main/webapp/js/common.js

Rev 7730 – Added option to convert "pickup-in-store" orders to "normal" orders

anupam.singh — Wed, 10 Jul 2013 19:43:27 +0530

anupam.singh – 11 file(s) modified
Added option to convert "pickup-in-store" orders to "normal" orders

~ /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/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-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/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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 .

~ /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/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/orders-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7399 – StoreWebsite changes

anupam.singh — Thu, 06 Jun 2013 02:00:36 +0530

anupam.singh – 8 file(s) modified
StoreWebsite changes

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

Rev 7393 – Added options in CRM to cancel storeWebsite orders

anupam.singh — Wed, 05 Jun 2013 16:47:44 +0530

anupam.singh – 17 file(s) modified
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/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/user-order-info-index.vm
~ /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

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.

~ /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/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/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 7162 –

kshitij.sood — Tue, 16 Apr 2013 17:36:58 +0530

kshitij.sood – 4 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm

Rev 6985 – Added capability to change the shipping address of an order ...

anupam.singh — Wed, 13 Mar 2013 16:56:30 +0530

anupam.singh – 10 file(s) modified
Added capability to change the shipping address of an order by outbound team

~ /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/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /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 6982 – Resized recharge order tables

anupam.singh — Tue, 12 Mar 2013 19:35:57 +0530

anupam.singh – 2 file(s) modified
Resized recharge order tables

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm

Rev 6516 – Page refresh on successful refund for recharges.

anupam.singh — Wed, 19 Dec 2012 16:42:36 +0530

anupam.singh – 1 file(s) modified
Page refresh on successful refund for recharges.

~ /trunk/Crm/src/main/webapp/js/common.js

Rev 6507 – Added a method in order service for refunding orders. Gave ...

anupam.singh — Tue, 18 Dec 2012 12:46:05 +0530

anupam.singh – 16 file(s) modified
Added a method in order service for refunding orders. Gave a handle in crm for the same.

~ /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/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/recharge-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/refund-failed.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-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/RechargeOrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6153 – Cosmetic fixes for CRM

anupam.singh — Wed, 10 Oct 2012 18:19:43 +0530

anupam.singh – 6 file(s) modified
Cosmetic fixes for CRM

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 5917 – On expiry-extension ticket Id was not being set. Fixed.

anupam.singh — Fri, 31 Aug 2012 15:22:19 +0530

anupam.singh – 4 file(s) modified
On expiry-extension ticket Id was not being set. Fixed.

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 5791 – Trac # 1526 CRM ticket will now be created for ...

anupam.singh — Wed, 15 Aug 2012 02:22:48 +0530

anupam.singh – 10 file(s) modified
Trac # 1526
CRM ticket will now be created for orders which are at pickup stores and their return date is nearing.

~ /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/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 5521 – Adding mark as Read option in Activity Description

amar.kumar — Fri, 29 Jun 2012 11:59:22 +0530

amar.kumar – 2 file(s) modified
Adding mark as Read option in Activity Description

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 5225 – Disallowing agent to create activity with empty description

amar.kumar — Mon, 21 May 2012 18:48:15 +0530

amar.kumar – 2 file(s) modified
Disallowing agent to create activity with empty description

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js

Rev 5224 – changes to fix issues in creation of activitites for existing ...

amar.kumar — Mon, 21 May 2012 18:12:53 +0530

amar.kumar – 3 file(s) modified
changes to fix issues in creation of activitites for existing customer

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm

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

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

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

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

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm

Rev 5168 – Ticket Id : #1251 #1228 Reviewed by Anupam Singh

amar.kumar — Mon, 14 May 2012 16:04:41 +0530

amar.kumar – 11 file(s) modified
Ticket Id : #1251 #1228
Reviewed by Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.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/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

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 4782 – Making POST call instead of PUT to avoid issue due ...

mandeep.dhir — Thu, 22 Mar 2012 16:10:49 +0530

mandeep.dhir – 1 file(s) modified
Making POST call instead of PUT to avoid issue due to large emails

~ /trunk/Crm/src/main/webapp/js/common.js

Rev 4704 – Value of cancellationInitiator should be checked intead of the object ...

anupam.singh — Tue, 13 Mar 2012 15:40:27 +0530

anupam.singh – 1 file(s) modified
Value of cancellationInitiator should be checked intead of the object itself

~ /trunk/Crm/src/main/webapp/js/common.js

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 4681 – Trac ID : #901, #961 Reviewed By : Anupam Singh

amar.kumar — Mon, 12 Mar 2012 18:42:41 +0530

amar.kumar – 9 file(s) modified
Trac ID : #901, #961
Reviewed By : Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4605 – Trac # 931 Tables now display 10 rows by default. ...

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

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

Reviewer : Mandeep Dhir

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

Rev 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 4451 – Fixed broken common.js

anupam.singh — Tue, 07 Feb 2012 17:43:37 +0530

anupam.singh – 1 file(s) modified
Fixed broken common.js

~ /trunk/Crm/src/main/webapp/js/common.js

Rev 4438 – Generating activity whenever a flagged payment is blocked or allowed. ...

anupam.singh — Mon, 06 Feb 2012 15:38:12 +0530

anupam.singh – 4 file(s) modified
Generating activity whenever a flagged payment is blocked or allowed. Doing exception handling

Reviewer : Mandeep Dhir

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

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

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

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

Rev 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

~ /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/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/java/in/shop2020/crm/util/FlaggedPaymentProcessorTask.java
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4249 – In (Line : 266) thOld was being checked for null ...

anupam.singh — Tue, 27 Dec 2011 12:43:34 +0530

anupam.singh – 1 file(s) modified
In (Line : 266) thOld was being checked for null although it is an array. This caused problems in updating tickets table.

Reviewer : Mandeep Dhir

~ /trunk/Crm/src/main/webapp/js/common.js

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 4027 – Enhancing the escalation matrix

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

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

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 4020 – Trac#647 Built Escalation matrix and also allowing agents to voluntarily ...

mandeep.dhir — Fri, 11 Nov 2011 11:40:16 +0530

mandeep.dhir – 8 file(s) modified
Trac#647 Built Escalation matrix and also allowing agents to voluntarily assign themselves to unassigned tickets

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

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