SmartDukaan – /

Rev 1491 – Add getUserByEmaill in userservice.

vikas — Thu, 21 Apr 2011 16:00:01 +0530

vikas – 6 file(s) modified
Add getUserByEmaill in userservice.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.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

Rev 1490 – Ensured that ie7.css and ie8.css are also downloaded using the ...

chandranshu — Thu, 21 Apr 2011 15:34:56 +0530

chandranshu – 1 file(s) modified
Ensured that ie7.css and ie8.css are also downloaded using the right URLs

~ /trunk/Website/src/production/resources/templates/commoncssfiles.vm

Rev 1489 – Added support to use different hostnames while building for different ...

chandranshu — Thu, 21 Apr 2011 14:56:47 +0530

chandranshu – 3 file(s) modified
Added support to use different hostnames while building for different environments

~ /trunk/Website/pom.xml
~ /trunk/Website/src/production/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/production/resources/templates/commonjsfiles.vm

Rev 1488 – Workbench for jmeter.

vikas — Thu, 21 Apr 2011 14:53:53 +0530

vikas – 1 file(s) modified
Workbench for jmeter.

+ /trunk/Website/src/test/jmeter/WorkBench.jmx

Rev 1487 – Added a profile to minify CSS and JS and modify ...

chandranshu — Thu, 21 Apr 2011 12:58:59 +0530

chandranshu – 1 file(s) modified
Added a profile to minify CSS and JS and modify commoncssfiles and commonjsfiles to link to the minified files

~ /trunk/Website/pom.xml

Rev 1486 – Correctly renamed the dev folder to be production

chandranshu — Thu, 21 Apr 2011 12:02:28 +0530

chandranshu – 2 file(s) modified
Correctly renamed the dev folder to be production

x /trunk/Website/src/dev
+ /trunk/Website/src/production (copied from /trunk/Website/src/dev@1484)

Rev 1485 – hyphen added to skin image

rajveer — Thu, 21 Apr 2011 12:01:44 +0530

rajveer – 1 file(s) modified
hyphen added to skin image

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

Rev 1484 – Changed the default resources to use separate CSS and JS ...

chandranshu — Thu, 21 Apr 2011 11:58:12 +0530

chandranshu – 4 file(s) modified
Changed the default resources to use separate CSS and JS files

~ /trunk/Website/src/dev/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/dev/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1483 – Logic for selecting cancellable orders modified in get_cancellable_orders_for_customer()

varun.gupta — Thu, 21 Apr 2011 11:38:17 +0530

varun.gupta – 1 file(s) modified
Logic for selecting cancellable orders modified in get_cancellable_orders_for_customer()

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

Rev 1482 – Different css and js configuration for development environment

chandranshu — Thu, 21 Apr 2011 11:22:37 +0530

chandranshu – 5 file(s) modified
Different css and js configuration for development environment

+ /trunk/Website/src/dev
+ /trunk/Website/src/dev/resources
+ /trunk/Website/src/dev/resources/templates
+ /trunk/Website/src/dev/resources/templates/commoncssfiles.vm
+ /trunk/Website/src/dev/resources/templates/commonjsfiles.vm

Rev 1481 – In case user doesn't have relevant orders, the communication type ...

varun.gupta — Thu, 21 Apr 2011 08:51:45 +0530

varun.gupta – 2 file(s) modified
In case user doesn't have relevant orders, the communication type will be disabled.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/webapp/js/contact-us.js

Rev 1480 – Updated footer links

rajveer — Wed, 20 Apr 2011 21:24:37 +0530

rajveer – 1 file(s) modified
Updated footer links

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

Rev 1479 – reconciliation of undelivered reports done till last midnight instead of ...

ankur.singhal — Wed, 20 Apr 2011 18:57:27 +0530

ankur.singhal – 1 file(s) modified
reconciliation of undelivered reports done till last midnight instead of current time as courier company would have sent the records updated till midnight.

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

Rev 1478 – Fixed the spacing issue

rajveer — Wed, 20 Apr 2011 18:39:05 +0530

rajveer – 1 file(s) modified
Fixed the spacing issue

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

Rev 1477 – updated category to show pagination at bottom also

rajveer — Wed, 20 Apr 2011 18:18:10 +0530

rajveer – 1 file(s) modified
updated category to show pagination at bottom also

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

Rev 1476 – changed the main method ---- invoice printing in user home ...

ankur.singhal — Wed, 20 Apr 2011 17:54:33 +0530

ankur.singhal – 1 file(s) modified
changed the main method ---- invoice printing in user home directory.

~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java

Rev 1475 – Removed unnecessary sysouts from the Utils class

chandranshu — Wed, 20 Apr 2011 15:51:34 +0530

chandranshu – 2 file(s) modified
Removed unnecessary sysouts from the Utils class

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

Rev 1474 – Added capability of incremental updates as well as regeneration of ...

rajveer — Wed, 20 Apr 2011 15:10:50 +0530

rajveer – 1 file(s) modified
Added capability of incremental updates as well as regeneration of all content

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

Rev 1473 – Removed spacing from velocity files

rajveer — Wed, 20 Apr 2011 15:06:57 +0530

rajveer – 5 file(s) modified
Removed spacing from velocity files

~ /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/entity_snippet_for_widget.vm
~ /trunk/ContentStore/src/velocity/slideguide_img_video.vm

Rev 1472 – Added all mobile and all accessories pages and modified their ...

rajveer — Wed, 20 Apr 2011 15:05:43 +0530

rajveer – 4 file(s) modified
Added all mobile and all accessories pages and modified their titles. Pagination added below the content also in category page

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/resources/templates/mainmenu.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

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