spree_frontend 3.1.14 → 3.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb9c135a149dc99bc98c2bc4ca4a30698c50b193
-  data.tar.gz: 005332d750c10875e42b46168dd77c13f4d2fdc9
+  metadata.gz: 6a338832e544a685ba98e6920db856223cebc89d
+  data.tar.gz: ba3582921a8f83ea5edb4477255c9f684899d156
 SHA512:
-  metadata.gz: 6ef20514a173fdf5e810a42e2931f34ed16d46ac69156cd4bb5e1b39c557ed71317ffe384e5a9e4f7dda599c6904eb0560b04c53a75dde42898bae1aa50679ee
-  data.tar.gz: 85e3382e09b3f56c258c3761e0267b01c98dd6bf4f76163518171dae45b98bc29666f9bbaef7e2e358e137adadee35be324e1c9207a9b5214099753fb8fb7c54
+  metadata.gz: b40461730f99df2887a3f6367dec2605a701cec1741c0a1ccb594a09ca54c6572113c8773ccc8f1d654a6c29c36b2c7160f82e358526d743c583d59d0e69bc39
+  data.tar.gz: 986c4f262981d47995e9cc724b779c59382fd08a51be0967047525adf7b5391a9ff645b85e46c68828f52bd7ea5296112582cf61b8714d9b56d7292edba3371f

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

@@ -1,3 +1,5 @@
+#= require spree/frontend/coupon_manager
+
 Spree.ready ($) ->
   if ($ 'form#update-cart').is('*')
     ($ 'form#update-cart a.delete').show().one 'click', ->
@@ -5,8 +7,19 @@ Spree.ready ($) ->
       ($ this).parents('form').first().submit()
       false
 
-  ($ 'form#update-cart').submit ->
+  ($ 'form#update-cart').submit (event) ->
     ($ 'form#update-cart #update-button').attr('disabled', true)
+    input =
+      couponCodeField: $('#order_coupon_code')
+      couponStatus: $('#coupon_status')
+    if input.couponCodeField.val().trim().length > 0
+      if new CouponManager(input).applyCoupon()
+        @submit()
+        return true
+      else
+        ($ 'form#update-cart #update-button').attr('disabled', false)
+        event.preventDefault()
+        return false
 
 Spree.fetch_cart = ->
   $.ajax

data/app/assets/javascripts/spree/frontend/checkout/payment.js.coffee

@@ -1,3 +1,4 @@
+#= require spree/frontend/coupon_manager
 Spree.ready ($) ->
   Spree.onPayment = () ->
     if ($ '#checkout_form_payment').is('*')
@@ -41,41 +42,16 @@ Spree.ready ($) ->
       ($ 'input[type="radio"]:checked').click()
 
       $('#checkout_form_payment').submit (event) ->
-        # Coupon code application may take a number of seconds.
-        # Informing the user that this is happening is a good way to indicate some progress to them.
-        # In addition to this, if the coupon code FAILS then they don't lose their just-entered payment data.
-        coupon_code_field = $('#order_coupon_code')
-        coupon_code = $.trim(coupon_code_field.val())
-        if (coupon_code != '')
-          if $('#coupon_status').length == 0
-            coupon_status = $("<div id='coupon_status'></div>")
-            coupon_code_field.parent().append(coupon_status)
+        input =
+          couponCodeField: $('#order_coupon_code')
+          couponStatus: $('#coupon_status')
+        if input.couponCodeField.val().trim().length > 0
+          if new CouponManager(input).applyCoupon()
+            @submit()
+            return true
           else
-            coupon_status = $("#coupon_status")
-
-          url = Spree.url(Spree.routes.apply_coupon_code(Spree.current_order_id),
-            {
-              order_token: Spree.current_order_token,
-              coupon_code: coupon_code
-            }
-          )
-
-          coupon_status.removeClass();
-          $.ajax({
-            async: false,
-            method: "PUT",
-            url: url,
-            success: (data) =>
-              coupon_code_field.val('')
-              coupon_status.addClass("alert-success").html("Coupon code applied successfully.")
-              @submit()
-              return true
-            error: (xhr) ->
-              handler = JSON.parse(xhr.responseText)
-              coupon_status.addClass("alert-error").html(handler["error"])
-              Spree.enableSave()
-              event.preventDefault()
-              return false
-          })
+            Spree.enableSave()
+            event.preventDefault()
+            return false
 
   Spree.onPayment()

data/app/assets/javascripts/spree/frontend/checkout/shipment.js.coffee

