SmartDukaan – /

Rev 3185 – Save session id in cookie as now mutilple tomcats are ...

vikas — Mon, 05 Sep 2011 14:25:17 +0530

vikas – 18 file(s) modified
Save session id in cookie as now mutilple tomcats are running. This generates diff session id for each req.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 3184 – Trim the source to 500 chars.

vikas — Mon, 05 Sep 2011 14:22:24 +0530

vikas – 1 file(s) modified
Trim the source to 500 chars.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java

Rev 3183 – Updated client to give exception when we dont have correct ...

rajveer — Mon, 05 Sep 2011 14:14:35 +0530

rajveer – 2 file(s) modified
Updated client to give exception when we dont have correct port in config server

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/GenericClient.java
~ /trunk/PyProj/src/shop2020/clients/GenericClient.py

Rev 3182 – Added logos for banks, cash cards and Visa electron debit ...

chandranshu — Mon, 05 Sep 2011 14:06:55 +0530

chandranshu – 6 file(s) modified
Added logos for banks, cash cards and Visa electron debit cards. Also corrected the labels for GA.

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
+ /trunk/Website/src/main/webapp/images/banks-sprite.gif
+ /trunk/Website/src/main/webapp/images/cash-cards.gif
+ /trunk/Website/src/main/webapp/images/cc-logos-1.gif
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3181 – Corrected options parsing.

rajveer — Mon, 05 Sep 2011 13:13:06 +0530

rajveer – 1 file(s) modified
Corrected options parsing.

~ /trunk/PyProj/src/shop2020/config/ConfigServer.py

Rev 3180 – Corrected the coupon rule to take all items in the ...

chandranshu — Mon, 05 Sep 2011 12:48:31 +0530

chandranshu – 1 file(s) modified
Corrected the coupon rule to take all items in the cart into account

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

Rev 3179 – Updated test config server starting script

rajveer — Mon, 05 Sep 2011 12:24:20 +0530

rajveer – 2 file(s) modified
Updated test config server starting script

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 3178 – Price of Desire S modified

varun.gupta — Mon, 05 Sep 2011 12:05:38 +0530

varun.gupta – 1 file(s) modified
Price of Desire S modified

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 3177 – Prices for selected HTC models updated

varun.gupta — Mon, 05 Sep 2011 05:31:18 +0530

varun.gupta – 1 file(s) modified
Prices for selected HTC models updated

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 3176 – Sprited the images in the payment modes widget

chandranshu — Fri, 02 Sep 2011 17:37:23 +0530

chandranshu – 6 file(s) modified
Sprited the images in the payment modes widget

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/paymentmodes.vm
+ /trunk/Website/src/main/webapp/css/payment-modes.css
+ /trunk/Website/src/main/webapp/images/cod-netbank.gif
+ /trunk/Website/src/main/webapp/images/payment-modes-sprite.gif

Rev 3175 – Resized the images correctly

chandranshu — Fri, 02 Sep 2011 15:06:21 +0530

chandranshu – 2 file(s) modified
Resized the images correctly

~ /trunk/Website/src/main/webapp/images/cod.jpg
~ /trunk/Website/src/main/webapp/images/netbanking.gif

Rev 3174 – Added COD to the payment modes widget. resized all the ...

chandranshu — Fri, 02 Sep 2011 15:04:48 +0530

chandranshu – 8 file(s) modified
Added COD to the payment modes widget. resized all the images

~ /trunk/Website/src/main/resources/templates/paymentmodes.vm
+ /trunk/Website/src/main/webapp/images/cod.jpg
~ /trunk/Website/src/main/webapp/images/maestro.png
~ /trunk/Website/src/main/webapp/images/mastercard.png
~ /trunk/Website/src/main/webapp/images/mastercard_securecode.gif
~ /trunk/Website/src/main/webapp/images/visa-electron.png
~ /trunk/Website/src/main/webapp/images/visa-verified.jpg
~ /trunk/Website/src/main/webapp/images/visa.png

Rev 3173 – Changed parameter names from min-price to minPrice

rajveer — Fri, 02 Sep 2011 14:56:51 +0530

rajveer – 5 file(s) modified
Changed parameter names from min-price to minPrice

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
~ /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/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/js/priceSlider.js

Rev 3172 – Limit the source string to 500 chars as restricted by ...

vikas — Fri, 02 Sep 2011 13:58:35 +0530

vikas – 1 file(s) modified
Limit the source string to 500 chars as restricted by GAE.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java

Rev 3171 – Invalid coupon code exception message corrected.

rajveer — Fri, 02 Sep 2011 13:52:15 +0530

rajveer – 1 file(s) modified
Invalid coupon code exception message corrected.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java

Rev 3170 – Added more machine configurations in config file.

rajveer — Fri, 02 Sep 2011 13:40:07 +0530

rajveer – 1 file(s) modified
Added more machine configurations in config file.

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

Rev 3169 – Get the sublist from the latest arrivals before reading the ...

chandranshu — Fri, 02 Sep 2011 12:44:35 +0530

chandranshu – 1 file(s) modified
Get the sublist from the latest arrivals before reading the snippets

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java

Rev 3168 – Trac#488 Updating the thrift file for optional fields Made relevant ...

mandeep.dhir — Fri, 02 Sep 2011 12:37:48 +0530

mandeep.dhir – 13 file(s) modified
Trac#488 Updating the thrift file for optional fields
Made relevant changes to velocity templates to use isset* methods from thrift model objects

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3167 – Update svn revision on both prod servers

