spree_frontend 3.6.6 → 3.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5de97052624944fa1d047c1ce80b59ce6f5b2bbc0dc1ec9638b21123d6a72c7
-  data.tar.gz: fda1112d43eec35e71116b0dbb7c85983903914ac01779366612c3e7c6999ff3
+  metadata.gz: a0e2c124c039c8effa704a756c493bb5ef7f033c75e62a7d212ce6a09b8b037c
+  data.tar.gz: d5fa482f5b8560847b2d3453ae8e7d312c8ffd2496b9e775d628f4c8bc7cef39
 SHA512:
-  metadata.gz: 5f0220854356664030033a5f585bbc609b782a1b015a049997ac415120a4fca0d499029d46ab62414c756300fb1617332c24a32122548720af184d8156083dc0
-  data.tar.gz: 81195e4e2e29c62fee1b474002bb0f3c91f980adc275253ada1839c863cb7b844d04b004f3a91ea0794f6e310a31a7b04446a34d76d8514ffee799d0189fe756
+  metadata.gz: 31e2ddb024d889816abdd39115a47ff816cac233d541307490392f327c46b18329dda1c0c16eec0b36f6c38c04ebd675c20a15fa7346f53533867f656f4d9657
+  data.tar.gz: 87c016d53c0bf16c7e298bca4a4009020a37bb05fa23fe240827d00beb56f2b0b707214d23169ad3c6d467f6f884e83ac20548a885f249ddccb5e84599799ba4

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

@@ -1,8 +1,16 @@
 //= require bootstrap-sprockets
 //= require jquery.payment
 //= require spree
+//= require polyfill.min
+//= require fetch.umd
+//= require spree/api/main
+//= require spree/frontend/api_tokens
 //= require spree/frontend/cart
 //= require spree/frontend/checkout
 //= require spree/frontend/checkout/address
 //= require spree/frontend/checkout/payment
 //= require spree/frontend/product
+
+Spree.routes.api_tokens = Spree.pathFor('api_tokens')
+Spree.routes.ensure_cart = Spree.pathFor('ensure_cart')
+Spree.routes.api_v2_storefront_cart_apply_coupon_code = Spree.pathFor('api/v2/storefront/cart/apply_coupon_code')

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

@@ -0,0 +1,17 @@
+Spree.fetchApiTokens = function () {
+  fetch(Spree.routes.api_tokens, {
+    method: 'GET',
+    credentials: 'same-origin'
+  }).then(function (response) {
+    switch (response.status) {
+      case 200:
+        response.json().then(function (json) {
+          SpreeAPI.orderToken = json.order_token
+          SpreeAPI.oauthToken = json.oauth_token
+        })
+        break
+    }
+  })
+}
+
+Spree.ready(function () { Spree.fetchApiTokens() })

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

@@ -0,0 +1,59 @@
+//= require spree/frontend/coupon_manager
+
+Spree.ready(function ($) {
+  var formUpdateCart = $('form#update-cart')
+  if (formUpdateCart.length) {
+    $('form#update-cart a.delete').show().one('click', function () {
+      $(this).parents('.line-item').first().find('input.line_item_quantity').val(0)
+      $(this).parents('form').first().submit()
+      return false
+    })
+  }
+  formUpdateCart.submit(function (event) {
+    var input = {
+      couponCodeField: $('#order_coupon_code'),
+      couponStatus: $('#coupon_status')
+    }
+    var updateButton = $('form#update-cart #update-button')
+    updateButton.attr('disabled', true)
+    if ($.trim(input.couponCodeField.val()).length > 0) {
+      // eslint-disable-next-line no-undef
+      if (new CouponManager(input).applyCoupon()) {
+        this.submit()
+        return true
+      } else {
+        updateButton.attr('disabled', false)
+        event.preventDefault()
+        return false
+      }
+    }
+  })
+})
+
+Spree.fetch_cart = function () {
+  return $.ajax({
+    url: Spree.pathFor('cart_link')
+  }).done(function (data) {
+    return $('#link-to-cart').html(data)
+  })
+}
+
+Spree.ensureCart = function (successCallback) {
+  if (SpreeAPI.orderToken) {
+    successCallback()
+  } else {
+    fetch(Spree.routes.ensure_cart, {
+      method: 'POST',
+      credentials: 'same-origin'
+    }).then(function (response) {
+      switch (response.status) {
+        case 200:
+          response.json().then(function (json) {
+            SpreeAPI.orderToken = json.token
+            successCallback()
+          })
+          break
+      }
+    })
+  }
+}

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

