solidus_backend 2.1.1 → 2.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f6d2c898856d64091248b66ab4d07a2a1e702f
-  data.tar.gz: 367efc21bf8753864c265e35a501b62afdf7467e
+  metadata.gz: 8f80d171de4d00d83aaab31e8a5bf414441b3865
+  data.tar.gz: b76fb58babd20d169eb08cd4c77ee2b4c4d1ada6
 SHA512:
-  metadata.gz: b320bd7956b5d9f7383b06f1d156359ff110340feadd7529805678d490fc455aed496990d753e4a104339405782e09c898feca1dda309ce931727b9e4435340b
-  data.tar.gz: 4fec08859202fcde00da1269c6716ebebee9bcb0e16600b1db8fc5653cf8f887b7421ef691d5c8a6fe42d32498abea6c4d6214becad89386188ee714b1157321
+  metadata.gz: ba210fac2ddf64b2a27a254fe37f58f83eaf0a250bea67000031ea992b639fa96bdb9433aca11001b98b29243444671e0a227b1bcf71d7ba926fdcdeda0fd450
+  data.tar.gz: 95ae582a3e69cdfdbe8da3c4e3ef68c0e2c3a74b3159de70a30f99737e94db51eee75e6bf43256e555c899befee32ee483bd89fabca3a1d53311e9e7faee0582

data/.eslintrc

@@ -0,0 +1,21 @@
+{
+  "rules": {
+    "no-unused-vars": ["error", { "vars": "all", "args": "none" }],
+    "linebreak-style": ["error", "unix"]
+  },
+  "env": {
+    "es6": false,
+    "browser": true,
+    "jquery": true
+  },
+  "globals": {
+    "Spree": true,
+    "Backbone": true,
+    "HandlebarsTemplates": true,
+    "_": true,
+    "Select2": true,
+    "show_flash": true,
+    "update_state": true,
+  },
+  "extends": "eslint:recommended"
+}

data/Gemfile

@@ -4,3 +4,6 @@ gem 'solidus_core', path: '../core'
 gem 'solidus_api', path: '../api'
 
 gemspec
+
+gem 'teaspoon'
+gem 'teaspoon-mocha'

data/Rakefile

@@ -6,7 +6,36 @@ require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
-task default: :spec
+task :dummy_environment do
+  ENV['RAILS_ENV'] = 'test'
+  require File.expand_path("../spec/dummy/config/environment", __FILE__)
+end
+
+desc "Run the javascript specs"
+task teaspoon: :dummy_environment do
+  require "teaspoon/console"
+
+  options = {
+    files: ENV["files"].nil? ? [] : ENV["files"].split(","),
+    suite: ENV["suite"],
+    coverage: ENV["coverage"],
+    driver_options: ENV["driver_options"],
+  }
+
+  options.delete_if { |k, v| v.nil? }
+
+  abort("rake teaspoon failed") if Teaspoon::Console.new(options).failures?
+end
+
+namespace :teaspoon do
+  task server: :dummy_environment do
+    require 'teaspoon/server'
+    server = Teaspoon::Server.new
+    server.start
+    puts "#{server.url}/teaspoon"
+    sleep
+  end
+end
 
 desc "Generates a dummy app for testing"
 task :test_app do

data/app/assets/config/solidus_backend_manifest.js

@@ -0,0 +1,6 @@
+//= link_tree ../images
+
+//= link spree/backend/all.js
+//= link spree/backend/all.css
+
+//= link solidus_admin/select2_locales

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

@@ -6,22 +6,30 @@
 //= require jquery-ui/sortable
 //= require jquery-ui/autocomplete
 //= require jquery.sticky-kit.min
+//= require solidus_admin/select2
 //= require solidus_admin/underscore
 //= require solidus_admin/backbone
+//= require solidus_admin/backbone-nested-models
 //= require solidus_admin/tether
 //= require solidus_admin/bootstrap
 //= require prism
 //= require spree
+//= require spree/backend/namespaces
+//= require spree/backend/translation
 //= require spree/backend/backbone-overrides
-//= require spree/backend/spree-select2
+//= require spree/backend/format_money
 //
 //= require spree/backend/templates
+//= require spree/backend/models
+//= 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
 //= require spree/backend/checkouts/edit
+//= require spree/backend/components/number_with_currency
 //= require spree/backend/components/tabs
 //= require spree/backend/components/tooltips
 //= require spree/backend/flash
@@ -30,19 +38,17 @@
 //= require spree/backend/images/index
 //= require spree/backend/images/new
 //= require spree/backend/images/upload
