SmartDukaan – /

Rev 13673 – integration with saholic system

anikendra — Fri, 30 Jan 2015 16:34:15 +0530

anikendra – 4 file(s) modified
integration with saholic system

~ /trunk/DtrMobileAppDashboard/app/Config/dev.php
~ /trunk/DtrMobileAppDashboard/app/Config/live.php
~ /trunk/DtrMobileAppDashboard/app/Controller/SocialProfilesController.php
~ /trunk/DtrMobileAppDashboard/app/Controller/UserAccountsController.php

Rev 13672 – starting design of deals page

anikendra — Fri, 30 Jan 2015 15:03:47 +0530

anikendra – 14 file(s) modified
starting design of deals page

~ /trunk/DtrMobileAppDashboard/app/Controller/OrdersController.php
~ /trunk/DtrMobileAppDashboard/app/Controller/UserActionsController.php
~ /trunk/DtrMobileAppDashboard/app/View/Categories/categorydeals.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Categories/deals.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/categorydeals.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/deals.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Layouts/innerpages.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Orders/mine.ctp
+ /trunk/DtrMobileAppDashboard/app/View/UserActions
+ /trunk/DtrMobileAppDashboard/app/View/UserActions/mine.ctp
~ /trunk/DtrMobileAppDashboard/app/webroot/css/style.css
+ /trunk/DtrMobileAppDashboard/app/webroot/img/sprite.png
~ /trunk/DtrMobileAppDashboard/app/webroot/js/profittill.js

Rev 13671 –

amit.gupta — Fri, 30 Jan 2015 13:08:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 13670 – Added post for wallet credit

amit.gupta — Fri, 30 Jan 2015 13:05:12 +0530

amit.gupta – 1 file(s) modified
Added post for wallet credit

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

Rev 13669 – Committed by Manish Sharma for Flipkart Issue on 30-Jan-2015

manish.sharma — Fri, 30 Jan 2015 12:27:36 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 30-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartFaSaleSnapshotGetter.java

Rev 13668 – Committed by Manish Sharma for Flipkart Issue on 30-Jan-2015

manish.sharma — Fri, 30 Jan 2015 12:17:40 +0530

manish.sharma – 4 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 30-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartAdvantageOrderRecon.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartFaSaleSnapshotGetter.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartOrderStatusReconciliation.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartPricingPannel.java

Rev 13667 – Committed by Manish Sharma for Flipkart Issue on 30-Jan-2015

manish.sharma — Fri, 30 Jan 2015 11:41:46 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 30-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13666 –

kshitij.sood — Thu, 29 Jan 2015 21:34:16 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/FlipkartFeeds/src/main/java/in/shop2020/CreateSubmitFlipkartInventoryFeed.java

Rev 13665 – Manish samosa ready rakhiyo

kshitij.sood — Thu, 29 Jan 2015 21:21:17 +0530

kshitij.sood – 1 file(s) modified
Manish samosa ready rakhiyo

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java

Rev 13664 –

amit.gupta — Thu, 29 Jan 2015 18:40:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 13663 –

kshitij.sood — Thu, 29 Jan 2015 17:20:14 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java

Rev 13662 – Added logic for settlement

amit.gupta — Thu, 29 Jan 2015 17:03:54 +0530

amit.gupta – 2 file(s) modified
Added logic for settlement

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

Rev 13661 – Added login for user.

amit.gupta — Thu, 29 Jan 2015 16:27:49 +0530

amit.gupta – 2 file(s) modified
Added login for user.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py

Rev 13660 –

kshitij.sood — Thu, 29 Jan 2015 12:54:48 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java

Rev 13659 – fixing issue of me variable not being set first time ...

anikendra — Thu, 29 Jan 2015 12:32:37 +0530

anikendra – 3 file(s) modified
fixing issue of me variable not being set first time and email missing in facebook login

~ /trunk/DtrMobileAppDashboard/app/Controller/AppController.php
~ /trunk/DtrMobileAppDashboard/app/Controller/SocialProfilesController.php
~ /trunk/DtrMobileAppDashboard/app/View/Layouts/default.ctp

Rev 13658 – Added flipkart order parsing

manas — Wed, 28 Jan 2015 18:12:21 +0530

manas – 1 file(s) modified
Added flipkart order parsing

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

Rev 13657 – handle numbers properly

anikendra — Wed, 28 Jan 2015 17:05:44 +0530

anikendra – 1 file(s) modified
handle numbers properly

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

