solidus_backend 2.4.2 → 2.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ddb6bbe7fd3ea3ea53a1923a6ce503af67ac2f3
-  data.tar.gz: 614e67bc5def610f22c333d4faf272b9876dc338
+SHA256:
+  metadata.gz: 37a62d156cc405826251df9a295eb9db3bbdbe4be6de02a6ae2fc5c504add400
+  data.tar.gz: bd70186a0f42fe73905837747b32ebefca697bee819ebb170f79754a91da88c9
 SHA512:
-  metadata.gz: fb5f4bb9b144fb16d5b768982d8be919e318f6e8d1ab7603cbde99bbda872497f76f6942c2298a1294ac6cdae04716688d1f78b9b3bf0517170f5f7446439906
-  data.tar.gz: fbdf3e039c1998c4e13e36b4dac1e2178c605eeaab8b6ad9786e0fad125180d61af4e12592372832b765953bb72cb84e49e8b5e07474af3109ad64106cba495b
+  metadata.gz: ca191e3d49fcc738c701bf706e9902a73d086c78a3e2b3a2dae3c057b9d46ba9fda4d7b8ce10e65aa746bc9a5764ec76a56e1b9db1132417267a3fd9b1f807dc
+  data.tar.gz: fe252a37e24708e7109d06feca3569e4c39e25fdf01018348a703ee74da697bf9119a5b8d924bed25236947fe81f507fa2f02ea6e7f9fea1947686fa3fd7f014

data/README.md

@@ -8,12 +8,12 @@ Backend contains the controllers, views, and assets making up the admin interfac
 
 Can be found in [app/assets/javascripts/spree/backend/](./app/assets/javascripts/spree/backend/)
 
-Out scripts are written in a mix of coffeescript and javascript. We can't
+Our scripts are written in a mix of coffeescript and javascript (ES5). We can't
 easily use a transpiler for ECMAScript >= 6 without adding additional steps for
 applications using solidus\_admin.
 
-As a result, we accept contributions in either plain-ol javascript or
-CoffeeScript, and discourage converting existing files.
+Though we have existing CoffeeScript files, any new files should be in
+javascript (ES5).
 
 ### Stylesheets
 
@@ -29,10 +29,10 @@ When running the application there is a styleguide available at:
 
 ## Testing
 
-Create the test site
+Run the tests
 
-    bundle exec rake test_app
+    bundle exec rspec
 
-Run the tests
+Run the javascript tests (must have chromedriver installed)
 
-    bundle exec rake spec
+    bundle exec teaspoon

data/Rakefile

@@ -2,17 +2,21 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+
+require 'solidus_backend'
+require 'spree/testing_support/dummy_app/rake_tasks'
 
 RSpec::Core::RakeTask.new
+task default: [:spec, 'spec:js']
 
-task :dummy_environment do
-  ENV['RAILS_ENV'] = 'test'
-  require File.expand_path("../spec/dummy/config/environment", __FILE__)
-end
+DummyApp::RakeTasks.new(
+  gem_root: File.expand_path('../', __FILE__),
+  lib_name: 'solidus_backend'
+)
 
