SmartDukaan – /

Rev 15073 – Agent Authentication

manas — Fri, 08 May 2015 14:28:18 +0530

manas – 13 file(s) modified
Agent Authentication

+ /trunk/DtrMobileAppDashboard/app/Controller/AgentRolesController.php
~ /trunk/DtrMobileAppDashboard/app/Model/Agent.php
+ /trunk/DtrMobileAppDashboard/app/Model/AgentRole.php
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/AgentRoles/view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/authenticate.ctp

Rev 15072 – Notificatio collection merged with Notifications

kshitij.sood — Fri, 08 May 2015 13:03:02 +0530

kshitij.sood – 1 file(s) modified
Notificatio collection merged with Notifications

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 15071 – Notificatio collection merged with Notifications

kshitij.sood — Fri, 08 May 2015 12:49:53 +0530

kshitij.sood – 1 file(s) modified
Notificatio collection merged with Notifications

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 15070 – Login for CRM in log

manas — Fri, 08 May 2015 12:11:08 +0530

manas – 1 file(s) modified
Login for CRM in log

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

Rev 15069 – Notificatio collection merged with Notifications

kshitij.sood — Fri, 08 May 2015 11:43:09 +0530

kshitij.sood – 1 file(s) modified
Notificatio collection merged with Notifications

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 15068 – Solr synonyms

kshitij.sood — Fri, 08 May 2015 01:11:03 +0530

kshitij.sood – 1 file(s) modified
Solr synonyms

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

Rev 15067 – Solr synonyms

kshitij.sood — Fri, 08 May 2015 01:06:05 +0530

kshitij.sood – 1 file(s) modified
Solr synonyms

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

Rev 15066 – max-width of popover 140px

anikendra — Thu, 07 May 2015 15:24:10 +0530

anikendra – 1 file(s) modified
max-width of popover 140px

~ /trunk/DtrMobileAppDashboard/app/webroot/css/style.css

Rev 15065 – popupover to highlight filters

anikendra — Thu, 07 May 2015 15:10:19 +0530

anikendra – 3 file(s) modified
popupover to highlight filters

~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp
~ /trunk/DtrMobileAppDashboard/app/webroot/css/style.css
~ /trunk/DtrMobileAppDashboard/app/webroot/js/profittill.js

Rev 15064 – display timeago in minutes/hours

anikendra — Thu, 07 May 2015 11:54:09 +0530

anikendra – 1 file(s) modified
display timeago in minutes/hours

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

Rev 15063 – More changes in Brand filter

kshitij.sood — Wed, 06 May 2015 17:17:23 +0530

kshitij.sood – 1 file(s) modified
More changes in Brand filter

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

Rev 15062 – More changes in Brand filter

kshitij.sood — Wed, 06 May 2015 17:17:00 +0530

kshitij.sood – 1 file(s) modified
More changes in Brand filter

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 15061 – display last updated time only if it is less than ...

anikendra — Wed, 06 May 2015 14:59:38 +0530

anikendra – 1 file(s) modified
display last updated time only if it is less than 6 hours

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

Rev 15060 – donot show time updated in deals page and fix format ...

anikendra — Wed, 06 May 2015 14:45:59 +0530

anikendra – 3 file(s) modified
donot show time updated in deals page and fix format of date of snapdeal

~ /trunk/DtrMobileAppDashboard/app/View/Elements/deals.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/searchresult.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Orders/mine.ctp

Rev 15059 – Added sign up page handling.

amit.gupta — Wed, 06 May 2015 12:06:29 +0530

amit.gupta – 1 file(s) modified
Added sign up page handling.

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

Rev 15058 – remove the nagging Mujhe Dekho Please title and add ga ...

anikendra — Wed, 06 May 2015 11:47:40 +0530

anikendra – 1 file(s) modified
remove the nagging Mujhe Dekho Please title and add ga events for filter clearing

~ /trunk/DtrMobileAppDashboard/app/webroot/js/profittill.js

Rev 15057 – Shailesh is added to mail

amit.gupta — Wed, 06 May 2015 10:45:59 +0530

amit.gupta – 1 file(s) modified
Shailesh is added to mail

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

Rev 15056 – Handled account page when user logs in with different user ...

amit.gupta — Tue, 05 May 2015 21:07:21 +0530

amit.gupta – 1 file(s) modified
Handled account page when user logs in with different user id.

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

Rev 15055 – changing color of filer header

anikendra — Tue, 05 May 2015 17:55:34 +0530

anikendra – 2 file(s) modified
changing color of filer header

~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp
~ /trunk/DtrMobileAppDashboard/app/webroot/css/style.css

Rev 15054 –

amit.gupta — Tue, 05 May 2015 15:56:24 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java

Rev 15053 – Added null check

amit.gupta — Tue, 05 May 2015 15:49:58 +0530

amit.gupta – 1 file(s) modified
Added null check

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java

Rev 15052 –

amit.gupta — Tue, 05 May 2015 15:37:05 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java

Rev 15051 – CRM application initial

manas — Tue, 05 May 2015 15:24:31 +0530

manas – 44 file(s) modified
CRM application initial

