spree_backend 2.4.10 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80fb94f2d788535db07501447472ffcba4d73d6
-  data.tar.gz: 5a6fcdf48a03df0383f65e8cc1cf476e44479cdb
+  metadata.gz: 92b7d72a3f5c456c8cb327b2f3f6c804198cf654
+  data.tar.gz: d6387bce54baf4307ece321f040be10cefe0d8cb
 SHA512:
-  metadata.gz: 97aee4a40803d7ed20556ea923ca472cfbf991af77a70978facd4c38f3687cc8226227dd5bbab34a28b568e48d5c7e99f12806758d61bd8999bb533e9ba59eaa
-  data.tar.gz: 07a781252c170a66f8185d548e303e0cfb3ae8f813fbc3fffbb5857859c3d49ddae8420fffd4ebe6ce5d1eaafb70d08f4611d07483ce1f806c5dde168e3a8b42
+  metadata.gz: e56440fb7535e7ca2529d9e43805a99765749651a5484687d169e17dd6d14b2cbb826668742f4e750462a41bce0e403a6eb42bef6dcf6a3c301eb59feec188cb
+  data.tar.gz: b7aade6d27904a5baececec20e03996ff570aa3b39e0086e5ab39fe4712711a6d980536866324c2158510bc8f01ee1e6c2a957fc841fa13104ec46184bdef9e6

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

@@ -6,7 +6,6 @@ $(@).ready( ->
       url: Spree.url(Spree.routes.apply_coupon_code(order_number))
       data:
         coupon_code: $("#coupon_code").val()
-        token: Spree.api_key
       success: ->
         window.location.reload();
       error: (msg) ->
@@ -14,4 +13,4 @@ $(@).ready( ->
           show_flash 'error', msg.responseJSON["error"]
         else
           show_flash 'error', "There was a problem adding this coupon code."
-)
+)

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

