spree_frontend 2.2.14 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a47e06ecad7da2529ba2f5dbee81779980736c
-  data.tar.gz: 4edd83021e93837988b9982c4bef8c2268702707
+  metadata.gz: 6a0e0eb8227ce2a40d9ebd174c8bbcfb5f9a30fd
+  data.tar.gz: eb1660bf01037e9c4b72bfa07dacfc0e28f827bb
 SHA512:
-  metadata.gz: b9a35dd8fa96a88ce239ae9430eb6a3c7c30c6de34dfb1f7a93cafabb537eba96fb8ca6149291342d7cf9823dfdf8bf144f5c12f19a832910f21bcfaa860894d
-  data.tar.gz: 98fe2639bfd81daf72c1c5415552fbabf67c1d284a7000947ac7259d6d286afdd5853b03af6cbee2f07841cf9f39cc9fb369f2b7a7f797de6cb427cdb9d7da42
+  metadata.gz: 35d1199abb1a692ce978b5c4d95bac60a688ca63f2ef318fefb72e59087d196917413e60cbe3db7989236b2962e3f54bc34752e1544fef155e4da021a0fed8cd
+  data.tar.gz: 87f5af64dd49d1e2e024dda96bbc24b3fa563db2134c33b935f31b5b4279cce3c9c62016b7fc8876b29a8ca3f9d44c85e60d9d11524de110a71f237cd6d90c12

data/app/assets/javascripts/spree/frontend/cart.js.coffee

@@ -10,6 +10,6 @@ Spree.ready ($) ->
 
 Spree.fetch_cart = ->
   $.ajax
-    url: Spree.routes.cart_link,
+    url: Spree.pathFor("/cart_link"),
     success: (data) ->
       $('#link-to-cart').html data

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -1,3 +1,9 @@
+//= depend_on_asset "fontawesome-webfont.eot"
+//= depend_on_asset "fontawesome-webfont.woff"
+//= depend_on_asset "fontawesome-webfont.ttf"
+//= depend_on_asset "fontawesome-webfont.svg"
+//= depend_on_asset "spree/frontend/cart.png"
+
 @import 'spree/frontend/variables';
 @import 'font-awesome';
 

data/app/controllers/spree/checkout_controller.rb

@@ -6,9 +6,7 @@ module Spree
   class CheckoutController < Spree::StoreController
     ssl_required
 
-    before_action :load_order_with_lock
-    before_filter :ensure_valid_state_lock_version, only: [:update]
-    before_filter :set_state_if_present
+    before_filter :load_order_with_lock
 
     before_filter :ensure_order_not_completed
     before_filter :ensure_checkout_allowed
@@ -27,7 +25,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)
+      if @order.update_from_params(params, permitted_checkout_attributes, request.headers.env)
         persist_user_address
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
@@ -35,9 +33,9 @@ module Spree
         end
 
         if @order.completed?
-          session[:order_id] = nil
+          @current_order = nil
           flash.notice = Spree.t(:order_processed_successfully)
-          flash[:commerce_tracking] = "nothing special"
+          flash[:order_completed] = true
           redirect_to completion_route
         else
           redirect_to checkout_state_path(@order.state)
@@ -72,23 +70,9 @@ module Spree
       end
 
       def load_order_with_lock
-        @order = current_order(lock: true) 
+        @order = current_order(lock: true)
         redirect_to spree.cart_path and return unless @order
-      end
-
-      def ensure_valid_state_lock_version
-        if params[:order] && params[:order][:state_lock_version]
-          @order.with_lock do
-            unless @order.state_lock_version == params[:order].delete(:state_lock_version).to_i
-              flash[:error] = Spree.t(:order_already_updated)
-              redirect_to checkout_state_path(@order.state) and return
-            end
-            @order.increment!(:state_lock_version)
-          end
-        end
-      end
 
-      def set_state_if_present
         if params[:state]
           redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
           @order.state = params[:state]
@@ -160,7 +144,7 @@ module Spree
       end
 
       def check_authorization
-        authorize!(:edit, current_order, session[:access_token])
+        authorize!(:edit, current_order, cookies.signed[:guest_token])
       end
 
       def persist_user_address