@@ -0,0 +1,38 @@
+class @ShippingTotalManager
+  REGEX_FOR_REMOVING_SPECIAL_CHARS = /[^0-9\.]+/g
+
+  constructor: (@input) ->
+    @shippingMethods = @input.shippingMethods
+    @shipmentTotal = @input.shipmentTotal
+    @orderTotal = @input.orderTotal
+
+  calculateShipmentTotal: ->
+    @sum = 0
+    $.each ($(@shippingMethods).filter(':checked')), (idx, shippingMethod) =>
+      @sum += @parseCurrencyToFloat($(shippingMethod).data('cost'))
+
+    @readjustSummarySection(
+      @parseCurrencyToFloat(@orderTotal.html()),
+      @sum,
+      @parseCurrencyToFloat(@shipmentTotal.html())
+    )
+
+  parseCurrencyToFloat: (input) ->
+    parseFloat(input.replace(REGEX_FOR_REMOVING_SPECIAL_CHARS, ""))
+
+  readjustSummarySection: (orderTotal, newShipmentTotal, oldShipmentTotal) ->
+    newOrderTotal = orderTotal + (newShipmentTotal - oldShipmentTotal)
+    @shipmentTotal.html(@shipmentTotal.data('currency') + newShipmentTotal.toFixed(2))
+    @orderTotal.html(@orderTotal.data('currency') + newOrderTotal.toFixed(2))
+
+  bindEvent: ->
+    @shippingMethods.change =>
+      @calculateShipmentTotal()
+
+Spree.ready ($) ->
+  input =
+    orderTotal: $('#summary-order-total')
+    shipmentTotal: $("[data-hook='shipping-total']")
+    shippingMethods: $("input[data-behavior='shipping-method-selector']")
+
+  new ShippingTotalManager(input).bindEvent()

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

@@ -0,0 +1,37 @@
+class @CouponManager
+  constructor: (@input) ->
+    @couponCodeField = @input.couponCodeField
+    @couponApplied = false
+    @couponStatus = @input.couponStatus
+
+  applyCoupon: ->
+    @couponCode = $.trim($(@couponCodeField).val())
+    if @couponCode != ''
+      if @couponStatus.length == 0
+        @couponStatus = $('<div/>', { id: 'coupon_status' })
+        @couponCodeField.parent().append @couponStatus
+      @createUrl()
+      @couponStatus.removeClass()
+      @sendRequest()
+      @couponApplied
+    else
+      true
+
+  createUrl: ->
+    @url = Spree.url(Spree.routes.apply_coupon_code(Spree.current_order_id),
+      order_token: Spree.current_order_token
+      coupon_code: @couponCode)
+
+  sendRequest: ->
+    $.ajax
+      async: false
+      method: 'PUT'
+      url: @url
+      success: =>
+        @couponCodeField.val ''
+        @couponStatus.addClass('alert-success')
+                     .html Spree.translations.coupon_code_applied
+        @couponApplied = true
+      error: (xhr) =>
+        handler = JSON.parse(xhr.responseText)
+        @couponStatus.addClass('alert-error').html handler['error']

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

@@ -6,8 +6,7 @@
 
 // -- Spree Custom Header and Footer ---------------------
 #spree-header {
-  background: $brand-primary asset-url('spree_header.jpg') center center;
-  background-size: cover;
+  background-color: $brand-primary;
   margin-bottom: $line-height-computed;
 
   #header {
@@ -19,7 +18,8 @@
     margin-bottom: 10px;
 
     img {
-      width: 100%;
+      max-width: 100%;
+      max-height: 50px;
     }
   }
 

data/app/controllers/spree/checkout_controller.rb

@@ -4,7 +4,6 @@ module Spree
   # checkout which has nothing to do with updating an order that this approach
   # is waranted.
   class CheckoutController < Spree::StoreController
-    before_action :expires_now, only: [:edit]
     before_action :load_order_with_lock
     before_action :ensure_valid_state_lock_version, only: [:update]
     before_action :set_state_if_present
@@ -16,7 +15,6 @@ module Spree
 
     before_action :associate_user
     before_action :check_authorization
-    before_action :apply_coupon_code
 
     before_action :setup_for_current_state
     before_action :add_store_credit_payments, only: [:update]
@@ -189,17 +187,5 @@ module Spree
     def check_authorization
       authorize!(:edit, current_order, cookies.signed[:guest_token])
     end
-
-    def sanitize_zip_code
-      order_params = params[:order]
-      return unless order_params
-      strip_zip(order_params[:bill_address_attributes])
-      strip_zip(order_params[:ship_address_attributes])
-    end
-
-    def strip_zip(address_params)
-      return unless address_params
-      address_params[:zipcode] = address_params[:zipcode].strip if address_params[:zipcode]
-    end
   end
 end

data/app/controllers/spree/content_controller.rb

@@ -4,16 +4,16 @@ module Spree
     before_action { render_404 if params[:path] =~ /(\.|\\)/ }
     after_action :fire_visited_path, only: :show
 
-    rescue_from ActionView::MissingTemplate, :with => :render_404
+    rescue_from ActionView::MissingTemplate, with: :render_404
 
     respond_to :html
 
     def show
-      render :action => params[:path]
+      render action: params[:path]
     end
 
     def cvv
-      render :layout => false
+      render layout: false
     end
 
     def fire_visited_path

data/app/controllers/spree/orders_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   class OrdersController < Spree::StoreController
     before_action :check_authorization
-    rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/products', 'spree/orders'
 
     respond_to :html
@@ -66,6 +66,11 @@ module Spree
       end
     end
 
+    def populate_redirect
+      flash[:error] = Spree.t(:populate_get_error)
+      redirect_to('/cart')
+    end
+
     def empty
       if @order = current_order
         @order.empty!
@@ -76,7 +81,7 @@ module Spree
 
     def accurate_title
       if @order && @order.completed?
-        Spree.t(:order_number, :number => @order.number)
+        Spree.t(:order_number, number: @order.number)
       else
         Spree.t(:shopping_cart)
       end

data/app/controllers/spree/products_controller.rb

@@ -3,7 +3,7 @@ module Spree
     before_action :load_product, only: :show
     before_action :load_taxon, only: :index
 
-    rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/taxons'
 
     respond_to :html
@@ -52,7 +52,8 @@ module Spree
         # If an old id or a numeric id was used to find the record,
         # we should do a 301 redirect that uses the current friendly id.
         if params[:id] != @product.friendly_id
-          params.merge!(id: @product.friendly_id)
+          params[:id] = @product.friendly_id
+          params.permit!
           return redirect_to url_for(params), status: :moved_permanently
         end
       end

data/app/controllers/spree/store_controller.rb

@@ -19,24 +19,6 @@ module Spree
 
     protected
 
-    # This method is placed here so that the CheckoutController
-    # and OrdersController can both reference it (or any other controller
-    # which needs it)
-    def apply_coupon_code
-      if params[:order] && params[:order][:coupon_code]
-        @order.coupon_code = params[:order][:coupon_code]
-
-        handler = PromotionHandler::Coupon.new(@order).apply
-
-        if handler.error.present?
-          flash.now[:error] = handler.error
-          respond_with(@order) { |format| format.html { render :edit } } and return
-        elsif handler.success
-          flash[:success] = handler.success
-        end
-      end
-    end
-
     def config_locale
       Spree::Frontend::Config[:locale]
     end

data/app/helpers/spree/frontend_helper.rb

@@ -73,7 +73,7 @@ module Spree
         css_class = 'full'
       end
 
-      link_to text.html_safe, spree.cart_path, :class => "cart-info #{css_class}"
+      link_to text.html_safe, spree.cart_path, class: "cart-info #{css_class}"
     end
 
     # helper to determine if its appropriate to show the store menu

data/app/helpers/spree/orders_helper.rb

@@ -1,14 +1,5 @@
-require 'truncate_html'
-require 'app/helpers/truncate_html_helper'
-
 module Spree
   module OrdersHelper
-    include TruncateHtmlHelper
-
-    def truncated_product_description(product)
-      truncate_html(raw(product.description))
-    end
-
     def order_just_completed?(order)
       flash[:order_completed] && order.present?
     end

data/app/views/kaminari/twitter-bootstrap-3/_first_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.first? %>
   <li class="first">
-    <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote %>
   </li>
 <% end %>

data/app/views/kaminari/twitter-bootstrap-3/_last_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.last? %>
   <li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
-    <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {remote: remote} %>
   </li>
 <% end %>

data/app/views/kaminari/twitter-bootstrap-3/_next_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.last? %>
   <li class="next_page">
-    <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote %>
   </li>
 <% end %>

data/app/views/kaminari/twitter-bootstrap-3/_page.html.erb

@@ -8,5 +8,5 @@
     remote:        data-remote
 -%>
 <li class="page<%= ' active' if page.current? %>">