@@ -5,6 +5,7 @@
 //= 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
 
 /**
@@ -15,64 +16,148 @@ Hopefully, this will evolve into a propper class.
 
 jQuery(function($) {
 
-  // Vertical align of checkbox fields
-  $('.field.checkbox label').vAlign()
+  // Add some tips
+  $('.with-tip').tooltip();
 
-  <% # Re-adjusting admin menu during test causes tests to fail,
-     # like states_spec and shipping_methods_spec. Let's not do this. %>
-  <% unless Rails.env.test? %>
-    $('.main-menu-wrapper ul').AdaptiveMenu({
-      text: "<a href='#'><i class='fa fa-chevron-down'></i> " + Spree.translations.more + "</a>",
-      klass: "dropdown"
-    });
-  <% end %>
+  $('.js-show-index-filters').click(function(){
+    $(".filter-well").slideToggle();
+    $(this).parents(".filter-wrap").toggleClass("collapsed");
+    $("span.icon", $(this)).toggleClass("icon-chevron-down");
+  });
 
-  // Add some tips
-  $('.with-tip').powerTip({
-    smartPlacement: true,
-    fadeInTime: 50,
-    fadeOutTime: 50,
+  $(".js-collapse-sidebar").click(function(){
+    $(".main-right-sidebar").toggleClass("collapsed");
+    $("section.content").toggleClass("sidebar-collapsed");
+    $("span.icon", $(this)).toggleClass("icon-chevron-right");
+    $("span.icon", $(this)).toggleClass("icon-chevron-left");
   });
 
-  $('body')
-    .on('powerTipPreRender', '.with-tip', function() {
-      $('#powerTip').addClass($(this).data('action'));
-      $('#powerTip').addClass($(this).data('tip-color'));
-    })
-    .on('powerTipClose', '.with-tip', function() {
-      $('#powerTip').removeClass($(this).data('action'));
-    })
+  $('#main-sidebar').find('[data-toggle="collapse"]').on('click', function()
+    {
+      if($(this).find('.icon-chevron-left').length == 1){
+        $(this).find('.icon-chevron-left').removeClass('icon-chevron-left').addClass('icon-chevron-down');
+      }
+      else {
+        $(this).find('.icon-chevron-down').removeClass('icon-chevron-down').addClass('icon-chevron-left');
+      }
+    }
+  )
 
-  // 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');
-    var klass = 'highlight action-' + $(this).data('action')
-    tr.addClass(klass)
-    tr.prev().addClass('before-' + klass);
-  }, function(){
-    var tr = $(this).closest('tr');
-    var klass = 'highlight action-' + $(this).data('action')
-    tr.removeClass(klass)
-    tr.prev().removeClass('before-' + klass);
+  // Sidebar nav toggle functionality
+  var sidebar_toggle = $('#sidebar-toggle');
+
+  sidebar_toggle.on('click', function(){
+    var wrapper = $('#wrapper');
+    var main    = $('#main-part');
+
+    if(wrapper.hasClass('sidebar-minimized')){
+      wrapper.removeClass('sidebar-minimized');
+      main
+        .removeClass('col-sm-12 col-md-12 sidebar-collapsed')
+        .addClass('col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2');
+      $.cookie('sidebar-minimized', 'false', { path: '/admin' });
+    }
+    else {
+      wrapper.addClass('sidebar-minimized');
+      main
+        .removeClass('col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2')
+        .addClass('col-sm-12 col-md-12 sidebar-collapsed');
+      $.cookie('sidebar-minimized', 'true', { path: '/admin' });
+    }
   });
 
-  // Trunkate text in page_title that didn't fit
-  var truncate_elements = $('.truncate');
+  $('.sidebar-menu-item').mouseover(function(){
+    if($('#wrapper').hasClass('sidebar-minimized')){
+      $(this).addClass('menu-active');
+      $(this).find('ul.nav').addClass('submenu-active');
+    }
+  });
+  $('.sidebar-menu-item').mouseout(function(){
+    if($('#wrapper').hasClass('sidebar-minimized')){
+      $(this).removeClass('menu-active');
+      $(this).find('ul.nav').removeClass('submenu-active');
+    }
+  });
 
-  truncate_elements.each(function(){
-    $(this).trunk8();
+  // TODO: remove this js temp behaviour and fix this decent
+  // Temp quick search
+  // When there was a search term, copy it
+  $(".js-quick-search").val($(".js-quick-search-target").val());
+  // Catch the quick search form submit and submit the real form
+  $("#quick-search").submit(function(){
+    $(".js-quick-search-target").val($(".js-quick-search").val());
+    $("#table-filter form").submit();
+    return false;
   });
-  $(window).resize(function (event) {
-    truncate_elements.each(function(){
-      $(this).trunk8();
-    })
+
+  // Main menu active item submenu show
+  var active_item = $('#sidebar').find('.selected');
+  active_item.parent().addClass('in');
+  active_item.parent().prev()
+    .find('.icon-chevron-left')
+    .removeClass('icon-chevron-left')
+    .addClass('icon-chevron-down');
+
+  // Replace ▼ and ▲ in sort_link with nicer icons
+  $(".sort_link").each(function(){
+    // Remove the &nbsp; in the text
+    var sort_link_text = $(this).text().replace('\xA0', '');
+
+    if(sort_link_text.indexOf("▼") >= 0){
+      $(this).text(sort_link_text.replace("▼",""));
+      $(this).append('<span class="icon icon-chevron-down"></span>');
+    } else if(sort_link_text.indexOf("▲") >= 0){
+      $(this).text(sort_link_text.replace("▲",""));
+      $(this).append('<span class="icon icon-chevron-up"></span>');
+    }
+  });
+
+  // Clickable ransack filters
+  $(".js-add-filter").click(function() {
+    var ransack_field = $(this).data("ransack-field");
+    var ransack_value = $(this).data("ransack-value");
+
+    $("#" + ransack_field).val(ransack_value);
+    $("#table-filter form").submit();
   });
 
-  // Make height of dt/dd elements the same
-  $("dl").equalize('outerHeight');
+  $(document).on("click", ".js-delete-filter", function() {
+    var ransack_field = $(this).parents(".js-filter").data("ransack-field");
+
+    $("#" + ransack_field).val('');
+    $("#table-filter form").submit();
+  });
+
+  $(".js-filterable").each(function(){
+    if($(this).val()){
+      var ransack_field = $(this).attr("id");
+      var ransack_value = $(this).val();
+      var filter = '<span class="js-filter label label-default" data-ransack-field="' + ransack_field + '">' + ransack_value + '<span class="icon icon-delete js-delete-filter"></span></span>';
+
+      $(".js-filters").show();
+      $(".js-filters").append(filter);
+    }
+  });
+
+  // Enable sidebar toggle
+  $("[data-toggle='offcanvas']").click(function(e) {
+    e.preventDefault();
+
+    // If window is small enough, enable sidebar push menu
+    if ($(window).width() <= 992) {
+      $('.row-offcanvas').toggleClass('active');
+      $('.left-side').removeClass("collapse-left");
+      $(".right-side").removeClass("strech");
+      $('.row-offcanvas').toggleClass("relative");
+    } else {
+      // Else, enable content streching
+      $('.left-side').toggleClass("collapse-left");
+      $(".right-side").toggleClass("strech");
+    }
+  });
+
+  // Make flash messages dissapear
+  setTimeout('$(".alert-auto-dissapear").slideUp()', 5000);
 
 });
 
@@ -82,10 +167,10 @@ $.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 = $('<div class="alert alert-' + type + '" />');
+    $('#content').prepend(flash_div);
   }
-  flash_div.html(message).show().delay(5000).fadeOut(500);
+  flash_div.html(message).show().delay(5000).slideUp();
 }
 
 
@@ -137,6 +222,7 @@ $(document).ready(function(){
              }
     });
   });
+
   var uniqueId = 1;
   $('.spree_add_fields').click(function() {
     var target = $(this).data("target");
@@ -276,9 +362,6 @@ $(document).ready(function(){
       $.ajax({
           type: "PUT",
           async: false,
-          data: {
-            token: Spree.api_key
-          },
           url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance")
       }).done(function() {
           window.location.reload();

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

@@ -19,10 +19,7 @@ $(document).ready(function() {
         url: Spree.routes.user_search,
         datatype: 'json',
         data: function(term, page) {
-          return {
-            q: term,
-            token: Spree.api_key
-          }
+          return { q: term }
         },
         results: function(data, page) {
           return { results: data }

data/app/assets/javascripts/spree/backend/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+    <style type="text/css">
+      html { height: 100% }
+      body { height: 100%; margin: 0; padding: 0 }
+      #map-canvas { height: 100% }
+    </style>
+    
+  </head>
+  <body>
+    <div id="map-canvas"/>
+  </body>
+</html>

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

@@ -46,7 +46,6 @@ adjustLineItem = (line_item_id, quantity) ->
     data:
       line_item:
         quantity: quantity
-      token: Spree.api_key
   ).done (msg) ->
     window.Spree.advanceOrder()
 
@@ -55,10 +54,8 @@ deleteLineItem = (line_item_id) ->
   $.ajax(
     type: "DELETE"
     url: Spree.url(url)
-    data:
-      token: Spree.api_key
   ).done (msg) ->
     $('#line-item-' + line_item_id).remove()
     if $('.line-items tr.line-item').length == 0
       $('.line-items').remove()
-    window.Spree.advanceOrder()
+    window.Spree.advanceOrder()

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

@@ -13,15 +13,6 @@ $(document).ready(function () {
         $('#stock_details').show();
 
         $('button.add_variant').click(addVariant);
-
-        // Add some tips
-        $('.with-tip').powerTip({
-            smartPlacement: true,
-            fadeInTime: 50,
-            fadeOutTime: 50,
-            intentPollInterval: 300
-        });
-
     });
 });
 
@@ -41,16 +32,12 @@ adjustLineItems = function(order_number, variant_id, quantity){
     $.ajax({
         type: "POST",
         url: Spree.url(url),
-        data: {
-          line_item: {
-            variant_id: variant_id,
-            quantity: quantity
-          },
-          token: Spree.api_key
-        }
+        data: { line_item: {variant_id: variant_id, quantity: quantity }}
     }).done(function( msg ) {
         window.Spree.advanceOrder();
         window.location.reload();
+    }).fail(function(msg) {
+        alert(msg.responseJSON.message)
     });
 
 }

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

@@ -7,8 +7,7 @@ $(document).ready(function () {
       multiple: true,
       initSelection: function (element, callback) {
         var url = Spree.url(Spree.routes.option_type_search, {
-          ids: element.val(),
-          token: Spree.api_key
+          ids: element.val()
         });
         return $.getJSON(url, null, function (data) {
           return callback(data);
@@ -22,8 +21,7 @@ $(document).ready(function () {
           return {
             q: {
               name_cont: term
-            },
-            token: Spree.api_key
+            }
           };
         },
         results: function (data) {

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

@@ -0,0 +1,44 @@
+$.fn.optionValueAutocomplete = function (options) {
+  /* globals Spree */
+  '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) {
+        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) {
+        return { results: data };
+      }
+    },
+    formatResult: function (optionValue) {
+      return optionValue.name;
+    },
+    formatSelection: function (optionValue) {
+      return optionValue.name;
+    }
+  });
+};

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