@@ -0,0 +1,19 @@
+Spree.disableSaveOnClick = function () {
+  $('form.edit_order').on('submit', function (event) {
+    if ($(this).data('submitted') === true) {
+      event.preventDefault()
+    } else {
+      $(this).data('submitted', true)
+      $(this).find(':submit, :image').removeClass('primary').addClass('disabled')
+    }
+  })
+}
+
+Spree.enableSave = function () {
+  $('form.edit_order').data('submitted', false).find(':submit, :image').attr('disabled', false).addClass('primary').removeClass('disabled')
+}
+
+Spree.ready(function () {
+  Spree.Checkout = {}
+  return Spree.Checkout
+})

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

@@ -0,0 +1,102 @@
+Spree.ready(function ($) {
+  Spree.onAddress = function () {
+    if ($('#checkout_form_address').length) {
+      Spree.updateState = function (region) {
+        var countryId = getCountryId(region)
+        if (countryId != null) {
+          if (Spree.Checkout[countryId] == null) {
+            $.get(Spree.routes.states_search, {
+              country_id: countryId
+            }).done(function (data) {
+              Spree.Checkout[countryId] = {
+                states: data.states,
+                states_required: data.states_required
+              }
+              Spree.fillStates(Spree.Checkout[countryId], region)
+            })
+          } else {
+            Spree.fillStates(Spree.Checkout[countryId], region)
+          }
+        }
+      }
+      Spree.fillStates = function (data, region) {
+        var selected, statesWithBlank
+        var statesRequired = data.states_required
+        var states = data.states
+        var statePara = $('#' + region + 'state')
+        var stateSelect = statePara.find('select')
+        var stateInput = statePara.find('input')
+        var stateSpanRequired = statePara.find('[id$="state-required"]')
+        if (states.length > 0) {
+          selected = parseInt(stateSelect.val())
+          stateSelect.html('')
+          statesWithBlank = [
+            {
+              name: '',
+              id: ''
+            }
+          ].concat(states)
+          $.each(statesWithBlank, function (idx, state) {
+            var opt = $(document.createElement('option')).attr('value', state.id).html(state.name)
+            if (selected === state.id) {
+              opt.prop('selected', true)
+            }
+            stateSelect.append(opt)
+          })
+          stateSelect.prop('disabled', false).show()
+          stateInput.hide().prop('disabled', true)
+          statePara.show()
+          stateSpanRequired.show()
+          if (statesRequired) {
+            stateSelect.addClass('required')
+          }
+          stateSelect.removeClass('hidden')
+          stateInput.removeClass('required')
+        } else {
+          stateSelect.hide().prop('disabled', true)
+          stateInput.show()
+          if (statesRequired) {
+            stateSpanRequired.show()
+            stateInput.addClass('required')
+          } else {
+            stateInput.val('')
+            stateSpanRequired.hide()
+            stateInput.removeClass('required')
+          }
+          statePara.toggle(!!statesRequired)
+          stateInput.prop('disabled', !statesRequired)
+          stateInput.removeClass('hidden')
+          stateSelect.removeClass('required')
+        }
+      }
+      $('#bcountry select').change(function () {
+        Spree.updateState('b')
+      })
+      $('#scountry select').change(function () {
+        Spree.updateState('s')
+      })
+      Spree.updateState('b')
+
+      var orderUseBilling = $('input#order_use_billing')
+      orderUseBilling.change(function () {
+        updateShippingFormState(orderUseBilling)
+      })
+      updateShippingFormState(orderUseBilling)
+    }
+    function updateShippingFormState (orderUseBilling) {
+      if (orderUseBilling.is(':checked')) {
+        $('#shipping .inner').hide()
+        $('#shipping .inner input, #shipping .inner select').prop('disabled', true)
+      } else {
+        $('#shipping .inner').show()
+        $('#shipping .inner input, #shipping .inner select').prop('disabled', false)
+        Spree.updateState('s')
+      }
+    }
+
+    function getCountryId (region) {
+      return $('#' + region + 'country select').val()
+    }
+  }
+  Spree.onAddress()
+})

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

