SmartDukaan – /

Rev 1471 – Form reset functionality added

varun.gupta — Wed, 20 Apr 2011 15:02:08 +0530

varun.gupta – 3 file(s) modified
Form reset functionality added

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

Rev 1470 – Added a step to kill any running Solr processes before ...

chandranshu — Wed, 20 Apr 2011 13:29:07 +0530

chandranshu – 1 file(s) modified
Added a step to kill any running Solr processes before starting a new one

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1469 – Added email address to Contact Us page

varun.gupta — Wed, 20 Apr 2011 12:49:11 +0530

varun.gupta – 1 file(s) modified
Added email address to Contact Us page

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

Rev 1468 – Configured logging to use Class.class

chandranshu — Wed, 20 Apr 2011 12:19:31 +0530

chandranshu – 1 file(s) modified
Configured logging to use Class.class

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 1467 – Added sysouts around the export path

chandranshu — Wed, 20 Apr 2011 12:11:23 +0530

chandranshu – 1 file(s) modified
Added sysouts around the export path

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 1466 – Ref:[Ticket #140] three messages configured. 1) cart updated, 2) ...

ankur.singhal — Wed, 20 Apr 2011 11:36:53 +0530

ankur.singhal – 9 file(s) modified
Ref:[Ticket #140] three messages configured. 1) cart updated, 2) Item removed 3) Delivery estimates updated. Earlier it was only one message viz cart updated.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java

Rev 1465 – AFL AWB numbers list

ankur.singhal — Wed, 20 Apr 2011 11:32:12 +0530

ankur.singhal – 1 file(s) modified
AFL AWB numbers list

+ /trunk/PyProj/src/samplesheets/AFL-AWBNumbers-18-Apr-2011.xls

Rev 1464 – Product Selector will be disabled until an order is selected. ...

varun.gupta — Wed, 20 Apr 2011 04:36:36 +0530

varun.gupta – 3 file(s) modified
Product Selector will be disabled until an order is selected. Moved js code, for Contact Us page, from custom-jquery.js to contact-us.js

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

Rev 1463 – Corrected indentation of code & removed commented code.

varun.gupta — Wed, 20 Apr 2011 03:46:26 +0530

varun.gupta – 1 file(s) modified
Corrected indentation of code & removed commented code.

~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 1462 – Removed an unnecessary semicolon which may interfere with a test

chandranshu — Tue, 19 Apr 2011 20:29:55 +0530

chandranshu – 1 file(s) modified
Removed an unnecessary semicolon which may interfere with a test

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1461 – Started echoing the ROOT dir in tomcat webapps. restored the ...

chandranshu — Tue, 19 Apr 2011 20:19:38 +0530

chandranshu – 2 file(s) modified
Started echoing the ROOT dir in tomcat webapps. restored the default value of EXPORT ENTITIES PATH

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1460 – Quantity now restricted to the upper limit of 5.(Trac ID: ...

varun.gupta — Tue, 19 Apr 2011 19:26:30 +0530

varun.gupta – 1 file(s) modified
Quantity now restricted to the upper limit of 5.(Trac ID: 130)

~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 1459 – afl barcode

ankur.singhal — Tue, 19 Apr 2011 19:25:25 +0530

ankur.singhal – 2 file(s) modified
afl barcode

+ /trunk/Support/src/main/resources/afl
+ /trunk/Support/src/main/resources/afl/barcode.TTF

Rev 1458 – changed date format to match with bluedart date format.

ankur.singhal — Tue, 19 Apr 2011 19:21:54 +0530

ankur.singhal – 1 file(s) modified
changed date format to match with bluedart date format.

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

Rev 1457 – Trying to force the build to fail

chandranshu — Tue, 19 Apr 2011 19:05:45 +0530

chandranshu – 1 file(s) modified
Trying to force the build to fail

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 1456 – Moved the in-line JavaScript code to a separate, entity.js file. ...

varun.gupta — Tue, 19 Apr 2011 18:51:11 +0530

varun.gupta – 2 file(s) modified
Moved the in-line JavaScript code to a separate, entity.js file. Shipping estimate now updating on product colour change (Trac ID: 258).

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

Rev 1455 – Printing exception stack trace as is w/o using log. there ...

chandranshu — Tue, 19 Apr 2011 18:36:48 +0530

chandranshu – 1 file(s) modified
Printing exception stack trace as is w/o using log. there is some problem with log configuration

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 1454 – Logged the exception reported, if any, while getting the export ...

chandranshu — Tue, 19 Apr 2011 18:17:38 +0530

chandranshu – 1 file(s) modified
Logged the exception reported, if any, while getting the export path

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 1453 – Started reading entities export path from the config server

chandranshu — Tue, 19 Apr 2011 18:06:29 +0530

chandranshu – 2 file(s) modified
Started reading entities export path from the config server

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1452 – Added export_entities_path as a config variable. cleaned up other configs

chandranshu — Tue, 19 Apr 2011 18:02:02 +0530

chandranshu – 3 file(s) modified
Added export_entities_path as a config variable. cleaned up other configs

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

Rev 1451 – Changes to not show mrp if selling price is same ...

vikas — Tue, 19 Apr 2011 17:51:04 +0530

vikas – 5 file(s) modified
Changes to not show mrp if selling price is same or more

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/VUI.java
~ /trunk/ContentStore/src/velocity/entity_snippet_for_categorypage.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_homepage.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_searchpage.vm
~ /trunk/ContentStore/src/velocity/product_summary.vm

Rev 1450 – New test samples for not showing price if mrp is ...

vikas — Tue, 19 Apr 2011 17:42:33 +0530

vikas – 35 file(s) modified
New test samples for not showing price if mrp is less than or equal to selling price.

~ /trunk/Website/src/test/samples/cart/test1.html
~ /trunk/Website/src/test/samples/cart/test3.html
~ /trunk/Website/src/test/samples/categorypage/test1.html
~ /trunk/Website/src/test/samples/categorypage/test24.html
~ /trunk/Website/src/test/samples/categorypage/test29.html
~ /trunk/Website/src/test/samples/categorypage/test30.html
~ /trunk/Website/src/test/samples/categorypage/test31.html
~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/login/test2.html
~ /trunk/Website/src/test/samples/login/test4.html
~ /trunk/Website/src/test/samples/login/test5.html
~ /trunk/Website/src/test/samples/myaccount/test1.html
~ /trunk/Website/src/test/samples/myaccount/test3.html
~ /trunk/Website/src/test/samples/product/test1.html
~ /trunk/Website/src/test/samples/product/test3.html
~ /trunk/Website/src/test/samples/product/test4.html
~ /trunk/Website/src/test/samples/product/test38.html
~ /trunk/Website/src/test/samples/product/test41.html
~ /trunk/Website/src/test/samples/register/test17.html
~ /trunk/Website/src/test/samples/register/test20.html
~ /trunk/Website/src/test/samples/register/test21.html
~ /trunk/Website/src/test/samples/register/test23.html
~ /trunk/Website/src/test/samples/register/test24.html
~ /trunk/Website/src/test/samples/searching/test1.html
~ /trunk/Website/src/test/samples/searching/test10.html
~ /trunk/Website/src/test/samples/shipping/test1.html
~ /trunk/Website/src/test/samples/shipping/test3.html
~ /trunk/Website/src/test/samples/shipping/test4.html
~ /trunk/Website/src/test/samples/shipping/test43.html
~ /trunk/Website/src/test/samples/shipping/test45.html
~ /trunk/Website/src/test/samples/shipping/test47.html
~ /trunk/Website/src/test/samples/shipping/test48.html
~ /trunk/Website/src/test/samples/shipping/test65.html
~ /trunk/Website/src/test/samples/shipping/test67.html
~ /trunk/Website/src/test/samples/shipping/test68.html

Rev 1449 – New static content for not showing price if mrp is ...

vikas — Tue, 19 Apr 2011 17:40:36 +0530

vikas – 49 file(s) modified
New static content for not showing price if mrp is less than or equal to selling price.

~ /trunk/Website/src/test/resources/db/catalog.sql
~ /trunk/Website/src/test/resources/static/html/entities/1000120/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000120/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000120/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000120/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000120/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000120/WidgetSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000194/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000194/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000194/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000194/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000194/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000194/WidgetSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000484/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000484/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000484/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000484/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000484/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000484/WidgetSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000495/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000495/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000495/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000495/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000495/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000495/WidgetSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000530/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000530/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000530/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000530/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000530/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000530/WidgetSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000532/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000532/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000532/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000532/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000532/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000532/WidgetSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000543/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000543/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000543/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000543/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000543/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000543/WidgetSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000546/CategorySnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000546/HomeSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000546/ProductDetail.html
~ /trunk/Website/src/test/resources/static/html/entities/1000546/SearchSnippet.html
~ /trunk/Website/src/test/resources/static/html/entities/1000546/SlideGuide.html
~ /trunk/Website/src/test/resources/static/html/entities/1000546/WidgetSnippet.html

Rev 1448 – The content within the HTML folder will be copied now ...

chandranshu — Tue, 19 Apr 2011 16:28:56 +0530

chandranshu – 1 file(s) modified
The content within the HTML folder will be copied now and not the folder itself

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1447 – Added -1 as linebreakpos to ensure that minified CSS output ...

chandranshu — Tue, 19 Apr 2011 16:03:53 +0530

chandranshu – 1 file(s) modified
Added -1 as linebreakpos to ensure that minified CSS output is on a single line

~ /trunk/Website/pom.xml

Rev 1446 – Trac ID 300 - Shipping estimate will update upon switching ...

varun.gupta — Tue, 19 Apr 2011 15:52:36 +0530

varun.gupta – 2 file(s) modified
Trac ID 300 - Shipping estimate will update upon switching the Shipping addresses

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm

Rev 1445 – old content should be deleted if it is no more ...

rajveer — Tue, 19 Apr 2011 15:23:41 +0530

rajveer – 1 file(s) modified
old content should be deleted if it is no more active

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

Rev 1444 – removed version file

rajveer — Tue, 19 Apr 2011 15:15:06 +0530

rajveer – 1 file(s) modified
removed version file

x /trunk/ContentStore/src/main/resources/content.version

Rev 1443 – Updated VUI to generate content for all updated items in ...

rajveer — Tue, 19 Apr 2011 15:14:32 +0530

rajveer – 3 file(s) modified
Updated VUI to generate content for all updated items in catalog

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/VUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/CMP.java

Rev 1442 – fix PRGDIR problem.

vikas — Tue, 19 Apr 2011 15:10:55 +0530

vikas – 1 file(s) modified
fix PRGDIR problem.

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1441 – If location is'nt serviceable, "Proceed to Payment" button will be ...

varun.gupta — Tue, 19 Apr 2011 14:48:48 +0530

varun.gupta – 1 file(s) modified
If location is'nt serviceable, "Proceed to Payment" button will be disabled.

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

Rev 1440 – Added 15s of sleep time between starting a solr service ...

chandranshu — Tue, 19 Apr 2011 14:16:35 +0530

chandranshu – 2 file(s) modified
Added 15s of sleep time between starting a solr service and posting data to it

~ /trunk/Website/pom.xml
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1439 – Added 5s sleep between starting solr and posting data to ...

chandranshu — Tue, 19 Apr 2011 13:36:59 +0530

chandranshu – 1 file(s) modified
Added 5s sleep between starting solr and posting data to it

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1438 – Added the new column to the item table. Also populated ...

chandranshu — Tue, 19 Apr 2011 13:22:11 +0530

chandranshu – 1 file(s) modified
Added the new column to the item table. Also populated data in the vendoritemmapping and vendoritempricing tables

~ /trunk/Website/src/test/resources/db/catalog.sql

Rev 1437 – Cleaned up the computation of PROJECT_DIR. Started using more global ...

chandranshu — Tue, 19 Apr 2011 12:09:34 +0530

chandranshu – 1 file(s) modified
Cleaned up the computation of PROJECT_DIR. Started using more global /home/ashish in place of ~

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1436 – Remove remote css and js references.

vikas — Mon, 18 Apr 2011 19:39:34 +0530

vikas – 4 file(s) modified
Remove remote css and js references.

~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.vm
~ /trunk/Website/src/test/samples/myaccount/test7.html
~ /trunk/Website/src/test/samples/register/test1.html

Rev 1435 – Removed outdated and unused imports

chandranshu — Mon, 18 Apr 2011 15:59:19 +0530

chandranshu – 9 file(s) modified
Removed outdated and unused imports

~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/AddressHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/AllOrderListHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/BilledOrderListHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/ShipOrderHandler.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/handler/ShippedOrderListHandler.java

Rev 1434 – Removed duplicate dependency declaration

chandranshu — Mon, 18 Apr 2011 15:48:15 +0530

chandranshu – 1 file(s) modified
Removed duplicate dependency declaration

~ /trunk/Support/pom.xml

Rev 1433 – scripts modified to update afl locations. There was slight difference ...

ankur.singhal — Mon, 18 Apr 2011 15:36:22 +0530

ankur.singhal – 2 file(s) modified
scripts modified to update afl locations. There was slight difference in excel format.

~ /trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/WarehouseAllocationLoader.py

Rev 1432 – AFL serviceable locations sheet.

ankur.singhal — Mon, 18 Apr 2011 15:33:20 +0530

ankur.singhal – 2 file(s) modified
AFL serviceable locations sheet.

+ /trunk/PyProj/src/samplesheets/AFLServiceableLocations.xls
+ /trunk/PyProj/src/samplesheets/AFLWarehouseAllocations.xls