@@ -9,8 +9,7 @@ $(document).ready(function () {
 
       $.post('/admin/orders/' + $('input#order_number').val() + '/line_items/' + $(id).val(), {
           _method: 'put',
-          'line_item[quantity]': $(this).val(),
-          token: Spree.api_key
+          'line_item[quantity]': $(this).val()
         },
 
         function (resp) {
@@ -18,4 +17,4 @@ $(document).ready(function () {
         });
     });
   });
-});
+});

data/app/assets/javascripts/spree/backend/payments/edit.js.coffee

@@ -3,13 +3,13 @@ jQuery ($) ->
   order_id = $('#payments').data('order-id')
   class Payment
     constructor: (id) ->
-      @url  = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json" + '?token=' + Spree.api_key)
+      @url  = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json")
       @json = $.getJSON @url.toString(), (data) =>
         @data = data
 
-    if_editable: (callback) ->
+    if_pending: (callback) ->
       @json.done (data) ->
-        callback() if data.state in ['checkout', 'pending']
+        callback() if data.state is 'pending'
 
     update: (attributes, success) ->
       jqXHR = $.ajax
@@ -48,9 +48,9 @@ jQuery ($) ->
       @$buttons().remove()
 
     $new_button: (action) ->
-      $('<a />')
+      $("<a><span class='icon icon-#{action}'></span></a>")
         .attr