@@ -0,0 +1,57 @@
+//= require spree/frontend/coupon_manager
+Spree.ready(function ($) {
+  Spree.onPayment = function () {
+    if ($('#checkout_form_payment').length) {
+      if ($('#existing_cards').length) {
+        $('#payment-method-fields').hide()
+        $('#payment-methods').hide()
+        $('#use_existing_card_yes').click(function () {
+          $('#payment-method-fields').hide()
+          $('#payment-methods').hide()
+          $('.existing-cc-radio').prop('disabled', false)
+        })
+        $('#use_existing_card_no').click(function () {
+          $('#payment-method-fields').show()
+          $('#payment-methods').show()
+          $('.existing-cc-radio').prop('disabled', true)
+        })
+      }
+      $('.cardNumber').payment('formatCardNumber')
+      $('.cardExpiry').payment('formatCardExpiry')
+      $('.cardCode').payment('formatCardCVC')
+      $('.cardNumber').change(function () {
+        $(this).parent().siblings('.ccType').val($.payment.cardType(this.value))
+      })
+      $('input[type="radio"][name="order[payments_attributes][][payment_method_id]"]').click(function () {
+        $('#payment-methods li').hide()
+        if (this.checked) {
+          $('#payment_method_' + this.value).show()
+        }
+      })
+      $(document).on('click', '#cvv_link', function (event) {
+        var windowName = 'cvv_info'
+        var windowOptions = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1'
+        window.open($(this).attr('href'), windowName, windowOptions)
+        event.preventDefault()
+      })
+      $('input[type="radio"]:checked').click()
+      $('#checkout_form_payment').submit(function (event) {
+        var input = {
+          couponCodeField: $('#order_coupon_code'),
+          couponStatus: $('#coupon_status')
+        }
+        if ($.trim(input.couponCodeField.val()).length > 0) {
+          // eslint-disable-next-line no-undef
+          if (new CouponManager(input).applyCoupon()) {
+            return true
+          } else {
+            Spree.enableSave()
+            event.preventDefault()
+            return false
+          }
+        }
+      })
+    }
+  }
+  Spree.onPayment()
+})

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

@@ -0,0 +1,47 @@
+/* global accounting */
+function ShippingTotalManager (input1) {
+  this.input = input1
+  this.shippingMethods = this.input.shippingMethods
+  this.shipmentTotal = this.input.shipmentTotal
+  this.orderTotal = this.input.orderTotal
+  this.formatOptions = {
+    symbol: this.shipmentTotal.data('currency'),
+    decimal: this.shipmentTotal.attr('decimal-mark'),
+    thousand: this.shipmentTotal.attr('thousands-separator'),
+    precision: 2
+  }
+}
+
+ShippingTotalManager.prototype.calculateShipmentTotal = function () {
+  var checked = $(this.shippingMethods).filter(':checked')
+  this.sum = 0
+  $.each(checked, function (idx, shippingMethod) {
+    this.sum += this.parseCurrencyToFloat($(shippingMethod).data('cost'))
+  }.bind(this))
+  return this.readjustSummarySection(this.parseCurrencyToFloat(this.orderTotal.html()), this.sum, this.parseCurrencyToFloat(this.shipmentTotal.html()))
+}
+
+ShippingTotalManager.prototype.parseCurrencyToFloat = function (input) {
+  return accounting.unformat(input, this.formatOptions.decimal)
+}
+
+ShippingTotalManager.prototype.readjustSummarySection = function (orderTotal, newShipmentTotal, oldShipmentTotal) {
+  var newOrderTotal = orderTotal + (newShipmentTotal - oldShipmentTotal)
+  this.shipmentTotal.html(accounting.formatMoney(newShipmentTotal, this.formatOptions))
+  return this.orderTotal.html(accounting.formatMoney(newOrderTotal, this.formatOptions))
+}
+
+ShippingTotalManager.prototype.bindEvent = function () {
+  this.shippingMethods.change(function () {
+    return this.calculateShipmentTotal()
+  }.bind(this))
+}
+
+Spree.ready(function ($) {
+  var input = {
+    orderTotal: $('#summary-order-total'),
+    shipmentTotal: $('[data-hook="shipping-total"]'),
+    shippingMethods: $('input[data-behavior="shipping-method-selector"]')
+  }
+  return new ShippingTotalManager(input).bindEvent()
+})

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

