spree_frontend 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4620d155a39c6395e1fc0c3783d5d07e72b9b1a2
-  data.tar.gz: 4492bb79bf2fe1ecc1ab34b4af769dc3e52f24b2
+  metadata.gz: d7412331db6132df41984568e7e0f570dfdfa161
+  data.tar.gz: a25f129f8b1ba8c7a49f05525814d013b7ad19bc
 SHA512:
-  metadata.gz: fd5395dfc6401d5f6f1865abc2f2b95419d97dc71d57934256bff116bac1b15b21b7e3c44b73a9ab3b8bb267ca542621bd6ccfad7e5c549a03fc5cb1d19317cc
-  data.tar.gz: 6b6a3a89944d2ab4efe406e1edf8039cd872a9af5e35f484964c73e4154466dcade27c1e78fc610779d8732fc13db8557c9184844f7835afb14cbc765a9d7331
+  metadata.gz: a6233061c39a311f8c8dc115ed81ed95413201617f1fa308187a512f559e36df2bce6b56cefd8d1a34a5e5a31a097e626cd3b55dedfa87f45e0149841d801842
+  data.tar.gz: 7c0a9463e53495a6565f8cc5e27c74b791263b374b199c250c3c43da5563f8c8284b99b59c676b1aef4a9a8bd8a27cfdae95bfda159eebbacbdbe968a072ac65

data/app/controllers/spree/checkout_controller.rb

@@ -26,7 +26,7 @@ module Spree
     # Updates the order and advances to the next state (when possible.)
     def update
       if @order.update_from_params(params, permitted_checkout_attributes, request.headers.env)
-        persist_user_address
+        @order.temporary_address = !params[:save_user_address]
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
           redirect_to checkout_state_path(@order.state) and return
@@ -35,7 +35,7 @@ module Spree
         if @order.completed?
           @current_order = nil
           flash.notice = Spree.t(:order_processed_successfully)
-          flash[:order_completed] = true
+          flash['order_completed'] = true
           redirect_to completion_route
         else
           redirect_to checkout_state_path(@order.state)
@@ -106,14 +106,11 @@ module Spree
         send(method_name) if respond_to?(method_name, true)
       end
 
-      # 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(try_spree_current_user, "bill")
-
-        if @order.checkout_steps.include? "delivery"
-          @order.ship_address ||= Address.default(try_spree_current_user, "ship")
-        end
+        # if the user has a default address, a callback takes care of setting
+        # that; but if he doesn't, we need to build an empty one here
+        @order.bill_address ||= Address.build_default
+        @order.ship_address ||= Address.build_default if @order.checkout_steps.include?('delivery')
       end
 
       def before_delivery
@@ -146,13 +143,5 @@ module Spree
       def check_authorization
         authorize!(:edit, current_order, cookies.signed[:guest_token])
       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

@@ -37,23 +37,19 @@ module Spree
     def edit
       @order = current_order || Order.new
       associate_user
-      if stale?(current_order)
-        respond_with(current_order)
-      end
     end
 
     # Adds a new item to the order (creating a new order if none already exists)
     def populate
       populator = Spree::OrderPopulator.new(current_order(create_order_if_necessary: true), current_currency)
-      if populator.populate(params[:variant_id], params[:quantity])
-        current_order.ensure_updated_shipments
 
+      if populator.populate(params[:variant_id], params[:quantity])
         respond_with(@order) do |format|
           format.html { redirect_to cart_path }
         end
       else
         flash[:error] = populator.errors.full_messages.join(" ")
-        redirect_to :back
+        redirect_back_or_default(spree.root_path)
       end
     end
 

data/app/views/spree/products/_cart_form.html.erb

@@ -7,7 +7,7 @@
         <ul>
           <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
             <li>
-              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => Spree::Money.new(variant.price, currency: current_currency, with_currency: true).to_s  %>
+              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).money  %>
               <%= label_tag "variant_id_#{ variant.id }" do %>
                 <span class="variant-description">
                   <%= variant_options variant %>

data/app/views/spree/shared/_google_analytics.html.erb

@@ -6,9 +6,10 @@
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
     ga('create', '<%= tracker.analytics_id %>','<%= current_store.url.sub(/(^www.)?/,'') %>');
+    ga('require', 'displayfeatures');
     ga('send', 'pageview');
 
-    <% if order_just_completed?(@order) %>
+    <% if @order && order_just_completed?(@order) %>
       <%# more info: https://developers.google.com/analytics/devguides/collection/analyticsjs/ecommerce %>
       ga('require', 'ecommerce', 'ecommerce.js');
       ga('ecommerce:addTransaction', {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency