SmartDukaan – /

Rev 2253 – Fixed bug where minimum of all items price was getting ...

rajveer — Sun, 19 Jun 2011 19:20:04 +0530

rajveer – 1 file(s) modified
Fixed bug where minimum of all items price was getting picked for partners.

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

Rev 2252 – Enhancements for Item risky flag.

ankur.singhal — Fri, 17 Jun 2011 21:01:56 +0530

ankur.singhal – 7 file(s) modified
Enhancements for Item risky flag.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemList.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml

Rev 2251 – Added risky flag to catalog item. Also added method mark_item_risky ...

ankur.singhal — Fri, 17 Jun 2011 20:57:58 +0530

ankur.singhal – 5 file(s) modified
Added risky flag to catalog item. Also added method mark_item_risky to PAUSE/ACTIVATE item based on inventory. This method is called at 3 places, update_inventory, reserve_item and reduce_reservation_count. Also written a test case to test its functionality.

~ /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/model/v1/catalog/test/CatalogTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 2250 – Added risky flag to catalog item.

ankur.singhal — Fri, 17 Jun 2011 20:55:11 +0530

ankur.singhal – 1 file(s) modified
Added risky flag to catalog item.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java

Rev 2249 – Added risky flag to catalog item.

ankur.singhal — Fri, 17 Jun 2011 20:54:49 +0530

ankur.singhal – 1 file(s) modified
Added risky flag to catalog item.

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2248 – Removed commented part for status update in update_item method

rajveer — Fri, 17 Jun 2011 18:46:22 +0530

rajveer – 1 file(s) modified
Removed commented part for status update in update_item method

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

Rev 2247 – More traceback related upgrades

chandranshu — Fri, 17 Jun 2011 18:24:17 +0530

chandranshu – 1 file(s) modified
More traceback related upgrades

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

Rev 2246 – Started printing the stack trace

chandranshu — Fri, 17 Jun 2011 18:15:34 +0530

chandranshu – 1 file(s) modified
Started printing the stack trace

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

Rev 2245 – Coalesced two exception clauses

chandranshu — Fri, 17 Jun 2011 18:13:43 +0530

chandranshu – 1 file(s) modified
Coalesced two exception clauses

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

Rev 2244 – Reverted OrderStatus to show the messages also.

rajveer — Fri, 17 Jun 2011 17:16:49 +0530

rajveer – 1 file(s) modified
Reverted OrderStatus to show the messages also.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 2243 – Exposed slideid in the content of slide guide

rajveer — Fri, 17 Jun 2011 16:29:10 +0530

rajveer – 1 file(s) modified
Exposed slideid in the content of slide guide

~ /trunk/ContentStore/src/velocity/slideguide_img_video.vm

Rev 2242 – Removed access of non existing properties: lineitem.discounted_price and order.discounted_amount

varun.gupta — Fri, 17 Jun 2011 15:30:26 +0530

varun.gupta – 1 file(s) modified
Removed access of non existing properties: lineitem.discounted_price and order.discounted_amount

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

Rev 2241 – Renamed coupon_code to couponCode

chandranshu — Fri, 17 Jun 2011 14:55:47 +0530

chandranshu – 1 file(s) modified
Renamed coupon_code to couponCode

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

Rev 2240 – Corrected some minor bugs

chandranshu — Fri, 17 Jun 2011 14:53:19 +0530

chandranshu – 1 file(s) modified
Corrected some minor bugs

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

Rev 2239 – modified the script to update content for javascripts also

rajveer — Fri, 17 Jun 2011 13:53:48 +0530

rajveer – 1 file(s) modified
modified the script to update content for javascripts also

~ /trunk/runutils/update-content.sh

Rev 2238 – Modified new static content generation script for javascript

rajveer — Fri, 17 Jun 2011 13:52:08 +0530

rajveer – 1 file(s) modified
Modified new static content generation script for javascript

~ /trunk/runutils/generate-static-html-new.sh

Rev 2237 – Added config parameters for Javascripts export path

rajveer — Fri, 17 Jun 2011 13:47:54 +0530

rajveer – 2 file(s) modified
Added config parameters for Javascripts export path

~ /trunk/Common/src/main/resources/shop2020.cfg
~ /trunk/Common/src/main/resources/shop2020_production.cfg

Rev 2236 – On Enter press key, we should call same event which ...

rajveer — Fri, 17 Jun 2011 13:45:52 +0530

rajveer – 2 file(s) modified
On Enter press key, we should call same event which call on click to Compare button

~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2235 – Suggest on at least three word typing

rajveer — Thu, 16 Jun 2011 19:23:08 +0530

rajveer – 1 file(s) modified
Suggest on at least three word typing

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

Rev 2234 – Added plusone button

rajveer — Thu, 16 Jun 2011 19:16:12 +0530

rajveer – 1 file(s) modified
Added plusone button

~ /trunk/ContentStore/src/velocity/product_summary.vm

Rev 2233 – updated to add a comma in javascript code

rajveer — Thu, 16 Jun 2011 18:46:09 +0530

rajveer – 1 file(s) modified
updated to add a comma in javascript code

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

Rev 2232 – Added ordering in SQL result set

varun.gupta — Thu, 16 Jun 2011 18:35:53 +0530

varun.gupta – 1 file(s) modified
Added ordering in SQL result set

~ /trunk/runutils/PromotionReporter.sh

Rev 2231 – Increased the estimate of Galaxy S II by 2 days