@@ -0,0 +1,45 @@
+function CouponManager (input) {
+  this.input = input
+  this.couponCodeField = this.input.couponCodeField
+  this.couponApplied = false
+  this.couponStatus = this.input.couponStatus
+}
+
+CouponManager.prototype.applyCoupon = function () {
+  this.couponCode = $.trim($(this.couponCodeField).val())
+  if (this.couponCode !== '') {
+    if (this.couponStatus.length === 0) {
+      this.couponStatus = $('<div/>', {
+        id: 'coupon_status'
+      })
+      this.couponCodeField.parent().append(this.couponStatus)
+    }
+    this.couponStatus.removeClass()
+    this.sendRequest()
+    return this.couponApplied
+  } else {
+    return true
+  }
+}
+
+CouponManager.prototype.sendRequest = function () {
+  return $.ajax({
+    async: false,
+    method: 'PATCH',
+    url: Spree.routes.api_v2_storefront_cart_apply_coupon_code,
+    dataType: 'json',
+    headers: {
+      'X-Spree-Order-Token': Spree.current_order_token
+    },
+    data: {
+      coupon_code: this.couponCode
+    }
+  }).done(function () {
+    this.couponCodeField.val('')
+    this.couponStatus.addClass('alert-success').html(Spree.translations.coupon_code_applied)
+    this.couponApplied = true
+  }.bind(this)).fail(function (xhr) {
+    var handler = xhr.responseJSON
+    this.couponStatus.addClass('alert-error').html(handler['error'])
+  }.bind(this))
+}

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

@@ -1,75 +1,128 @@
-Spree.ready(function ($) {
+//= require spree/api/storefront/cart
+//= require spree/frontend/cart
 
+Spree.ready(function ($) {
   Spree.addImageHandlers = function () {
-    var thumbnails = $("#product-images ul.thumbnails");
-    ($("#main-image")).data("selectedThumb", ($("#main-image img")).attr("src"));
-    thumbnails.find("li").eq(0).addClass("selected");
-
-    thumbnails.find("a").on("click", function (event) {
-      ($("#main-image")).data("selectedThumb", ($(event.currentTarget)).attr("href"));
-      ($("#main-image")).data("selectedThumbId", ($(event.currentTarget)).parent().attr("id"));
-      thumbnails.find("li").removeClass("selected");
-      ($(event.currentTarget)).parent("li").addClass("selected");
-      return false;
-    });
-
-    thumbnails.find("li").on("mouseenter", function (event) {
-      return ($("#main-image img")).attr("src", ($(event.currentTarget)).find("a").attr("href"));
-    });
-
-    return thumbnails.find("li").on("mouseleave", function (event) {
-      return ($("#main-image img")).attr("src", ($("#main-image")).data("selectedThumb"));
-    });
-  };
+    var thumbnails = $('#product-images ul.thumbnails');
+    ($('#main-image')).data('selectedThumb', ($('#main-image img')).attr('src'));
+    ($('#main-image')).data('selectedThumbAlt', ($('#main-image img')).attr('alt'))
+    thumbnails.find('li').eq(0).addClass('selected')
+
+    thumbnails.find('a').on('click', function (event) {
+      ($('#main-image')).data('selectedThumb', ($(event.currentTarget)).attr('href'));
+      ($('#main-image')).data('selectedThumbId', ($(event.currentTarget)).parent().attr('id'));
+      ($('#main-image')).data('selectedThumbAlt', ($(event.currentTarget)).find('img').attr('alt'))
+      thumbnails.find('li').removeClass('selected');
+      ($(event.currentTarget)).parent('li').addClass('selected')
+      return false
+    })
+
+    thumbnails.find('li').on('mouseenter', function (event) {
+      return ($('#main-image img'))
+        .attr({ 'src': ($(event.currentTarget)).find('a').attr('href'), 'alt': ($(event.currentTarget)).find('img').attr('alt') })
+    })
+
+    return thumbnails.find('li').on('mouseleave', function (event) {
+      return ($('#main-image img'))
+        .attr({ 'src': ($('#main-image')).data('selectedThumb'), 'alt': ($('#main-image')).data('selectedThumbAlt') })
+    })
+  }
 
   Spree.showVariantImages = function (variantId) {
-    ($("li.vtmb")).hide();
-    ($("li.tmb-" + variantId)).show();
-    var currentThumb = $("#" + ($("#main-image")).data("selectedThumbId"));
+    ($('li.vtmb')).hide();
+    ($('li.tmb-' + variantId)).show()
+    var currentThumb = $('#' + ($('#main-image')).data('selectedThumbId'))
 
-    if (!currentThumb.hasClass("vtmb + variantId")) {
-      var thumb = $(($("#product-images ul.thumbnails li:visible.vtmb")).eq(0));
+    if (!currentThumb.hasClass('vtmb + variantId')) {
+      var thumb = $(($('#product-images ul.thumbnails li:visible.vtmb')).eq(0))
 
       if (!(thumb.length > 0)) {
-        thumb = $(($("#product-images ul.thumbnails li:visible")).eq(0));
+        thumb = $(($('#product-images ul.thumbnails li:visible')).eq(0))
       }
 
-      var newImg = thumb.find("a").attr("href");
-      ($("#product-images ul.thumbnails li")).removeClass("selected");
-      thumb.addClass("selected");
-      ($("#main-image img")).attr("src", newImg);
-      ($("#main-image")).data("selectedThumb", newImg);
-      return ($("#main-image")).data("selectedThumbId", thumb.attr("id"));
+      var newImg = thumb.find('a').attr('href')
+
+      var newAlt = thumb.find('img').attr('alt');
+      ($('#product-images ul.thumbnails li')).removeClass('selected')
+      thumb.addClass('selected');
+      ($('#main-image img')).attr({ 'src': newImg, 'alt': newAlt });
+      ($('#main-image')).data({ 'selectedThumb': newImg, 'selectedThumbAlt': newAlt })
+      return ($('#main-image')).data('selectedThumbId', thumb.attr('id'))
     }
-  };
+  }
 
   Spree.updateVariantPrice = function (variant) {
-    var variantPrice = variant.data("price");
+    var variantPrice = variant.data('price')
 
     if (variantPrice) {
-      return ($(".price.selling")).text(variantPrice);
+      return ($('.price.selling')).text(variantPrice)
     }
-  };
+  }
 
   Spree.disableCartForm = function (variant) {
-    var inStock = variant.data("in-stock");
-    return $("#add-to-cart-button").attr("disabled", !inStock);
-  };
+    var inStock = variant.data('in-stock')
+    return $('#add-to-cart-button').attr('disabled', !inStock)
+  }
 
-  var radios = $("#product-variants input[type='radio']");
+  var radios = $("#product-variants input[type='radio']")
 
   if (radios.length > 0) {
-    var selectedRadio = $("#product-variants input[type='radio'][checked='checked']");
-    Spree.showVariantImages(selectedRadio.attr("value"));
-    Spree.updateVariantPrice(selectedRadio);
-    Spree.disableCartForm(selectedRadio);
+    var selectedRadio = $("#product-variants input[type='radio'][checked='checked']")
+    Spree.showVariantImages(selectedRadio.attr('value'))
+    Spree.updateVariantPrice(selectedRadio)
+    Spree.disableCartForm(selectedRadio)
 
     radios.click(function (event) {
-      Spree.showVariantImages(this.value);
-      Spree.updateVariantPrice($(this));
-      return Spree.disableCartForm($(this));
-    });
+      Spree.showVariantImages(this.value)
+      Spree.updateVariantPrice($(this))
+      return Spree.disableCartForm($(this))
+    })
   }
 