Rev 13656 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:56:51 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java

Rev 13655 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:53:41 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13654 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:52:21 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13653 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:48:49 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13652 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:44:55 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13651 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:40:11 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13650 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:39:11 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13649 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:35:20 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13648 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:33:09 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13647 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:29:20 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13646 – exceptional nlc and schemes

anikendra — Wed, 28 Jan 2015 16:27:58 +0530

anikendra – 33 file(s) modified
exceptional nlc and schemes

~ /trunk/DtrMobileAppDashboard/app/Config/routes.php
+ /trunk/DtrMobileAppDashboard/app/Controller/ExceptionalnlcsController.php
+ /trunk/DtrMobileAppDashboard/app/Controller/ExceptionalskudiscountsController.php
~ /trunk/DtrMobileAppDashboard/app/Controller/SkuschemesController.php
+ /trunk/DtrMobileAppDashboard/app/Model/Exceptionalnlc.php
+ /trunk/DtrMobileAppDashboard/app/Model/Exceptionalskudiscount.php
~ /trunk/DtrMobileAppDashboard/app/View/Elements/adminactions.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/adminheader.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/categorydeals.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/deals.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalnlcs/view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Exceptionalskudiscounts/view.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Layouts/admin.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/admin_add.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/webroot/css/jquery.datepick.css
+ /trunk/DtrMobileAppDashboard/app/webroot/js/jquery.datepick.js

Rev 13645 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:27:01 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13644 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:21:32 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13643 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 16:16:52 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13642 –

kshitij.sood — Wed, 28 Jan 2015 16:08:41 +0530

kshitij.sood – 1 file(s) modified

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

Rev 13641 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 15:57:55 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13640 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 15:51:15 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java

Rev 13639 –

kshitij.sood — Wed, 28 Jan 2015 15:48:44 +0530

kshitij.sood – 1 file(s) modified

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

Rev 13638 – Added Tizen 2.3 to Mobile OS

amit.gupta — Wed, 28 Jan 2015 15:01:01 +0530

amit.gupta – 1 file(s) modified
Added Tizen 2.3 to Mobile OS

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 13637 – cashback configuration and api

anikendra — Wed, 28 Jan 2015 14:16:20 +0530

anikendra – 40 file(s) modified
cashback configuration and api

+ /trunk/DtrMobileAppDashboard/app/Config/Schema/product_cashbacks.sql
+ /trunk/DtrMobileAppDashboard/app/Config/Schema/store_cashbacks.sql
+ /trunk/DtrMobileAppDashboard/app/Controller/CashbacksController.php
~ /trunk/DtrMobileAppDashboard/app/Controller/CategoryDiscountsController.php
+ /trunk/DtrMobileAppDashboard/app/Controller/ProductCashbacksController.php
+ /trunk/DtrMobileAppDashboard/app/Controller/SkuschemesController.php
+ /trunk/DtrMobileAppDashboard/app/Controller/StoreCashbacksController.php
+ /trunk/DtrMobileAppDashboard/app/Model/Datasource/RestSource.php
+ /trunk/DtrMobileAppDashboard/app/Model/ProductCashback.php
+ /trunk/DtrMobileAppDashboard/app/Model/Skuscheme.php
+ /trunk/DtrMobileAppDashboard/app/Model/StoreCashback.php
~ /trunk/DtrMobileAppDashboard/app/View/Elements/adminactions.ctp
~ /trunk/DtrMobileAppDashboard/app/View/Elements/adminheader.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/ProductCashbacks/view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/Skuschemes/view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/admin_add.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/admin_edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/admin_index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/admin_view.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/edit.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/index.ctp
+ /trunk/DtrMobileAppDashboard/app/View/StoreCashbacks/view.ctp

Rev 13636 – Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

manish.sharma — Wed, 28 Jan 2015 10:18:58 +0530

manish.sharma – 5 file(s) modified
Committed by Manish Sharma for Flipkart Issue on 28-Jan-2015

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartAdvantageOrderRecon.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartFaSaleSnapshotGetter.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartOrderStatusReconciliation.java

Rev 13635 –

kshitij.sood — Tue, 27 Jan 2015 19:10:52 +0530

kshitij.sood – 1 file(s) modified

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

Rev 13634 – Added store parsing logic for Snapdeal

amit.gupta — Tue, 27 Jan 2015 18:26:14 +0530

amit.gupta – 1 file(s) modified
Added store parsing logic for Snapdeal

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