solidus_backend 2.2.2 → 2.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6acc4cfee78b4706bcd2d07f7a66a5e7bec16195
-  data.tar.gz: fc469241223bd6813067ce6512b4e7309fc112d4
+  metadata.gz: cebe06f697d76eeeeb4f0127598a92a3bac822e1
+  data.tar.gz: f6d8aadac696b01eddbe0eeeb20ebc350b086991
 SHA512:
-  metadata.gz: a8cc397b8f83c1adeb7ec297977cca5216e43b0f1469c8373f661d570917d625ca1ddbc9cb3db176de0b5acf534a7ed2d5af5987447aa28f96b4935242ccf2b5
-  data.tar.gz: 4a4d53b91eeb7ff9c5de2a4fabc3f04ea03ec1845de84b3d0f708d7511daccd39010a48e7ae9a29cb20f3e1a5336313b4c6eb2f989b70b0a512bd70656bf810d
+  metadata.gz: d66d74dc75f5cd2c9f9cc2e793896e7a938ec3549f4a0d2e92096a8f36041a943a19a10e8c776af35691f33cc325a13d6d50c04a7da8e5842ba53a33ee6638f0
+  data.tar.gz: bd40e9bf6e7e06f667970d34cbb7389b320b0752a68fc7d112acfec8d8d959253eac2fa555e55218aa83e8564a58a4664092fb468dc33111e10746e3fbb89078

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

@@ -32,11 +32,11 @@
 //= require spree/backend/components/number_with_currency
 //= require spree/backend/components/tabs
 //= require spree/backend/components/tooltips
+//= require spree/backend/components/editable_table
 //= require spree/backend/flash
 //= require spree/backend/gateway
 //= require spree/backend/handlebars_extensions
 //= require spree/backend/images/index
-//= require spree/backend/images/new
 //= require spree/backend/images/upload
 //= require spree/backend/navigation
 //= require spree/backend/number_field_updater
@@ -51,7 +51,6 @@
 //= require spree/backend/promotions/activation
 //= require spree/backend/returns/return_item_selection
 //= require spree/backend/routes
-//= require spree/backend/select_payments
 //= require spree/backend/shipments
 //= require spree/backend/spree-select2
 //= require spree/backend/states

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

