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

Rev 18462 – Committed by Manish Sharma for Removing Ritesh Id from escalation ...

manish.sharma — Mon, 01 Feb 2016 19:22:44 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Removing Ritesh Id from escalation on Feb-01-2016

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

Rev 18171 – Committed by Manish Sharma for Changing Assignee Id for Low ...

manish.sharma — Tue, 05 Jan 2016 15:17:19 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Changing Assignee Id for Low Inventory Cancellation on Jan-05-2015

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

Rev 18071 – Committed by Manish Sharma for Address Change Issue on Dec-23-2015

manish.sharma — Wed, 23 Dec 2015 13:42:07 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Address Change Issue on Dec-23-2015

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

Rev 18070 – Committed by Manish Sharma for Address Change Issue on Dec-23-2015

manish.sharma — Wed, 23 Dec 2015 13:41:23 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Address Change Issue on Dec-23-2015

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

Rev 16582 –

manish.sharma — Thu, 27 Aug 2015 16:14:10 +0530

manish.sharma – 1 file(s) modified

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

Rev 13440 – Added PaymentGateway info

amit.gupta — Wed, 24 Dec 2014 16:46:21 +0530

amit.gupta – 2 file(s) modified
Added PaymentGateway info

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

Rev 13208 –

kshitij.sood — Fri, 05 Dec 2014 12:18:36 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12601 – Made Junglee specific changes.

amit.gupta — Fri, 05 Sep 2014 16:43:19 +0530

amit.gupta – 2 file(s) modified
Made Junglee specific changes.

~ /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 10305 – Committed by Manish Sharma for Payment Failed Order Error on ...

manish.sharma — Mon, 24 Mar 2014 10:53:55 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Payment Failed Order Error on Mar-24-2014

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

Rev 9338 – Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse ...

manish.sharma — Thu, 09 Jan 2014 16:14:25 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for FedEx Shipping from Mumbai Warehouse on Jan-09-2014

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java
~ /trunk/Common/src/main/java/in/shop2020/utils/FedExShipAccountInfo.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReshipOrderHandler.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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.py
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FedExUpdatesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 9238 – Committed by Manish Sharma for Physical Refund Issue on Dec-27-2013

manish.sharma — Fri, 27 Dec 2013 14:55:23 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Physical Refund Issue on Dec-27-2013

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

Rev 9235 – Committed by Manish Sharma for Physical Refund Issue on Dec-26-2013

manish.sharma — Thu, 26 Dec 2013 18:04:20 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Physical Refund Issue on Dec-26-2013

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

Rev 9143 – Committed by Manish Sharma for Physical Refund Issue on Dec-16-2013

manish.sharma — Mon, 16 Dec 2013 16:36:32 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Physical Refund Issue on Dec-16-2013

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

Rev 8941 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Tue, 03 Dec 2013 10:56:21 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Dec-03-2013

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

Rev 8929 – Committed by Manish Sharma for Physical Refund Details Display on ...

manish.sharma — Fri, 29 Nov 2013 13:13:30 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Physical Refund Details Display on Nov-29-2013

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

Rev 8896 – Committed by Manish Sharma for Display Physical Refund Details on ...

manish.sharma — Fri, 22 Nov 2013 13:02:57 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Display Physical Refund Details on Nov-22-2013

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

Rev 8893 – Committed by Manish Sharma for Display Physical Refund Details on ...

manish.sharma — Thu, 21 Nov 2013 13:18:23 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Display Physical Refund Details on Nov-21-2013

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

Rev 8872 – Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

manish.sharma — Tue, 19 Nov 2013 19:01:18 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

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

Rev 8871 – Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

manish.sharma — Tue, 19 Nov 2013 18:58:39 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

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

Rev 8866 – Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

manish.sharma — Tue, 19 Nov 2013 15:28:07 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

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

Rev 8864 – Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

manish.sharma — Tue, 19 Nov 2013 15:24:45 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

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

Rev 8862 – Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

manish.sharma — Tue, 19 Nov 2013 15:11:57 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

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

Rev 8860 – Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

manish.sharma — Tue, 19 Nov 2013 14:42:30 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Refund Details on Nov-19-2013

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

Rev 8848 – Committed by Manish Sharma for Physical Refunds for CRM on ...

manish.sharma — Tue, 19 Nov 2013 11:53:31 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Physical Refunds for CRM on Nov-19-2013

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

Rev 8824 – Committed by Manish Sharma for Physical Refunds Implementation on Nov-15-2013

manish.sharma — Fri, 15 Nov 2013 16:23:35 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Physical Refunds Implementation on Nov-15-2013

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

Rev 8606 – Adding Order Source in Crm

amar.kumar — Wed, 30 Oct 2013 11:53:16 +0530

amar.kumar – 2 file(s) modified
Adding Order Source in Crm

~ /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 8356 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Thu, 10 Oct 2013 13:42:12 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Oct-10-2013

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

Rev 8296 –

kshitij.sood — Fri, 04 Oct 2013 20:48:38 +0530

kshitij.sood – 2 file(s) modified

~ /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 7959 – Not logging stack trace when amazon order is null

anupam.singh — Mon, 12 Aug 2013 12:20:05 +0530

anupam.singh – 1 file(s) modified
Not logging stack trace when amazon order is null

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

Rev 7942 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 18:12:12 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 06-Aug-2013

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

Rev 7836 – Handling case where logisticsProvider is 0

anupam.singh — Fri, 26 Jul 2013 18:28:24 +0530

anupam.singh – 2 file(s) modified
Handling case where logisticsProvider is 0

~ /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 7830 – Thrift doesn't allow returning null object. Handling exceptions and null ...

anupam.singh — Thu, 25 Jul 2013 23:43:55 +0530

anupam.singh – 3 file(s) modified
Thrift doesn't allow returning null object.
Handling exceptions and null cases

~ /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/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 7826 – Committed by Manish Sharma for Displaying Logistics Provider Name and ...

manish.sharma — Thu, 25 Jul 2013 16:33:01 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Logistics Provider Name and Amazon Order Id on 25-Jul-2013

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

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 7643 – Committed by Manish Sharma for resolving Exception for getting order ...

manish.sharma — Thu, 27 Jun 2013 14:17:10 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for resolving Exception for getting order delivery and confirmation mail on 27-Jun-2013

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py

Rev 7612 – Check before refunding

anupam.singh — Mon, 24 Jun 2013 17:19:57 +0530

anupam.singh – 1 file(s) modified
Check before refunding

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

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 7499 – If the order is from store then refund the order ...

anupam.singh — Thu, 13 Jun 2013 18:56:10 +0530

anupam.singh – 1 file(s) modified
If the order is from store then refund the order directly

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

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