Download as
Browse Code »

Commit 0b0c001cf5e24a31c55813324d7e1bb47f45d180

Authored by Daniela Feitosa
Committed by Rodrigo Souto
1 parent 837d754a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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