solidus_backend 1.0.7 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dbbf7a5f419e4c7ff6f2ec55a6623f97d29c846
-  data.tar.gz: e5b5eae32640e97530ea948f9963c758ff7b021c
+  metadata.gz: 31c0e6ee035ec9c8679843792c20cf6ccffbd137
+  data.tar.gz: a9f07294542aaaceea52e73fbafd7ff7b011421a
 SHA512:
-  metadata.gz: 7284f3d05bc0c3c4acda21dcdb2a2304b868f9f15dff52d3f41e205c91aeb81799e06fd53127d56bf21c4c2267f9e29f06f799805fbf40761f1f8c069756b9a7
-  data.tar.gz: 2e7b0c1455a7e2a2711bbf77910993c5023139ee117a24f8415c5472ca21467aeeb9cba1ed9fe2a1f1ea8e31a40703abc7ce502bae83d2a775ad040e62dfb044
+  metadata.gz: 9f3b42161d63c0439952e919e1588864b45cff766e70a4a94f2b6ee32a5dcdb7ad252d869a59d3ab02cd47ae36614c9552a0b199ffb4f1d0827913e7c9099620
+  data.tar.gz: 35aa2571b81598639e3e0ab1694a7991351f45ba29f781185cca9c300067b55f918c038e3c3db238a8807266f17dbe88af955b7b18f5f7620f0af0e050bd07a0

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

@@ -1,5 +1,7 @@
+//= require handlebars
 //= require jquery
 //= require jquery_ujs
+//= require jquery-migrate-1.0.0
 //= require jquery-ui/datepicker
 //= require jquery-ui/sortable
 //= require jquery-ui/autocomplete
@@ -15,5 +17,6 @@
 //= require spree
 //= require ./backend/backbone-overrides
 //= require spree/backend/spree-select2
+//= require_tree ./backend/templates
 //= require_tree .
 

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

@@ -1,10 +1,11 @@
 //= require_self
-//= require spree/backend/handlebar_extensions
+//= require spree/backend/handlebars_extensions
 //= require spree/backend/variant_autocomplete
 //= require spree/backend/taxon_autocomplete
 //= require spree/backend/option_type_autocomplete
 //= require spree/backend/user_picker
 //= require spree/backend/product_picker
