SmartDukaan – /

Rev 5664 – Made folders for html entities configurable on domain basis. It ...

amit.gupta — Tue, 24 Jul 2012 12:34:07 +0530

amit.gupta – 3 file(s) modified
Made folders for html entities configurable on domain basis. It is now used from shop2020.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5663 – Even where warehouse id is zero - we wont use ...

mandeep.dhir — Tue, 24 Jul 2012 12:32:44 +0530

mandeep.dhir – 1 file(s) modified
Even where warehouse id is zero - we wont use it as billing warehouse

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

Rev 5662 – removed tag from website.

amit.gupta — Tue, 24 Jul 2012 10:54:27 +0530

amit.gupta – 1 file(s) modified
removed <url> tag from website.

~ /trunk/Website/pom.xml

Rev 5661 – Updating reservation count appropriately

mandeep.dhir — Mon, 23 Jul 2012 19:02:21 +0530

mandeep.dhir – 1 file(s) modified
Updating reservation count appropriately

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

Rev 5660 – Adding configuration for HOTSPOT m/c

mandeep.dhir — Mon, 23 Jul 2012 17:24:50 +0530

mandeep.dhir – 1 file(s) modified
Adding configuration for HOTSPOT m/c

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5659 –

vikram.raghav — Mon, 23 Jul 2012 16:08:28 +0530

vikram.raghav – 1 file(s) modified

x /SeleniumTests

Rev 5658 – Selenium Tests for Prod and Shop2020

vikram.raghav — Mon, 23 Jul 2012 13:46:47 +0530

vikram.raghav – 9 file(s) modified
Selenium Tests for Prod and Shop2020

+ /SeleniumTests/.classpath
+ /SeleniumTests/.project
+ /SeleniumTests/.settings
+ /SeleniumTests/.settings/org.eclipse.jdt.core.prefs
+ /SeleniumTests/bin
+ /SeleniumTests/src
+ /SeleniumTests/src/com
+ /SeleniumTests/src/com/Buyproductonprod.java
+ /SeleniumTests/src/com/Buyproductonshop2020.java

Rev 5657 – Selenium Tests for Prod and Shop2020

vikram.raghav — Mon, 23 Jul 2012 13:31:42 +0530

vikram.raghav – 1 file(s) modified
Selenium Tests for Prod and Shop2020

+ /SeleniumTests

Rev 5656 – Fixed special characters display, replace with their respective codes

amit.gupta — Mon, 23 Jul 2012 12:50:27 +0530

amit.gupta – 1 file(s) modified
Fixed special characters display, replace with their respective codes

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

Rev 5655 – Fixed special characters display, replace with their respective codes

amit.gupta — Mon, 23 Jul 2012 12:49:01 +0530

amit.gupta – 1 file(s) modified
Fixed special characters display, replace with their respective codes

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

Rev 5654 – Correcting urls for Tradus and Sulekha in PriceChart

amar.kumar — Mon, 23 Jul 2012 01:53:59 +0530

amar.kumar – 1 file(s) modified
Correcting urls for Tradus and Sulekha in PriceChart

~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html

Rev 5653 – Removed email addresses meant for testing

anupam.singh — Sat, 21 Jul 2012 03:21:54 +0530

anupam.singh – 2 file(s) modified
Removed email addresses meant for testing

~ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
~ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 5652 – Reports for previous day sales for accessories and other categories

anupam.singh — Sat, 21 Jul 2012 03:11:17 +0530

anupam.singh – 2 file(s) modified
Reports for previous day sales for accessories and other categories

+ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
+ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 5651 –

vikram.raghav — Sat, 21 Jul 2012 01:54:09 +0530

vikram.raghav – 1 file(s) modified

x /trunk/Website/src/main/webapp/images/staging

Rev 5650 –

vikram.raghav — Sat, 21 Jul 2012 01:52:25 +0530

vikram.raghav – 4 file(s) modified

~ /trunk/Website/pom.xml
x /trunk/Website/src/main/webapp/images/dev
x /trunk/Website/src/main/webapp/images/hotspot
x /trunk/Website/src/main/webapp/images/prod

Rev 5649 –

vikram.raghav — Sat, 21 Jul 2012 01:31:26 +0530

vikram.raghav – 1 file(s) modified

x /trunk/Website/src/main/webapp/images/staging/saholic-logo.jpg

