Download as
Browse Code »

Commit 0b0c001cf5e24a31c55813324d7e1bb47f45d180

Authored by Daniela Feitosa
Committed by Rodrigo Souto
1 parent 837d754a
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Replacing methods used on mailer 

Also added cursor:pointer on form's button

(ActionItem1970)
Showing 2 changed files with 8 additions and 4 deletions   Show diff stats
plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
  Diff comments   View file @0b0c001
@@ -5,9 +5,9 @@ class ShoppingCartPlugin::Mailer < ActionMailer::Base @@ -5,9 +5,9 @@ class ShoppingCartPlugin::Mailer < ActionMailer::Base
5 prepend_view_path(ShoppingCartPlugin.root_path+'/views') 5 prepend_view_path(ShoppingCartPlugin.root_path+'/views')
6 6
7 def customer_notification(customer, supplier, items) 7 def customer_notification(customer, supplier, items)
8 - domain = supplier.domains.first || supplier.environment.domains.first 8 + domain = supplier.hostname || supplier.environment.default_hostname
9 recipients customer[:email] 9 recipients customer[:email]
10 - from 'no-reply@' + domain.name 10 + from 'no-reply@' + domain
11 reply_to supplier.contact_email 11 reply_to supplier.contact_email
12 subject _("[%s] Your buy request was performed successfully.") % supplier[:name] 12 subject _("[%s] Your buy request was performed successfully.") % supplier[:name]
13 content_type 'text/html' 13 content_type 'text/html'
@@ -18,9 +18,9 @@ class ShoppingCartPlugin::Mailer < ActionMailer::Base @@ -18,9 +18,9 @@ class ShoppingCartPlugin::Mailer < ActionMailer::Base
18 end 18 end
19 19
20 def supplier_notification(customer, supplier, items) 20 def supplier_notification(customer, supplier, items)
21 - domain = supplier.environment.domains.first 21 + domain = supplier.environment.default_hostname
22 recipients supplier.contact_email 22 recipients supplier.contact_email
23 - from 'no-reply@' + domain.name 23 + from 'no-reply@' + domain
24 reply_to customer[:email] 24 reply_to customer[:email]
25 subject _("[%s] You have a new buy request from %s.") % [supplier.environment.name, customer[:name]] 25 subject _("[%s] You have a new buy request from %s.") % [supplier.environment.name, customer[:name]]
26 content_type 'text/html' 26 content_type 'text/html'
plugins/shopping_cart/public/style.css
  Diff comments   View file @0b0c001
@@ -143,6 +143,10 @@ @@ -143,6 +143,10 @@
143 text-align: center; 143 text-align: center;
144 } 144 }
145 145
  146 +#cart-form-actions .submit {
  147 + cursor: pointer;
  148 +}
  149 +
146 #cart-items-table { 150 #cart-items-table {
147 margin-left: 285px; 151 margin-left: 285px;
148 width: 400px 152 width: 400px