-  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <%= link_to page, url, opts = {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
 </li>

data/app/views/kaminari/twitter-bootstrap-3/_prev_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.first? %>
   <li class="prev">
-    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote %>
   </li>
 <% end %>

data/app/views/spree/address/_form.html.erb

@@ -5,42 +5,42 @@
     <%= form.label :firstname do %>
       <%= Spree.t(:first_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
-    <%= form.text_field :firstname, :class => 'form-control required' %>
+    <%= form.text_field :firstname, class: 'form-control required' %>
   </p>
   <p class="form-group" id=<%="#{address_id}lastname" %>>
     <%= form.label :lastname do %>
       <%= Spree.t(:last_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
-    <%= form.text_field :lastname, :class => 'form-control required' %>
+    <%= form.text_field :lastname, class: 'form-control required' %>
   </p>
   <% if Spree::Config[:company] %>
     <p class="form-group" id=<%="#{address_id}company" %>>
       <%= form.label :company, Spree.t(:company) %>
-      <%= form.text_field :company, :class => 'form-control' %>
+      <%= form.text_field :company, class: 'form-control' %>
     </p>
   <% end %>
   <p class="form-group" id=<%="#{address_id}address1" %>>
     <%= form.label :address1 do %>
       <%= Spree.t(:street_address) %><abbr class="required" title="required">*</abbr>
     <% end %>
-    <%= form.text_field :address1, :class => 'form-control  required' %>
+    <%= form.text_field :address1, class: 'form-control  required' %>
   </p>
   <p class="form-group" id=<%="#{address_id}address2" %>>
     <%= form.label :address2, Spree.t(:street_address_2) %>
-    <%= form.text_field :address2, :class => 'form-control' %>
+    <%= form.text_field :address2, class: 'form-control' %>
   </p>
   <p class="form-group" id=<%="#{address_id}city" %>>
     <%= form.label :city do %>
       <%= Spree.t(:city) %><abbr class="required" title="required">*</abbr>
     <% end %>
-    <%= form.text_field :city, :class => 'form-control required' %>
+    <%= form.text_field :city, class: 'form-control required' %>
   </p>
   <p class="form-group" id=<%="#{address_id}country" %>>
     <%= form.label :country_id do %>
       <%= Spree.t(:country) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <span id=<%="#{address_id}country-selection" %>>
-      <%= form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'form-control required'} %>
+      <%= form.collection_select :country_id, available_countries, :id, :name, {}, {class: 'form-control required'} %>
     </span>
   </p>
 
@@ -54,17 +54,17 @@
       <%== state_elements = [
          form.collection_select(:state_id, address.country.states,
                             :id, :name,
-                            {:include_blank => true},
-                            {:class => have_states ? 'form-control required' : 'form-control hidden',
-                            :disabled => !have_states}) +
+                            {include_blank: true},
+                            {class: have_states ? 'form-control required' : 'form-control hidden',
+                            disabled: !have_states}) +
          form.text_field(:state_name,
-                            :class => !have_states ? 'form-control required' : 'form-control hidden',
-                            :disabled => have_states)
+                            class: !have_states ? 'form-control required' : 'form-control hidden',
+                            disabled: have_states)
          ].join.gsub('"', "'").gsub("\n", "")
       %>
     </p>
       <noscript>
-        <%= form.text_field :state_name, :class => 'form-control required' %>
+        <%= form.text_field :state_name, class: 'form-control required' %>
       </noscript>
   <% end %>
 
@@ -72,18 +72,18 @@
     <%= form.label :zipcode do %>
       <%= Spree.t(:zip) %><% if address.require_zipcode? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
-    <%= form.text_field :zipcode, :class => "form-control #{'required' if address.require_zipcode?}" %>
+    <%= form.text_field :zipcode, class: "form-control #{'required' if address.require_zipcode?}" %>
   </p>
   <p class="form-group" id=<%="#{address_id}phone" %>>
     <%= form.label :phone do %>
       <%= Spree.t(:phone) %><% if address.require_phone? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
-    <%= form.phone_field :phone, :class => "form-control #{'required' if address.require_phone?}" %>
+    <%= form.phone_field :phone, class: "form-control #{'required' if address.require_phone?}" %>
   </p>
   <% if Spree::Config[:alternative_shipping_phone] %>
     <p class="form-group" id=<%="#{address_id}altphone" %>>
       <%= form.label :alternative_phone, Spree.t(:alternative_phone) %>
-      <%= form.phone_field :alternative_phone, :class => 'form-control' %>
+      <%= form.phone_field :alternative_phone, class: 'form-control' %>
     </p>
   <% end %>
 </div>