spree_frontend 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8785a3b87576e5eebb362cc98645fe59ff04f75
-  data.tar.gz: 902320408c1675e84484a8e877a7054835dda0d6
+  metadata.gz: 76ad79bf5596bc669d0bfcb35c08f53f6495c697
+  data.tar.gz: 3edd749c386d6b285cb46ce55f89ff2a4b7164fe
 SHA512:
-  metadata.gz: 8430cf436239009f9b98b3869164e384c23eacb730d205f5f212e3d790a97c1266a713282d67bbf3eb9536e7dbf8555941a296b8d25af92f238aa4dcd4a8d81b
-  data.tar.gz: bd0ad3e7f55e94dfdaa6e9b48130708c693be975db8a9a10d1b3c403e60be4fb653e09d85b51e166adc760d04a6b56a53672eb0e3f90ebb567993de7b21fe8bf
+  metadata.gz: 631a9178b740d3685ef96490f71442af33c423e0e744a1bffb1e5144b79170e8357731ed791e8b9f9c367b91c6c9c8b5438013bb08c421e8e1fa612899271f68
+  data.tar.gz: e7c5f2f4fe847578c616662531e2b3b3346061aa65a7d8062c27598fa69a9ec529feff2dcaf3e5bf891e49cd001d9f41b58b420efbbc25d250828baf2f057564

data/app/assets/stylesheets/store/screen.css.scss