-//= require spree/backend/line_items
-//= require spree/backend/line_items_on_order_edit
 //= 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/edit
+//= require spree/backend/orders
 //= require spree/backend/payments/edit
 //= require spree/backend/payments/new
 //= require spree/backend/product_picker
 //= require spree/backend/progress
 //= require spree/backend/promotions
-//= require spree/backend/returns/expedited_exchanges_warning
+//= require spree/backend/promotions/activation
 //= require spree/backend/returns/return_item_selection
 //= require spree/backend/routes
 //= require spree/backend/select_payments
@@ -52,7 +58,6 @@
 //= 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_movement
 //= require spree/backend/stock_transfers/count_update_forms
 //= require spree/backend/stock_transfers/edit
 //= require spree/backend/stock_transfers/receive
@@ -68,5 +73,4 @@
 //= require spree/backend/taxons
 //= require spree/backend/user_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,4 +1,4 @@
-var update_state = function (region, done) {
+window.update_state = function (region, done) {
   'use strict';
 
   var country = $('span#' + region + 'country .select2').select2('val');

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

@@ -36,8 +36,8 @@ $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 // Apply to individual radio button that makes another element visible when checked
 $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   if(!this.get(0)){ return  }
-  showValue = this.get(0).value;
-  radioGroup = $("input[name='" + this.get(0).name + "']");
+  var showValue = this.get(0).value;
+  var radioGroup = $("input[name='" + this.get(0).name + "']");
   radioGroup.each(function(){
     $(this).click(function(){
       $(dependentElementSelector).visible(this.checked && this.value == showValue)
@@ -46,7 +46,7 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   });
 }
 
-handle_date_picker_fields = function(){
+var handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
     dateFormat: Spree.translations.date_picker,
     dayNames: Spree.translations.abbr_day_names,
@@ -70,7 +70,7 @@ handle_date_picker_fields = function(){
 $(document).ready(function(){
   handle_date_picker_fields();
   $(".observe_field").on('change', function() {
-    target = $(this).data("update");
+    var target = $(this).data("update");
     $(target).hide();
     Spree.ajax({ dataType: 'html',
              url: $(this).data("base-url")+encodeURIComponent($(this).val()),
@@ -127,7 +127,7 @@ $(document).ready(function(){
   });
 
   $('body').on('click', 'a.spree_remove_fields', function() {
-    el = $(this);
+    var el = $(this);
     el.prev("input[type=hidden]").val("1");
     el.closest(".fields").hide();
     if (el.prop("href").substr(-1) == '#') {
@@ -168,12 +168,12 @@ $(document).ready(function(){
         placeholder: 'ui-sortable-placeholder',
         update: function(event, ui) {
           $("#progress").show();
-          tableEl = $(ui.item).closest("table.sortable")
-          positions = {};
+          var tableEl = $(ui.item).closest("table.sortable")
+          var positions = {};
           $.each(tableEl.find('tbody tr'), function(position, obj){
-            idAttr = $(obj).prop('id');
+            var idAttr = $(obj).prop('id');
             if (idAttr) {
-              objId = idAttr.split('_').slice(-1);
+              var objId = idAttr.split('_').slice(-1);
               if (!isNaN(objId)) {
                 positions['positions['+objId+']'] = position+1;
               }
@@ -194,7 +194,7 @@ $(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")
+          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");
@@ -210,7 +210,7 @@ $(document).ready(function(){
       data: {
         token: Spree.api_key
       },
-      url: Spree.routes.checkouts_api + "/" + order_number + "/advance"
+      url: Spree.routes.checkouts_api + "/" + window.order_number + "/advance"
     }).done(function() {
       window.location.reload();
     });

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

@@ -1,16 +1,26 @@
+Spree.CalculatorEditView = Backbone.View.extend({
+  events: {
+    "change .js-calculator-type": "render",
+  },
+
+  initialize: function() {
+    this.render();
+  },
+
+  render: function() {
+    var selected_class = this.$('.js-calculator-type option:selected').val();
+    this.$('.js-calculator-preferences').each(function() {
+      var selected = ($(this).data('calculator-type') === selected_class);
+      $(this).find(':input').prop("disabled", !selected);
+      $(this).toggle(selected);
+    });
+  }
+})
+
 $(function() {
-  var calculator_select = $('select#calc_type')
-  var original_calc_type = calculator_select.prop('value');
-  $('.calculator-settings-warning').hide();
-  calculator_select.change(function() {
-    if (calculator_select.prop('value') == original_calc_type) {
-      $('div.calculator-settings').show();
-      $('.calculator-settings-warning').hide();
-      $('.calculator-settings').find('input,textarea').prop("disabled", false);
-    } else {
-      $('div.calculator-settings').hide();
-      $('.calculator-settings-warning').show();
-      $('.calculator-settings').find('input,texttarea').prop("disabled", true);
-    }
+  $('.js-calculator-fields').each(function() {
+    new Spree.CalculatorEditView({
+      el: this
+    });
   });
-})
+});

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

@@ -1,99 +1,12 @@
-//= require_self
-$(document).ready(function() {
-  window.customerTemplate = HandlebarsTemplates['orders/customer_details/autocomplete'];
-
-  formatCustomerResult = function(customer) {
-    return customerTemplate({
-      customer: customer,
-      bill_address: customer.bill_address,
-      ship_address: customer.ship_address
-    })
-  }
-
-  if ($("#customer_search").length > 0) {
-    $("#customer_search").select2({
-      placeholder: Spree.translations.choose_a_customer,
-      ajax: {
-        url: Spree.routes.users_api,
-        params: { "headers": { "X-Spree-Token": Spree.api_key } },
-        datatype: 'json',
-        data: function(term, page) {
-          return {
-            q: {
-              m: 'or',
-              email_start: term,
-              addresses_firstname_start: term,
-              addresses_lastname_start: term
-            }
-          }
-        },
-        results: function(data, page) {
-          return {
-            results: data.users,
-            more: data.current_page < data.pages
-          }
-        }
-      },
-      dropdownCssClass: 'customer_search',
-      formatResult: formatCustomerResult,
-      formatSelection: function (customer) {
-        return Select2.util.escapeMarkup(customer.email);
-      }
-    })
-
-    $("#customer_search").on("select2-selecting", function(e) {
-      var customer = e.choice;
-      $('#order_email').val(customer.email);
-      $('#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_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);
-          });
-        });
-      }
+$(function() {
+  if($(".js-customer-details").length) {
+    var order = new Spree.Models.Order({
+      bill_address: {},
+      ship_address: {}
+    });
+    new Spree.Views.Order.CustomerDetails({
+      el: $(".js-customer-details"),
+      model: order
     });
   }
-
-  var order_use_billing_input = $('input#order_use_billing');
-
-  var order_use_billing = function () {
-    if (!order_use_billing_input.is(':checked')) {
-      $('#shipping').show();
-    } else {
-      $('#shipping').hide();
-    }
-  };
-
-  order_use_billing_input.click(function() {
-    order_use_billing();
-  });
-
-  order_use_billing();
-
-  $('#guest_checkout_true').change(function() {
-    $('#customer_search').val("");
-    $('#user_id').val("");
-    $('#checkout_email').val("");
-
-    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("");
-    })
-  });
 });

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

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

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

@@ -0,0 +1,9 @@
+//= require spree/backend/models/line_item
+
+Spree.Collections.LineItems = Backbone.Collection.extend({
+  model: Spree.Models.LineItem,
+
+  url: function () {
+    return this.parent.url() + "/line_items";
+  }
+})

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

@@ -0,0 +1,13 @@
+Spree.Collections.States = Backbone.Collection.extend({
+  initialize: function (models, options) {
+    this.country_id = options.country_id
+  },
+
+  url: function () {
+    return Spree.routes.states_search + "?country_id=" + this.country_id
+  },
+
+  parse: function(resp, options) {
+    return resp.states;
+  }
+})

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

@@ -0,0 +1,12 @@
+Spree.initNumberWithCurrency = function() {
+  $('.js-number-with-currency').each(function() {
+    var view = new Spree.Views.NumberWithCurrency({
+      el: this,
+    });
+    view.render();
+  });
+}
+
+$(function() {
+  Spree.initNumberWithCurrency()
+})

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

@@ -1,7 +1,8 @@
 $(function(){
   $('body').popover({selector: '.hint-tooltip', html: true, trigger: 'hover', placement: 'top'});
 
-  $('body').tooltip({selector: '.with-tip'});
+  /* 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.

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

@@ -0,0 +1,11 @@
+//= require spree/backend/translation
+//= require solidus_admin/accounting
+
+Spree.formatMoney = function(amount, currency) {
+  var currencyInfo = Spree.currencyInfo[currency];
+
+  var thousand = Spree.t('currency_delimiter');
+  var decimal = Spree.t('currency_separator');
+
+  return accounting.formatMoney(amount, currencyInfo[0], currencyInfo[1], thousand, decimal, currencyInfo[2]);
+}