-desc "Run the javascript specs"
-task teaspoon: :dummy_environment do
+task :teaspoon do
+  require 'teaspoon'
+  Rake::Task['dummy_environment'].invoke
   require "teaspoon/console"
 
   options = {
@@ -27,9 +31,15 @@ task teaspoon: :dummy_environment do
   abort("rake teaspoon failed") if Teaspoon::Console.new(options).failures?
 end
 
+desc "Run javascript specs"
+task 'spec:js' => :teaspoon
+
 namespace :teaspoon do
-  task server: :dummy_environment do
+  task :server  do
+    require 'teaspoon'
+    Rake::Task['dummy_environment'].invoke
     require 'teaspoon/server'
+
     server = Teaspoon::Server.new
     server.start
     puts "#{server.url}/teaspoon"
@@ -37,8 +47,4 @@ namespace :teaspoon do
   end
 end
 
-desc "Generates a dummy app for testing"
-task :test_app do
-  ENV['LIB_NAME'] = 'spree/backend'
-  Rake::Task['common:test_app'].invoke
-end
+task test_app: 'db:reset'

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

@@ -2,9 +2,6 @@
 //= require handlebars
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui/datepicker
-//= require jquery-ui/sortable
-//= require jquery-ui/autocomplete
 //= require jquery.sticky-kit.min
 //= require solidus_admin/select2
 //= require solidus_admin/underscore
@@ -12,6 +9,7 @@
 //= require solidus_admin/backbone-nested-models
 //= require solidus_admin/popover
 //= require solidus_admin/bootstrap
+//= require solidus_admin/flatpickr/flatpickr
 //= require prism
 //= require spree
 //= require spree/backend/namespaces
@@ -24,7 +22,6 @@
 //= require spree/backend/collections
 //= require spree/backend/views
 //
-//= require spree/backend/address_states
 //= require spree/backend/adjustments
 //= require spree/backend/admin
 //= require spree/backend/calculator
@@ -33,13 +30,14 @@
 //= require spree/backend/components/tabs
 //= require spree/backend/components/tooltips
 //= require spree/backend/components/editable_table
+//= require spree/backend/components/sortable_table
+//= require spree/backend/datepicker
 //= require spree/backend/flash
 //= require spree/backend/gateway
 //= require spree/backend/handlebars_extensions
 //= require spree/backend/images/index
 //= require spree/backend/images/upload
 //= require spree/backend/navigation
-//= require spree/backend/number_field_updater
 //= require spree/backend/option_type_autocomplete
 //= require spree/backend/option_value_picker
 //= require spree/backend/orders
@@ -53,18 +51,8 @@
 //= require spree/backend/routes
 //= require spree/backend/shipments
 //= require spree/backend/spree-select2
-//= require spree/backend/states
-//= require spree/backend/stock_management/index_add_forms
-//= require spree/backend/stock_management/index_update_forms
-//= require spree/backend/stock_management/stock_item
-//= require spree/backend/stock_transfers/count_update_forms
-//= require spree/backend/stock_transfers/edit
-//= require spree/backend/stock_transfers/receive
-//= require spree/backend/stock_transfers/received_counter
-//= require spree/backend/stock_transfers/stock_transfer
-//= require spree/backend/stock_transfers/transfer_item
-//= require spree/backend/stock_transfers/transfer_item_deleting
-//= require spree/backend/stock_transfers/variant_form
+//= require spree/backend/stock_location
+//= require spree/backend/stock_management
 //= require spree/backend/store_credits
 //= require spree/backend/style_guide
 //= require spree/backend/taxon_autocomplete

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

@@ -0,0 +1,26 @@
+Spree.ready(function() {
+  $('[data-hook=adjustments_new_coupon_code] #add_coupon_code').click(function() {
+    if ($("#coupon_code").val().length === 0) {
+      return;
+    }
+
+    Spree.ajax({
+      type: 'PUT',
+      url: Spree.routes.apply_coupon_code(window.order_number),
+      data: {
+        coupon_code: $("#coupon_code").val(),
+        token: Spree.api_key
+      },
+      success: function() {
+        window.location.reload();
+      },
+      error: function(msg) {
+        if (msg.responseJSON["error"]) {
+          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

@@ -20,13 +20,19 @@ Spree.ready(function() {
     var tr = $(this).closest('tr');
     var klass = 'highlight action-' + $(this).data('action')
     tr.addClass(klass)
-    tr.prev().addClass('before-' + klass);
-  });
-  $('table').on("mouseleave", 'td.actions a, td.actions button', function(){
-    var tr = $(this).closest('tr');
-    var klass = 'highlight action-' + $(this).data('action')
-    tr.removeClass(klass)
-    tr.prev().removeClass('before-' + klass);
+
+    var observer = new MutationObserver(function(mutations) {
+      tr.removeClass(klass);
+      this.disconnect();
+    });
+    observer.observe(tr.get(0), { childList: true });
+
+    // Using .one() instead of .on() prevents multiple callbacks to be attached
+    // to this event if mouseentered multiple times.
+    $(this).one("mouseleave", function() {
+      tr.removeClass(klass);
+      observer.disconnect();
+    });
   });
 });
 
@@ -46,29 +52,7 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   });
 }
 
-var handle_date_picker_fields = function(){
-  $('.datepicker').datepicker({
-    dateFormat: Spree.translations.date_picker,
-    dayNames: Spree.translations.abbr_day_names,
-    dayNamesMin: Spree.translations.abbr_day_names,
-    firstDay: Spree.translations.first_day,
-    monthNames: Spree.translations.month_names,
-    prevText: Spree.translations.previous,
-    nextText: Spree.translations.next,
-    showOn: "focus"
-  });
-
-  // Correctly display range dates
-  $('.date-range-filter .datepicker-from').datepicker('option', 'onSelect', function(selectedDate) {
-    $(".date-range-filter .datepicker-to" ).datepicker( "option", "minDate", selectedDate );
-  });
-  $('.date-range-filter .datepicker-to').datepicker('option', 'onSelect', function(selectedDate) {
-    $(".date-range-filter .datepicker-from" ).datepicker( "option", "maxDate", selectedDate );
-  });
-}
-
-$(document).ready(function(){
-  handle_date_picker_fields();
+Spree.ready(function(){
   var uniqueId = 1;
   $('.spree_add_fields').click(function() {
     var target = $(this).data("target");
@@ -139,54 +123,6 @@ $(document).ready(function(){
     return false;
   });
 
-  // Fix sortable helper
-  var fixHelper = function(e, ui) {
-      ui.children().each(function() {
-          $(this).width($(this).width());
-      });
-      return ui;
-  };
-
-  var td_count = $(this).find('tbody tr:first-child td').length
-  $('table.sortable tbody').sortable({
-    handle: '.handle',
-    helper: fixHelper,
-    placeholder: 'ui-sortable-placeholder',
-    update: function(event, ui) {
-      $("#progress").show();
-      var tableEl = $(ui.item).closest("table.sortable")
-      var positions = {};
-      $.each(tableEl.find('tbody tr'), function(position, obj){
-        var idAttr = $(obj).prop('id');
-        if (idAttr) {
-          var objId = idAttr.split('_').slice(-1);
-          if (!isNaN(objId)) {
-            positions['positions['+objId+']'] = position+1;
-          }
-        }
-      });
-      Spree.ajax({
-        type: 'POST',
-        dataType: 'script',
-        url: tableEl.data("sortable-link"),
-        data: positions,
-        success: function(data){ $("#progress").hide(); }
-      });
-    },
-    start: function (event, ui) {
-      // Set correct height for placehoder (from dragged tr)
-      ui.placeholder.height(ui.item.height())
-      // Fix placeholder content to make it correct width
-      ui.placeholder.html("<td colspan='"+(td_count-1)+"'></td><td class='actions'></td>")
-    },
-    stop: function (event, ui) {
-      var tableEl = $(ui.item).closest("table.sortable")
-      // Fix odd/even classes after reorder
-      tableEl.find("tr:even").removeClass("odd even").addClass("even");
-      tableEl.find("tr:odd").removeClass("odd even").addClass("odd");
-    }
-  });
-
   window.Spree.advanceOrder = function() {
     Spree.ajax({
       type: "PUT",

data/app/assets/javascripts/spree/backend/backbone-overrides.js

@@ -0,0 +1,25 @@
+Backbone.ajax = Spree.ajax;
+
+Backbone._sync = Backbone.sync;
+
+Backbone.sync = function(method, model, options) {
+  var beforeSend = options.beforeSend;
+  options.beforeSend = function(xhr) {
+    var token = $('meta[name="csrf-token"]').attr('content');
+    if (token) {
+      xhr.setRequestHeader('X-CSRF-Token', token);
+    }
+    if (beforeSend) {
+      return beforeSend.apply(this, arguments);
+    }
+  };
+
+  if (options.data == null && model && model.paramRoot && (method === 'create' || method === 'update' || method === 'patch')) {
+    options.contentType = "application/json";
+    var data = {};
+    data[model.paramRoot] = model.toJSON(options);
+    options.data = JSON.stringify(data);
+  }
+
+  return Backbone._sync(method, model, options);
+};

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

@@ -17,7 +17,7 @@ Spree.CalculatorEditView = Backbone.View.extend({
   }
 })
 
-$(function() {
+Spree.ready(function() {
   $('.js-calculator-fields').each(function() {
     new Spree.CalculatorEditView({
       el: this

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

@@ -1,4 +1,4 @@
-$(function() {
+Spree.ready(function() {
   if($(".js-customer-details").length) {
     var order = new Spree.Models.Order({
       bill_address: {},

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

@@ -1,2 +1,3 @@
 //= require spree/backend/collections/line_items
+//= require spree/backend/collections/shipments
 //= require spree/backend/collections/states

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

@@ -0,0 +1,6 @@
+//= require spree/backend/routes
+//= require spree/backend/models/shipment
+
+Spree.Collections.Shipments = Backbone.Collection.extend({
+  model: Spree.Models.Shipment
+})

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

@@ -0,0 +1,5 @@
+Spree.ready(function() {
+  $('.inline-editable-table tr').each(function() {
+    Spree.Views.Tables.EditableTable.add($(this));
+  });
+});

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

@@ -7,6 +7,6 @@ Spree.initNumberWithCurrency = function() {
   });
 }
 
-$(function() {
+Spree.ready(function() {
   Spree.initNumberWithCurrency()
 })

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

@@ -0,0 +1,29 @@
+//= require solidus_admin/Sortable
+
+Spree.ready(function() {
+  var sortable_tables = document.querySelectorAll('table.sortable');
+
+  _.each(sortable_tables, function(table) {
+    var url = table.getAttribute('data-sortable-link');
+    var tbody = table.querySelector('tbody');
+    var sortable = Sortable.create(tbody,{
+      handle: ".handle",
+      onEnd: function(e) {
+        var positions = {};
+        _.each(e.to.querySelectorAll('tr'), function(el, index) {
+          var idAttr = el.id;
+          if (idAttr) {
+            var objId = idAttr.split('_').slice(-1);
+            positions['positions['+objId+']'] = index + 1;
+          }
+        });
+        Spree.ajax({
+          type: 'POST',
+          dataType: 'json',
+          url: url,
+          data: positions,
+        });
+      }
+    });
+  });
+});

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

@@ -0,0 +1,67 @@
+/* global Tabs */
+
+Tabs = (function() {
+  function Tabs(el) {
+    _.bindAll(this, 'overflowTabs');
+
+    this.el = el;
+    this.tabs = this.el.querySelectorAll("li:not(.tabs-dropdown)")
+
+    /* <li class='tabs-dropdown'><a href='#'></a><ul></ul></li> */
+    this.dropdown = document.createElement('li');
+    this.dropdown.classList.add('tabs-dropdown');
+    this.dropdown.appendChild(document.createElement('a'));
+    this.dropdownList = document.createElement('ul');
+    this.dropdown.appendChild(this.dropdownList);
+
+    this.el.appendChild(this.dropdown);
+
+    this.tabWidths = _.map(this.tabs, function(tab) {
+      return tab.offsetWidth;
+    });
+    this.totalTabsWidth = this.tabWidths.reduce(function(previousValue, currentValue) {
+      return previousValue + currentValue;
+    });
+
+    window.addEventListener("resize", this.overflowTabs);
+    this.overflowTabs();
+  }
+
+  Tabs.prototype.overflowTabs = function() {
+    var containerWidth = this.el.offsetWidth;
+    var dropdownWidth = this.dropdown.offsetWidth;
+
+    for (var i = 0; i < this.tabs.length; i++) {
+      var tab = this.tabs[i];
+      tab.parentNode.removeChild(tab);
+    }
+
+    if (this.totalTabsWidth < containerWidth) {
+      this.el.classList.remove("tabs-overflowed");
+    } else {
+      this.el.classList.add("tabs-overflowed");
+      remainingWidth -= dropdownWidth;
+    }
+
+    var remainingWidth = containerWidth;
+    for (var i = 0; i < this.tabs.length; i++) {
+      remainingWidth -= this.tabWidths[i];
+      var tab = this.tabs[i];
+      if (remainingWidth >= 0) {
+        tab.classList.remove("in-dropdown");
+        this.el.insertBefore(tab, this.dropdown);
+      } else {
+        tab.classList.add("in-dropdown");
+        this.dropdownList.appendChild(tab);
+      }
+    }
+  };
+
+  return Tabs;
+})();
+
+window.addEventListener('load', function() {
+  _.each(document.querySelectorAll('.tabs'), function(el) {
+    new Tabs(el);
+  });
+});