SmartDukaan – /

Rev 12653 –

manish.sharma — Tue, 16 Sep 2014 18:23:01 +0530

manish.sharma – 13 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/Support/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderBillingController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
+ /trunk/Support/src/main/webapp/js/bulk-order-billing.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-billing.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12652 –

kshitij.sood — Tue, 16 Sep 2014 18:16:58 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12651 –

kshitij.sood — Tue, 16 Sep 2014 18:06:56 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12650 – Addded changes to incorporate partially active items as well.

amit.gupta — Tue, 16 Sep 2014 18:03:09 +0530

amit.gupta – 1 file(s) modified
Addded changes to incorporate partially active items as well.

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

Rev 12649 –

kshitij.sood — Tue, 16 Sep 2014 18:00:42 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12648 – Changed function calling to dict

amit.gupta — Tue, 16 Sep 2014 17:50:45 +0530

amit.gupta – 1 file(s) modified
Changed function calling to dict

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

Rev 12647 –

kshitij.sood — Tue, 16 Sep 2014 17:47:38 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12646 –

kshitij.sood — Tue, 16 Sep 2014 17:33:10 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12645 –

kshitij.sood — Tue, 16 Sep 2014 17:29:49 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12644 –

kshitij.sood — Tue, 16 Sep 2014 17:24:33 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12643 –

kshitij.sood — Tue, 16 Sep 2014 17:22:00 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12642 –

kshitij.sood — Tue, 16 Sep 2014 17:14:33 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12641 – Added itemStatus

amit.gupta — Tue, 16 Sep 2014 17:14:04 +0530

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

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

Rev 12640 – Now new item can handle status.

amit.gupta — Tue, 16 Sep 2014 17:01:41 +0530

amit.gupta – 1 file(s) modified
Now new item can handle status.

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

Rev 12639 –

kshitij.sood — Tue, 16 Sep 2014 16:57:56 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12638 – quickfix for handling logos

anikendra — Mon, 15 Sep 2014 18:42:08 +0530

anikendra – 3 file(s) modified
quickfix for handling logos

~ /trunk/MobileSite/application/widgets/productinfo/views/product_details_c.php
+ /trunk/MobileSite/assets/images/amazon.gif
+ /trunk/MobileSite/assets/images/flipkart.gif

Rev 12637 – Amazon logo image added.

amit.gupta — Mon, 15 Sep 2014 17:13:37 +0530

amit.gupta – 1 file(s) modified
Amazon logo image added.

+ /trunk/Website/src/main/webapp/unversioned/images/amazon_logo.jpg

Rev 12636 – adding ga event

anikendra — Mon, 15 Sep 2014 16:56:12 +0530

anikendra – 1 file(s) modified
adding ga event

~ /trunk/MobileSite/application/widgets/productinfo/views/product_details_c.php

Rev 12635 – changing the cdn version

anikendra — Mon, 15 Sep 2014 16:47:56 +0530

anikendra – 1 file(s) modified
changing the cdn version

~ /trunk/MobileSite/application/config/magento.php

Rev 12634 – minor changes in design of affiliate link

anikendra — Mon, 15 Sep 2014 16:43:47 +0530

anikendra – 1 file(s) modified
minor changes in design of affiliate link

~ /trunk/MobileSite/assets/css/pd-detail.less

Rev 12633 – checked for npe

amit.gupta — Mon, 15 Sep 2014 15:41:00 +0530

amit.gupta – 1 file(s) modified
checked for npe

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

Rev 12632 –

amit.gupta — Mon, 15 Sep 2014 14:47:08 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Website/src/main/webapp/js/entity.js

Rev 12631 – Handled multi-line offers

amit.gupta — Mon, 15 Sep 2014 14:31:04 +0530

amit.gupta – 1 file(s) modified
Handled multi-line offers

~ /trunk/Website/src/main/webapp/js/entity.js

Rev 12630 – Added flipkart

amit.gupta — Mon, 15 Sep 2014 12:26:45 +0530

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

+ /trunk/MobileWebsiteApi/src/main/webapp/images/flipkart_icon.gif

Rev 12629 – Trimmed the supplier name.

amit.gupta — Mon, 15 Sep 2014 12:02:26 +0530

amit.gupta – 1 file(s) modified
Trimmed the supplier name.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java

Rev 12628 – Added flipkart image to unversioned images.

