raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing nothing special text and patching change password form slightly more

Browse Source
This commit is contained in:
Will Marshall
2014-04-07 14:46:48 +10:00
parent a73b714d9e
commit 8a45b6c012
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/shop/checkout_controller.rb
View File

@@ -30,7 +30,6 @@ class Shop::CheckoutController < Spree::CheckoutController
if @order.state == "complete" || @order.completed?
flash.notice = t(:order_processed_successfully)
flash[:commerce_tracking] = "nothing special"
respond_with(@order, :location => order_path(@order))
else
clear_ship_address

31
app/views/user_passwords/edit.html.haml
View File

@@ -1,15 +1,16 @@
.row
= f_form_for @spree_user, :as => :spree_user, :url => spree.spree_user_password_path, :method => :put do |f|
= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user }
%fieldset
%legend= t(:change_my_password)
.row
.large-12.columns
= f.password_field :password
.row
.large-12.columns
= f.password_field :password_confirmation
= f.hidden_field :reset_password_token
.row
.large-12.columns
= f.submit t(:update_password), :class => 'button primary'
= f_form_for @spree_user, :as => :spree_user, :url => spree.spree_user_password_path, :method => :put do |f|
= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user }
%fieldset
.row
.small-12.medium-6.large-4.columns.medium-centered.large-centered
%legend= t(:change_my_password)
.row
.small-12.medium-6.large-4.columns.medium-centered.large-centered
= f.password_field :password
.row
.small-12.medium-6.large-4.columns.medium-centered.large-centered
= f.password_field :password_confirmation
= f.hidden_field :reset_password_token
.row
.small-10.medium-6.large-4.columns.small-centered
= f.submit t(:update_password), :class => 'button primary'