spree_backend 4.2.0.rc2 → 4.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caac247ae4531a6f5a3a6801e0bccfb61a89534db3db870157fd4fbc369e6f4a
-  data.tar.gz: 1e6d1992b4ef3922e5581618ad3e3dd8217834d7cdfbdf9e037b8e6f04b77474
+  metadata.gz: 6ea801a7a77488cba4283f0bb1d99d237d7a5e9b180c98092837cb39f86ca794
+  data.tar.gz: 0b2fe5d30019037e6712b7c4cbb19def4ea4096d7b81224cc2d762654b50fd1a
 SHA512:
-  metadata.gz: dce86a37e8ee568b809acaec411c7845c321a4850d39047167e5101fd594ade748f235d00fe4a3bec5915078c1cebe0e44bc01a1b9e9d022e3dfb4859ad20186
-  data.tar.gz: 4e901dd7190ef44b43065ee007aa696c9d89c3e3f6acf7eb6c643712973309cdf6860bf8233c17d10ecd861358562c146e5cbe5f73256f1f307cefc20294cef1
+  metadata.gz: 8ce23c93f231611913fffa2accf3cb5934a53f400d3f5cb03a72db40541502e44a66b64cf6b79e74a15f27e8496fa8e696b1d65d425c95e90f86515b4deb54e2
+  data.tar.gz: ad48197a9b626b2cfd07d2094e94165b62e01d265054ba12755932efef8cc267071e0c9ef67e04564c14adb61a898ccb6c6ec6be94496ddcb95d02500924df63

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

@@ -50,7 +50,6 @@
 //= require spree/backend/taxons
 //= require spree/backend/users/edit
 //= require spree/backend/user_picker
-//= require spree/backend/tag_picker
 //= require spree/backend/variant_autocomplete
 //= require spree/backend/variant_management
 //= require spree/backend/zone

data/app/assets/javascripts/spree/backend/address_states.js

@@ -1,31 +1,42 @@
 // eslint-disable-next-line camelcase, no-unused-vars
-function update_state (region, done) {
+function update_state(region, done) {
   'use strict'
 
-  var country = $('span#' + region + 'country .select2').select2('val')
-  var stateSelect = $('span#' + region + 'state select.select2')
-  var stateInput = $('span#' + region + 'state input.state_name')
+  var countryId = $('#' + region + 'country select').val()
+  var stateContainer = $('#' + region + 'state').parent()
+  var stateSelect = $('#' + region + 'state select')
+  var stateInput = $('#' + region + 'state input.state_name')
 
-  $.get(Spree.routes.states_search + '?country_id=' + country, function (data) {
+  $.get(Spree.routes.states_search + '?country_id=' + countryId, function (data) {
     var states = data.states
+    var statesRequired = data.states_required
     if (states.length > 0) {
       stateSelect.html('')
       var statesWithBlank = [{
         name: '',
         id: ''
       }].concat(states)
-      $.each(statesWithBlank, function (pos, state) {
+      $.each(statesWithBlank, function (_pos, state) {
         var opt = $(document.createElement('option'))
           .prop('value', state.id)
           .html(state.name)
-        stateSelect.append(opt)
+        stateSelect.append(opt).trigger('change')
       })
       stateSelect.prop('disabled', false).show()
       stateSelect.select2()
       stateInput.hide().prop('disabled', true)
+      stateContainer.show()
     } else {
-      stateInput.prop('disabled', false).show()
-      stateSelect.select2('destroy').hide()
+      stateSelect.val(null).trigger('change')
+      if (stateSelect.data('select2')) {
+        stateSelect.select2('destroy')
+      }
+      stateSelect.hide()
+      if (statesRequired) {
+        stateInput.prop('disabled', false).show()
+      } else {
+        stateContainer.hide()
+      }
     }
 
     if (done) done()

data/app/assets/javascripts/spree/backend/calculator.js

@@ -6,10 +6,12 @@ $(function () {
     // eslint-disable-next-line
     if (calculatorSelect.prop('value') == originalCalcType) {
       $('div.calculator-settings').show()
+      $('#shipping_method_calculator_attributes_preferred_currency').removeAttr('disabled')
       $('.calculator-settings-warning').hide()
       $('.calculator-settings').find('input, textarea').prop('disabled', false)
     } else {
       $('div.calculator-settings').hide()
+      $('#shipping_method_calculator_attributes_preferred_currency').attr('disabled', 'disabled')
       $('.calculator-settings-warning').show()
       $('.calculator-settings').find('input, textarea').prop('disabled', true)
     }

data/app/assets/javascripts/spree/backend/checkouts/edit.js

@@ -1,85 +1,109 @@
-//= require_self
-/* global customerTemplate, update_state */
-// eslint-disable-next-line camelcase
-var clear_address_fields = function () {
-  var fields = ['firstname', 'lastname', 'company', 'address1', 'address2', 'city', 'zipcode', 'state_id', 'country_id', 'phone']
-  $.each(fields, function (i, field) {
-    $('#order_bill_address_attributes_' + field).val('')
-    $('#order_ship_address_attributes_' + field).val('')
+function clearAddressFields(addressKinds) {
+  if (addressKinds === undefined) {
+    addressKinds = ['ship', 'bill']
+  }
+  addressKinds.forEach(function(addressKind) {
+    ADDRESS_FIELDS.forEach(function(field) {
+      $('#order_' + addressKind + '_address_attributes_' + field).val('')
+    })
   })
 }
 
-$(document).ready(function () {
-  if ($('#customer_autocomplete_template').length > 0) {
-    window.customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text())
+function formatCustomerResult(customer) {
+  var escapedResult = window.customerTemplate({
+    customer: customer,
+    bill_address: customer.bill_address,
+    ship_address: customer.ship_address
+  })
+  return $(escapedResult)
+}
+
+function formatCustomerAddress(address, kind) {
+  $('#order_' + kind + '_address_attributes_firstname').val(address.firstname)
+  $('#order_' + kind + '_address_attributes_lastname').val(address.lastname)
+  $('#order_' + kind + '_address_attributes_address1').val(address.address1)
+  $('#order_' + kind + '_address_attributes_company').val(address.company)
+  $('#order_' + kind + '_address_attributes_address2').val(address.address2)
+  $('#order_' + kind + '_address_attributes_city').val(address.city)
+  $('#order_' + kind + '_address_attributes_zipcode').val(address.zipcode)
+  $('#order_' + kind + '_address_attributes_phone').val(address.phone)
+  $('#order_' + kind + '_address_attributes_phone').val(address.phone)
+  $('#order_' + kind + '_address_attributes_country_id').val(address.country_id)
+  $('#order_' + kind + '_address_attributes_country_id').trigger('change')
+
+  var stateSelect = $('#order_' + kind + '_address_attributes_state_id')
+
+  update_state(kind.charAt(0), function() {
+    stateSelect.val(address.state_id).trigger('change')
+  })
+}
+
+function formatCustomerSelection(customer) {
+  $('#order_email').val(customer.email)
+  $('#order_user_id').val(customer.id)
+  $('#guest_checkout_true').prop('checked', false)
+  $('#guest_checkout_false').prop('checked', true)
+  $('#guest_checkout_false').prop('disabled', false)
+
+  var billAddress = customer.bill_address
+  var shipAddress = customer.ship_address
+
+  if (billAddress) {
+    formatCustomerAddress(billAddress, 'bill')
+  } else {
+    clearAddressFields(['bill'])
   }
 
-  var formatCustomerResult = function (customer) {
-    return customerTemplate({
-      customer: customer,
-      bill_address: customer.bill_address,
-      ship_address: customer.ship_address
-    })
+  if (shipAddress) {
+    formatCustomerAddress(shipAddress, 'ship')
+  } else {
+    clearAddressFields(['ship'])
   }
 
-  if ($('#customer_search').length > 0) {
-    $('#customer_search').select2({
-      placeholder: Spree.translations.choose_a_customer,
-      ajax: {
-        url: Spree.routes.users_api,
-        datatype: 'json',
-        cache: true,
-        data: function (term, page) {
-          return {
-            q: {
-              'm': 'or',
-              'email_start': term,
-              'ship_address_firstname_start': term,
-              'ship_address_lastname_start': term,
-              'bill_address_firstname_start': term,
-              'bill_address_lastname_start': term
-            },
-            token: Spree.api_key
-          }
-        },
-        results: function (data, page) {
-          return { results: data.users }
+  return customer.email
+}
+
+$.fn.customerAutocomplete = function() {
+  this.select2({
+    minimumInputLength: 3,
+    placeholder: Spree.translations.choose_a_customer,
+    ajax: {
+      url: Spree.routes.users_api,
+      datatype: 'json',
+      data: function (params) {
+        return {
+          q: {
+            'm': 'or',
+            email_start: params.term,
+            ship_address_firstname_start: params.term,
+            ship_address_lastname_start: params.term,
+            bill_address_firstname_start: params.term,
+            bill_address_lastname_start: params.term
+          },
+          token: Spree.api_key
         }
       },
-      dropdownCssClass: 'customer_search',
-      formatResult: formatCustomerResult,
-      formatSelection: function (customer) {
-        $('#order_email').val(customer.email)
-        $('#order_user_id').val(customer.id)
-        $('#guest_checkout_true').prop('checked', false)
-        $('#guest_checkout_false').prop('checked', true)
-        $('#guest_checkout_false').prop('disabled', false)
-
-        var billAddress = customer.bill_address
-        if (billAddress) {
-          $('#order_bill_address_attributes_firstname').val(billAddress.firstname)
-          $('#order_bill_address_attributes_lastname').val(billAddress.lastname)
-          $('#order_bill_address_attributes_company').val(billAddress.company)
-          $('#order_bill_address_attributes_address1').val(billAddress.address1)
-          $('#order_bill_address_attributes_address2').val(billAddress.address2)
-          $('#order_bill_address_attributes_city').val(billAddress.city)
-          $('#order_bill_address_attributes_zipcode').val(billAddress.zipcode)
-          $('#order_bill_address_attributes_phone').val(billAddress.phone)
-
-          $('#order_bill_address_attributes_country_id').select2('val', billAddress.country_id).promise().done(function () {
-            update_state('b', function () {
-              $('#order_bill_address_attributes_state_id').select2('val', billAddress.state_id)
-            })
-          })
-        } else {
-          clear_address_fields()
-        }
-        return Select2.util.escapeMarkup(customer.email)
+      processResults: function (data) {
+        return { results: data.users }
       }
-    })
+    },
+    templateResult: formatCustomerResult
+  }).on('select2:select', function (e) {
+    var data = e.params.data;
+    formatCustomerSelection(data)
+  })
+}
+
+document.addEventListener('DOMContentLoaded', function() {
+  $('#customer_search').customerAutocomplete()
+
+  if ($('#customer_autocomplete_template').length > 0) {
+    window.customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text())
   }
 
+  // Handle Billing Shipping Address
   var orderUseBillingInput = $('input#order_use_billing')
+
   var orderUseBilling = function () {
     if (!orderUseBillingInput.is(':checked')) {
       $('#shipping').show()
@@ -88,13 +112,17 @@ $(document).ready(function () {
     }
   }
 
-  orderUseBillingInput.click(orderUseBilling)
+  // On page load hide shipping address from
   orderUseBilling()
 
+  // On click togggle shipping address from
+  orderUseBillingInput.click(orderUseBilling)
+
+  // If guest checkout clear fields
   $('#guest_checkout_true').change(function () {
     $('#customer_search').val('')
     $('#order_user_id').val('')
     $('#order_email').val('')
-    clear_address_fields()
+    clearAddressFields()
   })
 })

data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js

@@ -19,7 +19,7 @@ $(document).ready(function () {
 
 function addVariant () {
   $('#stock_details').hide()
-  var variantId = $('input.variant_autocomplete').val()
+  var variantId = $('select.variant_autocomplete').val()
   var quantity = $('input#variant_quantity').val()
 
   adjustLineItems(order_number, variantId, quantity)

data/app/assets/javascripts/spree/backend/option_type_autocomplete.js

@@ -1,43 +1,37 @@
-$(document).ready(function () {
+$.fn.optionTypeAutocomplete = function () {
   'use strict'
 
-  function formatOptionType (optionType) {
-    return Select2.util.escapeMarkup(optionType.presentation + ' (' + optionType.name + ')')
-  }
-
-  if ($('#product_option_type_ids').length > 0) {
-    $('#product_option_type_ids').select2({
-      placeholder: Spree.translations.option_type_placeholder,
-      multiple: true,
-      initSelection: function (element, callback) {
-        var url = Spree.url(Spree.routes.option_types_api, {
-          ids: element.val(),
+  this.select2({
+    minimumInputLength: 2,
+    multiple: true,
+    ajax: {
+      url: Spree.routes.option_types_api,
+      datatype: 'json',
+      data: function (params) {
+        var query = {
+          q: {
+            name_cont: params.term
+          },
           token: Spree.api_key
-        })
-        return $.getJSON(url, null, function (data) {
-          return callback(data)
-        })
-      },
-      ajax: {
-        url: Spree.routes.option_types_api,
-        quietMillis: 200,
-        datatype: 'json',
-        data: function (term) {
-          return {
-            q: {
-              name_cont: term
-            },
-            token: Spree.api_key
-          }
-        },
-        results: function (data) {
-          return {
-            results: data
-          }
         }
+
+        return query
       },
-      formatResult: formatOptionType,
-      formatSelection: formatOptionType
-    })
-  }
+      processResults: function (data) {
+        return {
+          results: data
+        }
+      }
+    },
+    templateResult: function (optionType) {
+      return optionType.name
+    },
+    templateSelection: function (optionType) {
+      return optionType.text
+    }
+  })
+}
+
+$(document).ready(function () {
+  $('#product_option_type_ids').optionTypeAutocomplete()
 })

data/app/assets/javascripts/spree/backend/option_value_picker.js

@@ -5,40 +5,67 @@ $.fn.optionValueAutocomplete = function (options) {
   options = options || {}
   var multiple = typeof (options.multiple) !== 'undefined' ? options.multiple : true
   var productSelect = options.productSelect
+  var productId = options.productId
+  var values = options.values
+  var clearSelection = options.clearSelection
+
+  function formatOptionValueList(values) {
+    return values.map(function(obj) {
+      return { id: obj.id, text: obj.name }
+    })
+  }
+
+  function addOptions(select, productId, values) {
+    $.ajax({
+      type: 'GET',
+      url: Spree.routes.option_values_api,
+      dataType: 'json',
+      data: {
+        token: Spree.api_key,
+        q: {
+          id_in: values,
+          variants_product_id_eq: productId
+        }
+      }
+    }).then(function (data) {
+      select.addSelect2Options(data)
+    })
+  }
 
   this.select2({
-    minimumInputLength: 3,
     multiple: multiple,
-    initSelection: function (element, callback) {
-      $.get(Spree.routes.option_values_api, {
-        ids: element.val().split(','),
-        token: Spree.api_key
-      }, function (data) {
-        callback(multiple ? data : data[0])
-      })
-    },
+    minimumInputLength: 1,
     ajax: {
       url: Spree.routes.option_values_api,
-      datatype: 'json',
-      data: function (term) {
-        var productId = typeof (productSelect) !== 'undefined' ? $(productSelect).select2('val') : null
-        return {
+      dataType: 'json',
+      data: function (params) {
+        var selectedProductId = typeof (productSelect) !== 'undefined' ? productSelect.val() : null
+
+        var query = {
           q: {
-            name_cont: term,
-            variants_product_id_eq: productId
+            name_cont: params.term,
+            variants_product_id_eq: selectedProductId
           },
           token: Spree.api_key
         }
+
+        return query;
       },
-      results: function (data) {
-        return { results: data }
+      processResults: function(data) {
+        var results = formatOptionValueList(data)
+
+        return {
+          results: results
+        }
       }
-    },
-    formatResult: function (optionValue) {
-      return optionValue.name
-    },
-    formatSelection: function (optionValue) {
-      return optionValue.name
     }
   })
+
+  if (values && productId && !clearSelection) {
+    addOptions(this, productId, values)
+  }
+
+  if (clearSelection) {
+    this.val(null).trigger('change')
+  }
 }