solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -1,33 +1,28 @@
-$(function(){
+Spree.ready(function(){
   $('body').popover({selector: '.hint-tooltip', html: true, trigger: 'hover', placement: 'top'});
 
-  /* Animation has to be off to work around a bug in bootstrap 4.0.0.alpha6 */
-  $('body').tooltip({selector: '.with-tip', animation: false});
-
-  /*
-   * Poll tooltips to hide them if they are no longer being hovered.
-   *
-   * This is necessary to fix tooltips hanging around after their attached
-   * element has been removed from the DOM (and will therefore receive no
-   * mouseleave event). This may be unnecessary in a future version of
-   * bootstrap, which intends to solve this using MutationObserver.
-   */
-  var removeDesyncedTooltip = function(tooltip) {
-    var interval = setInterval(function(){
-      if(!$(tooltip.element).is(":hover")) {
-        tooltip.hide();
-        clearInterval(interval);
-      }
-    }, 200);
-    $(tooltip.element).on('hidden.bs.tooltip', function(){
-      clearInterval(interval);
-    });
-  };
+  $('body').tooltip({selector: '.with-tip'});
 
   $('body').on('inserted.bs.tooltip', function(e){
     var $target = $(e.target);
     var tooltip = $target.data('bs.tooltip');
-    removeDesyncedTooltip(tooltip);
+
+    /*
+     * Observe target changes to understand if we need to remove tooltips.
+     *
+     * This is necessary to fix tooltips hanging around after their attached
+     * element has been removed from the DOM (and will therefore receive no
+     * mouseleave event).
+     */
+    var observer = new MutationObserver(function(mutations) {
+      // disconnect itself when content is changed, a new observer will
+      // be attached to this element when the new tooltip is created.
+      this.disconnect();
+
+      tooltip.hide();
+    });
+    observer.observe($target.get(0), { attributes: true });
+
     var $tooltip = $("#" + $target.attr("aria-describedby"));
     $tooltip.addClass("action-" + $target.data("action"));
   });

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

@@ -0,0 +1,55 @@
+'use strict';
+
+Spree.ready(function(){
+  flatpickr.localize({
+    weekdays: {
+      shorthand: Spree.t('abbr_day_names')
+    },
+    months: {
+      longhand: Spree.t('month_names')
+    }
+  });
+
+  $('.datepicker').flatpickr({
+    allowInput: true
+  });
+
+  // Handle range dates
+  if ($('.date-range-filter .datepicker-from, .date-range-filter .datepicker-to').length) {
+    // Returns a callback for flatpickr onChange event which updates the
+    // respective range extremity flatpickr instance in order to have
+    // the left range extremity lower or equal to the right range extremity.
+    // This is accomplished swapping the range extremities when they are in the
+    // wrong order.
+    var swapDates = function($other, otherInstance, compareDates) {
+      return function(selectedDates, dateStr, instance) {
+        var date = instance.parseDate(dateStr);
+        var otherDateStr = $other.val();
+        var otherDate = instance.parseDate(otherDateStr);
+
+        if (date && otherDate && compareDates(date, otherDate)) {
+          instance.setDate(otherDate);
+          otherInstance.setDate(date);
+        }
+      }
+    }
+
+    var $left = $('.date-range-filter .datepicker-from');
+    var $right = $('.date-range-filter .datepicker-to');
+    var leftInstance = $left[0]._flatpickr;
+    var rightInstance = $right[0]._flatpickr;
+    var leftSwapDates = swapDates($right, rightInstance, function(date, otherDate) {
+      return date > otherDate
+    })
+    var rightSwapDates = swapDates($left, leftInstance, function(date, otherDate) {
+      return date < otherDate
+    })
+
+    leftInstance.config.onChange.push(leftSwapDates);
+    rightInstance.config.onChange.push(rightSwapDates);
+
+    // Execute swap dates check in order to correct possible wrong order at page
+    // load
+    leftSwapDates(null, $left.val(), leftInstance);
+  }
+});

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

@@ -0,0 +1,20 @@
+(function() {
+  var showTime = 5000;
+
+  var fadeOutTime = 500;
+
+  Spree.ready(function() {
+    var $initialFlash;
+    $initialFlash = $(".flash");
+    setTimeout((function() {
+      $initialFlash.fadeOut(fadeOutTime);
+    }), showTime);
+  });
+
+  window.show_flash = function(type, message) {
+    var $flashWrapper = $(".js-flash-wrapper");
+    var 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/gateway.js

@@ -0,0 +1,22 @@
+Spree.ready(function() {
+  var $gateway_type = $('select.js-gateway-type');
+  var $preference_source = $('select.js-preference-source');
+  var original_gateway_type = $gateway_type.val();
+  var original_preference_source = $preference_source.val();
+
+  var render = function() {
+    var gateway_type = $gateway_type.val();
+    var preference_source = $preference_source.val();
+    $('.js-preference-source-wrapper').toggle(gateway_type === original_gateway_type);
+    if (gateway_type === original_gateway_type && preference_source === original_preference_source) {
+      $('.js-gateway-settings').show();
+      $('.js-gateway-settings-warning').hide();
+    } else {
+      $('.js-gateway-settings').hide();
+      $('.js-gateway-settings-warning').show();
+    }
+  };
+  $gateway_type.change(render);
+  $preference_source.change(render);
+  render();
+});

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

@@ -9,6 +9,10 @@ Handlebars.registerHelper("human_attribute_name", function(model, attr) {
   return Spree.human_attribute_name(model, attr);
 });
 
+Handlebars.registerHelper("human_model_name", function(model) {
+  return Spree.human_model_name(model);
+});
+
 Handlebars.registerHelper("admin_url", function() {
   return Spree.pathFor("admin")
 });
@@ -16,3 +20,7 @@ Handlebars.registerHelper("admin_url", function() {
 Handlebars.registerHelper("concat", function() {
   return Array.prototype.slice.call(arguments, 0, -1).join('');
 });
+
+Handlebars.registerHelper("format_money", function(amount, currency) {
+  return Spree.formatMoney(amount, currency);
+});

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

@@ -0,0 +1,8 @@
+Spree.ready(function() {
+  $('#new_image_link').click(function(event) {
+    event.preventDefault();
+
+    $(this).hide();
+    $('#new_image').show();
+  });
+});

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

@@ -1,4 +1,7 @@
 //= require spree/backend/models/image_upload
 //= require spree/backend/models/line_item
 //= require spree/backend/models/order
+//= require spree/backend/models/shipment
+//= require spree/backend/models/stock_item
 //= require spree/backend/models/taxonomy
+//= require spree/backend/models/payment

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

@@ -1,6 +1,10 @@
 //= require spree/backend/routes
 
 Spree.Models.LineItem = Backbone.Model.extend({
+  defaults: {
+    quantity: 1
+  },
+
   initialize: function(options) {
     this.order = this.collection.parent;
   }

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

@@ -1,5 +1,6 @@
 //= require spree/backend/routes
 //= require spree/backend/collections/line_items
+//= require spree/backend/collections/shipments
 //= require spree/backend/models/address
 
 Spree.Models.Order = Backbone.Model.extend({
@@ -8,7 +9,7 @@ Spree.Models.Order = Backbone.Model.extend({
 
   relations: {
     "line_items": Spree.Collections.LineItems,
-    "shipments": Backbone.Collection,
+    "shipments": Spree.Collections.Shipments,
     "bill_address": Spree.Models.Address,
     "ship_address": Spree.Models.Address
   },

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

@@ -0,0 +1,5 @@
+Spree.Models.Payment = Backbone.Model.extend({
+  urlRoot: function() {
+    return Spree.routes.payments_api(this.get('order_id'));
+  }
+});

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

@@ -0,0 +1,27 @@
+Spree.Models.Shipment = Backbone.Model.extend({
+  idAttribute: "number",
+  paramRoot: "shipment",
+  urlRoot: Spree.routes.shipments_api,
+
+  relations: {
+    "selected_shipping_rate": Backbone.Model,
+    "shipping_rates": Backbone.Collection,
+  },
+
+  estimatedRates: function() {
+    var ratesCollection = Backbone.Collection.extend({
+      parse: function(resp){ return resp.shipping_rates }
+    });
+    var rates = new ratesCollection();
+    rates.fetch({ url: this.url() + "/estimated_rates" })
+    return rates;
+  },
+
+  selectShippingMethodId: function(shippingMethodId, options) {
+    this.sync("update", this, _.extend({
+      url: this.url() + "/select_shipping_method",
+      contentType: 'application/json',
+      data: JSON.stringify({ shipping_method_id: shippingMethodId })
+    }, options));
+  }
+})

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

@@ -0,0 +1,6 @@
+Spree.Models.StockItem = Backbone.Model.extend({
+  paramRoot: 'stock_item',
+  urlRoot: function() {
+    return Spree.routes.stock_items_api(this.get('stock_location_id'));
+  }
+});

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

@@ -2,10 +2,14 @@ _.extend(window.Spree, {
   Models: {},
   Collections: {},
   Views: {
+    Calculators: {},
     Images: {},
     Order: {},
     Cart: {},
     Zones: {},
-    Payment: {}
+    Payment: {},
+    Promotions: {},
+    Stock: {},
+    Tables: {}
   }
 })

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

@@ -0,0 +1,14 @@
+Spree.ready(function() {
+  var navHeight = function() {
+    return $('.admin-nav-header').outerHeight() + $('.admin-nav-menu').outerHeight() + $('.admin-nav-footer').outerHeight();
+  };
+
+  var checkSideBarFit = function() {
+    $('.admin-nav').toggleClass('fits', navHeight() < $(window).height());
+  };
+
+  $(".admin-nav-sticky, .admin-nav").stick_in_parent();
+
+  checkSideBarFit();
+  $(window).on('resize', checkSideBarFit);
+});

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

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+Spree.ready(function () {
   'use strict';
 
   function formatOptionType(option_type) {

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

@@ -25,6 +25,7 @@ $.fn.optionValueAutocomplete = function (options) {
       url: Spree.routes.option_value_search,
       datatype: 'json',
       data: function (term, page) {
+        // Note: This doesn't work. variants_product_id isn't an allowed filter
         var productId = typeof(productSelect) !== 'undefined' ? $(productSelect).select2('val') : null;
         return {
           q: {

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

@@ -48,7 +48,7 @@ Spree.Order.initCartPage = function(order_number) {
   })
 }
 
-$(function() {
+Spree.ready(function() {
   if ($(".js-order-cart-page").length) {
     Spree.Order.initCartPage($(".js-order-cart-page").data("order-number"));
   }

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

@@ -1,6 +1,6 @@
-$(document).ready(function () {
+Spree.ready(function () {
   'use strict';
 
-  $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete({ in_stock_only: true });
+  $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete({ suppliable_only: true });
   $("[data-hook='admin_orders_index_search']").find(".variant_autocomplete").variantAutocomplete();
 });

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

@@ -0,0 +1,16 @@
+Spree.ready(function() {
+  var order_id = $('#payments').data('order-id');
+
+  $('tr.payment').each(function() {
+    var payment_id = $(this).data('payment-id');
+    var model = new Spree.Models.Payment({
+      id: payment_id,
+      order_id: order_id
+    });
+
+    new Spree.Views.Payment.PaymentRow({
+      el: this,
+      model: model
+    });
+  });
+});

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

@@ -1,4 +1,4 @@
-$(function() {
+Spree.ready(function() {
   if ($("#new_payment").length) {
     new Spree.Views.Payment.New({
       el: $('#new_payment')

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

@@ -48,6 +48,6 @@ $.fn.productAutocomplete = function (options) {
   });
 };
 
-$(document).ready(function () {
+Spree.ready(function () {
   $('.product_picker').productAutocomplete();
 });

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

@@ -0,0 +1,9 @@
+Spree.ready(function() {
+  $(document).ajaxStart(function() {
+    $("#progress").show();
+  });
+
+  $(document).ajaxStop(function() {
+    $("#progress").hide();
+  });
+});

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

@@ -0,0 +1,35 @@
+// This is called on page load and via an ajax request in
+// app/views/spree/admin/promotion_actions/create.js.erb
+window.initPromotionActions = function() {
+  $('#promotion-filters').find('.variant_autocomplete').variantAutocomplete();
+
+  $('.promo-rule-option-values').each(function() {
+    if (!$(this).data('has-view')) {
+      $(this).data('has-view', true);
+      new Spree.Views.Promotions.OptionValuesRule({
+        el: this
+      });
+    }
+  });
+
+  $('.js-tiered-calculator').each(function() {
+    if (!$(this).data('has-view')) {
+      $(this).data('has-view', true);
+      new Spree.Views.Calculators.Tiered({
+        el: this
+      });
+    }
+  });
+};
+
+Spree.ready(function() {
+  // Add classes to boxes when hovering over delete
+  $('#promotion-filters').on('mouseover', 'a.delete', function(event) {
+    $(this).parent().addClass('action-remove');
+  });
+  $('#promotion-filters').on('mouseout', 'a.delete', function(event) {
+    $(this).parent().removeClass('action-remove');
+  });
+
+  window.initPromotionActions();
+});

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

@@ -17,7 +17,7 @@ Spree.PromotionActivationView = Backbone.View.extend({
   }
 });
 
-$(function(){
+Spree.ready(function(){
   if($("#js_promotion_activation").length) {
     new Spree.PromotionActivationView({
       el: $("#js_promotion_activation")

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

@@ -1,4 +1,4 @@
-$(document).ready(function() {
+Spree.ready(function() {
   function checkAddItemBox() {
     $(this).closest('tr').find('input.add-item').attr('checked', 'checked');
     updateSuggestedAmount();

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

@@ -25,15 +25,3 @@ Spree.routes.payments_api = function(order_id) {
 Spree.routes.stock_items_api = function(stock_location_id) {
   return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
 }
-
-Spree.routes.receive_stock_transfer_api = function(stockTransferNumber) {
-  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/receive')
-}
-
-Spree.routes.create_transfer_items_api = function(stockTransferNumber) {
-  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/transfer_items')
-}
-
-Spree.routes.update_transfer_items_api = function(stockTransferNumber, itemId) {
-  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/transfer_items/' + itemId)
-}