SmartDukaan – /

Rev 14903 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 19:36:25 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

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

Rev 14902 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 19:28:27 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 14901 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 19:10:41 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java

Rev 14900 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 19:04:25 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 14899 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 18:57:02 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 14898 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 18:50:56 +0530

manish.sharma – 9 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /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/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 14897 – read token from cookie

anikendra — Tue, 21 Apr 2015 17:58:48 +0530

anikendra – 1 file(s) modified
read token from cookie

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

Rev 14896 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 17:58:30 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

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

Rev 14895 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Tue, 21 Apr 2015 17:57:03 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

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

Rev 14894 – read cookie for token

anikendra — Tue, 21 Apr 2015 17:44:43 +0530

anikendra – 1 file(s) modified
read cookie for token

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

Rev 14893 – extraFulfillmentFeesAfterWaiver change.

kshitij.sood — Tue, 21 Apr 2015 17:19:52 +0530

kshitij.sood – 1 file(s) modified
extraFulfillmentFeesAfterWaiver change.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/SnapdealReconciliation.py

Rev 14892 – extraFulfillmentFeesAfterWaiver change.

kshitij.sood — Tue, 21 Apr 2015 17:01:08 +0530

kshitij.sood – 1 file(s) modified
extraFulfillmentFeesAfterWaiver change.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/SnapdealReconciliation.py

Rev 14891 – handle token based authentication in my wallet

anikendra — Tue, 21 Apr 2015 16:33:04 +0530

anikendra – 5 file(s) modified
handle token based authentication in my wallet

~ /trunk/DtrMobileAppDashboard/app/Config/routes.php
~ /trunk/DtrMobileAppDashboard/app/Controller/AboutsController.php
~ /trunk/DtrMobileAppDashboard/app/Controller/AppController.php
~ /trunk/DtrMobileAppDashboard/app/Controller/UsersController.php
+ /trunk/DtrMobileAppDashboard/app/View/Abouts/native.ctp

Rev 14890 – check for token in headers

anikendra — Tue, 21 Apr 2015 15:58:41 +0530

anikendra – 2 file(s) modified
check for token in headers

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

Rev 14889 –

amit.gupta — Tue, 21 Apr 2015 14:50:03 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Elements/suborder.ctp

Rev 14888 – Fixed display logic for estimations on basis of order status.

amit.gupta — Tue, 21 Apr 2015 14:47:34 +0530

amit.gupta – 1 file(s) modified
Fixed display logic for estimations on basis of order status.

~ /trunk/DtrMobileAppDashboard/app/View/Elements/suborder.ctp

Rev 14887 – Fixed display logic for estimations on basis of order status.

amit.gupta — Tue, 21 Apr 2015 14:39:37 +0530

amit.gupta – 1 file(s) modified
Fixed display logic for estimations on basis of order status.

~ /trunk/DtrMobileAppDashboard/app/View/Elements/suborder.ctp

Rev 14886 – Added fix for gzip

amit.gupta — Tue, 21 Apr 2015 14:11:46 +0530

amit.gupta – 1 file(s) modified
Added fix for gzip

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

Rev 14885 – Added Sailesh

amit.gupta — Tue, 21 Apr 2015 12:20:32 +0530

amit.gupta – 1 file(s) modified
Added Sailesh

~ /trunk/PyDTR/src/dtr/reports/usersegmentation.py

Rev 14884 – activate user if registered using utm parameter

anikendra — Tue, 21 Apr 2015 12:17:56 +0530

anikendra – 1 file(s) modified
activate user if registered using utm parameter

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

Rev 14883 – Fixed order creation for simple orders.

amit.gupta — Tue, 21 Apr 2015 11:53:04 +0530

amit.gupta – 1 file(s) modified
Fixed order creation for simple orders.

~ /trunk/PyDTR/src/dtr/sources/snapdeal.py

Rev 14882 – Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

manish.sharma — Mon, 20 Apr 2015 17:05:59 +0530

manish.sharma – 18 file(s) modified
Committed by Manish Sharma for Profit_Mandi CRM Integration on 20-Apr-2015

~ /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/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
+ /trunk/PyProj/src/shop2020/model/v1/order/script/ProfitMandiCrmTicketGenerator.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/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/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 14881 – Removed cashaback filter