@@ -1,4 +1,4 @@
-@import 'variables';
+@import 'store/variables';
 
 /*--------------------------------------*/
 /* Basic styles

data/app/controllers/spree/checkout_controller.rb

@@ -26,6 +26,8 @@ module Spree
     # Updates the order and advances to the next state (when possible.)
     def update
       if @order.update_attributes(object_params)
+        persist_user_address
+
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
           redirect_to checkout_state_path(@order.state) and return
@@ -53,6 +55,13 @@ module Spree
             redirect_to checkout_state_path(@order.checkout_steps.first)
           end
         end
+
+        # Fix for #4117
+        # If confirmation of payment fails, redirect back to payment screen
+        if params[:state] == "confirm" && @order.payment_required? && @order.payments.valid.empty?
+          flash.keep
+          redirect_to checkout_state_path("payment")
+        end
       end
 
       # Should be overriden if you have areas of your checkout that don't match
@@ -127,10 +136,10 @@ module Spree
       # Skip setting ship address if order doesn't have a delivery checkout step
       # to avoid triggering validations on shipping address
       def before_address
-        @order.bill_address ||= Address.default
+        @order.bill_address ||= Address.default(try_spree_current_user, "bill")
 
         if @order.checkout_steps.include? "delivery"
-          @order.ship_address ||= Address.default
+          @order.ship_address ||= Address.default(try_spree_current_user, "ship")
         end
       end
 
@@ -152,7 +161,7 @@ module Spree
       end
 
       def rescue_from_spree_gateway_error(exception)
-        flash[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
+        flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
         @order.errors.add(:base, exception.message)
         render :edit
       end
@@ -169,10 +178,19 @@ module Spree
           if coupon_result[:coupon_applied?]
             flash[:success] = coupon_result[:success] if coupon_result[:success].present?
           else
-            flash[:error] = coupon_result[:error]
+            flash.now[:error] = coupon_result[:error]
             respond_with(@order) { |format| format.html { render :edit } } and return
           end
         end
       end
+
+      def persist_user_address
+        if @order.checkout_steps.include? "address"
+          if @order.address? && try_spree_current_user.respond_to?(:persist_order_address)
+            try_spree_current_user.persist_order_address(@order) if params[:save_user_address]
+          end
+        end
+      end
+
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -29,7 +29,7 @@ module Spree
         respond_with(@order) do |format|
           format.html do
             if params.has_key?(:checkout)
-              @order.next_transition.run_callbacks if @order.cart?
+              @order.next if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             else
               redirect_to cart_path
@@ -43,7 +43,7 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order(true)
+      @order = current_order || Order.new
       associate_user
     end
 
@@ -73,7 +73,11 @@ module Spree
     end
 
     def accurate_title
-      @order && @order.completed? ? "#{Spree.t(:order)} #{@order.number}" : Spree.t(:shopping_cart)
+      if @order && @order.completed?
+        Spree.t(:order_number, :number => @order.number)
+      else
+        Spree.t(:shopping_cart)
+      end
     end
 
     def check_authorization
@@ -103,7 +107,7 @@ module Spree
           flash[:success] = coupon_result[:success] if coupon_result[:success].present?
           return false
         else
-          flash[:error] = coupon_result[:error]
+          flash.now[:error] = coupon_result[:error]
           respond_with(@order) { |format| format.html { render :edit } }
           return true
         end

data/app/views/spree/checkout/_address.html.erb

@@ -22,4 +22,9 @@
 <hr class="clear" />
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag Spree.t(:save_and_continue), :class => 'continue button primary' %>
+  <span data-hook="save_user_address">
+    &nbsp; &nbsp;
+    <%= check_box_tag 'save_user_address', '1', try_spree_current_user.respond_to?(:persist_order_address) %>
+    <%= label_tag :save_user_address, Spree.t(:save_my_address) %>
+  </span>
 </div>

data/app/views/spree/checkout/_confirm.html.erb

@@ -1,6 +1,6 @@
 <fieldset id="order_details" data-hook>
   <div class="clear"></div>
-  <legend align="center"><%= Spree.t(@order.state, :scope => :order_state).titleize %></legend>
+  <legend align="center"><%= Spree.t(:confirm) %></legend>
   <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
 </fieldset>
 

data/app/views/spree/checkout/_delivery.html.erb

@@ -37,7 +37,7 @@
 
           <h5 class="stock-shipping-method-title"><%= Spree.t(:shipping_method) %></h5>
           <ul class="field radios shipping-methods">
-            <% ship_form.object.shipping_rates.frontend.each do |rate| %>
+            <% ship_form.object.shipping_rates.with_shipping_method.each do |rate| %>
               <li class="shipping-method">
                 <label>
                   <%= ship_form.radio_button :selected_shipping_rate_id, rate.id %>
@@ -51,7 +51,7 @@
 
       <% end %>
 
-      <% if @differentiator.missing? %>
+      <% if @differentiator.try(:missing?) %>
         <div class="shipment unshippable">
           <h3 class="stock-location" data-hook="stock-location">
             <%= Spree.t(:unshippable_items) %>

data/app/views/spree/checkout/_payment.html.erb

@@ -1,14 +1,16 @@
 <fieldset id="payment" data-hook>
   <legend align="center"><%= Spree.t(:payment_information) %></legend>
   <div data-hook="checkout_payment_step">
-    <% @order.available_payment_methods.each do |method| %>
-    <p>
-      <label>
-        <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods.first %>
-        <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
-      </label>
-    </p>
-    <% end %>
+    <div id="payment-method-fields" data-hook>
+      <% @order.available_payment_methods.each do |method| %>
+      <p>
+        <label>
+          <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods.first %>
+          <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
+        </label>
+      </p>
+      <% end %>
+    </div>
 
     <ul id="payment-methods" data-hook>
       <% @order.available_payment_methods.each do |method| %>

data/app/views/spree/checkout/_summary.html.erb

@@ -17,11 +17,11 @@
     </tbody>
     <tr data-hook="order_total">
       <td><strong><%= Spree.t(:order_total) %>:</strong></td>
-      <td><strong><span id='summary-order-total'><%= @order.display_total.to_html %></span></strong></td>
+      <td><strong><span id='summary-order-total'><%= order.display_total.to_html %></span></strong></td>
     </tr>
     <% if order.line_item_adjustment_totals.present? %>
       <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
-        <% @order.line_item_adjustment_totals.each do |label, total| %>
+        <% order.line_item_adjustment_totals.each do |label, total| %>
           <tr class="total">
             <td><strong><%= label %></strong></td>
             <td><strong><span><%= total.to_html %></span></strong></td>

data/app/views/spree/checkout/edit.html.erb

@@ -28,5 +28,5 @@
 </div>
 
 <% if I18n.locale != :en %>
-  <script src='/assets/jquery.validate/localization/messages_<%= I18n.locale %>.js'></script>
+  <script src="<%= assets_prefix %>/jquery.validate/localization/messages_<%= I18n.locale %>.js"></script>
 <% end %>

data/app/views/spree/layouts/spree_application.html.erb

@@ -19,7 +19,7 @@
 
         <%= render :partial => 'spree/shared/sidebar' if content_for? :sidebar %>
 
-        <div id="content" class="columns <%= !content_for?(:sidebar) ? "sixteen" : "twelve" %>" data-hook>
+        <div id="content" class="columns <%= !content_for?(:sidebar) ? "sixteen" : "twelve omega" %>" data-hook>
           <%= flash_messages %>
           <%= yield %>
         </div>

data/app/views/spree/orders/edit.html.erb

@@ -1,22 +1,22 @@
 <% @body_id = 'cart' %>
+<div data-hook="cart_container">
+  <h1><%= Spree.t(:shopping_cart) %></h1>
 
-<h1><%= Spree.t(:shopping_cart) %></h1>
+  <% if @order.line_items.empty? %>
 
-<% if @order.line_items.empty? %>
+    <div data-hook="empty_cart">
+      <p><%= Spree.t(:your_cart_is_empty) %></p>
+      <p><%= link_to Spree.t(:continue_shopping), products_path, :class => 'button continue' %></p>
+    </div>
 
-  <div data-hook="empty_cart">
-    <p><%= Spree.t(:your_cart_is_empty) %></p>
-    <p><%= link_to Spree.t(:continue_shopping), products_path, :class => 'button continue' %></p>
-  </div>
-
-<% else %>
-  <div data-hook="outside_cart_form">
+  <% else %>
+    <div data-hook="outside_cart_form">
     <%= form_for @order, :url => update_cart_path, :html => {:id => 'update-cart'} do |order_form| %>
       <div data-hook="inside_cart_form">
 
-        <div data-hook="cart_items">
-          <%= render :partial => 'form', :locals => { :order_form => order_form } %>
-        </div>
+      <div data-hook="cart_items">
+        <%= render :partial => 'form', :locals => { :order_form => order_form } %>
+      </div>
 
         <div id="subtotal" data-hook class="columns sixteen alpha omega">
           <h5><%= Spree.t(:subtotal) %>: <span class="order-total"><%= @order.display_total.to_html %></span></h5>
@@ -32,8 +32,8 @@
           <% end %>
         </div>
       </div>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 
   <div id="empty-cart" data-hook>
     <%= form_tag empty_cart_path, :method => :put do %>
@@ -45,4 +45,5 @@
     <% end %>
   </div>
 
-<% end %>
+  <% end %>
+</div>

data/app/views/spree/orders/show.html.erb

@@ -1,5 +1,5 @@
 <fieldset id="order_summary" data-hook>
-  <legend align="center"><%= Spree.t(:order) + " #" + @order.number %></legend>
+  <legend><%= Spree.t(:order_number, :number => @order.number) %></legend>
   <h1><%= accurate_title %></h1>
 
   <div id="order" data-hook>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,96 +16,96 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: capybara-accessible
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Required dependency for Spree
@@ -210,9 +210,9 @@ files:
 - config/initializers/rails_5868.rb
 - config/initializers/spree.rb
 - config/routes.rb
+- lib/spree/frontend.rb
 - lib/spree/frontend/engine.rb
 - lib/spree/frontend/middleware/seo_assist.rb
-- lib/spree/frontend.rb
 - lib/spree_frontend.rb
 - lib/tasks/rake_util.rb
 - lib/tasks/taxon.rake
@@ -518,18 +518,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.1.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.