@@ -1,7 +1,7 @@
 window.update_state = function (region, done) {
   'use strict';
 
-  var country = $('span#' + region + 'country .select2').select2('val');
+  var country = $('span#' + region + 'country select.select2').select2('val');
   var state_select = $('span#' + region + 'state select.select2');
   var state_input = $('span#' + region + 'state input.state_name');
 

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

@@ -1,4 +1,4 @@
-$(@).ready( ->
+Spree.ready( ->
   $('[data-hook=adjustments_new_coupon_code] #add_coupon_code').click ->
     return if $("#coupon_code").val().length == 0
     Spree.ajax

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

@@ -14,7 +14,7 @@ under the spree namespace that do stuff we find helpful.
 Hopefully, this will evolve into a propper class.
 **/
 
-jQuery(function($) {
+Spree.ready(function() {
   // Highlight hovered table column
   $('table').on("mouseenter", 'td.actions a, td.actions button', function(){
     var tr = $(this).closest('tr');
@@ -159,48 +159,44 @@ $(document).ready(function(){
       return ui;
   };
 
-  $('table.sortable').ready(function(){
-    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");
+  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() {

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

@@ -0,0 +1,3 @@
+Spree.ready ->
+  $('.inline-editable-table tr').each ->
+    Spree.Views.Tables.EditableTable.add $(this)

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

@@ -10,4 +10,4 @@ $ ->
       url: @href
       success: (r) ->
         ($ '#images').html r
-        ($ '.select2').select2()
+        ($ 'select.select2').select2()

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

@@ -3,199 +3,23 @@ Spree.prepareImageUploader = function () {
   var uploadZone = document.getElementById('upload-zone');
   if(!uploadZone) return;
 
-  var UploadZone = Backbone.View.extend({
-    el: uploadZone,
-
-    events: {
-      "dragover" : "onDragOver",
-      "dragleave" : "onDragLeave",
-      "drop" : "onDrop",
-      'change input[type="file"]' : "onFileBrowserSelect"
-    },
-
-    progressZone: document.getElementById('progress-zone'),
-
-    // Hide or highlight supported browser features
-    initialize: function() {
-      "filereader formdata progress".split(' ').forEach(function (api) {
-        this.support[api].className = (this.tests[api] === false) ? 'red' : 'hidden'
-      }, this);
-    },
-
-    upload: function(file) {
-      if (!FormData) return;
-
-      var progressModel = new ProgressModel({file: file});
-      progressModel.previewFile();
-      progressModel.uploadFile();
-
-      var progressView = new ProgressView({model: progressModel});
-      this.progressZone.appendChild(progressView.render().el);
-    },
-
-    dragClass: 'with-images',
-
-    onDragOver: function(e) {
-      this.el.classList.add(this.dragClass);
-      e.preventDefault();
-    },
-
-    onDragLeave: function() {
-      this.el.classList.remove(this.dragClass);
-    },
-
-    onDrop: function(e) {
-      this.el.classList.remove(this.dragClass);
-      e.preventDefault();
-
-      _.each(e.originalEvent.dataTransfer.files, this.upload, this);
-    },
-
-    onFileBrowserSelect: function(e) {
-      _.each(e.target.files, this.upload, this);
-    },
-
-    tests: {
-      filereader: typeof FileReader != 'undefined',
-      dnd: 'draggable' in document.createElement('span'),
-      formdata: !!window.FormData,
-      progress: "upload" in new XMLHttpRequest
-    },
+  // Kick off by binding the events on the upload zone
+  var imageUploads = new Backbone.Collection();
+  var progressZone = document.getElementById('progress-zone');
+  var variantId = document.querySelector('input[name="image[viewable_id]"]').value;
 
-    support: {
-      filereader: document.getElementById('filereader'),
-      formdata:   document.getElementById('formdata'),
-      progress:   document.getElementById('progress')
-    }
+  new Spree.Views.Images.UploadZone({
+    el: uploadZone,
+    collection: imageUploads
   });
 
-  var ProgressModel = Backbone.Model.extend({
-    initialize: function() {
-      this.set({summary: this.get("file").name});
-    },
-
-    defaults: function() {
-      return {
-        file: null,
-        imgSrc: '',
-        progress: 0,
-        serverError: false,
-        summary: ''
-      }
-    },
-
-    acceptedTypes: {
-      'image/png': true,
-      'image/jpeg': true,
-      'image/gif': true
-    },
-
-    variantId: document.querySelector('input[name="image[viewable_id]"]').value,
-
-    previewFile: function () {
-      var file = this.get('file'),
-          that = this;
+  imageUploads.on('add', function(progressModel) {
+    progressModel.set({variant_id: variantId});
 
-      if (FileReader && this.acceptedTypes[file.type] === true) {
-        var reader = new FileReader();
-        reader.onload = function (event) {
-          that.set({imgSrc: event.target.result});
-        };
-
-        reader.readAsDataURL(file);
-      } else {
-        var summary = 'Uploading ' + file.name + ' ' + (file.size ? (file.size/1024|0) + 'K' : '');
-        this.set({summary: summary});
-      }
-    },
-
-    uploadFile: function () {
-      var formData = new FormData(),
-          that = this;
-
-      formData.append('image[attachment]', this.get('file'));
-      formData.append('image[viewable_id]', this.variantId);
-      formData.append('upload_id', this.cid);
-
-      // send the image to the server
-      Spree.ajax({
-        url: window.location.pathname,
-        type: "POST",
-        dataType: 'script',
-        data: formData,
-        processData: false,  // tell jQuery not to process the data
-        contentType: false,  // tell jQuery not to set contentType
-        xhr: function () {
-          var xhr = $.ajaxSettings.xhr();
-          if (xhr.upload) {
-            xhr.upload.onprogress = function (event) {
-              if (event.lengthComputable) {
-                var complete = (event.loaded / event.total * 100 | 0);
-                that.set({progress: complete})
-              }
-            };
-          }
-          return xhr;
-        }
-      }).done(function() {
-        that.set({progress: 100})
-      }).error(function(jqXHR, textStatus, errorThrown) {
-        that.set({serverError: true});
-      });
-    }
-  }); // end ProgressModel
-
-
-  var ProgressView = Backbone.View.extend({
-    tagName: "div",
-
-    // Cache the template function for a single item.
-    template: HandlebarsTemplates["products/upload_progress"],
-
-    initialize: function() {
-      this.listenTo(this.model, 'change:progress', this.updateProgressBar);
-      this.listenTo(this.model, 'change', this.render);
-      this.listenTo(this.model, 'destroy', this.remove);
-    },
-
-    events: {
-      "clear" : "clear"
-    },
-
-    className: 'col-sm-6 col-md-4 margin-bottom-one',
-
-    attributes: function() {
-      return {
-        "data-upload-id": this.model.cid
-      }
-    },
-
-    render: function() {
-      // Skip progress bar update for better performance
-      var changedAttrs = Object.keys(this.model.changed);
-      if(changedAttrs.length === 1 && changedAttrs[0] == 'progress') return this;
-
-      this.el.innerHTML = this.template(this.model.attributes);
-      return this;
-    },
-
-    updateProgressBar: function() {
-      var progressBar = this.el.querySelector('progress');
-      progressBar.value = progressBar.innerHTML = this.model.get('progress');
-      return this;
-    },
-
-    // Remove the item, destroy the model
-    clear: function() {
-      this.model.destroy();
-    }
-  }); // end ProgressView
-
-
-  // Kick off by binding the events on the upload zone
-  new UploadZone();
-
-}; // end prepareImageUploader
+    var progressView = new Spree.Views.Images.UploadProgress({model: progressModel});
+    progressZone.appendChild(progressView.render().el);
+  });
+};
 
 
 Spree.ready(function () {

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

@@ -0,0 +1,76 @@
+Spree.Models.ImageUpload = Backbone.Model.extend({
+  initialize: function() {
+    var file = this.get("file");
+    this.set({
+      filename: file.name,
+      size: file.size ? (file.size/1024|0) + 'K' : ''
+    });
+  },
+
+  defaults: function() {
+    return {
+      file: null,
+      imgSrc: '',
+      progress: 0,
+      serverError: false,
+      filename: '',
+      size: ''
+    }
+  },
+
+  acceptedTypes: {
+    'image/png': true,
+    'image/jpeg': true,
+    'image/gif': true
+  },
+
+
+  previewFile: function () {
+    var file = this.get('file'),
+      that = this;
+
+    if (FileReader && this.acceptedTypes[file.type] === true) {
+      var reader = new FileReader();
+      reader.onload = function (event) {
+        that.set({imgSrc: event.target.result});
+      };
+
+      reader.readAsDataURL(file);
+    }
+  },
+
+  uploadFile: function () {
+    var formData = new FormData(),
+      that = this;
+
+    formData.append('image[attachment]', this.get('file'));
+    formData.append('image[viewable_id]', this.get('variant_id'));
+    formData.append('upload_id', this.cid);
+
+    // send the image to the server
+    Spree.ajax({
+      url: window.location.pathname,
+      type: "POST",
+      dataType: 'script',
+      data: formData,
+      processData: false,  // tell jQuery not to process the data
+      contentType: false,  // tell jQuery not to set contentType
+      xhr: function () {
+        var xhr = $.ajaxSettings.xhr();
+        if (xhr.upload) {
+          xhr.upload.onprogress = function (event) {
+            if (event.lengthComputable) {
+              var complete = (event.loaded / event.total * 100 | 0);
+              that.set({progress: complete})
+            }
+          };
+        }
+        return xhr;
+      }
+    }).done(function() {
+      that.set({progress: 100})
+    }).error(function(jqXHR, textStatus, errorThrown) {
+      that.set({serverError: true});
+    });
+  }
+});

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

@@ -1,2 +1,4 @@
+//= require spree/backend/models/image_upload
 //= require spree/backend/models/line_item
 //= require spree/backend/models/order
+//= require spree/backend/models/taxonomy