solidus_backend 2.2.2 → 2.3.0.beta1

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

@@ -0,0 +1,3 @@
+Spree.Models.Taxonomy = Backbone.Model.extend({
+  urlRoot: Spree.pathFor('api/taxonomies')
+});

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

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

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

@@ -1,39 +1,11 @@
-//= require jquery.payment
-$(document).ready(function() {
-  if ($("#new_payment").is("*")) {
-    $(".cardNumber").payment('formatCardNumber');
-    $(".cardExpiry").payment('formatCardExpiry');
-    $(".cardCode").payment('formatCardCVC');
-
-    $(".cardNumber").change(function() {
-      $(".ccType").val($.payment.cardType(this.value))
+$(function() {
+  if ($("#new_payment").length) {
+    new Spree.Views.Payment.New({
+      el: $('#new_payment')
     })
-
-    $('.payment_methods_radios').click(
-      function() {
-        $('.payment-methods').hide();
-        $('.payment-methods :input').prop('disabled', true);
-        if (this.checked) {
-          $('#payment_method_' + this.value + ' :input').prop('disabled', false);
-          $('#payment_method_' + this.value).show();
-        }
-      }
-    );
-
-    $('.payment_methods_radios').each(
-      function() {
-        if (this.checked) {
-          $('#payment_method_' + this.value + ' :input').prop('disabled', false);
-          $('#payment_method_' + this.value).show();
-        } else {
-          $('#payment_method_' + this.value).hide();
-          $('#payment_method_' + this.value + ' :input').prop('disabled', true);
-        }
-
-        if ($("#card_new" + this.value).is("*")) {
-          $("#card_new" + this.value).radioControlsVisibilityOfElement('#card_form' + this.value);
-        }
-      }
-    );
   }
+
+  $(".js-edit-credit-card").each(function() {
+    new Spree.Views.Payment.EditCreditCard({ el: this })
+  });
 });

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

@@ -96,4 +96,4 @@ window.initPromotionActions = ->
 
   initTieredCalculators()
 
-$ initPromotionActions
+Spree.ready(initPromotionActions)

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

@@ -1,12 +0,0 @@
-$ ->
-  if $('.new_payment').is('*')
-    $input = $('input[name="payment[payment_method_id]"]')
-    $paymentMethods = $('.payment-method-settings .payment-methods')
-
-    updateSelected = ->
-      id = $input.filter(":checked").val()
-      $paymentMethods.addClass('hidden')
-      $paymentMethods.filter("#payment_method_#{id}").removeClass('hidden')
-
-    $input.on('click', updateSelected)
-    updateSelected()

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

@@ -188,7 +188,7 @@ var ShipmentSplitItemView = Backbone.View.extend({
       return false;
     }
     jqXHR.error(function(msg) {
-      alert(msg.responseJSON['message']);
+      alert(Spree.t("split_failed"));
     }).done(function() {
       window.Spree.advanceOrder();
     });

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

@@ -1,5 +1,5 @@
 //= require solidus_admin/select2
-jQuery(function($) {
+Spree.ready(function() {
   // Make select beautiful
   $('select.select2').select2({
     allowClear: true,

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

@@ -1,102 +1,108 @@
 Handlebars.registerHelper 'isRootTaxon', ->
   !@parent_id?
 
-get_taxonomy = ->
-  Spree.ajax
-    url: "#{Spree.routes.taxonomy_path}?set=nested"
-
-create_taxon = ({name, parent_id, child_index}) ->
-  Spree.ajax
-    type: "POST",
-    dataType: "json",
-    url: Spree.routes.taxonomy_taxons_path,
-    data:
-      taxon: {name, parent_id, child_index}
-    complete: redraw_tree
-
-update_taxon = ({id, parent_id, child_index}) ->
-  Spree.ajax
-    type: "PUT"
-    dataType: "json"
-    url: "#{Spree.routes.taxonomy_taxons_path}/#{id}"
-    data:
-      taxon: {parent_id, child_index}
-    error: redraw_tree
-
-delete_taxon = ({id}) ->
-  Spree.ajax
-    type: "DELETE"
-    dataType: "json"
-    url: "#{Spree.routes.taxonomy_taxons_path}/#{id}"
-    error: redraw_tree
-
-draw_tree = (taxonomy) ->
-  taxons_template = HandlebarsTemplates["taxons/tree"]
-  $('#taxonomy_tree')
-    .html( taxons_template({ taxons: [taxonomy.root] }) )
-    .find('ul')
-    .sortable
-      connectWith: '#taxonomy_tree ul'
-      placeholder: 'sortable-placeholder ui-state-highlight'
-      tolerance: 'pointer'
-      cursorAt: { left: 5 }
-
-redraw_tree = ->
-  get_taxonomy().done(draw_tree)
-
-resize_placeholder = (ui) ->
-  handleHeight = ui.helper.find('.sortable-handle').outerHeight()
-  ui.placeholder.height(handleHeight)
-
-restore_sort_targets = ->
-  $('.ui-sortable-over').removeClass('ui-sortable-over')
-
-highlight_sort_targets = (ui) ->
-  restore_sort_targets()
-  ui.placeholder.parents('ul').addClass('ui-sortable-over')
-
-handle_move = (el) ->
-  update_taxon
-    id: el.data('taxon-id')
-    parent_id: el.parent().closest('li').data('taxon-id')
-    child_index: el.index()
-
-handle_delete = (e) ->
-  el = $(e.target).closest('li')
-  if confirm(Spree.translations.are_you_sure_delete)
-    delete_taxon({id: el.data('taxon-id')})
-    el.remove()
-
-handle_add_child = (e) ->
-  el = $(e.target).closest('li')
-  parent_id = el.data('taxon-id')
-  name = 'New node'
-  child_index = 0
-  create_taxon({name, parent_id, child_index})
-
-get_create_handler = (taxonomy_id) ->
-  handle_create = (e) ->
+TaxonTreeView = Backbone.View.extend
+  create_taxon: ({name, parent_id, child_index}) ->
+    Spree.ajax
+      type: "POST",
+      dataType: "json",
+      url: "#{this.model.url()}/taxons",
+      data:
+        taxon: {name, parent_id, child_index}
+      complete: @redraw_tree
+
+  update_taxon: ({id, parent_id, child_index}) ->
+    Spree.ajax
+      type: "PUT"
+      dataType: "json"
+      url: "#{this.model.url()}/taxons/#{id}",
+      data:
+        taxon: {parent_id, child_index}
+      error: @redraw_tree
+
+  delete_taxon: ({id}) ->
+    Spree.ajax
+      type: "DELETE"
+      dataType: "json"
+      url: "#{this.model.url()}/taxons/#{id}",
+      error: @redraw_tree
+
+  render: ->
+    taxons_template = HandlebarsTemplates["taxons/tree"]
+    this.$el
+      .html( taxons_template({ taxons: [this.model.get("root")] }) )
+      .find('ul')
+      .sortable
+        connectWith: '#taxonomy_tree ul'
+        placeholder: 'sortable-placeholder ui-state-highlight'
+        tolerance: 'pointer'
+        cursorAt: { left: 5 }
+
+  redraw_tree: ->
+    this.model.fetch({
+      url: this.model.url() + '?set=nested'
+    })
+
+  resize_placeholder: (e, ui) ->
+    handleHeight = ui.helper.find('.sortable-handle').outerHeight()
+    ui.placeholder.height(handleHeight)
+
+  restore_sort_targets: ->
+    $('.ui-sortable-over').removeClass('ui-sortable-over')
+
+  highlight_sort_targets: (e, ui) ->
+    @restore_sort_targets()
+    ui.placeholder.parents('ul').addClass('ui-sortable-over')
+
+  handle_move: (e, ui) ->
+    return if ui.sender?
+    el = ui.item
+    @update_taxon
+      id: el.data('taxon-id')
+      parent_id: el.parent().closest('li').data('taxon-id')
+      child_index: el.index()
+
+  handle_delete: (e) ->
+    el = $(e.target).closest('li')
+    if confirm(Spree.translations.are_you_sure_delete)
+      @delete_taxon({id: el.data('taxon-id')})
+      el.remove()
+
+  handle_add_child: (e) ->
+    el = $(e.target).closest('li')
+    parent_id = el.data('taxon-id')
+    name = 'New node'
+    child_index = 0
+    @create_taxon({name, parent_id, child_index})
+
+  handle_create: (e) ->
     e.preventDefault()
-    get_taxonomy().done (taxonomy) ->
-      name = 'New node'
-      parent_id = taxonomy.root.id
-      child_index = 0
-      create_taxon({name, parent_id, child_index})
-
-setup_taxonomy_tree = (taxonomy_id) ->
-  redraw_tree()
-  $("#taxonomy_tree").on
-    sortstart: (e, ui) ->
-      resize_placeholder(ui)
-    sortover: (e, ui) ->
-      highlight_sort_targets(ui)
-    sortstop: restore_sort_targets
-    sortupdate: (e, ui) ->
-      handle_move(ui.item) unless ui.sender?
-  .on('click', '.js-taxon-delete', handle_delete)
-  .on('click', '.js-taxon-add-child', handle_add_child)
-  $('.add-taxon-button').on('click', get_create_handler(taxonomy_id))
+    name = 'New node'
+    parent_id = this.model.get("root").id
+    child_index = 0
+    @create_taxon({name, parent_id, child_index})
+
+  events: {
+    'sortstart': 'resize_placeholder',
+    'sortover': 'highlight_sort_targets',
+    'sortstop': 'restore_sort_targets',
+    'sortupdate': 'handle_move',
+
+    'click .js-taxon-delete': 'handle_delete',
+    'click .js-taxon-add-child': 'handle_add_child',
+  }
+
+  initialize: ->
+    _.bindAll(this, 'redraw_tree', 'handle_create')
+    $('.add-taxon-button').on('click', @handle_create)
+
+    this.listenTo(this.model, 'sync', this.render)
+
+    @redraw_tree()
 
 $ ->
   if $('#taxonomy_tree').length
-    setup_taxonomy_tree($('#taxonomy_tree').data("taxonomy-id"))
+    model = new Spree.Models.Taxonomy({id: $('#taxonomy_tree').data("taxonomy-id")})
+    new TaxonTreeView
+      el: $('#taxonomy_tree')
+      model: model

data/app/assets/javascripts/spree/backend/templates/products/upload_progress.hbs

@@ -2,10 +2,12 @@
   <img src="{{ imgSrc }}" class="card-img-top img-fluid">
 
   <div class="card-block">
-    <progress min="0" max="100" value="{{ progress }}">{{ progress }}</progress>
+    <div class="progress">
+      <div class="progress-bar progress-bar-animated" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+    </div>
 
-    <summary>{{ summary }}</summary>
-    <br>
+    <div class="filename">{{ filename }}</div>
+    <div class="size">{{ size }}B</div>
 
     <error class="text-danger {{#unless serverError}} hidden {{/unless}}">{{t 'admin.images.index.image_process_failed' }}</error>
   </div>

data/app/assets/javascripts/spree/backend/views/images/upload_progress.js

@@ -0,0 +1,48 @@
+Spree.Views.Images.UploadProgress = 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 mb-3',
+
+  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.toJSON());
+    this.updateProgressBar();
+    return this;
+  },
+
+  updateProgressBar: function() {
+    var progressBar = this.el.querySelector('.progress-bar');
+    var percent = this.model.get('progress');
+    progressBar.setAttribute('aria-valuenow', percent);
+    progressBar.style.width = percent + '%';
+    progressBar.innerHTML = percent + '%';
+    return this;
+  },
+
+  // Remove the item, destroy the model
+  clear: function() {
+    this.model.destroy();
+  }
+});

data/app/assets/javascripts/spree/backend/views/images/upload_zone.js

@@ -0,0 +1,39 @@
+Spree.Views.Images.UploadZone = Backbone.View.extend({
+  events: {
+    "dragover" : "onDragOver",
+    "dragleave" : "onDragLeave",
+    "drop" : "onDrop",
+    'change input[type="file"]' : "onFileBrowserSelect"
+  },
+
+  upload: function(file) {
+    var progressModel = new Spree.Models.ImageUpload({file: file});
+
+    this.collection.add(progressModel);
+
+    progressModel.previewFile();
+    progressModel.uploadFile();
+  },
+
+  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);
+  }
+});

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

@@ -1,6 +1,8 @@
 //= require 'spree/backend/views/cart/add_line_item_button'
 //= require 'spree/backend/views/cart/line_item_row'
 //= require 'spree/backend/views/cart/line_item_table'
+//= require 'spree/backend/views/images/upload_zone'
+//= require 'spree/backend/views/images/upload_progress'
 //= require 'spree/backend/views/order/address'
 //= require 'spree/backend/views/order/details_adjustments'
 //= require 'spree/backend/views/order/details_total'
@@ -10,3 +12,7 @@
 //= require 'spree/backend/views/state_select'
 //= require 'spree/backend/views/zones/form'
 //= require 'spree/backend/views/number_with_currency'
+//= require 'spree/backend/views/payment/new'
+//= require 'spree/backend/views/payment/edit_credit_card'
+//= require 'spree/backend/views/tables/editable_table'
+//= require 'spree/backend/views/tables/editable_table_row'

data/app/assets/javascripts/spree/backend/views/order/address.js

@@ -1,7 +1,5 @@
 Spree.Views.Order.Address = Backbone.View.extend({
   initialize: function(options) {
-    this.$(".js-country_id").select2();
-
     // read initial values from page
     this.onChange();
 
@@ -26,7 +24,7 @@ Spree.Views.Order.Address = Backbone.View.extend({
   eachField: function(callback){
     var view = this;
     var fields = ["firstname", "lastname", "company", "address1", "address2",
-      "city", "zipcode", "phone"];
+      "city", "zipcode", "phone", "country_id"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');
       if (el.length) callback(field, el);
@@ -38,7 +36,6 @@ Spree.Views.Order.Address = Backbone.View.extend({
     this.eachField(function(name, el) {
       attributes[name] = el.val();
     });
-    attributes['country_id'] = this.$(".js-country_id").select2("val")
     return attributes;
   },
 
@@ -47,6 +44,5 @@ Spree.Views.Order.Address = Backbone.View.extend({
     this.eachField(function(name, el) {
       el.val(model.get(name))
     })
-    this.$(".js-country_id").select2("val", this.model.get("country_id"))
   }
 });