amit.gupta — Mon, 20 Apr 2015 12:51:17 +0530

amit.gupta – 1 file(s) modified
Removed cashaback filter

~ /trunk/PyDTR/src/dtr/reports/affiliatereco.py

Rev 14880 – Added Tracking url exception for snapdeal

amit.gupta — Mon, 20 Apr 2015 12:40:08 +0530

amit.gupta – 1 file(s) modified
Added Tracking url exception for snapdeal

~ /trunk/DtrMobileAppDashboard/app/View/Elements/suborder.ctp

Rev 14879 –

amit.gupta — Sat, 18 Apr 2015 17:33:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/reports/scrapepaytm.py

Rev 14878 –

amit.gupta — Sat, 18 Apr 2015 17:31:42 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/reports/scrapepaytm.py

Rev 14877 – Added

amit.gupta — Sat, 18 Apr 2015 16:02:40 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/PyDTR/src/dtr/reports/scrapepaytm.py

Rev 14876 – Fixed bug related to missing id

amit.gupta — Sat, 18 Apr 2015 14:17:19 +0530

amit.gupta – 1 file(s) modified
Fixed bug related to missing id

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 14875 – Added scrape paytm

amit.gupta — Sat, 18 Apr 2015 13:03:37 +0530

amit.gupta – 1 file(s) modified
Added scrape paytm

~ /trunk/PyDTR/src/dtr/reports/scrapepaytm.py

Rev 14874 –

amit.gupta — Fri, 17 Apr 2015 16:35:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/reports/affiliatereco.py

Rev 14873 – Added transaction time

amit.gupta — Fri, 17 Apr 2015 16:20:24 +0530

amit.gupta – 1 file(s) modified
Added transaction time

~ /trunk/PyDTR/src/dtr/reports/affiliatereco.py

Rev 14872 – Added offer discount

amit.gupta — Fri, 17 Apr 2015 14:48:46 +0530

amit.gupta – 1 file(s) modified
Added offer discount

~ /trunk/PyDTR/src/dtr/sources/snapdeal.py

Rev 14871 – Updated for Activation code equals 1

manas — Fri, 17 Apr 2015 14:18:59 +0530

manas – 1 file(s) modified
Updated for Activation code equals 1

~ /trunk/PyDTR/src/scripts/ActivityReport.py

Rev 14870 – Fixed issue related to bulk order update for spice

amit.gupta — Fri, 17 Apr 2015 13:17:36 +0530

amit.gupta – 1 file(s) modified
Fixed issue related to bulk order update for spice

~ /trunk/PyDTR/src/dtr/sources/spice.py

Rev 14869 – error logging tracking cookie

anikendra — Fri, 17 Apr 2015 12:48:05 +0530

anikendra – 1 file(s) modified
error logging tracking cookie

~ /trunk/MobileSite/application/hooks/tracking.php

Rev 14868 – check for already loggedin users during autologin

anikendra — Fri, 17 Apr 2015 11:50:58 +0530

anikendra – 2 file(s) modified
check for already loggedin users during autologin

~ /trunk/MobileSite/application/widgets/auth/controllers/auth.php
~ /trunk/MobileSite/application/widgets/auth/views/autologin.php

Rev 14867 – Added None

amit.gupta — Fri, 17 Apr 2015 11:32:18 +0530

amit.gupta – 1 file(s) modified
Added None

~ /trunk/PyDTR/src/dtr/main.py

Rev 14866 – send contact us messgaes to help@profitmandi.com

anikendra — Fri, 17 Apr 2015 11:06:02 +0530

anikendra – 1 file(s) modified
send contact us messgaes to help@profitmandi.com

~ /trunk/DtrMobileAppDashboard/app/Config/live.php

Rev 14865 – Committed by Manish Sharma for Snapdeal VOI Integration and Some ...

manish.sharma — Fri, 17 Apr 2015 10:03:26 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Snapdeal VOI Integration and Some Changes for Flipkart FA on 17-Apr-2015

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py

Rev 14864 – Fixed snapdeal parsing

amit.gupta — Thu, 16 Apr 2015 23:50:33 +0530

amit.gupta – 1 file(s) modified
Fixed snapdeal parsing

~ /trunk/PyDTR/src/dtr/sources/snapdeal.py