spree_frontend 2.1.12 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc8aeaf94e1bce4df9c73c960efc855f8f8c21b
-  data.tar.gz: 30f0b3554add427e0650f90025fbfe836866f357
+  metadata.gz: 29db93da707c1bbb9a6ef087863995df92f50c94
+  data.tar.gz: aba8daaa326750b739f5166436c7dc176612b931
 SHA512:
-  metadata.gz: aa8a3a7f040b1287bea24efac679b7eb1c01c6df8c0a8c32ef2f0f048ea19485e0985cfd207f1719196050551957ec133552ea8fd59af3e38efbf4ac0893a062
-  data.tar.gz: c463b0ab120a3fbaf955047d94835c1d4702ce186129fcbe4b75a9c3c57833e735e515c1d1a3d5334171b12aa266bc09b06664b75ffef5ae561fc1ec6136fd29
+  metadata.gz: b58abca47b3506fe2dfee3c2d96e79c3adb1fd2e5d5b3d5dc3cfc974a0170f1ff6c5e0afaa5cea35175dd174adea1036f1ae5fb26a22e7993953a7d717d97fe8
+  data.tar.gz: 447914326a17b8c14bfa48a7a6f276913e240f0c21516e4ff3d1fc37920c4bc60a87b9263c2f0eb9cdc221f6c6cbb3f51d99694b3a81e2da0efae6ea239c1ab4

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

@@ -0,0 +1,5 @@
+//= require jquery.validate/jquery.validate.min
+//= require spree
+//= require spree/frontend/checkout
+//= require spree/frontend/product
+//= require spree/frontend/cart

data/app/assets/javascripts/{store → spree/frontend}/cart.js.coffee

@@ -6,4 +6,10 @@ Spree.ready ($) ->
       false
 
   ($ 'form#update-cart').submit ->
-    ($ 'form#update-cart #update-button').attr('disabled', true)
+    ($ 'form#update-cart #update-button').attr('disabled', true)
+
+Spree.fetch_cart = ->
+  $.ajax
+    url: Spree.routes.cart_link,
+    success: (data) ->
+      $('#link-to-cart').html data

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

@@ -0,0 +1,11 @@
+//= require jquery.payment
+//= require_self
+//= require spree/frontend/checkout/address
+//= require spree/frontend/checkout/payment
+
+Spree.disableSaveOnClick = ->
+  ($ 'form.edit_order').submit ->
+    ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
+
+Spree.ready ($) ->
+  Spree.Checkout = {}

data/app/assets/javascripts/{store/checkout.js.coffee → spree/frontend/checkout/address.js.coffee}

@@ -1,25 +1,11 @@
-//= require jquery.payment
-
-Spree.disableSaveOnClick = ->
-  ($ 'form.edit_order').submit ->
-    ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
-
-Spree.ready ($) ->
-  Spree.Checkout = {}
-  $(".cardNumber").payment('formatCardNumber')
-  $(".cardExpiry").payment('formatCardExpiry')
-  $(".cardCode").payment('formatCardCVC')
-
-  $(".cardNumber").change ->
-    $(this).parent().siblings(".ccType").val($.payment.cardType(@value))
-
+Spree.onAddress = () ->
   if ($ '#checkout_form_address').is('*')
     ($ '#checkout_form_address').validate()
 
     getCountryId = (region) ->
       $('#' + region + 'country select').val()
 
-    updateState = (region) ->
+    Spree.updateState = (region) ->
       countryId = getCountryId(region)
       if countryId?
         unless Spree.Checkout[countryId]?
@@ -27,11 +13,11 @@ Spree.ready ($) ->
             Spree.Checkout[countryId] =
               states: data.states
               states_required: data.states_required
-            fillStates(Spree.Checkout[countryId], region)
+            Spree.fillStates(Spree.Checkout[countryId], region)
         else
-          fillStates(Spree.Checkout[countryId], region)
+          Spree.fillStates(Spree.Checkout[countryId], region)
 
-    fillStates = (data, region) ->
+    Spree.fillStates = (data, region) ->
       statesRequired = data.states_required
       states = data.states
 
@@ -71,12 +57,12 @@ Spree.ready ($) ->
         stateSelect.removeClass('required')
 
     ($ '#bcountry select').change ->
-      updateState 'b'
+      Spree.updateState 'b'
 
     ($ '#scountry select').change ->
-      updateState 's'
+      Spree.updateState 's'
 
-    updateState 'b'
+    Spree.updateState 'b'
 
     order_use_billing = ($ 'input#order_use_billing')
     order_use_billing.change ->
@@ -89,23 +75,9 @@ Spree.ready ($) ->
       else
         ($ '#shipping .inner').show()
         ($ '#shipping .inner input, #shipping .inner select').prop 'disabled', false
-        updateState('s')
-    
-    update_shipping_form_state order_use_billing
-
-  if ($ '#checkout_form_payment').is('*')
-    ($ 'input[type="radio"][name="order[payments_attributes][][payment_method_id]"]').click(->
-      ($ '#payment-methods li').hide()
-      ($ '#payment_method_' + @value).show() if @checked
-    )
+        Spree.updateState('s')
 
