SmartDukaan – /

Rev 4232 – Trac #778 - Message added on Pay Success page and ...

varun.gupta — Thu, 22 Dec 2011 19:05:30 +0530

varun.gupta – 3 file(s) modified
Trac #778 - Message added on Pay Success page and Order confirmation email for delay due to fog

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 4231 – Trac #772 - Cart footer fixed for A/B test variation. ...

varun.gupta — Thu, 22 Dec 2011 14:52:47 +0530

varun.gupta – 2 file(s) modified
Trac #772 - Cart footer fixed for A/B test variation. 'Checkout' button now appearing correctly when coupon is applied.

~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 4230 – Temporarily setting the action button ID to 'checkout' to avoid ...

varun.gupta — Thu, 22 Dec 2011 13:01:48 +0530

varun.gupta – 1 file(s) modified
Temporarily setting the action button ID to 'checkout' to avoid login/register popup issue

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

Rev 4229 – Updated to get image url matching to color

rajveer — Wed, 21 Dec 2011 18:47:14 +0530

rajveer – 2 file(s) modified
Updated to get image url matching to color

~ /trunk/ContentStore/src/main/java/in/shop2020/util/FeatureValueExtractor.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/GenerateJungleeData.py

Rev 4228 – Trac #773 - Excluded Nokia C2-06 from XML feed

varun.gupta — Wed, 21 Dec 2011 16:41:43 +0530

varun.gupta – 1 file(s) modified
Trac #773 - Excluded Nokia C2-06 from XML feed

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

Rev 4227 – As per ticket #767. 1) Added new email address ...

rajveer — Tue, 20 Dec 2011 19:37:46 +0530

rajveer – 1 file(s) modified
As per ticket #767.
1) Added new email address to which email is sent.
2) Changed sender's name.
3) Changes subject, added city name in subject itself.

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

Rev 4226 – Modified CSS for Best Deal text

varun.gupta — Tue, 20 Dec 2011 18:59:58 +0530

varun.gupta – 1 file(s) modified
Modified CSS for Best Deal text

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 4225 – Not storing best deal text for an item in a ...

varun.gupta — Tue, 20 Dec 2011 18:06:42 +0530

varun.gupta – 1 file(s) modified
Not storing best deal text for an item in a variable

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

Rev 4224 – Not storing best deal text for an item in a ...

varun.gupta — Tue, 20 Dec 2011 17:17:12 +0530

varun.gupta – 1 file(s) modified
Not storing best deal text for an item in a variable

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

Rev 4223 – Trac #683 - Retry Payment link added to Payment Failure ...

varun.gupta — Tue, 20 Dec 2011 15:42:18 +0530

varun.gupta – 1 file(s) modified
Trac #683 - Retry Payment link added to Payment Failure page

~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm

Rev 4222 – Trac #745 - Login/Registeration form will be poped up during ...

varun.gupta — Tue, 20 Dec 2011 15:41:03 +0530

varun.gupta – 5 file(s) modified
Trac #745 - Login/Registeration form will be poped up during cart flow

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 4221 – Changed the touchscreen to touch_screen.

rajveer — Tue, 20 Dec 2011 13:23:01 +0530

rajveer – 1 file(s) modified
Changed the touchscreen to touch_screen.

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

Rev 4220 – New order for COD sales return order should be cod ...

rajveer — Mon, 19 Dec 2011 16:31:13 +0530

rajveer – 1 file(s) modified
New order for COD sales return order should be cod not prepaid.

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

Rev 4219 – Updated the amazon report generator.

rajveer — Mon, 19 Dec 2011 13:47:27 +0530

rajveer – 1 file(s) modified
Updated the amazon report generator.

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

Rev 4218 – Added code to get image url in featurevalueextractor.

rajveer — Mon, 19 Dec 2011 13:39:22 +0530

rajveer – 2 file(s) modified
Added code to get image url in featurevalueextractor.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/FeatureValueExtractor.java

Rev 4217 – Trac #734 - Deal text included in Cart flow

varun.gupta — Sat, 17 Dec 2011 14:58:06 +0530

varun.gupta – 7 file(s) modified
Trac #734 - Deal text included in Cart flow

~ /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/orderdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 4216 – Changed escalation matrix (with new receipients) as discussed with Suraj

mandeep.dhir — Fri, 16 Dec 2011 18:50:21 +0530

mandeep.dhir – 1 file(s) modified
Changed escalation matrix (with new receipients) as discussed with Suraj

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

Rev 4215 – Changed escalation matrix (with new receipients) as discussed with Suraj

mandeep.dhir — Fri, 16 Dec 2011 18:36:48 +0530

mandeep.dhir – 1 file(s) modified
Changed escalation matrix (with new receipients) as discussed with Suraj

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

Rev 4214 – Reverting my temporary change

mandeep.dhir — Fri, 16 Dec 2011 17:16:06 +0530

mandeep.dhir – 1 file(s) modified
Reverting my temporary change

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

Rev 4213 – Temporary commit to fix existing images - trimming label ...

mandeep.dhir — Fri, 16 Dec 2011 16:42:35 +0530

mandeep.dhir – 1 file(s) modified
Temporary commit to fix existing images
- trimming label name to identify default images
- recreating images older than today

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

Rev 4212 – Trac#713 Generate images if creation time is zero for old ...

mandeep.dhir — Fri, 16 Dec 2011 14:56:53 +0530

mandeep.dhir – 1 file(s) modified
Trac#713 Generate images if creation time is zero for old products.

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

Rev 4211 – Adding/Fixing the close_session operations needed to close the DB handles

mandeep.dhir — Fri, 16 Dec 2011 14:18:59 +0530

mandeep.dhir – 1 file(s) modified
Adding/Fixing the close_session operations needed to close the DB handles

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

Rev 4210 – Trac #761 - Added code to hide widget container in ...

varun.gupta — Thu, 15 Dec 2011 20:09:59 +0530

varun.gupta – 4 file(s) modified
Trac #761 - Added code to hide widget container in case when no snippets are received, optimized widget rendering by DOM caching and removed checkboxes from widgets where they are not required

~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm
~ /trunk/Website/src/main/webapp/css/widget.css
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 4209 – Merge the multiple reports of the same warehouse location.

rajveer — Thu, 15 Dec 2011 15:49:24 +0530

rajveer – 3 file(s) modified
Merge the multiple reports of the same warehouse location.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsReportMerger.java

Rev 4208 – Adding link ot let users go back to all orders ...

mandeep.dhir — Thu, 15 Dec 2011 15:04:22 +0530

mandeep.dhir – 1 file(s) modified
Adding link ot let users go back to all orders page

~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm

Rev 4207 – Trac#537 New panel for bulk orders

mandeep.dhir — Thu, 15 Dec 2011 14:42:48 +0530

mandeep.dhir – 27 file(s) modified
Trac#537 New panel for bulk orders

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
+ /trunk/Support/src/main/webapp/css
+ /trunk/Support/src/main/webapp/css/bulk-order.css
+ /trunk/Support/src/main/webapp/css/demo_page.css
+ /trunk/Support/src/main/webapp/css/demo_table.css
+ /trunk/Support/src/main/webapp/css/demo_table_jui.css
+ /trunk/Support/src/main/webapp/images
+ /trunk/Support/src/main/webapp/images/back_disabled.jpg
+ /trunk/Support/src/main/webapp/images/back_enabled.jpg
+ /trunk/Support/src/main/webapp/images/favicon.ico
+ /trunk/Support/src/main/webapp/images/forward_disabled.jpg
+ /trunk/Support/src/main/webapp/images/forward_enabled.jpg
+ /trunk/Support/src/main/webapp/images/Sorting icons.psd
+ /trunk/Support/src/main/webapp/images/sort_asc.png
+ /trunk/Support/src/main/webapp/images/sort_asc_disabled.png
+ /trunk/Support/src/main/webapp/images/sort_both.png
+ /trunk/Support/src/main/webapp/images/sort_desc.png
+ /trunk/Support/src/main/webapp/images/sort_desc_disabled.png
+ /trunk/Support/src/main/webapp/js/bulk-order-common.js
+ /trunk/Support/src/main/webapp/js/bulk-order-events.js
+ /trunk/Support/src/main/webapp/js/jquery.dataTables.min.js
+ /trunk/Support/src/main/webapp/js/jquery.validate.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-error.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-output.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-show.vm

Rev 4206 – Reducing activity size in case it grows beyond a limit

mandeep.dhir — Thu, 15 Dec 2011 10:58:36 +0530

mandeep.dhir – 3 file(s) modified
Reducing activity size in case it grows beyond a limit

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java

Rev 4205 – Added null check for ticket category

mandeep.dhir — Wed, 14 Dec 2011 23:24:41 +0530

mandeep.dhir – 1 file(s) modified
Added null check for ticket category

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

Rev 4204 – Trac# Passing userId as well to associate activities with customers

mandeep.dhir — Wed, 14 Dec 2011 23:16:21 +0530

mandeep.dhir – 1 file(s) modified
Trac# Passing userId as well to associate activities with customers

~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm

Rev 4203 – Modified scraping logic for Flipkart and HS18

varun.gupta — Wed, 14 Dec 2011 18:26:08 +0530

varun.gupta – 2 file(s) modified
Modified scraping logic for Flipkart and HS18

~ /trunk/PriceComparisonFramework/src/Scrapers/FlipcartScraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/HS18Scraper.py

Rev 4202 – Escaping XML entities in product description

varun.gupta — Wed, 14 Dec 2011 17:47:19 +0530

varun.gupta – 1 file(s) modified
Escaping XML entities in product description

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

Rev 4201 – Trac #717 - Attribute 'isMultivalue' for feature 'Battery Type' set ...

varun.gupta — Wed, 14 Dec 2011 16:32:59 +0530

varun.gupta – 1 file(s) modified
Trac #717 - Attribute 'isMultivalue' for feature 'Battery Type' set to false.

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

Rev 4200 –

varun.gupta — Tue, 13 Dec 2011 18:54:52 +0530

varun.gupta – 1 file(s) modified

~ /trunk/runutils/start-price-comparison-server.sh

Rev 4199 – Trac #723: Modified logic for product page scraping.

varun.gupta — Tue, 13 Dec 2011 18:39:25 +0530

varun.gupta – 4 file(s) modified
Trac #723: Modified logic for product page scraping.

~ /trunk/PriceComparisonFramework/src/Scrapers/HS18Scraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/InfibeamScraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/LetsBuyScraper.py
~ /trunk/PriceComparisonFramework/src/Utils.py

Rev 4198 – Trac #723: Third iteration of Price Comparison Dashboard. Added mechanism ...

varun.gupta — Tue, 13 Dec 2011 18:06:19 +0530

varun.gupta – 20 file(s) modified
Trac #723: Third iteration of Price Comparison Dashboard. Added mechanism to add URL feedback from the dashboard UI.

+ /trunk/PriceComparisonFramework/src/FileUtils.py
~ /trunk/PriceComparisonFramework/src/ProcessManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/IndexBuilder.py
~ /trunk/PriceComparisonFramework/src/PyLucene/IndexManager.py
~ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
+ /trunk/PriceComparisonFramework/src/ScrapedDataManager.py
~ /trunk/PriceComparisonFramework/src/ScraperAgent.py
+ /trunk/PriceComparisonFramework/src/Scrapers/AdexmartScraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/FlipcartScraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/HS18Scraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/InfibeamScraper.py
~ /trunk/PriceComparisonFramework/src/Scrapers/LetsBuyScraper.py
+ /trunk/PriceComparisonFramework/src/URLQueue.py
~ /trunk/PriceComparisonFramework/src/Utils.py
~ /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
~ /trunk/PriceComparisonFramework/src/WebUI/static/facebox.css

Rev 4197 – Trac# Support for new laptop with 1 GB memory

mandeep.dhir — Tue, 13 Dec 2011 15:15:14 +0530

mandeep.dhir – 1 file(s) modified
Trac# Support for new laptop with 1 GB memory

~ /trunk/ContentStore/src/jython/irdatarules/laptops/ram.py

Rev 4196 – Setting ticket status in activity after its changed in ticket.

mandeep.dhir — Tue, 13 Dec 2011 09:39:07 +0530

mandeep.dhir – 1 file(s) modified
Setting ticket status in activity after its changed in ticket.

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

Rev 4195 – Excluded Nokia C2-06 from SH911

varun.gupta — Mon, 12 Dec 2011 13:48:12 +0530

varun.gupta – 1 file(s) modified
Excluded Nokia C2-06 from SH911

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

Rev 4194 – Trac#685 making promotion service point to prod db at staging ...

mandeep.dhir — Fri, 09 Dec 2011 16:50:20 +0530

mandeep.dhir – 1 file(s) modified
Trac#685 making promotion service point to prod db at staging m/c

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

Rev 4193 – Trac#711, Trac#722, Trac#753 Modifying OS rules for iOS5 and Android ...

mandeep.dhir — Fri, 09 Dec 2011 15:36:58 +0530

mandeep.dhir – 2 file(s) modified
Trac#711, Trac#722, Trac#753 Modifying OS rules for iOS5 and Android 3.1.
Also, modifying rules for IMAP4 protocol

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