SmartDukaan – /

Rev 9324 – Added logistics

amit.gupta — Tue, 07 Jan 2014 17:55:44 +0530

amit.gupta – 2 file(s) modified
Added logistics

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

Rev 9323 –

amit.gupta — Tue, 07 Jan 2014 17:54:58 +0530

amit.gupta – 3 file(s) modified

x /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/CatalogPojo.java
x /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/ItemPojo.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/SolrResultPojo.java

Rev 9322 – Panel to Update pricing for a vendor

rajveer — Tue, 07 Jan 2014 17:53:33 +0530

rajveer – 2 file(s) modified
Panel to Update pricing for a vendor

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorPriceController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-price-authsuccess.vm

Rev 9321 – Adding reconciliation with mobisoc

anupam.singh — Tue, 07 Jan 2014 15:24:01 +0530

anupam.singh – 2 file(s) modified
Adding reconciliation with mobisoc

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py

Rev 9320 – Committed by Manish Sharma for Google Adwords Service on Jan-07-2014

manish.sharma — Tue, 07 Jan 2014 14:56:55 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-07-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicAdKeywordsSync.java

Rev 9319 – Change for showing proper tax type while billing from Bombay ...

amar.kumar — Tue, 07 Jan 2014 11:56:34 +0530

amar.kumar – 1 file(s) modified
Change for showing proper tax type while billing from Bombay warehouse

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

Rev 9318 – Cosmetic changes

kshitij.sood — Tue, 07 Jan 2014 11:46:25 +0530

kshitij.sood – 1 file(s) modified
Cosmetic changes

~ /trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm

Rev 9317 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 18:21:33 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicAdGroupSync.java
~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicAdKeywordsSync.java
~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicTextAdsSync.java

Rev 9316 – fixed empty items

amit.gupta — Mon, 06 Jan 2014 18:15:58 +0530

amit.gupta – 1 file(s) modified
fixed empty items

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

Rev 9315 – fixed empty items

amit.gupta — Mon, 06 Jan 2014 18:14:28 +0530

amit.gupta – 1 file(s) modified
fixed empty items

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

Rev 9314 – Removed some unwanted fields

amit.gupta — Mon, 06 Jan 2014 18:07:08 +0530

amit.gupta – 1 file(s) modified
Removed some unwanted fields

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

Rev 9313 – Removed some unwanted fields

amit.gupta — Mon, 06 Jan 2014 17:58:43 +0530

amit.gupta – 2 file(s) modified
Removed some unwanted fields

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/PojoCreator.java

Rev 9312 – Removed some unwanted fields

amit.gupta — Mon, 06 Jan 2014 17:58:14 +0530

amit.gupta – 2 file(s) modified
Removed some unwanted fields

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/ContentPojo.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 9311 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 17:42:13 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicCampaignSync.java

Rev 9310 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 17:41:31 +0530

manish.sharma – 4 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsAdGroupAdMapper.xml
~ /trunk/AdwordsServices/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsAdGroupMapper.xml
~ /trunk/AdwordsServices/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsAdKeywordMapper.xml
~ /trunk/AdwordsServices/src/main/resources/in/shop2020/googleadwords/persistence/AdwordsCampaignMapper.xml

Rev 9309 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 17:21:54 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/service/handler/AdwordsServiceHandler.java

Rev 9308 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 17:21:44 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicCampaignSync.java

Rev 9307 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 17:18:10 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/service/handler/AdwordsServiceHandler.java

Rev 9306 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 17:17:43 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9305 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 16:57:24 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/service/handler/AdwordsServiceHandler.java

Rev 9304 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 16:38:38 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicCampaignSync.java

Rev 9303 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 16:22:27 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/service/handler/AdwordsServiceHandler.java

Rev 9302 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 16:00:54 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9301 – One assist changes for website.

kshitij.sood — Mon, 06 Jan 2014 15:49:45 +0530

kshitij.sood – 10 file(s) modified
One assist changes for website.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/images/insurance.jpg
+ /trunk/Website/src/main/webapp/images/oneassist.jpg
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/widgets.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/accessory-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/oneassist-terms.vm

Rev 9300 – Service changes for one assist

kshitij.sood — Mon, 06 Jan 2014 15:48:41 +0530

kshitij.sood – 1 file(s) modified
Service changes for one assist

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

Rev 9299 – Service changes for one assist

kshitij.sood — Mon, 06 Jan 2014 15:47:54 +0530

kshitij.sood – 24 file(s) modified
Service changes for one assist

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/model/v1/order/impl/Convertors.py
~ /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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/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/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InsurerType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInsurerMapping.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 9298 – Added recommended accessories.

amit.gupta — Mon, 06 Jan 2014 15:44:42 +0530

amit.gupta – 3 file(s) modified
Added recommended accessories.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CategoryController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RecommendedAccessoriesController.java

Rev 9297 – Added recommended accessories.

amit.gupta — Mon, 06 Jan 2014 15:43:29 +0530

amit.gupta – 1 file(s) modified
Added recommended accessories.

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

Rev 9296 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 15:35:05 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9295 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 15:15:40 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicCampaignSync.java

Rev 9294 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 15:13:46 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsServices/src/main/java/in/shop2020/googleadwords/util/AdwordsSaholicCampaignSync.java

Rev 9293 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 13:36:43 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9292 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 13:32:11 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9291 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 13:22:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9290 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 13:17:23 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9289 – Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

manish.sharma — Mon, 06 Jan 2014 13:07:11 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-06-2014

~ /trunk/AdwordsAxis/src/main/java/adwords/axis/v201309/basicoperations/GetCampaigns.java

Rev 9288 – Added a condition for snapdeal manual order creation.Ship date should ...

vikram.raghav — Mon, 06 Jan 2014 11:52:18 +0530

vikram.raghav – 1 file(s) modified
Added a condition for snapdeal manual order creation.Ship date should not be set to sunday

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java

Rev 9287 – Committed by Manish Sharma for Displaying Pay Method for Citi ...

manish.sharma — Mon, 06 Jan 2014 11:45:16 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Displaying Pay Method for Citi Bank 12 Months EMI on Jan-06-2014

~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java

Rev 9286 – Added a condition for flipkart orders.Ship date should not be ...

vikram.raghav — Mon, 06 Jan 2014 11:39:37 +0530

vikram.raghav – 1 file(s) modified
Added a condition for flipkart orders.Ship date should not be set to sunday

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

Rev 9285 – Added a condition for flipkart orders.Ship date should not be ...

vikram.raghav — Mon, 06 Jan 2014 11:39:15 +0530

vikram.raghav – 1 file(s) modified
Added a condition for flipkart orders.Ship date should not be set to sunday

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