chandranshu — Thu, 16 Jun 2011 18:29:00 +0530

chandranshu – 1 file(s) modified
Increased the estimate of Galaxy S II by 2 days

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

Rev 2230 – Modified for javascript generation

rajveer — Thu, 16 Jun 2011 18:25:22 +0530

rajveer – 1 file(s) modified
Modified for javascript generation

~ /trunk/runutils/generate-static-html-new.sh

Rev 2229 – Added content generation for js files list of phones for ...

rajveer — Thu, 16 Jun 2011 18:20:07 +0530

rajveer – 1 file(s) modified
Added content generation for js files list of phones for comparison

~ /trunk/runutils/generate-static-html.sh

Rev 2228 – Added comparison box for mobile phones.

rajveer — Thu, 16 Jun 2011 18:12:41 +0530

rajveer – 8 file(s) modified
Added comparison box for mobile phones.

~ /trunk/Website/src/main/resources/templates/socialutils.vm
+ /trunk/Website/src/main/webapp/css/jquery.ui.autocomplete.css
~ /trunk/Website/src/main/webapp/css/product.css
+ /trunk/Website/src/main/webapp/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
~ /trunk/Website/src/main/webapp/js/entity.js
+ /trunk/Website/src/main/webapp/js/jquery.ui.autocomplete.js
+ /trunk/Website/src/main/webapp/js/saholicmobilephones.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2227 – Included socialutils.vm as part of VUI. Added generation of javascript ...

rajveer — Thu, 16 Jun 2011 18:11:20 +0530

rajveer – 5 file(s) modified
Included socialutils.vm as part of VUI. Added generation of javascript for the product page.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/velocity/product_summary.vm

Rev 2226 – Missed the query attribute

chandranshu — Thu, 16 Jun 2011 16:05:11 +0530

chandranshu – 1 file(s) modified
Missed the query attribute

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

Rev 2225 – Changed the get_by to filter_by

chandranshu — Thu, 16 Jun 2011 16:04:23 +0530

chandranshu – 1 file(s) modified
Changed the get_by to filter_by

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

Rev 2224 – Price formatting applied and use of Pageloader methods removed

varun.gupta — Thu, 16 Jun 2011 16:04:13 +0530

varun.gupta – 3 file(s) modified
Price formatting applied and use of Pageloader methods removed

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompletedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm

Rev 2223 – Passed 0 as the start index for Best sellers and ...

chandranshu — Thu, 16 Jun 2011 15:52:52 +0530

chandranshu – 1 file(s) modified
Passed 0 as the start index for Best sellers and Latest arrivals as well

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

Rev 2222 – Commented a failing test

chandranshu — Thu, 16 Jun 2011 14:14:01 +0530

chandranshu – 1 file(s) modified
Commented a failing test

~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py

Rev 2221 – Made Best Deal data loading more strict. Inverted the sense ...

chandranshu — Thu, 16 Jun 2011 14:13:14 +0530

chandranshu – 1 file(s) modified
Made Best Deal data loading more strict. Inverted the sense of dry run.

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

Rev 2220 – Silently ignore AWB nos not in our list

chandranshu — Thu, 16 Jun 2011 14:03:47 +0530

chandranshu – 1 file(s) modified
Silently ignore AWB nos not in our list

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

Rev 2219 – Coupon code now being stored in Transaction. discounted_price and discounted_amount ...

varun.gupta — Thu, 16 Jun 2011 13:43:14 +0530

varun.gupta – 11 file(s) modified
Coupon code now being stored in Transaction. discounted_price and discounted_amount fields dropped from lineitem and order tables.

~ /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/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 2218 – Corrected spellings

rajveer — Thu, 16 Jun 2011 12:59:05 +0530

rajveer – 2 file(s) modified
Corrected spellings

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm

Rev 2217 – Added new static content generation script

rajveer — Thu, 16 Jun 2011 12:57:44 +0530

rajveer – 1 file(s) modified
Added new static content generation script

+ /trunk/runutils/generate-static-html-new.sh

Rev 2216 – Added ID attribute to order_id text box

varun.gupta — Thu, 16 Jun 2011 12:43:43 +0530

varun.gupta – 1 file(s) modified
Added ID attribute to order_id text box

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

Rev 2215 – Moved the main module xml to the resources folder

chandranshu — Thu, 16 Jun 2011 12:41:54 +0530

chandranshu – 11 file(s) modified
Moved the main module xml to the resources folder

~ /trunk/HotspotDashboard/.classpath
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/HotspotDashboard.gwt.xml
+ /trunk/HotspotDashboard/src/main/resources/in
+ /trunk/HotspotDashboard/src/main/resources/in/shop2020
+ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot
+ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord
+ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/HotspotDashboard.gwt.xml (copied from /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/HotspotDashboard.gwt.xml@2211)
+ /trunk/HotspotDashboard/src/test/resources/in
+ /trunk/HotspotDashboard/src/test/resources/in/shop2020
+ /trunk/HotspotDashboard/src/test/resources/in/shop2020/hotspot
+ /trunk/HotspotDashboard/src/test/resources/in/shop2020/hotspot/dashbaord

Rev 2214 – Added src/test/java to eclipse source path

chandranshu — Thu, 16 Jun 2011 12:38:03 +0530

chandranshu – 1 file(s) modified
Added src/test/java to eclipse source path

~ /trunk/HotspotDashboard/.classpath