spree_frontend 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4de87e043800f121326d03ee2f4505f2cac7cba
-  data.tar.gz: 0033ae9ddaf67d6e00101df373814f8836439217
+  metadata.gz: 720de19081a15e84f769e40a110468b72a3e1aca
+  data.tar.gz: 408a70061fb1e16df28c76643ec3ce3ee7ffcadc
 SHA512:
-  metadata.gz: ac65662b06b0698ce296c01c5fca6e18fe9b64c58be38e4b3d5eb6d054f42db07042dddc99b1949391246af4d61174db5ee71e8179b39ea0d6da7523bddb3285
-  data.tar.gz: 2dfc4519d9269b627809631f312538a146dae97575ec6b93978573cd8d4cd8a2752040d0b01a577c464be22ac248aa30388f522858279306f096fd73d6184637
+  metadata.gz: ee8445a2a30daf3e2f409efa48628017b0c30ae72d14da45dbaf3917e25b9bf014dee1fae71ab8ba817a93a00dc8c1c061919646ecc22832cd75f407706700a3
+  data.tar.gz: 1dcf80fe7ead87d96d41ec7a9aa26f1699ae7099c69709b23bd99e76d1b00fe192ec7be5f6e760d986494a22752bad56ee49ccbe5b1a53cbf82e9ec180d8a064

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

@@ -55,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.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
@@ -149,7 +156,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
@@ -166,7 +173,7 @@ 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

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
@@ -95,7 +95,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/controllers/spree/store_controller.rb

@@ -7,64 +7,10 @@ module Spree
     end
 
     protected
-      # This method is placed here so that the CheckoutController
-      # and OrdersController can both reference it.
-      def apply_coupon_code
-        if @order.coupon_code.present?
-          # check if coupon code is already applied
-          if @order.adjustments.promotion.eligible.detect { |p| p.originator.promotion.code == @order.coupon_code }.present?
-            flash[:notice] = Spree.t(:coupon_code_already_applied)
-            true
-          else
-            event_name = "spree.checkout.coupon_code_added"
-            promotion = Spree::Promotion.where("event_name = ? AND lower(code) = ?", event_name, @order.coupon_code).first
-
-            if promotion.present?
-              if promotion.expired?
-                flash[:error] = Spree.t(:coupon_code_expired)
-                return false
-              end
-
-              if promotion.usage_limit_exceeded?
-                flash[:error] = Spree.t(:coupon_code_max_usage)
-                return false
-              end
-
-              eligible_promos = @order.adjustments.promotion.eligible
-
-              previous_promo = eligible_promos.first
-              fire_event(event_name, :coupon_code => @order.coupon_code)
-              promo = eligible_promos.detect { |p| p.originator.promotion.code == @order.coupon_code }
-              ineligible_promos = @order.adjustments.promotion.where(:eligible => false)
-              ineligible_promo = ineligible_promos.detect { |p| p.originator.promotion.code == @order.coupon_code }
-
-              if promo.present? and promo.eligible?
-                flash[:success] = Spree.t(:coupon_code_applied)
-                true
-              elsif previous_promo.present?
-                flash[:error] = Spree.t(:coupon_code_better_exists)
-                false
-              elsif ineligible_promo.present?
-                flash[:error] = Spree.t(:coupon_code_not_eligible)
-                false
-              else
-                # if the promotion was created after the order
-                flash[:error] = Spree.t(:coupon_code_not_found)
-                false
-              end
-            else
-              flash[:error] = Spree.t(:coupon_code_not_found)
-              false
-            end
-          end
-        else
-          true
-        end
-      end
-
-      def config_locale
-        Spree::Frontend::Config[:locale]
-      end
+    
+    def config_locale
+      Spree::Frontend::Config[:locale]
+    end
   end
 end
 

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/_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/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/shared/_google_analytics.html.erb

@@ -32,7 +32,7 @@
 
     (function() {
       var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = '//google-analytics.com/ga.js';
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
   <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,124 +16,124 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !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: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !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: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.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
@@ -238,9 +238,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/scopes/dynamic.rb
 - lib/spree_frontend.rb
 - lib/tasks/rake_util.rb
@@ -547,18 +547,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.