data/app/controllers/spree/orders_controller.rb

@@ -37,19 +37,23 @@ 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
+
         respond_with(@order) do |format|
           format.html { redirect_to cart_path }
         end
       else
         flash[:error] = populator.errors.full_messages.join(" ")
-        redirect_back_or_default(spree.root_path)
+        redirect_to :back
       end
     end
 
@@ -70,11 +74,11 @@ module Spree
     end
 
     def check_authorization
-      session[:access_token] = params[:token] if params[:token]
+      cookies.permanent.signed[:guest_token] = params[:token] if params[:token]
       order = Spree::Order.find_by_number(params[:id]) || current_order
 
       if order
-        authorize! :edit, order, session[:access_token]
+        authorize! :edit, order, cookies.signed[:guest_token]
       else
         authorize! :create, Spree::Order
       end

data/app/controllers/spree/products_controller.rb

@@ -15,8 +15,6 @@ module Spree
     end
 
     def show
-      return unless @product
-
       @variants = @product.variants_including_master.active(current_currency).includes([:option_values, :images])
       @product_properties = @product.product_properties.includes(:property)
       @taxon = Spree::Taxon.find(params[:taxon_id]) if params[:taxon_id]

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

@@ -5,14 +5,10 @@
     <% if @payment_sources.present? %>
       <div class="card_options">
         <%= radio_button_tag 'use_existing_card', 'yes', true %>
-        <label for="use_existing_card_yes">
-          <%= Spree.t(:use_existing_cc) %>
-        </label>
+        <label for="use_existing_card_yes">Use an existing card on file</label>
         <br/>
         <%= radio_button_tag 'use_existing_card', 'no' %>
-        <label for="use_existing_card_no">
-          <%= Spree.t(:use_new_cc_or_payment_method) %>
-        </label>
+        <label for="use_existing_card_no">Use a new card / payment method</label>
       </div>
 
       <div id="existing_cards">

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

@@ -29,7 +29,7 @@
 
     <% if order.checkout_steps.include?("delivery") && order.shipments.any? %>
       <tr data-hook="shipping_total">
-        <td><%= Spree.t(:shipping_total) %>:</td>
+        <td><%= Spree.t(:shipping_total) %></td>
         <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
       </tr>
 
@@ -37,7 +37,7 @@
         <tbody data-hook="order_details_shipment_promotion_adjustments">
           <% order.shipment_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
             <tr class="total">
-              <td><%= label %>:</td>
+              <td><%= label %></td>
               <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
             </tr>
           <% end %>
@@ -50,7 +50,7 @@
         <% order.adjustments.eligible.each do |adjustment| %>
         <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
           <tr class="total">
-            <td><%= adjustment.label %>:</td>
+            <td><%= adjustment.label %>: </td>
             <td><%= adjustment.display_amount.to_html %></td>
           </tr>
         <% end %>

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

@@ -1,11 +1,11 @@
-<div id="checkout" data-hook>
+<div id="checkout" data-hook>  
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-
+  
   <div class="row" data-hook="checkout_header">
     <h1 class="columns three alpha" data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
     <div class="columns thirteen omega" data-hook="checkout_progress"><%= checkout_progress %></div>
   </div>
-
+  
   <div class="row" data-hook="checkout_content">
     <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
       <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
@@ -15,10 +15,9 @@
             <%= form.text_field :email %>
           </p>
         <% end %>
-        <%= form.hidden_field :state_lock_version %>
         <%= render @order.state, :form => form %>
       <% end %>
-    </div>
+    </div>    
     <% if @order.state != 'confirm' %>
       <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
         <%= render :partial => 'summary', :locals => { :order => @order } %>
@@ -29,7 +28,7 @@
 
 <script>
 Spree.current_order_id = "<%= @order.number %>"
-Spree.current_order_token = "<%= @order.token %>"
+Spree.current_order_token = "<%= @order.guest_token %>"
 </script>
 
 <% if I18n.locale != :en %>

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

@@ -33,8 +33,5 @@
     </div>
 
     <%= render :partial => 'spree/shared/google_analytics' %>