rajveer — Fri, 02 Sep 2011 12:03:56 +0530

rajveer – 1 file(s) modified
Update svn revision on both prod servers

~ /trunk/runutils/copy-wars-to-production.sh

Rev 3166 – Added authorized payments to the payment details report

chandranshu — Fri, 02 Sep 2011 11:03:56 +0530

chandranshu – 1 file(s) modified
Added authorized payments to the payment details report

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

Rev 3165 – Used new constructors for service clients

chandranshu — Fri, 02 Sep 2011 10:53:31 +0530

chandranshu – 1 file(s) modified
Used new constructors for service clients

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 3164 – Added the description of the COD payment method

chandranshu — Fri, 02 Sep 2011 10:52:48 +0530

chandranshu – 3 file(s) modified
Added the description of the COD payment method

~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 3163 – Added logos of credit and debit cards

chandranshu — Fri, 02 Sep 2011 10:50:57 +0530

chandranshu – 3 file(s) modified
Added logos of credit and debit cards

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
+ /trunk/Website/src/main/webapp/images/cc_logos.gif
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 3162 – Removed a hyphen

chandranshu — Thu, 01 Sep 2011 19:02:25 +0530

chandranshu – 1 file(s) modified
Removed a hyphen

~ /trunk/runutils/start-config-service.sh

Rev 3161 – Corrected path in config server and config start sctipt

rajveer — Thu, 01 Sep 2011 18:49:34 +0530

rajveer – 2 file(s) modified
Corrected path in config server and config start sctipt

~ /trunk/PyProj/src/shop2020/config/ConfigServer.py
~ /trunk/runutils/start-config-service.sh

Rev 3160 – Run config server from same directory

rajveer — Thu, 01 Sep 2011 18:22:01 +0530

rajveer – 1 file(s) modified
Run config server from same directory

~ /trunk/PyProj/src/shop2020/config/ConfigServer.py

Rev 3159 – Redirected the standard and error output to a file

chandranshu — Thu, 01 Sep 2011 18:06:48 +0530

chandranshu – 1 file(s) modified
Redirected the standard and error output to a file

~ /trunk/runutils/start-solr-service.sh

Rev 3158 – Corrected the location of start.jar

chandranshu — Thu, 01 Sep 2011 18:03:36 +0530

chandranshu – 1 file(s) modified
Corrected the location of start.jar

~ /trunk/runutils/start-solr-service.sh

Rev 3157 – Added a script to start the solr service

chandranshu — Thu, 01 Sep 2011 18:01:30 +0530

chandranshu – 1 file(s) modified
Added a script to start the solr service

+ /trunk/runutils/start-solr-service.sh

Rev 3156 – Trac#488 Ignoring test cases for now

mandeep.dhir — Thu, 01 Sep 2011 17:41:51 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Ignoring test cases for now

~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/ActivityHandlerTest.java

Rev 3155 – Trac#488 Excluding slf4j readonly jars.

mandeep.dhir — Thu, 01 Sep 2011 17:22:30 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Excluding slf4j *readonly* jars.

~ /trunk/CRMService/pom.xml

Rev 3154 – We need a only a catalog Id to Name map ...

vikas — Thu, 01 Sep 2011 17:19:51 +0530

vikas – 1 file(s) modified
We need a only a catalog Id to Name map here.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp

Rev 3153 – Trac#488 Moved away from readonly jars except for thrift jar.

mandeep.dhir — Thu, 01 Sep 2011 17:13:18 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Moved away from *readonly* jars except for thrift jar.

~ /trunk/CRMService/pom.xml

Rev 3152 – Changed the log file location

chandranshu — Thu, 01 Sep 2011 17:01:17 +0530

chandranshu – 1 file(s) modified
Changed the log file location

~ /trunk/runutils/run-crm-service.sh

Rev 3151 – Trac#488 Added a ajax-loading image

mandeep.dhir — Thu, 01 Sep 2011 15:18:01 +0530

mandeep.dhir – 7 file(s) modified
Trac#488 Added a ajax-loading image

~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/images/ajax-loader.gif
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm

Rev 3150 – Memorize method to get the provider for COD and prepaid.

rajveer — Thu, 01 Sep 2011 15:07:29 +0530

rajveer – 1 file(s) modified
Memorize method to get the provider for COD and prepaid.

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

Rev 3149 – Do not send the amount of transaction to adohana.

vikas — Thu, 01 Sep 2011 15:00:33 +0530

vikas – 1 file(s) modified
Do not send the amount of transaction to adohana.

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

Rev 3148 – Proper HIT and MISS messages.

rajveer — Thu, 01 Sep 2011 14:56:09 +0530

rajveer – 1 file(s) modified
Proper HIT and MISS messages.

~ /trunk/PyProj/src/shop2020/utils/caching/SimpleCaching.py

Rev 3147 – Added support to deploy website on the 2nd production server ...

chandranshu — Thu, 01 Sep 2011 14:53:39 +0530

chandranshu – 4 file(s) modified
Added support to deploy website on the 2nd production server as well

~ /trunk/runutils/copy-wars-to-production.sh
~ /trunk/runutils/generate-content-from-catalog.sh
+ /trunk/runutils/update-content-and-catalog.sh
~ /trunk/runutils/update-content.sh

Rev 3146 – Ensured that the war is also copied to the second ...

chandranshu — Thu, 01 Sep 2011 14:41:44 +0530

chandranshu – 1 file(s) modified
Ensured that the war is also copied to the second production server