SmartDukaan – /

Rev 11896 – Added logic of store affiliate.

amit.gupta — Thu, 03 Jul 2014 18:20:53 +0530

amit.gupta – 11 file(s) modified
Added logic of store affiliate.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java
~ /trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 11895 – PD user in side bar

kshitij.sood — Thu, 03 Jul 2014 18:19:54 +0530

kshitij.sood – 2 file(s) modified
PD user in side bar

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm

Rev 11894 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 18:01:17 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11893 –

kshitij.sood — Thu, 03 Jul 2014 18:00:45 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm

Rev 11892 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 17:49:40 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

~ /trunk/FlipkartFeeds/src/main/java/inventory/NlcLeftOutInventory.java

Rev 11891 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 17:39:58 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11890 – Crm changes related to bulk order enquiry & private deals.

kshitij.sood — Thu, 03 Jul 2014 17:23:48 +0530

kshitij.sood – 25 file(s) modified
Crm changes related to bulk order enquiry & private deals.

~ /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/UserInfoController.java
+ /trunk/Crm/src/main/java/in/shop2020/util/BulkOrderEmailReader.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
+ /trunk/Crm/src/main/java/in/shop2020/util/DesEncrypter.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/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/orders-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 11889 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 17:17:37 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11888 – fixing coupon event issue

anikendra — Thu, 03 Jul 2014 17:03:55 +0530

anikendra – 1 file(s) modified
fixing coupon event issue

~ /trunk/MobileSite/magento/js/cart.js

Rev 11887 – small fix for deal text display on coupon application

anikendra — Thu, 03 Jul 2014 16:54:47 +0530

anikendra – 1 file(s) modified
small fix for deal text display on coupon application

~ /trunk/MobileSite/application/widgets/cart/views/carts.php

Rev 11886 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 16:54:15 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11885 – done with ui level changes for private deals

anikendra — Thu, 03 Jul 2014 16:47:48 +0530

anikendra – 10 file(s) modified
done with ui level changes for private deals

~ /trunk/MobileSite/application/models/magento_model.php
~ /trunk/MobileSite/application/views/layout/header.php
~ /trunk/MobileSite/application/widgets/cart/controllers/cart.php
~ /trunk/MobileSite/application/widgets/cart/views/carts.php
~ /trunk/MobileSite/application/widgets/privatedeals/views/private_deals.php
~ /trunk/MobileSite/assets/css/cart.less
~ /trunk/MobileSite/assets/css/pd-list.less
~ /trunk/MobileSite/magento/js/cart.js
~ /trunk/MobileSite/magento/js/checkout.js
~ /trunk/MobileSite/magento/js/recharge.js

Rev 11884 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 16:16:44 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11883 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 16:13:21 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

~ /trunk/FlipkartFeeds/src/main/java/inventory/NlcLeftOutInventory.java

Rev 11882 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 16:12:20 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11881 – Committed by Manish Sharma for Add Manoj Pal Email Id ...

manish.sharma — Thu, 03 Jul 2014 15:24:44 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Add Manoj Pal Email Id on 03-Jul-2014

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

Rev 11880 – Committed by Manish Sharma for Change in Daily Stock Inventory ...

manish.sharma — Thu, 03 Jul 2014 15:21:46 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change in Daily Stock Inventory Report Script on 03-Jul-2014

~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/DailyStockReportGenerator.py

Rev 11879 – Committed by Manish Sharma for Change in Daily Stock Inventory ...

manish.sharma — Thu, 03 Jul 2014 14:54:07 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change in Daily Stock Inventory Report Script on 03-Jul-2014

~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/DailyStockReportGenerator.py

Rev 11878 – Added availability of colors

amit.gupta — Thu, 03 Jul 2014 12:07:21 +0530

amit.gupta – 1 file(s) modified
Added availability of colors

~ /trunk/ContentStore/src/velocity/DealSnippet.vm

Rev 11877 – Fixed bug when item added to cart goes out of ...

amit.gupta — Thu, 03 Jul 2014 11:39:32 +0530

amit.gupta – 1 file(s) modified
Fixed bug when item added to cart goes out of stock. and coupon has been applied for that item.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 11876 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 11:32:45 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11875 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 11:17:59 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

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

