SmartDukaan – /

Rev 8156 – Adding new images Adding store page Changes to css

anupam.singh — Sat, 21 Sep 2013 03:01:35 +0530

anupam.singh – 50 file(s) modified
Adding new images
Adding store page
Changes to css

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java
~ /trunk/Website/src/main/webapp/css/androidland/style.css
+ /trunk/Website/src/main/webapp/images/accessories1.png
+ /trunk/Website/src/main/webapp/images/accessories2.png
+ /trunk/Website/src/main/webapp/images/accessories3.png
+ /trunk/Website/src/main/webapp/images/Android-Land.png
+ /trunk/Website/src/main/webapp/images/android-store-thumbs.png
+ /trunk/Website/src/main/webapp/images/app-business.png
+ /trunk/Website/src/main/webapp/images/app-communication.png
+ /trunk/Website/src/main/webapp/images/app-education.png
+ /trunk/Website/src/main/webapp/images/app-entertainment.png
+ /trunk/Website/src/main/webapp/images/app-games.png
+ /trunk/Website/src/main/webapp/images/app-health.png
+ /trunk/Website/src/main/webapp/images/app-photography.png
+ /trunk/Website/src/main/webapp/images/app-social.png
+ /trunk/Website/src/main/webapp/images/app-sports.png
+ /trunk/Website/src/main/webapp/images/app-travel.png
+ /trunk/Website/src/main/webapp/images/apps-homepage.png
+ /trunk/Website/src/main/webapp/images/apps-page1.png
+ /trunk/Website/src/main/webapp/images/apps-page2.png
+ /trunk/Website/src/main/webapp/images/apps-page3.png
+ /trunk/Website/src/main/webapp/images/apps-widget-image.png
+ /trunk/Website/src/main/webapp/images/arrow_tab_yellow (1).png
+ /trunk/Website/src/main/webapp/images/arrow_tab_yellow.png
+ /trunk/Website/src/main/webapp/images/btn_3d_mid.png
+ /trunk/Website/src/main/webapp/images/btn_large_sides.png
+ /trunk/Website/src/main/webapp/images/device-homepage.png
+ /trunk/Website/src/main/webapp/images/device1.png
+ /trunk/Website/src/main/webapp/images/device2.png
+ /trunk/Website/src/main/webapp/images/device3.png
+ /trunk/Website/src/main/webapp/images/devices-widget-image.png
+ /trunk/Website/src/main/webapp/images/general_sprite_sheet.png
+ /trunk/Website/src/main/webapp/images/home-page-apps.png
+ /trunk/Website/src/main/webapp/images/home-page-device.png
+ /trunk/Website/src/main/webapp/images/icon01.png
+ /trunk/Website/src/main/webapp/images/icon02.png
+ /trunk/Website/src/main/webapp/images/icon03.png
+ /trunk/Website/src/main/webapp/images/main-banner.jpg
+ /trunk/Website/src/main/webapp/images/store-widget-image.png
+ /trunk/Website/src/main/webapp/images/tablet1.png
+ /trunk/Website/src/main/webapp/images/tablet2.png
+ /trunk/Website/src/main/webapp/images/tablet3.png
+ /trunk/Website/src/main/webapp/images/tab_yellow_mid.png
+ /trunk/Website/src/main/webapp/images/tab_yellow_sides.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipment-show.vm

Rev 8155 – previous changes checked in

amit.gupta — Fri, 20 Sep 2013 17:25:04 +0530

amit.gupta – 1 file(s) modified
previous changes checked in

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py

Rev 8154 – Added Blackberry OS 10.2

amit.gupta — Fri, 20 Sep 2013 17:17:15 +0530

amit.gupta – 2 file(s) modified
Added Blackberry OS 10.2

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 8153 –

amit.gupta — Fri, 20 Sep 2013 17:05:58 +0530

amit.gupta – 2 file(s) modified

x /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm
x /trunk/Website/src/main/webapp/WEB-INF/content/note2-exchange-offer.vm

Rev 8152 – Added android overview

amit.gupta — Fri, 20 Sep 2013 17:04:20 +0530

amit.gupta – 3 file(s) modified
Added android overview

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandOverviewController.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java@8146)
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm (copied from /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm@8147)

Rev 8151 – Added android land apps page

anupam.singh — Fri, 20 Sep 2013 17:02:22 +0530

anupam.singh – 2 file(s) modified
Added android land apps page

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandAppsController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm

Rev 8150 – removed $ from css.

amit.gupta — Thu, 19 Sep 2013 19:27:21 +0530

amit.gupta – 1 file(s) modified
removed $ from css.