-    ($ document).on('click', '#cvv_link', (event) ->
-      windowName = 'cvv_info'
-      windowOptions = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1'
-      window.open(($ this).attr('href'), windowName, windowOptions)
-      event.preventDefault()
-    )
+    update_shipping_form_state order_use_billing
 
-    # Activate already checked payment method if form is re-rendered
-    # i.e. if user enters invalid data
-    ($ 'input[type="radio"]:checked').click()
+Spree.ready ($) ->
+  Spree.onAddress()

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

@@ -0,0 +1,64 @@
+Spree.onPayment = () ->
+  if ($ '#checkout_form_payment').is('*')
+
+    $(".cardNumber").payment('formatCardNumber')
+    $(".cardExpiry").payment('formatCardExpiry')
+    $(".cardCode").payment('formatCardCVC')
+
+    $(".cardNumber").change ->
+      $(this).parent().siblings(".ccType").val($.payment.cardType(@value))
+
+    ($ 'input[type="radio"][name="order[payments_attributes][][payment_method_id]"]').click(->
+      ($ '#payment-methods li').hide()
+      ($ '#payment_method_' + @value).show() if @checked
+    )
+
+    ($ document).on('click', '#cvv_link', (event) ->
+      windowName = 'cvv_info'
+      windowOptions = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1'
+      window.open(($ this).attr('href'), windowName, windowOptions)
+      event.preventDefault()
+    )
+
+    # Activate already checked payment method if form is re-rendered
+    # i.e. if user enters invalid data
+    ($ 'input[type="radio"]:checked').click()
+
+    $('#checkout_form_payment').submit ->
+      # 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)
+        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("success").html("Coupon code applied successfully.")
+            return true
+          error: (xhr) ->
+            handler = JSON.parse(xhr.responseText)
+            coupon_status.addClass("error").html(handler["error"])
+            $('.continue').attr('disabled', false)
+            return false
+        })
+
+Spree.ready ($) ->
+  Spree.onPayment()

data/app/assets/javascripts/{store → spree/frontend}/product.js.coffee

@@ -37,9 +37,8 @@ $ ->
   radios = ($ '#product-variants input[type="radio"]')
 
   if radios.length > 0
-    selectedRadio = ($ '#product-variants input[type="radio"][checked="checked"]')
-    Spree.showVariantImages selectedRadio.attr('value')
-    Spree.updateVariantPrice selectedRadio
+    Spree.showVariantImages ($ '#product-variants input[type="radio"]').eq(0).attr('value')
+    Spree.updateVariantPrice radios.first()
 
   Spree.addImageHandlers()
 

data/app/assets/stylesheets/{store/spree_frontend.css → spree/frontend.css}

@@ -2,5 +2,5 @@
 * This is a manifest file that includes stylesheets for spree_frontend 
  *= require normalize
  *= require skeleton
- *= require store/screen
+ *= require spree/frontend/screen
 */

data/app/assets/stylesheets/{store → spree/frontend}/screen.css.scss

@@ -1,4 +1,5 @@
-@import 'store/variables';
+@import 'spree/frontend/variables';
+@import 'font-awesome';
 
 /*--------------------------------------*/
 /* Basic styles
@@ -309,7 +310,7 @@ nav #main-nav-bar {
     &#link-to-cart {
       float: right;
       padding-left: 24px;
-      background: asset-url("store/cart.png") no-repeat left center;
+      background: image-url("spree/frontend/cart.png") no-repeat left center;
 
       &:hover {
         border-color: $link_text_color;
@@ -792,6 +793,12 @@ ul#products {
         }
       }
     }
+
+    &#subtotal {
+      text-transform: uppercase;
+      font-size: $base_font_size + 4;
+      color: $body_text_color;
+    }
   }
 
   .steps-data {
@@ -906,11 +913,24 @@ p[data-hook="use_billing"] {
   padding: 5px;
 }
 
+#coupon_status {
+  font-weight: bold;
+  font-size: 125%;
+  &.success {
+    color: $c_green;
+  }
+  &.error {
+    color: $c_red;
+  }
+}
+
 /*--------------------------------------*/
 /* Cart
 /*--------------------------------------*/
 table#cart-detail {
   width: 100%;
+  border-collapse: separate;
+
   tbody#line_items {
     tr {
 
@@ -920,7 +940,7 @@ table#cart-detail {
       }
       td[data-hook="cart_item_quantity"] {
         .line_item_quantity {
-          width: 40px;
+          width: 65px;
         }
       }
       td[data-hook="cart_item_delete"] {
@@ -951,10 +971,23 @@ div[data-hook="inside_cart_form"] {
 }
 
 #empty-cart {
-  margin-top: -75px;
+  margin-top: -50px;
   float: left;
 }
 
+.cart-subtotal, .cart-total {
+  background: #00ADEE;
+
+  td h5 {
+    color: #fff;
+  }
+}
+
+.adjustment:nth-child(even) {
+  background: #eaeaea;
+  
+}
+
 /*--------------------------------------*/
 /* Account
 /*--------------------------------------*/

data/app/controllers/spree/checkout_controller.rb

@@ -25,9 +25,8 @@ module Spree
 
     # Updates the order and advances to the next state (when possible.)
     def update
-      if @order.update_attributes(object_params)
+      if @order.update_from_params(params, permitted_checkout_attributes)
         persist_user_address
-
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
           redirect_to checkout_state_path(@order.state) and return
@@ -71,7 +70,7 @@ 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
 
         if params[:state]
@@ -102,32 +101,6 @@ module Spree
         spree.order_path(@order)
       end
 
-      # For payment step, filter order parameters to produce the expected nested
-      # attributes for a single payment and its source, discarding attributes
-      # for payment methods other than the one selected
-      def object_params
-        # has_checkout_step? check is necessary due to issue described in #2910
-        if @order.has_checkout_step?("payment") && @order.payment?
-          if params[:payment_source].present?
-            source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].underscore]
-
-            if source_params
-              params[:order][:payments_attributes].first[:source_attributes] = source_params
-            end
-          end
-
-          if (params[:order][:payments_attributes])
-            params[:order][:payments_attributes].first[:amount] = @order.total
-          end
-        end
-
-        if params[:order]
-          params[:order].permit(permitted_checkout_attributes)
-        else
-          {}
-        end
-      end
-
       def setup_for_current_state
         method_name = :"before_#{@order.state}"
         send(method_name) if respond_to?(method_name, true)
@@ -170,20 +143,6 @@ module Spree
         authorize!(:edit, current_order, session[:access_token])
       end
 
-      def apply_coupon_code
-        if params[:order] && params[:order][:coupon_code]
-          @order.coupon_code = params[:order][:coupon_code]
-
-          coupon_result = Spree::Promo::CouponApplicator.new(@order).apply
-          if coupon_result[:coupon_applied?]
-            flash[:success] = coupon_result[:success] if coupon_result[:success].present?
-          else
-            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)
@@ -191,6 +150,5 @@ module Spree
           end
         end
       end
-
   end
 end

data/app/controllers/spree/content_controller.rb

@@ -3,7 +3,6 @@ module Spree
     # Don't serve local files or static assets
     before_filter { render_404 if params[:path] =~ /(\.|\\)/ }
     after_filter :fire_visited_path, :only => :show
-    after_filter :fire_visited_action, :except => :show
 
     rescue_from ActionView::MissingTemplate, :with => :render_404
 
@@ -18,11 +17,7 @@ module Spree
     end
 
     def fire_visited_path
-      fire_event('spree.content.visited', :path => "content/#{params[:path]}")
-    end
-
-    def fire_visited_action
-      fire_event('spree.content.visited', :path => "content/#{params[:action]}")
+      Spree::PromotionHandler::Page.new(current_order, params[:path]).activate
     end
   end
 end

data/app/controllers/spree/home_controller.rb

@@ -6,6 +6,7 @@ module Spree
     def index
       @searcher = build_searcher(params)
       @products = @searcher.retrieve_products
+      @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -8,24 +8,16 @@ module Spree
 
     respond_to :html
 
+    before_filter :assign_order_with_lock, only: :update
+    before_filter :apply_coupon_code, only: :update
+    skip_before_filter :verify_authenticity_token
+
     def show
       @order = Order.find_by_number!(params[:id])
     end
 
     def update
-      @order = current_order(lock: true)
-      unless @order
-        flash[:error] = Spree.t(:order_not_found)
-        redirect_to root_path and return
-      end
-
-      if @order.update_attributes(order_params)
-        @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
-        @order.ensure_updated_shipments
-        return if after_update_attributes
-
-        fire_event('spree.order.contents_changed')
-
+      if @order.contents.update_cart(order_params)
         respond_with(@order) do |format|
           format.html do
             if params.has_key?(:checkout)
@@ -45,16 +37,17 @@ 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.slice(:products, :variants, :quantity))
+      if populator.populate(params[:variant_id], params[:quantity])
         current_order.ensure_updated_shipments
 
-        fire_event('spree.cart.add')
-        fire_event('spree.order.contents_changed')
         respond_with(@order) do |format|
           format.html { redirect_to cart_path }
         end
@@ -101,15 +94,11 @@ module Spree
         end
       end
 
-      def after_update_attributes
-        coupon_result = Spree::Promo::CouponApplicator.new(@order).apply
-        if coupon_result[:coupon_applied?]
-          flash[:success] = coupon_result[:success] if coupon_result[:success].present?
-          return false
-        else
-          flash.now[:error] = coupon_result[:error]
-          respond_with(@order) { |format| format.html { render :edit } }
-          return true
+      def assign_order_with_lock
+        @order = current_order(lock: true)
+        unless @order
+          flash[:error] = Spree.t(:order_not_found)
+          redirect_to root_path and return
         end
       end
   end