-          class: "fa fa-#{action} icon_link no-text with-tip"
+          class: "payment-action-#{action} btn btn-default btn-sm icon-link no-text with-tip"
           title: Spree.translations[action]
         .data
           action: action
@@ -61,13 +61,9 @@ jQuery ($) ->
             $(@).data('clicked', true)
           mouseup: =>
             @[action]()
-        .powerTip
-          smartPlacement: true
-          fadeInTime:     50
-          fadeOutTime:    50
 
     $buttons: ->
-      @$actions().find(".fa-#{@action}, .fa-cancel")
+      @$actions().find(".payment-action-#{@action}, .payment-action-cancel")
 
     $actions: ->
       @$el.find('.actions')
@@ -142,8 +138,8 @@ jQuery ($) ->
       separator = Spree.translations.currency_separator
       amount.replace(///[^\d#{separator}]///g, '')
 
-  # Attach ShowPaymentView to each editable payment in the table
+  # Attach ShowPaymentView to each pending payment in the table
   $('.admin tr[data-hook=payments_row]').each ->
     $el = $(@)
     payment = new Payment($el.prop('id').match(/\d+$/))
-    payment.if_editable -> new ShowPaymentView($el, payment)
+    payment.if_pending -> new ShowPaymentView($el, payment)

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

@@ -1,15 +1,18 @@
-$.fn.productAutocomplete = function () {
+$.fn.productAutocomplete = function (options) {
   'use strict';
 
+  // Default options
+  options = options || {};
+  var multiple = typeof(options.multiple) !== 'undefined' ? options.multiple : true;
+
   this.select2({
-    minimumInputLength: 1,
-    multiple: true,
+    minimumInputLength: 3,
+    multiple: multiple,
     initSelection: function (element, callback) {
       $.get(Spree.routes.product_search, {
-        ids: element.val().split(','),
-        token: Spree.api_key
+        ids: element.val().split(',')
       }, function (data) {
-        callback(data.products);
+        callback(multiple ? data.products : data.products[0]);
       });
     },
     ajax: {
@@ -21,8 +24,7 @@ $.fn.productAutocomplete = function () {
             name_cont: term,
             sku_cont: term
           },
-          m: 'OR',
-          token: Spree.api_key
+          m: 'OR'
         };
       },
       results: function (data, page) {

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

@@ -1,27 +1,6 @@
 $(document).ready ->
-  opts =
-    lines: 11
-    length: 2
-    width: 3
-    radius: 9
-    corners: 1
-    rotate: 0
-    color: '#fff'
-    speed: 0.8
-    trail: 48
-    shadow: false
-    hwaccel: true
-    className: 'spinner'
-    zIndex: 2e9
-    top: 'auto'
-    left: 'auto'
-
-  target  = document.getElementById("spinner")
-  spinner = new Spinner(opts).spin(target)
-
   $(document).ajaxStart ->
     $("#progress").stop(true, true).fadeIn()
 
   $(document).ajaxStop ->
     $("#progress").fadeOut()
-

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

@@ -1,4 +1,5 @@
 var initProductActions = function () {
+  /* globals Handlebars */
   'use strict';
 
   // Add classes on promotion items for design
@@ -16,7 +17,7 @@ var initProductActions = function () {
     var $fields_container = $(this);
     var $type_select = $fields_container.find('.type-select');
     var $settings = $fields_container.find('.settings');
-    var $warning = $fields_container.find('.warning');
+    var $warning = $fields_container.find('.js-warning');
     var originalType = $type_select.val();
 
     $warning.hide();
@@ -33,6 +34,54 @@ var initProductActions = function () {
     });
   });
 
+  //
+  // Option Value Promo Rule
+  //
+  if ($('#promo-rule-option-value-template').length) {
+    var optionValueSelectNameTemplate = Handlebars.compile($('#promo-rule-option-value-option-values-select-name-template').html());
+    var optionValueTemplate = Handlebars.compile($('#promo-rule-option-value-template').html());
+
+    var addOptionValue = function(product, values) {
+      $('.js-promo-rule-option-values').append(optionValueTemplate({
+        productSelect: {value: product},
+        optionValuesSelect: {value: values}
+      }));
+      var 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);
+      }
+    };
+
+    var 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', function (event) {
+      event.preventDefault();
+      addOptionValue(null, null);
+    });
+
+    $(document).on('click', '.js-remove-promo-rule-option-value', function () {
+      $(this).parents('.promo-rule-option-value').remove();
+    });
+
+    $(document).on('change', '.js-promo-rule-option-value-product-select', function () {
+      var optionValueSelect = $(this).parents('.promo-rule-option-value').find('.js-promo-rule-option-value-option-values-select');
+      optionValueSelect.attr('name', optionValueSelectNameTemplate({productId: $(this).val()}).trim());
+      optionValueSelect.prop('disabled', $(this).val() === '').select2('val', '');
+    });
+  }
+
   //
   // Tiered Calculator
   //

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

@@ -0,0 +1,7 @@
+$ ->
+  if $('.new_payment').is('*')
+    $('.payment-method-settings fieldset').addClass('hidden').first().removeClass('hidden')
+    $('input[name="payment[payment_method_id]"]').click ()->
+      $('.payment-method-settings fieldset').addClass('hidden')
+      id = $(this).parents('div.radio').data('id')
+      $("fieldset[data-id='#{id}']").removeClass('hidden')