~ /trunk/Website/src/main/webapp/css/androidland/style.css

Rev 8149 – Added battery type for Headset

amit.gupta — Thu, 19 Sep 2013 18:00:20 +0530

amit.gupta – 1 file(s) modified
Added battery type for Headset

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

Rev 8148 – Adding page for android land devices

anupam.singh — Thu, 19 Sep 2013 17:54:21 +0530

anupam.singh – 2 file(s) modified
Adding page for android land devices

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandDevicesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-devices.vm

Rev 8147 – Android land more features checked in.

amit.gupta — Thu, 19 Sep 2013 16:37:24 +0530

amit.gupta – 9 file(s) modified
Android land more features checked in.

~ /trunk/Website/src/main/webapp/css/androidland/style.css
+ /trunk/Website/src/main/webapp/images/androidland
+ /trunk/Website/src/main/webapp/images/androidland/130_811_myandroid_topbanner.jpg
+ /trunk/Website/src/main/webapp/images/androidland/arrow_tab_yellow.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_grey_mid.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_grey_sides.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_yellow_mid.png
+ /trunk/Website/src/main/webapp/images/androidland/tab_yellow_sides.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8146 – Added android land.

amit.gupta — Wed, 18 Sep 2013 19:44:25 +0530

amit.gupta – 8 file(s) modified
Added android land.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidLandStoreController.java
+ /trunk/Website/src/main/webapp/css/androidland
+ /trunk/Website/src/main/webapp/css/androidland/counter013.css
+ /trunk/Website/src/main/webapp/css/androidland/main.css
+ /trunk/Website/src/main/webapp/css/androidland/style.css
+ /trunk/Website/src/main/webapp/css/androidland/widget115.css
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/discounts-on-harmon-kardon-speakers.vm

Rev 8145 – Changes suggested by Vrinda

amit.gupta — Wed, 18 Sep 2013 11:00:23 +0530

amit.gupta – 3 file(s) modified
Changes suggested by Vrinda

~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 8144 –

amit.gupta — Tue, 17 Sep 2013 15:27:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 8143 – Alert when partner feed generation fails.

amit.gupta — Mon, 16 Sep 2013 17:46:13 +0530

amit.gupta – 2 file(s) modified
Alert when partner feed generation fails.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 8142 – Static page (android land)

kshitij.sood — Mon, 16 Sep 2013 12:00:53 +0530

kshitij.sood – 11 file(s) modified
Static page (android land)

+ /trunk/Website/src/main/webapp/css/android.css
+ /trunk/Website/src/main/webapp/images/androidLand-logo.jpg
+ /trunk/Website/src/main/webapp/images/FaceBook_Footer.png
+ /trunk/Website/src/main/webapp/images/Find-Button.png
+ /trunk/Website/src/main/webapp/images/Google-+.png
+ /trunk/Website/src/main/webapp/images/Google-plus.png
+ /trunk/Website/src/main/webapp/images/Phones.png
+ /trunk/Website/src/main/webapp/images/Tweet.png
+ /trunk/Website/src/main/webapp/images/White-Andriod.png
+ /trunk/Website/src/main/webapp/images/Word-Press.png
+ /trunk/Website/src/main/webapp/WEB-INF/content/android-land.vm

Rev 8141 – Added suppress fba price update flag.

kshitij.sood — Fri, 13 Sep 2013 23:12:55 +0530

kshitij.sood – 1 file(s) modified
Added suppress fba price update flag.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 8140 – Added suppress fba price update flag.

kshitij.sood — Fri, 13 Sep 2013 23:11:25 +0530

kshitij.sood – 8 file(s) modified
Added suppress fba price update flag.

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeedAndFetchResults.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalFBAPricingFeedAndFetchResults.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8139 – Added suppress mfn price update flag.

kshitij.sood — Fri, 13 Sep 2013 19:30:53 +0530

kshitij.sood – 11 file(s) modified
Added suppress mfn price update flag.

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalNonFBAPricingFeedAndFetchResults.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeedAndFetchResults.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8138 – Added kotak emi to widget

kshitij.sood — Fri, 13 Sep 2013 18:27:20 +0530

kshitij.sood – 1 file(s) modified
Added kotak emi to widget

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

Rev 8137 – Committed by Manish Sharma for Store Orders Reconciliation on ...

manish.sharma — Fri, 13 Sep 2013 17:43:51 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Store Orders Reconciliation on Sep-13-2013

+ /trunk/PyProj/src/shop2020/model/v1/order/script/StoreOrdersMismatch.py

Rev 8136 – typo :(

amit.gupta — Fri, 13 Sep 2013 17:13:12 +0530

amit.gupta – 1 file(s) modified
typo :(

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 8135 – Deleted by Manish Sharma

manish.sharma — Fri, 13 Sep 2013 16:46:44 +0530

manish.sharma – 1 file(s) modified
Deleted by Manish Sharma

x /trunk/PyProj/src/shop2020/model/v1/order/script/StoreOrdersMismatch.py

Rev 8134 – Added category laptop batteries

amit.gupta — Fri, 13 Sep 2013 16:14:25 +0530

amit.gupta – 3 file(s) modified
Added category laptop batteries

~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 8133 – Changed password

amit.gupta — Fri, 13 Sep 2013 13:55:49 +0530

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

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

Rev 8132 – Added category Mouse pads and laptop bags

amit.gupta — Thu, 12 Sep 2013 16:40:00 +0530

amit.gupta – 1 file(s) modified
Added category Mouse pads and laptop bags

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

Rev 8131 – added printstacktrace.

amit.gupta — Thu, 12 Sep 2013 14:25:27 +0530

amit.gupta – 1 file(s) modified
added printstacktrace.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/WeeklyContentCreation.java

Rev 8130 – Added mouse pads.

amit.gupta — Thu, 12 Sep 2013 12:54:10 +0530

amit.gupta – 1 file(s) modified
Added mouse pads.

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 8129 – Laptop bags, mouse pads minor changes

amit.gupta — Thu, 12 Sep 2013 12:33:24 +0530

amit.gupta – 1 file(s) modified
Laptop bags, mouse pads minor changes

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

Rev 8128 – For COD/NONCOD awb, Declared value should be the original value ...

anupam.singh — Wed, 11 Sep 2013 19:02:27 +0530

anupam.singh – 2 file(s) modified
For COD/NONCOD awb, Declared value should be the original value of the shipment and it’s need to be provided in soft data.
In case of COD shipment, If no collectable amount is involved, then please use prepaid awb series for such shipments.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java

Rev 8127 – Committed by Manish Sharma for Change Outbound Default Assignee Id ...

manish.sharma — Wed, 11 Sep 2013 16:21:22 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change Outbound Default Assignee Id on Sep-11-2013

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java

Rev 8126 – Committed by Manish Sharma for Change agent id in CRM ...

manish.sharma — Wed, 11 Sep 2013 16:19:57 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change agent id in CRM Escalation Matrix on Sep-11-2013

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 8125 – Using another variable to store freebie warehouse

anupam.singh — Wed, 11 Sep 2013 14:56:28 +0530

anupam.singh – 1 file(s) modified
Using another variable to store freebie warehouse

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

Rev 8124 – Added content model for "Laptop bags". Corrected for "Mouse pads". ...

amit.gupta — Wed, 11 Sep 2013 14:20:42 +0530

amit.gupta – 5 file(s) modified
Added content model for "Laptop bags".
Corrected for "Mouse pads".
Summary slide is cropped.

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 8123 – Committed by Manish Sharma for Order Acception Issue on Sep-11-2013

manish.sharma — Wed, 11 Sep 2013 11:30:31 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Order Acception Issue on Sep-11-2013

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

Rev 8122 – added ios 7

amit.gupta — Tue, 10 Sep 2013 16:03:19 +0530

amit.gupta – 1 file(s) modified
added ios 7

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

Rev 8121 – removed mfn price validation

manish.sharma — Tue, 10 Sep 2013 11:44:58 +0530

manish.sharma – 2 file(s) modified
removed mfn price validation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm

Rev 8120 – Committed by Manish Sharma for Order Acception Issue on Sep-07-2013

manish.sharma — Sat, 07 Sep 2013 13:16:34 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Order Acception Issue on Sep-07-2013

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 8119 – Casting int to string for logging

anupam.singh — Fri, 06 Sep 2013 18:49:26 +0530

anupam.singh – 1 file(s) modified
Casting int to string for logging

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 8118 – Made two scripts executable

rajveer — Fri, 06 Sep 2013 18:37:19 +0530

rajveer – 2 file(s) modified
Made two scripts executable

+ /trunk/PyProj/src/shop2020/model/v1/order/script/MFNCustomerFeedbackEmailNotification.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/StoreOrdersMismatch.py

Rev 8117 – Removed non executable scripts

rajveer — Fri, 06 Sep 2013 18:35:22 +0530

rajveer – 2 file(s) modified
Removed non executable scripts

x /trunk/PyProj/src/shop2020/model/v1/order/script/MFNCustomerFeedbackEmailNotification.py
x /trunk/PyProj/src/shop2020/model/v1/order/script/StoreOrdersMismatch.py