Rev 11874 – Committed by Manish Sharma for Not Sent Inventory for Flipkart ...

manish.sharma — Thu, 03 Jul 2014 10:44:10 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Not Sent Inventory for Flipkart and Snapdeal due to NLC Limitation on 03-Jul-2014

+ /trunk/FlipkartFeeds/src/main/java/in/shop2020/NlcLeftOutInventoryDetailScript.java
+ /trunk/FlipkartFeeds/src/main/java/inventory/NlcLeftOutInventory.java

Rev 11873 – Added Url for entities in content

amit.gupta — Thu, 03 Jul 2014 10:38:19 +0530

amit.gupta – 2 file(s) modified
Added Url for entities in content

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 11872 – Added new ehcache variable for private-deal snippets

amit.gupta — Wed, 02 Jul 2014 23:35:48 +0530

amit.gupta – 3 file(s) modified
Added new ehcache variable for private-deal snippets

~ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PrivateDealsController.java
~ /trunk/Website/src/main/resources/ehcache.xml

Rev 11871 – Changed DealSnippet

amit.gupta — Wed, 02 Jul 2014 23:23:38 +0530

amit.gupta – 1 file(s) modified
Changed DealSnippet

~ /trunk/ContentStore/src/velocity/DealSnippet.vm

Rev 11870 – fixed the syntax error.

amit.gupta — Wed, 02 Jul 2014 22:05:11 +0530

amit.gupta – 1 file(s) modified
fixed the syntax error.

~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 11869 – a

amit.gupta — Wed, 02 Jul 2014 21:05:46 +0530

amit.gupta – 1 file(s) modified
a

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11868 –

amit.gupta — Wed, 02 Jul 2014 19:54:07 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11867 – message for deal text

anikendra — Wed, 02 Jul 2014 17:26:36 +0530

anikendra – 2 file(s) modified
message for deal text

~ /trunk/MobileSite/application/widgets/cart/views/carts.php
~ /trunk/MobileSite/assets/css/cart.less

Rev 11866 – Revert 502 bad gateway fix

vikram.raghav — Wed, 02 Jul 2014 17:20:58 +0530

vikram.raghav – 1 file(s) modified
Revert 502 bad gateway fix

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

Rev 11865 –

amit.gupta — Wed, 02 Jul 2014 17:08:37 +0530

amit.gupta – 2 file(s) modified

~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 11864 – Added deal text

amit.gupta — Wed, 02 Jul 2014 16:30:25 +0530

amit.gupta – 2 file(s) modified
Added deal text

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/CartLinePojo.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/PojoPopulator.java

Rev 11863 –

amit.gupta — Wed, 02 Jul 2014 16:29:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py

Rev 11862 – 502 Bad Gateway fix

vikram.raghav — Wed, 02 Jul 2014 16:21:18 +0530

vikram.raghav – 1 file(s) modified
502 Bad Gateway fix

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

Rev 11861 – Added message appropriately

amit.gupta — Wed, 02 Jul 2014 16:17:47 +0530

amit.gupta – 1 file(s) modified
Added message appropriately

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

Rev 11860 –

amit.gupta — Wed, 02 Jul 2014 16:10:29 +0530

amit.gupta – 2 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/Website/src/main/webapp/WEB-INF/content/private-deals-show.vm

Rev 11859 – hack for fixing cart coupon discounted price issue

anikendra — Wed, 02 Jul 2014 15:57:57 +0530

anikendra – 2 file(s) modified
hack for fixing cart coupon discounted price issue

~ /trunk/MobileSite/application/widgets/cart/views/carts.php
~ /trunk/MobileSite/assets/js/common.js

Rev 11858 – removing hard coded value

anikendra — Wed, 02 Jul 2014 14:42:50 +0530

anikendra – 1 file(s) modified
removing hard coded value

~ /trunk/MobileSite/application/widgets/privatedeals/views/private_deals.php

Rev 11857 – Only active items should be considered.

amit.gupta — Wed, 02 Jul 2014 14:35:30 +0530

amit.gupta – 1 file(s) modified
Only active items should be considered.

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