+ /trunk/DtrMobileAppDashboard/app/Controller/AgentsController.php
+ /trunk/DtrMobileAppDashboard/app/Controller/CallsController.php
+ /trunk/DtrMobileAppDashboard/app/Controller/PlayStoreLinksController.php
+ /trunk/DtrMobileAppDashboard/app/Controller/RetailersController.php
+ /trunk/DtrMobileAppDashboard/app/Model/Agent.php
+ /trunk/DtrMobileAppDashboard/app/Model/Call.php
+ /trunk/DtrMobileAppDashboard/app/Model/PlayStoreLink.php
+ /trunk/DtrMobileAppDashboard/app/Model/Retailer.php
+ /trunk/DtrMobileAppDashboard/app/View/Agents
+ /trunk/DtrMobileAppDashboard/app/View/Agents/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Agents/view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls
+ /trunk/DtrMobileAppDashboard/app/View/Calls/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Calls/view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/PlayStoreLinks/view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Retailers/view.ctp

Rev 15050 – Added

amit.gupta — Tue, 05 May 2015 15:19:16 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java

Rev 15049 –

amit.gupta — Tue, 05 May 2015 15:19:01 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 15048 – Orders class

kshitij.sood — Tue, 05 May 2015 12:20:10 +0530

kshitij.sood – 1 file(s) modified
Orders class

~ /trunk/PyDTR/src/dtr/storage/DataService.py

Rev 15047 – Added store id.

amit.gupta — Tue, 05 May 2015 12:01:59 +0530

amit.gupta – 1 file(s) modified
Added store id.

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

Rev 15046 – Added if else block for order creation.

amit.gupta — Tue, 05 May 2015 10:40:17 +0530

amit.gupta – 1 file(s) modified
Added if else block for order creation.

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

Rev 15045 – Committed by Manish Sharma for Changes in the Third Party ...

manish.sharma — Mon, 04 May 2015 18:34:45 +0530

manish.sharma – 18 file(s) modified
Committed by Manish Sharma for Changes in the Third Party Inventory Receive and Movement Report Changes on 05-May-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotReceiveController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-show.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/RemovalStockShipmentReference.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/RemovalStockShipmentReference.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/TransferLot.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/TransferLotHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/TransferLotMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/TransferLotMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 15044 – handle brand filter via cookie in php

anikendra — Mon, 04 May 2015 18:14:36 +0530

anikendra – 3 file(s) modified
handle brand filter via cookie in php

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php
~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp
~ /trunk/DtrMobileAppDashboard/app/webroot/css/style.css

Rev 15043 – changes in gcm resgitration login

anikendra — Mon, 04 May 2015 17:16:32 +0530

anikendra – 1 file(s) modified
changes in gcm resgitration login

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

Rev 15042 – filters auto-select and clearfilter done

anikendra — Mon, 04 May 2015 15:11:13 +0530

anikendra – 5 file(s) modified
filters auto-select and clearfilter done

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php
~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp
~ /trunk/DtrMobileAppDashboard/app/View/StoreProducts/filter.ctp
~ /trunk/DtrMobileAppDashboard/app/webroot/css/style.css
~ /trunk/DtrMobileAppDashboard/app/webroot/js/profittill.js

Rev 15041 – Reverted, snapdeal auto select

kshitij.sood — Mon, 04 May 2015 11:56:35 +0530

kshitij.sood – 1 file(s) modified
Reverted, snapdeal auto select

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 15040 – brand filters

kshitij.sood — Mon, 04 May 2015 11:53:12 +0530

kshitij.sood – 1 file(s) modified
brand filters

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 15039 – Testing for mongo Connection

manas — Fri, 01 May 2015 18:29:10 +0530

manas – 2 file(s) modified
Testing for mongo Connection

~ /trunk/DtrMobileAppDashboard/app/Controller/MasterDatasController.php
+ /trunk/DtrMobileAppDashboard/app/View/MasterDatas/admin_show.ctp

Rev 15038 – Fixed Order display for saholic

amit.gupta — Fri, 01 May 2015 12:20:42 +0530

amit.gupta – 2 file(s) modified
Fixed Order display for saholic

~ /trunk/DtrMobileAppDashboard/app/View/Orders/all.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Orders/mine.ctp

Rev 15037 – Fixed Order display for saholic

amit.gupta — Fri, 01 May 2015 12:19:32 +0530

amit.gupta – 2 file(s) modified
Fixed Order display for saholic

~ /trunk/DtrMobileAppDashboard/app/View/Orders/all.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Orders/mine.ctp

Rev 15036 – Fixed Order display for saholic

amit.gupta — Fri, 01 May 2015 12:15:34 +0530

amit.gupta – 3 file(s) modified
Fixed Order display for saholic

~ /trunk/DtrMobileAppDashboard/app/Controller/OrdersController.php
~ /trunk/DtrMobileAppDashboard/app/View/Orders/all.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Orders/mine.ctp

Rev 15035 – Saholic orders should display order id instead of transaction id.

amit.gupta — Fri, 01 May 2015 11:54:15 +0530

amit.gupta – 3 file(s) modified
Saholic orders should display order id instead of transaction id.

~ /trunk/DtrMobileAppDashboard/app/Controller/OrdersController.php
~ /trunk/DtrMobileAppDashboard/app/View/Orders/all.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Orders/mine.ctp

Rev 15034 – Saholic Log View

manas — Fri, 01 May 2015 11:47:35 +0530

manas – 13 file(s) modified
Saholic Log View

+ /trunk/DtrMobileAppDashboard/app/Controller/SaholicLogsController.php
~ /trunk/DtrMobileAppDashboard/app/Model/SaholicLog.php
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/admin_html.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/admin_show.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/SaholicLogs/view.ctp