amit.gupta — Mon, 15 Sep 2014 10:48:18 +0530

amit.gupta – 1 file(s) modified
Added flipkart image to unversioned images.

~ /trunk/Website/src/main/webapp/js/entity.js

Rev 12627 –

amit.gupta — Mon, 15 Sep 2014 10:47:25 +0530

amit.gupta – 1 file(s) modified

+ /trunk/Website/src/main/webapp/unversioned/images/flipkart_logo.png

Rev 12626 – Changes related to affiliate

amit.gupta — Mon, 15 Sep 2014 00:01:30 +0530

amit.gupta – 5 file(s) modified
Changes related to affiliate

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/css/entity.css
+ /trunk/Website/src/main/webapp/images/flipkart_logo.png
~ /trunk/Website/src/main/webapp/js/entity.js

Rev 12625 – adding the new flipkart logo

anikendra — Sun, 14 Sep 2014 11:09:45 +0530

anikendra – 1 file(s) modified
adding the new flipkart logo

+ /trunk/MobileSite/assets/images/flip.gif

Rev 12624 – changing a few text and fixing layout issue on uc ...

anikendra — Sun, 14 Sep 2014 11:08:41 +0530

anikendra – 2 file(s) modified
changing a few text and fixing layout issue on uc browser

~ /trunk/MobileSite/application/widgets/productinfo/controllers/productinfo.php
~ /trunk/MobileSite/application/widgets/productinfo/views/product_details_c.php

Rev 12623 – adding flipkart logo and changes related to affiliate age

anikendra — Sat, 13 Sep 2014 19:02:25 +0530

anikendra – 2 file(s) modified
adding flipkart logo and changes related to affiliate age

~ /trunk/MobileSite/assets/css/pd-detail.less
+ /trunk/MobileSite/assets/images/flipkart.jpeg

Rev 12622 – exclusive affiliate link

anikendra — Sat, 13 Sep 2014 18:58:38 +0530

anikendra – 3 file(s) modified
exclusive affiliate link

~ /trunk/MobileSite/application/widgets/productinfo/controllers/productinfo.php
~ /trunk/MobileSite/application/widgets/productinfo/views/productinfo_view.php
+ /trunk/MobileSite/application/widgets/productinfo/views/product_details_c.php

Rev 12621 – Added ExclusiveAffiliateInfo

amit.gupta — Fri, 12 Sep 2014 16:58:30 +0530

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

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ContentPojo.java

Rev 12620 – Added changes related to exclusive affiliate program

amit.gupta — Fri, 12 Sep 2014 16:10:17 +0530

amit.gupta – 20 file(s) modified
Added changes related to exclusive affiliate program

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ExclusiveAffiliateItemInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ExclusiveItemInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/OutbuoundAffiliate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 12619 – Reverted asin change

kshitij.sood — Fri, 12 Sep 2014 11:13:28 +0530

kshitij.sood – 9 file(s) modified
Reverted asin change

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/CreateSendFBAStockEstimation.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FbaSalesSnapshot.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonXMLSalesSnapshot.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/XMLFileParser.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12618 – Changes done to accomodate asin in report

kshitij.sood — Thu, 11 Sep 2014 18:08:37 +0530

kshitij.sood – 3 file(s) modified
Changes done to accomodate asin in report

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

Rev 12617 – Changes done to accomodate asin in report

kshitij.sood — Thu, 11 Sep 2014 17:51:53 +0530

kshitij.sood – 4 file(s) modified
Changes done to accomodate asin in report

~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FbaSalesSnapshot.java
~ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonXMLSalesSnapshot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12616 – disabling data logging for now

anikendra — Thu, 11 Sep 2014 12:05:50 +0530

anikendra – 23 file(s) modified
disabling data logging for now

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 12615 – Added FAO

amit.gupta — Wed, 10 Sep 2014 08:17:31 +0530

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

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartAdvantageOrder.java

Rev 12614 – Added Junglee specific changes.

amit.gupta — Tue, 09 Sep 2014 23:12:54 +0530

amit.gupta – 13 file(s) modified
Added Junglee specific changes.

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateOrderAcknowledgementFeed.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/Test.java
~ /trunk/JungleeOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java
~ /trunk/JungleeOrders/src/main/java/com/amazonservices/mws/orders/samples/Test.java
~ /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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift