SmartDukaan – /

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

Rev 4192 – TracId : #676 Reviewer : Mandeep In user order ...

anupam.singh — Fri, 09 Dec 2011 13:59:55 +0530

anupam.singh – 8 file(s) modified
TracId : #676
Reviewer : Mandeep

In user order info view one can see the new orderId corresponding to older id when an order is reshipped. Refund timestamp is also visible now.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4191 – Trac#750 Not swallowing any exception before marking the transcaction/payment as ...

mandeep.dhir — Fri, 09 Dec 2011 00:04:43 +0530

mandeep.dhir – 3 file(s) modified
Trac#750 Not swallowing any exception before marking the transcaction/payment as processed

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

Rev 4190 – Included 'Soft Black' color of Galaxy P7500 to STAB coupon

varun.gupta — Thu, 08 Dec 2011 18:17:48 +0530

varun.gupta – 1 file(s) modified
Included 'Soft Black' color of Galaxy P7500 to STAB coupon

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

Rev 4189 – Support added in Promotion Service to simulate coupon codes on ...

varun.gupta — Wed, 07 Dec 2011 17:28:29 +0530

varun.gupta – 14 file(s) modified
Support added in Promotion Service to simulate coupon codes on given items.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_BB_campaign.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Tablet_campaign.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.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/user/ItemCouponDiscount.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 4188 – XML feed, including Coupon details, for partners

varun.gupta — Wed, 07 Dec 2011 17:22:33 +0530

varun.gupta – 2 file(s) modified
XML feed, including Coupon details, for partners

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

Rev 4187 – modified the discount value

varun.gupta — Tue, 06 Dec 2011 17:35:28 +0530

varun.gupta – 1 file(s) modified
modified the discount value

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

Rev 4186 – Rule to give one time off to particular user(s)

varun.gupta — Tue, 06 Dec 2011 17:08:28 +0530

varun.gupta – 1 file(s) modified
Rule to give one time off to particular user(s)

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py

Rev 4185 – Removed comma

rajveer — Tue, 06 Dec 2011 13:05:43 +0530

rajveer – 1 file(s) modified
Removed comma

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java

Rev 4184 – Removed anchor tag

rajveer — Tue, 06 Dec 2011 13:02:41 +0530

rajveer – 2 file(s) modified
Removed anchor tag

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 4183 – Changed welcome message

rajveer — Tue, 06 Dec 2011 12:57:18 +0530

rajveer – 2 file(s) modified
Changed welcome message

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 4182 – Updated the style

rajveer — Tue, 06 Dec 2011 12:49:01 +0530

rajveer – 1 file(s) modified
Updated the style

~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 4181 – updated header section

rajveer — Tue, 06 Dec 2011 12:36:13 +0530

rajveer – 1 file(s) modified
updated header section

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

Rev 4180 – Added menu for user to navigate to my accounts, ...

rajveer — Tue, 06 Dec 2011 11:44:26 +0530

rajveer – 2 file(s) modified
Added menu for user to navigate to my accounts, open orders. logged out,

~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/js/common.js

Rev 4179 – Trac#652 Setting ticket Id for activities

mandeep.dhir — Mon, 05 Dec 2011 14:52:10 +0530

mandeep.dhir – 3 file(s) modified
Trac#652 Setting ticket Id for activities

Rev 4178 – Minimum price for Nokia product to qualify for coupon is ...

varun.gupta — Mon, 05 Dec 2011 14:44:01 +0530

varun.gupta – 1 file(s) modified
Minimum price for Nokia product to qualify for coupon is increased to Rs.3,000

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

Rev 4177 – Trac ticket #712. Menu disturbed in firefox if we zoom ...

rajveer — Fri, 02 Dec 2011 18:22:18 +0530

rajveer – 1 file(s) modified
Trac ticket #712. Menu disturbed in firefox if we zoom out.

~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 4176 – Added columns for inventory stock report.

rajveer — Fri, 02 Dec 2011 17:53:03 +0530

rajveer – 1 file(s) modified
Added columns for inventory stock report.

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

Rev 4175 – Added Deal Text at the top of the product name.

rajveer — Fri, 02 Dec 2011 16:56:41 +0530

rajveer – 2 file(s) modified
Added Deal Text at the top of the product name.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java