-  return Spree.addImageHandlers();
-});
+  return Spree.addImageHandlers()
+})
+
+Spree.ready(function () {
+  var addToCartForm = document.getElementById('add-to-cart-form')
+  var addToCartButton = document.getElementById('add-to-cart-button')
+
+  if (addToCartForm) {
+    // enable add to cart button
+    if (addToCartButton) {
+      addToCartButton.removeAttribute('disabled')
+    }
+
+    addToCartForm.addEventListener('submit', function (event) {
+      event.preventDefault()
+
+      // prevent multiple clicks
+      if (addToCartButton) {
+        addToCartButton.setAttribute('disabled', 'disabled')
+      }
+
+      var variantId = addToCartForm.elements.namedItem('variant_id').value
+      var quantity = parseInt(addToCartForm.elements.namedItem('quantity').value, 10)
+
+      // we need to ensure that we have an existing cart we want to add the item to
+      // if we have already a cart assigned to this guest / user this won't create
+      // another one
+      Spree.ensureCart(
+        function () {
+          SpreeAPI.Storefront.addToCart(
+            variantId,
+            quantity,
+            {}, // options hash - you can pass additional parameters here, your backend
+            // needs to be aware of those, see API docs:
+            // https://github.com/spree/spree/blob/master/api/docs/v2/storefront/index.yaml#L42
+            function () {
+              // redirect with `variant_id` is crucial for analytics tracking
+              // provided by `spree_analytics_trackers` extension
+              window.location = Spree.routes.cart + '?variant_id=' + variantId.toString()
+            },
+            function (error) { alert(error) } // failure callback for 422 and 50x errors
+          )
+        }
+      )
+    })
+  }
+})