+//= require spree/backend/option_value_picker
 //= require spree/backend/taxons
 
 /**
@@ -34,9 +35,6 @@ jQuery(function($) {
       $('#powerTip').removeClass($(this).data('action'));
     })
 
-  // Make flash messages dissapear
-  setTimeout('$(".flash").fadeOut()', 5000);
-
   // Highlight hovered table column
   $('table tbody tr td.actions').find('a, button').hover(function(){
     var tr = $(this).closest('tr');
@@ -58,16 +56,6 @@ jQuery(function($) {
 
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
-show_flash = function(type, message) {
-  var flash_div = $('.flash.' + type);
-  if (flash_div.length == 0) {
-    flash_div = $('<div class="flash ' + type + '" />');
-    $('#wrapper').prepend(flash_div);
-  }
-  flash_div.html(message).show().delay(5000).fadeOut(500);
-}
-
-
 // Apply to individual radio button that makes another element visible when checked
 $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   if(!this.get(0)){ return  }
@@ -124,8 +112,9 @@ $(document).ready(function(){
     new_table_row.find("input, select").each(function () {
       var el = $(this);
       el.val("");
-      el.prop("id", el.prop("id").replace(/\d+/, new_id))
-      el.prop("name", el.prop("name").replace(/\d+/, new_id))
+      // Replace last occurrence of a number
+      el.prop("id", el.prop("id").replace(/\d+(?=[^\d]*$)/, new_id))
+      el.prop("name", el.prop("name").replace(/\d+(?=[^\d]*$)/, new_id))
     })
     // When cloning a new row, set the href of all icons to be an empty "#"
     // This is so that clicking on them does not perform the actions for the
@@ -216,18 +205,21 @@ $(document).ready(function(){
         placeholder: 'ui-sortable-placeholder',
         update: function(event, ui) {
           $("#progress").show();
+          tableEl = $(ui.item).closest("table.sortable")
           positions = {};
-          $.each($('table.sortable tbody tr'), function(position, obj){
-            reg = /spree_(\w+_?)+_(\d+)/;
-            parts = reg.exec($(obj).prop('id'));
-            if (parts) {
-              positions['positions['+parts[2]+']'] = position;
+          $.each(tableEl.find('tbody tr'), function(position, obj){
+            idAttr = $(obj).prop('id');
+            if (idAttr) {
+              objId = idAttr.split('_').slice(-1);
+              if (!isNaN(objId)) {
+                positions['positions['+objId+']'] = position;
+              }
             }
           });
           Spree.ajax({
             type: 'POST',
             dataType: 'script',
-            url: $(ui.item).closest("table.sortable").data("sortable-link"),
+            url: tableEl.data("sortable-link"),
             data: positions,
             success: function(data){ $("#progress").hide(); }
           });
@@ -239,9 +231,10 @@ $(document).ready(function(){
           ui.placeholder.html("<td colspan='"+(td_count-1)+"'></td><td class='actions'></td>")
         },
         stop: function (event, ui) {
+          tableEl = $(ui.item).closest("table.sortable")
           // Fix odd/even classes after reorder
-          $("table.sortable tr:even").removeClass("odd even").addClass("even");
-          $("table.sortable tr:odd").removeClass("odd even").addClass("odd");
+          tableEl.find("tr:even").removeClass("odd even").addClass("even");
+          tableEl.find("tr:odd").removeClass("odd even").addClass("odd");
         }
 
       });

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

@@ -1,8 +1,6 @@
 //= require_self
 $(document).ready(function() {
-  if ($('#customer_autocomplete_template').length > 0) {
-    window.customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text());
-  }
+  window.customerTemplate = HandlebarsTemplates['orders/customer_details/autocomplete'];
 
   formatCustomerResult = function(customer) {
     return customerTemplate({
@@ -26,7 +24,7 @@ $(document).ready(function() {
           }
         },
         results: function(data, page) {
-          return { results: data.users }
+          return { results: data }
         }
       },
       dropdownCssClass: 'customer_search',
@@ -54,7 +52,7 @@ $(document).ready(function() {
             });
           });
         }
-        return Select2.util.escapeMarkup(customer.email);
+        return customer.email;
       }
     })
   }

data/app/assets/javascripts/spree/backend/flash.coffee

@@ -0,0 +1,17 @@
+showTime = 5000
+fadeOutTime = 500
+
+$ ->
+  # Make flash messages dissapear
+  # We only want to target the flash messages which are initially on the page.
+  # Otherwise we risk hiding messages added by show_flash
+  $initialFlash = $(".flash")
+  setTimeout (->
+    $initialFlash.fadeOut(fadeOutTime)
+  ), showTime
+
+window.show_flash = (type, message) ->
+  $flashWrapper = $(".js-flash-wrapper")
+  flash_div = $("<div class=\"flash #{type}\" />")
+  $flashWrapper.prepend(flash_div)
+  flash_div.html(message).show().delay(showTime).fadeOut(fadeOutTime)

data/app/assets/javascripts/spree/backend/handlebars_extensions.coffee

@@ -0,0 +1,9 @@
+#= require handlebars
+
+Handlebars.registerHelper "t", (key)->
+  if Spree.translations[key]
+    Spree.translations[key]
+  else
+    console.error "No translation found for #{key}."
+    key
+

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

@@ -1,10 +1,6 @@
 $(document).ready(function () {
   'use strict';
 
-  function formatOptionType(option_type) {
-    return Select2.util.escapeMarkup(option_type.presentation + ' (' + option_type.name + ')');
-  }
-
   if ($('#product_option_type_ids').length > 0) {
     $('#product_option_type_ids').select2({
       placeholder: Spree.translations.option_type_placeholder,
@@ -35,8 +31,12 @@ $(document).ready(function () {
           };
         }
       },
-      formatResult: formatOptionType,
-      formatSelection: formatOptionType
+      formatResult: function (option_type) {
+        return option_type.presentation + ' (' + option_type.name + ')';
+      },
+      formatSelection: function (option_type) {
+        return option_type.presentation + ' (' + option_type.name + ')';
+      }
     });
   }
 });

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

@@ -0,0 +1,43 @@
+$.fn.optionValueAutocomplete = function (options) {
+  'use strict';
+
+  // Default options
+  options = options || {}
+  var multiple = typeof(options['multiple']) !== 'undefined' ? options['multiple'] : true;
+  var productSelect = options['productSelect'];
+
+  this.select2({
+    minimumInputLength: 3,
+    multiple: multiple,
+    initSelection: function (element, callback) {
+      $.get(Spree.routes.option_value_search, {
+        ids: element.val().split(',')
+      }, function (data) {
+        callback(multiple ? data : data[0]);
+      });
+    },
+    ajax: {
+      url: Spree.routes.option_value_search,
+      datatype: 'json',
+      data: function (term, page) {
+        var productId = typeof(productSelect) !== 'undefined' ? $(productSelect).select2('val') : null;
+        return {
+          q: {
+            name_cont: term,
+            variants_product_id_eq: productId
+          },
+          token: Spree.api_key
+        };
+      },
+      results: function (data, page) {
+        return { results: data };
+      }
+    },
+    formatResult: function (option_value) {
+      return option_value.name;
+    },
+    formatSelection: function (option_value) {
+      return option_value.name;
+    }
+  });
+};

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

@@ -5,10 +5,6 @@ $.fn.productAutocomplete = function (options) {
   options = options || {}
   var multiple = typeof(options['multiple']) !== 'undefined' ? options['multiple'] : true
 
-  function formatProduct(product) {
-    return Select2.util.escapeMarkup(product.name);
-  }
-
   this.select2({
     minimumInputLength: 3,
     multiple: multiple,
@@ -31,18 +27,24 @@ $.fn.productAutocomplete = function (options) {
             sku_cont: term
           },
           m: 'OR',
-          token: Spree.api_key
+          token: Spree.api_key,
+          page: page
         };
       },
       results: function (data, page) {
         var products = data.products ? data.products : [];
         return {
-          results: products
+          results: products,
+          more: (data.current_page * data.per_page) < data.total_count
         };
       }
     },
-    formatResult: formatProduct,
-    formatSelection: formatProduct
+    formatResult: function (product) {
+      return product.name;
+    },
+    formatSelection: function (product) {
+      return product.name;
+    }
   });
 };
 

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

@@ -0,0 +1,101 @@
+window.initProductActions = ->
+  # Add classes on promotion items for design
+  $(document).on 'mouseover', 'a.delete', (event) ->
+    $(this).parent().addClass 'action-remove'
+
+  $(document).on 'mouseout', 'a.delete', (event) ->
+    $(this).parent().removeClass 'action-remove'
+
+  $('#promotion-filters').find('.variant_autocomplete').variantAutocomplete()
+
+  $('.calculator-fields').each ->
+    $fields_container = $(this)
+    $type_select = $fields_container.find('.type-select')
+    $settings = $fields_container.find('.settings')
+    $warning = $fields_container.find('.warning')
+    originalType = $type_select.val()
+    $warning.hide()
+    $type_select.change ->
+      if $(this).val() == originalType
+        $warning.hide()
+        $settings.show()
+        $settings.find('input').removeProp 'disabled'
+      else
+        $warning.show()
+        $settings.hide()
+        $settings.find('input').prop 'disabled', 'disabled'
+
+  #
+  # Option Value Promo Rule
+  #
+  if $('.promo-rule-option-values').length
+    optionValueSelectNameTemplate = HandlebarsTemplates['promotions/rules/option_values_select']
+    optionValueTemplate = HandlebarsTemplates['promotions/rules/option_values']
+
+    addOptionValue = (product, values) ->
+      paramPrefix = $('.promo-rule-option-values').find('.param-prefix').data('param-prefix')
+      $('.js-promo-rule-option-values').append optionValueTemplate(
+        productSelect: value: product
+        optionValuesSelect: value: values
+        paramPrefix: paramPrefix)
+      optionValue = $('.js-promo-rule-option-values .promo-rule-option-value').last()
+      optionValue.find('.js-promo-rule-option-value-product-select').productAutocomplete multiple: false
+      optionValue.find('.js-promo-rule-option-value-option-values-select').optionValueAutocomplete productSelect: '.js-promo-rule-option-value-product-select'
+      if product == null
+        optionValue.find('.js-promo-rule-option-value-option-values-select').prop 'disabled', true
+      return
+
+    originalOptionValues = $('.js-original-promo-rule-option-values').data('original-option-values')
+    if !$('.js-original-promo-rule-option-values').data('loaded')
+      if $.isEmptyObject(originalOptionValues)
+        addOptionValue null, null
+      else
+        $.each originalOptionValues, addOptionValue
+    $('.js-original-promo-rule-option-values').data 'loaded', true
+    $(document).on 'click', '.js-add-promo-rule-option-value', (event) ->
+      event.preventDefault()
+      addOptionValue null, null
+      return
+    $(document).on 'click', '.js-remove-promo-rule-option-value', ->
+      $(this).parents('.promo-rule-option-value').remove()
+      return
+    $(document).on 'change', '.js-promo-rule-option-value-product-select', ->
+      optionValueSelect = $(this).parents('.promo-rule-option-value').find('input.js-promo-rule-option-value-option-values-select')
+      paramPrefix = $('.promo-rule-option-values').find('.param-prefix').data('param-prefix')
+      optionValueSelect.attr 'name', optionValueSelectNameTemplate(product_id: $(this).val(), param_prefix: paramPrefix).trim()
+      optionValueSelect.prop('disabled', $(this).val() == '').select2 'val', ''
+      return
+
+  #
+  # Tiered Calculator
+  #
+  if $('.js-tiers').length
+    calculatorName = $('.js-tiers').data('calculator')
+    tierFieldsTemplate = HandlebarsTemplates["promotions/calculators/fields/#{calculatorName}"]
+    originalTiers = $('.js-tiers').data('original-tiers')
+    formPrefix = $('.js-tiers').data('form-prefix')
+
+    tierInputName = (base) ->
+      "#{formPrefix}[calculator_attributes][preferred_tiers][#{base}]"
+
+    $.each originalTiers, (base, value) ->
+      $('.js-tiers').append tierFieldsTemplate
+        baseField:
+          value: base
+        valueField:
+          name: tierInputName(base)
+          value: value
+
+    $(document).on 'click', '.js-add-tier', (event) ->
+      event.preventDefault()
+      $('.js-tiers').append tierFieldsTemplate(valueField: name: null)
+
+    $(document).on 'click', '.js-remove-tier', (event) ->
+      event.preventDefault()
+      $(this).parents('.tier').remove()
+
+    $(document).on 'change', '.js-base-input', (event) ->
+      valueInput = $(this).parents('.tier').find('.js-value-input')
+      valueInput.attr 'name', tierInputName($(this).val())
+
+$ initProductActions

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

@@ -1,6 +1,7 @@
 Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
 Spree.routes.classifications_api = Spree.pathFor('api/classifications')
 Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
+Spree.routes.option_value_search = Spree.pathFor('api/option_values')
 Spree.routes.option_type_search = Spree.pathFor('api/option_types')
 Spree.routes.orders_api = Spree.pathFor('api/orders')
 Spree.routes.product_search = Spree.pathFor('api/products')
@@ -25,7 +26,7 @@ Spree.routes.stock_items_api = function(stock_location_id) {
   return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
 }
 
-Spree.routes.receive_transfer_items_api = function(stockTransferNumber) {
+Spree.routes.receive_stock_transfer_api = function(stockTransferNumber) {
   return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/receive')
 }
 

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

@@ -218,7 +218,7 @@ startItemSplit = function(event){
   });
 
   var max_quantity = link.closest('tr').data('item-quantity');
-  var split_item_template = Handlebars.compile($('#variant_split_template').text());
+  var split_item_template = HandlebarsTemplates['variants/split'];
   link.closest('tr').after(split_item_template({ variant: variant, shipments: shipments, max_quantity: max_quantity }));
   $('a.cancel-split').click(cancelItemSplit);
   $('a.save-split').click(completeItemSplit);

data/app/assets/javascripts/spree/backend/stock_management/index_add_forms.coffee

@@ -42,7 +42,7 @@ class IndexAddForms
     stockLocationName = selectedStockLocationOption.text().trim()
     selectedStockLocationOption.remove()
 
-    rowTemplate = Handlebars.compile($('#stock-item-count-for-location-template').html())
+    rowTemplate = HandlebarsTemplates['stock_items/stock_location_stock_item']
     $("tr[data-variant-id='#{variantId}']:last").before(
       rowTemplate
         id: stockItem.id

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

@@ -17,5 +17,5 @@ jQuery ->
           return { results: data.stock_items, more: more }
       formatResult: (stock_item) ->
         variantTemplate({ variant: stock_item.variant })
-      formatSelection: (stock_item, container, excapeMarkup) ->
-        Select2.util.escapeMarkup("#{stock_item.variant.name} (#{stock_item.variant.options_text})")
+      formatSelection: (stock_item) ->
+        "#{stock_item.variant.name} (#{stock_item.variant.options_text})"

data/app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee

@@ -77,7 +77,7 @@ class VariantForm
 
   successHandler = (transferItem, isReceiving) =>
     resetVariantAutocomplete()
-    rowTemplate = Handlebars.compile($('#transfer-item-template').html())
+    rowTemplate = HandlebarsTemplates['stock_transfers/transfer_item']
     templateAttributes =
       id: transferItem.id
       isReceiving: isReceiving