-    <script>
-      Spree.api_key = <%= raw(try_spree_current_user.try(:spree_api_key).to_s.inspect) %>;
-    </script>
   </body>
 </html>

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

@@ -3,7 +3,7 @@
   <h1><%= accurate_title %></h1>
 
   <div id="order" data-hook>
-    <% if params.has_key? :checkout_complete %>
+    <% if order_just_completed?(@order) %>
       <h1><%= Spree.t(:thank_you_for_your_order) %></h1>
     <% end %>
     <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
@@ -12,7 +12,7 @@
 
     <p data-hook="links">
       <%= link_to Spree.t(:back_to_store), spree.root_path, :class => "button" %>
-      <% unless params.has_key? :checkout_complete %>
+      <% unless order_just_completed?(@order) %>
         <% if try_spree_current_user && respond_to?(:spree_account_path) %>
           <%= link_to Spree.t(:my_account), spree_account_path, :class => "button" %>
         <% 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' => variant.price_in(current_currency).money  %>
+              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => Spree::Money.new(variant.price, currency: current_currency, with_currency: true).to_s  %>
               <%= label_tag "variant_id_#{ variant.id }" do %>
                 <span class="variant-description">
                   <%= variant_options variant %>

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

@@ -22,8 +22,6 @@
 <% else %>
 
   <div data-hook="homepage_products">
-    <% cache(cache_key_for_products) do %>
-      <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
-    <% end %>
+    <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
   </div>
 <% end %>

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

@@ -5,19 +5,18 @@
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    ga('create', '<%= tracker.analytics_id %>','<%= Spree::Config[:site_url].sub!(/(^www.)?/,'') %>');
-    ga('require', 'displayfeatures');
+    ga('create', '<%= tracker.analytics_id %>','<%= current_store.url.sub(/(^www.)?/,'') %>');
     ga('send', 'pageview');
 
-    <% if flash[:commerce_tracking] && @order.present? %>
+    <% if order_just_completed?(@order) %>
       <%# more info: https://developers.google.com/analytics/devguides/collection/analyticsjs/ecommerce %>
       ga('require', 'ecommerce', 'ecommerce.js');
       ga('ecommerce:addTransaction', {
         'id': '<%= j @order.number %>',                                    // Transaction ID. Required.
-        'affiliation': '<%= Spree::Config[:site_name] %>',                // Affiliation or store name.
+        'affiliation': '<%= current_store.name %>',                 // Affiliation or store name.
         'revenue': '<%= @order.total %>',                                // Grand Total.
         'shipping': '<%= @order.ship_total %>',                                  // Shipping.
-        'tax': '<%= @order.additional_tax_total + @order.included_tax_total %>', // Tax.
+        'tax': '<%= @order.tax_total %>',                                        // Tax.
         'currency': '<%= current_currency %>'                        // local currency code.
       });
       <% @order.line_items.each do |line_item| %>

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

@@ -3,7 +3,7 @@
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 <meta content="width=device-width, initial-scale=1.0, maximum-scale=1" name="viewport">
 <%== meta_data_tags %>
-<%= canonical_tag(Spree::Config.site_url) %>
+<%= canonical_tag(current_store.url) %>
 <%= favicon_link_tag image_path('favicon.ico') %>
 <%= stylesheet_link_tag 'spree/frontend/all', :media => 'screen' %>
 <%= csrf_meta_tags %>
@@ -11,6 +11,4 @@
 <!--[if lt IE 9]>
   <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6/html5shiv.min.js"></script>
 <![endif]-->
-<%= render "spree/shared/routes" %>
-<%= render "spree/shared/frontend_routes" %>
 <%= yield :head %>

data/app/views/spree/taxons/_taxon.html.erb

@@ -1,4 +1,4 @@
 <div class="taxon" data-hook="taxon">
-  <h5 class="subtaxon-title"><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h5>
-  <%= render :partial => 'spree/shared/products', :locals => { :products => taxon_preview(taxon), :taxon => taxon } %>
+  <h5 class="subtaxon-title"><%= link_to taxon.name, seo_url(taxon), class: 'breadcrumbs' %></h5>
+  <%= render partial: 'spree/shared/products', locals: { products: taxon_preview(taxon), taxon: taxon } %>
 </div>

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

@@ -2,19 +2,19 @@
 
 <% content_for :sidebar do %>
   <div data-hook="taxon_sidebar_navigation">
-    <%= render :partial => 'spree/shared/taxonomies' %>
-    <%= render :partial => 'spree/shared/filters' if @taxon.children.empty? %>
+    <%= render partial: 'spree/shared/taxonomies' %>
+    <%= render partial: 'spree/shared/filters' if @taxon.children.empty? %>
   </div>
 <% end %>
 
 <div data-hook="taxon_products">
-  <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+  <%= render partial: 'spree/shared/products', locals: { products: @products, taxon: @taxon } %>
 </div>
 
-  <% unless params[:keywords].present? %>
-    <div data-hook="taxon_children">
+<% unless params[:keywords].present? %>
+  <div data-hook="taxon_children">
     <% cache [I18n.locale, @taxon] do %>
-      <%= render :partial => 'taxon', :collection => @taxon.children %>
+      <%= render partial: 'taxon', collection: @taxon.children %>
     <% end %>
-    </div>
+  </div>
 <% end %>

data/config/routes.rb

@@ -19,7 +19,7 @@ Spree::Core::Engine.add_routes do
   get '/orders/populate', :to => populate_redirect
   get '/orders/:id/token/:token' => 'orders#show', :as => :token_order
 
-  resources :orders, :except => [:new, :create, :destroy] do
+  resources :orders, :except => [:index, :new, :create, :destroy] do
     post :populate, :on => :collection
   end
 

data/lib/spree/frontend.rb

@@ -1,15 +1,10 @@
 require 'rails/all'
-require 'rails/generators'
 require 'jquery-rails'
 require 'canonical-rails'
 require 'deface'
 
 require 'spree/core'
 
-require 'spree/core/mail_settings'
-require 'spree/core/mail_interceptor'
-
 require 'spree/responder'
 require 'spree/frontend/middleware/seo_assist'
-
 require 'spree/frontend/engine'

data/vendor/assets/javascripts/jquery.validate/localization/messages_ko.js

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: KO (Korean; 한국어)
+ */
+(function ($) {
+  $.extend($.validator.messages, {
+    required: "필수 항목입니다.",
+    remote: "항목을 수정하세요.",
+    email: "유효하지 않은 E-Mail주소입니다.",
+    url: "유효하지 않은 URL입니다.",
+    date: "올바른 날짜를 입력하세요.",
+    dateISO: "올바른 날짜(ISO)를 입력하세요.",
+    number: "유효한 숫자가 아닙니다.",
+    digits: "숫자만 입력 가능합니다.",
+    creditcard: "신용카드 번호가 바르지 않습니다.",
+    equalTo: "같은 값을 다시 입력하세요.",
+    extension: "올바른 확장자가 아닙니다.",
+    maxlength: $.validator.format("{0}자를 넘을 수 없습니다. "),
+    minlength: $.validator.format("{0}자 이상 입력하세요."),
+    rangelength: $.validator.format("문자 길이가 {0} 에서 {1} 사이의 값을 입력하세요."),
+    range: $.validator.format("{0} 에서 {1} 사이의 값을 입력하세요."),
+    max: $.validator.format("{0} 이하의 값을 입력하세요."),
+    min: $.validator.format("{0} 이상의 값을 입력하세요.")
+  });
+}(jQuery));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.2.14
+  version: 2.3.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2014-06-30 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.2.14
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.14
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.14
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.14
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,6 @@ files:
 - app/views/spree/shared/_address.html.erb
 - app/views/spree/shared/_filters.html.erb
 - app/views/spree/shared/_footer.html.erb
-- app/views/spree/shared/_frontend_routes.html.erb
 - app/views/spree/shared/_google_analytics.html.erb
 - app/views/spree/shared/_head.html.erb
 - app/views/spree/shared/_header.html.erb
@@ -496,6 +495,7 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/messages_it.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ja.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_kk.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_ko.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_lt.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_lv.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_nl.js
@@ -538,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.

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

@@ -1,3 +0,0 @@
-<script>
-Spree.routes.cart_link = "<%= spree.cart_link_url %>"
-</script>