Rev 5648 –

vikram.raghav — Sat, 21 Jul 2012 01:07:18 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/Website/src/main/webapp/images/saholic-logo.jpg

Rev 5647 –

vikram.raghav — Sat, 21 Jul 2012 01:02:34 +0530

vikram.raghav – 1 file(s) modified

+ /trunk/Website/src/main/webapp/images/saholic-logo.jpg

Rev 5646 –

vikram.raghav — Sat, 21 Jul 2012 00:06:31 +0530

vikram.raghav – 4 file(s) modified

x /trunk/Website/src/main/webapp/images/Hotspot-logo.jpg
x /trunk/Website/src/main/webapp/images/Saholic-logo.jpg
x /trunk/Website/src/main/webapp/images/saholic-logo.jpg
x /trunk/Website/src/main/webapp/images/Shop2020-logo.jpg

Rev 5645 –

vikram.raghav — Fri, 20 Jul 2012 23:54:57 +0530

vikram.raghav – 2 file(s) modified

+ /trunk/Website/src/main/webapp/images/prod
+ /trunk/Website/src/main/webapp/images/prod/saholic-logo.jpg

Rev 5644 – New images added for hotspot

vikram.raghav — Fri, 20 Jul 2012 23:39:42 +0530

vikram.raghav – 5 file(s) modified
New images added for hotspot

x /trunk/Website/src/main/webapp/images/Hotspot
x /trunk/Website/src/main/webapp/images/localhost
x /trunk/Website/src/main/webapp/images/Saholic
x /trunk/Website/src/main/webapp/images/Shop2020
~ /trunk/Website/src/main/webapp/images/staging/saholic-logo.jpg

Rev 5643 – Adding fontsize for selfpickup

mandeep.dhir — Fri, 20 Jul 2012 17:33:30 +0530

mandeep.dhir – 1 file(s) modified
Adding fontsize for selfpickup

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5642 – Added Product Documents Generator.

amit.gupta — Fri, 20 Jul 2012 16:44:55 +0530

amit.gupta – 1 file(s) modified
Added Product Documents Generator.

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

Rev 5641 – Added sensitivity feature for Headphones/headsets.

amit.gupta — Fri, 20 Jul 2012 16:32:30 +0530

amit.gupta – 3 file(s) modified
Added sensitivity feature for Headphones/headsets.

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

Rev 5640 – Changes in SulekhaScraper to remove trailing "/-" from price while ...

amar.kumar — Fri, 20 Jul 2012 15:29:06 +0530

amar.kumar – 1 file(s) modified
Changes in SulekhaScraper to remove trailing "/-" from price while fetching price from Product page

~ /trunk/PriceComparisonFramework/src/Scrapers/SulekhaScraper.py

Rev 5639 – Adding Support for scrapers for Sulekha and Tradus Reviewed by: ...

amar.kumar — Fri, 20 Jul 2012 15:21:20 +0530

amar.kumar – 11 file(s) modified
Adding Support for scrapers for Sulekha and Tradus
Reviewed by: Anupam Singh

~ /trunk/PriceComparisonFramework/src/ScraperLoader.py
+ /trunk/PriceComparisonFramework/src/Scrapers/SulekhaScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/TradusScraper.py
~ /trunk/PriceComparisonFramework/src/URLQueue.py
~ /trunk/PriceComparisonFramework/src/Utils.py
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/MSPChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
~ /trunk/PriceComparisonFramework/src/WebUI/MSPDashboard.py
~ /trunk/PriceComparisonFramework/src/WebUI/PriceComparisonServer.py
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.css
~ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js

Rev 5638 – #1478 [SEO] Improve After Sales Pages Reviewer: Amar

amit.gupta — Fri, 20 Jul 2012 13:52:29 +0530

amit.gupta – 7 file(s) modified
#1478
[SEO] Improve After Sales Pages
Reviewer: Amar

+ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductDocumentsGenerator.java
~ /trunk/ContentStore/src/velocity/AfterSales.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AfterSalesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/LoginInterceptor.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm

Rev 5637 – Bug fix. First amending reservations and then amending the fulfilment ...

mandeep.dhir — Thu, 19 Jul 2012 18:33:37 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. First amending reservations and then amending the fulfilment warehouse

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

Rev 5636 – Adding code for tracking Logistics through AlertService

amar.kumar — Thu, 19 Jul 2012 16:20:29 +0530

amar.kumar – 1 file(s) modified
Adding code for tracking Logistics through AlertService

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

Rev 5635 – Trac # 1493 Reviewer : Mandeep Dhir

anupam.singh — Thu, 19 Jul 2012 15:07:44 +0530

anupam.singh – 1 file(s) modified
Trac # 1493
Reviewer : Mandeep Dhir

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

Rev 5634 –

vikram.raghav — Thu, 19 Jul 2012 12:59:03 +0530

vikram.raghav – 1 file(s) modified

+ /trunk/Website/src/main/resources/templates/localhost-address.vm

Rev 5633 – Adding images for domain specific changes

vikram.raghav — Thu, 19 Jul 2012 12:29:00 +0530

vikram.raghav – 8 file(s) modified
Adding images for domain specific changes

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/header.vm
+ /trunk/Website/src/main/webapp/images/dev
+ /trunk/Website/src/main/webapp/images/dev/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/hotspot
+ /trunk/Website/src/main/webapp/images/hotspot/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/staging
+ /trunk/Website/src/main/webapp/images/staging/saholic-logo.jpg

Rev 5632 – #1485 Add new display type "Ultra AMOLED" for phones

amit.gupta — Thu, 19 Jul 2012 12:09:48 +0530

amit.gupta – 2 file(s) modified
#1485
Add new display type "Ultra AMOLED" for phones

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

Rev 5631 – Adding new method for sending html mails and using this ...

amar.kumar — Thu, 19 Jul 2012 11:57:09 +0530

amar.kumar – 2 file(s) modified
Adding new method for sending html mails and using this method while sending delayed-selivery/cancelled order mails

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

Rev 5630 – Reducing reservation count of accurate warehouse

mandeep.dhir — Thu, 19 Jul 2012 11:23:44 +0530

mandeep.dhir – 1 file(s) modified
Reducing reservation count of accurate warehouse

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

Rev 5629 –

vikram.raghav — Wed, 18 Jul 2012 20:31:58 +0530

vikram.raghav – 1 file(s) modified

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

Rev 5628 – images changes for domain

vikram.raghav — Wed, 18 Jul 2012 20:30:35 +0530

vikram.raghav – 8 file(s) modified
images changes for domain

+ /trunk/Website/src/main/webapp/images/Hotspot
+ /trunk/Website/src/main/webapp/images/Hotspot/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/localhost
+ /trunk/Website/src/main/webapp/images/localhost/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/Saholic
+ /trunk/Website/src/main/webapp/images/Saholic/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/Shop2020
+ /trunk/Website/src/main/webapp/images/Shop2020/saholic-logo.jpg

Rev 5627 – shop2020 address file

vikram.raghav — Wed, 18 Jul 2012 19:10:41 +0530

vikram.raghav – 1 file(s) modified
shop2020 address file

+ /trunk/Website/src/main/resources/templates/Shop2020-address.vm

Rev 5626 – Removing ga-invoker.js from minification process

amar.kumar — Wed, 18 Jul 2012 18:38:23 +0530

amar.kumar – 1 file(s) modified
Removing ga-invoker.js from minification process

~ /trunk/Website/pom.xml

Rev 5625 –

vikram.raghav — Wed, 18 Jul 2012 18:32:03 +0530

vikram.raghav – 62 file(s) modified

~ /trunk/Website/pom.xml
/trunk/Website/src/main/filters/dev/filters.properties
+ /trunk/Website/src/main/filters/hotspot
+ /trunk/Website/src/main/filters/hotspot/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
+ /trunk/Website/src/main/resources/templates/Hotspot-address.vm
+ /trunk/Website/src/main/resources/templates/Saholic-address.vm
+ /trunk/Website/src/main/webapp/images/Hotspot-logo.jpg
+ /trunk/Website/src/main/webapp/images/localhost-logo.jpg
+ /trunk/Website/src/main/webapp/images/Saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/Shop2020-logo.jpg (copied from /trunk/Website/src/main/webapp/images/saholic-logo.jpg@5588)
~ /trunk/Website/src/main/webapp/WEB-INF/content/aboutus.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/banner.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cache-admin-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/easy-linux.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/fblike-test-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/generated-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/get-paid-for-your-reviews.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/product-index-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm