SmartDukaan – /

Rev 20111 – Return transaction thrift & service changes.

kshitij.sood — Wed, 29 Jun 2016 17:41:24 +0530

kshitij.sood – 5 file(s) modified
Return transaction thrift & service changes.

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

Rev 20110 – Return Transaction Crm

kshitij.sood — Wed, 29 Jun 2016 14:49:05 +0530

kshitij.sood – 24 file(s) modified
Return Transaction Crm

~ /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/ReturnTransactionsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.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/resources/struts.xml
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/images/add_button.png
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /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/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.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

Rev 20109 –

amit.gupta — Wed, 29 Jun 2016 11:33:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java

Rev 20108 – Fixed

amit.gupta — Mon, 27 Jun 2016 19:39:39 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 20107 – changed logic of logging in user

naman — Mon, 27 Jun 2016 19:35:43 +0530

naman – 1 file(s) modified
changed logic of logging in user

~ /trunk/DtrMobileAppDashboard/app/Controller/AppController.php

Rev 20106 – commentted userid login section

naman — Mon, 27 Jun 2016 19:31:13 +0530

naman – 1 file(s) modified
commentted userid login section

~ /trunk/DtrMobileAppDashboard/app/Controller/UserActionsController.php

Rev 20105 – commentted userid login section

naman — Mon, 27 Jun 2016 19:29:39 +0530

naman – 1 file(s) modified
commentted userid login section

~ /trunk/DtrMobileAppDashboard/app/Controller/AboutsController.php

Rev 20104 – commentted userid login section

naman — Mon, 27 Jun 2016 19:27:08 +0530

naman – 1 file(s) modified
commentted userid login section

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php

Rev 20103 – commentted userid login section

naman — Mon, 27 Jun 2016 19:24:15 +0530

naman – 1 file(s) modified
commentted userid login section

~ /trunk/DtrMobileAppDashboard/app/Controller/StoreProductsController.php

Rev 20102 – commentted userid login section

naman — Mon, 27 Jun 2016 19:20:14 +0530

naman – 1 file(s) modified
commentted userid login section

~ /trunk/DtrMobileAppDashboard/app/Controller/OrdersController.php

Rev 20101 – commentted userid login section

naman — Mon, 27 Jun 2016 19:18:56 +0530

naman – 1 file(s) modified
commentted userid login section

~ /trunk/DtrMobileAppDashboard/app/Controller/PreferencesController.php

Rev 20100 – commentted userid login section

naman — Mon, 27 Jun 2016 19:17:09 +0530

naman – 1 file(s) modified
commentted userid login section

~ /trunk/DtrMobileAppDashboard/app/Controller/StoresController.php

Rev 20099 –

kshitij.sood — Mon, 27 Jun 2016 18:20:23 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessShipmentDelay.java

Rev 20098 –

kshitij.sood — Mon, 27 Jun 2016 18:13:50 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessShipmentDelay.java

Rev 20097 – added .in

naman — Mon, 27 Jun 2016 17:01:25 +0530

naman – 1 file(s) modified
added .in

~ /trunk/DtrMobileAppDashboard/app/Console/Command/CallhistoryShell.php

Rev 20096 – added bcc

naman — Mon, 27 Jun 2016 16:59:07 +0530

naman – 1 file(s) modified
added bcc

~ /trunk/DtrMobileAppDashboard/app/Console/Command/CallhistoryShell.php

Rev 20095 – removed div

naman — Mon, 27 Jun 2016 15:51:27 +0530

naman – 1 file(s) modified
removed div

~ /trunk/DtrMobileAppDashboard/app/View/UserActions/mine.ctp

Rev 20094 –

kshitij.sood — Mon, 27 Jun 2016 13:34:48 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py

Rev 20093 –

amit.gupta — Mon, 27 Jun 2016 10:24:15 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm

Rev 20092 –

amit.gupta — Mon, 27 Jun 2016 09:11:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm

Rev 20091 –

kshitij.sood — Fri, 24 Jun 2016 18:14:44 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20090 –

kshitij.sood — Fri, 24 Jun 2016 17:23:46 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/utils/AutoSuggest.py

Rev 20089 –

kshitij.sood — Fri, 24 Jun 2016 17:15:49 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/utils/AutoSuggest.py

Rev 20088 – Removed sandeep

kshitij.sood — Fri, 24 Jun 2016 16:07:08 +0530

kshitij.sood – 6 file(s) modified
Removed sandeep

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/FedexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/RedExpressLogisticsReconciliation.py

Rev 20087 – changed escalation matrix from sachin sachdeva(18) to himanshu pandey(65)

aman.kumar — Fri, 24 Jun 2016 15:02:24 +0530

aman.kumar – 1 file(s) modified
changed escalation matrix from sachin sachdeva(18) to himanshu pandey(65)

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

Rev 20086 –

kshitij.sood — Fri, 24 Jun 2016 14:45:14 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/utils/AutoSuggest.py

Rev 20085 –

kshitij.sood — Fri, 24 Jun 2016 14:37:22 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/utils/AutoSuggest.py

Rev 20084 – changed email id from to and cc

naman — Fri, 24 Jun 2016 12:16:06 +0530

naman – 1 file(s) modified
changed email id from to and cc

~ /trunk/DtrMobileAppDashboard/app/Console/Command/CallhistoryShell.php

Rev 20083 – changed file location

naman — Fri, 24 Jun 2016 10:49:30 +0530

naman – 1 file(s) modified
changed file location

~ /trunk/DtrMobileAppDashboard/app/Console/Command/CallhistoryShell.php

Rev 20082 – Added 29 agent_id in sticky agents.

rajender — Thu, 23 Jun 2016 15:22:30 +0530

rajender – 1 file(s) modified
Added 29 agent_id in sticky agents.

~ /trunk/PyDTR/src/dtr/api/Service.py

Rev 20081 –

kshitij.sood — Wed, 22 Jun 2016 17:32:09 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/PyDTR/src/scripts/RedisAutoComplete.py

Rev 20080 –

kshitij.sood — Wed, 22 Jun 2016 17:31:50 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/PyDTR/src/dtr/utils/AutoSuggest.py

Rev 20079 –

kshitij.sood — Wed, 22 Jun 2016 17:31:28 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/api/Service.py

Rev 20078 –

kshitij.sood — Wed, 22 Jun 2016 17:30:50 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/api/Routing.py

Rev 20077 – added cc and masked number

naman — Wed, 22 Jun 2016 14:57:37 +0530

naman – 1 file(s) modified
added cc and masked number

~ /trunk/DtrMobileAppDashboard/app/Console/Command/CallhistoryShell.php

Rev 20076 – call history report shell script

naman — Wed, 22 Jun 2016 14:29:57 +0530

naman – 1 file(s) modified
call history report shell script

+ /trunk/DtrMobileAppDashboard/app/Console/Command/CallhistoryShell.php

Rev 20075 – Changes related to omg

amit.gupta — Tue, 21 Jun 2016 11:49:33 +0530

amit.gupta – 1 file(s) modified
Changes related to omg

~ /trunk/DtrMobileAppDashboard/app/Controller/ClicksController.php

Rev 20074 – Fixed unaccept

amit.gupta — Mon, 20 Jun 2016 18:49:11 +0530

amit.gupta – 1 file(s) modified
Fixed unaccept

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 20073 – Changed shipping address to billing address

amit.gupta — Mon, 20 Jun 2016 18:25:13 +0530

amit.gupta – 1 file(s) modified
Changed shipping address to billing address

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java

Rev 20072 – Fixed warehouse address

amit.gupta — Mon, 20 Jun 2016 17:45:02 +0530

amit.gupta – 2 file(s) modified
Fixed warehouse address

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py