solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -0,0 +1,18 @@
+//= require handlebars
+//= require spree/backend/translation
+
+Handlebars.registerHelper("t", function(key, options) {
+  return Spree.t(key, options.hash);
+});
+
+Handlebars.registerHelper("human_attribute_name", function(model, attr) {
+  return Spree.human_attribute_name(model, attr);
+});
+
+Handlebars.registerHelper("admin_url", function() {
+  return Spree.pathFor("admin")
+});
+
+Handlebars.registerHelper("concat", function() {
+  return Array.prototype.slice.call(arguments, 0, -1).join('');
+});

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

@@ -126,7 +126,7 @@ Spree.prepareImageUploader = function () {
         processData: false,  // tell jQuery not to process the data
         contentType: false,  // tell jQuery not to set contentType
         xhr: function () {
-          xhr = $.ajaxSettings.xhr();
+          var xhr = $.ajaxSettings.xhr();
           if (xhr.upload) {
             xhr.upload.onprogress = function (event) {
               if (event.lengthComputable) {

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

@@ -0,0 +1,2 @@
+Spree.Models.Address = Backbone.Model.extend({
+})

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

@@ -0,0 +1,2 @@
+//= require spree/backend/models/line_item
+//= require spree/backend/models/order

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

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

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

@@ -0,0 +1,37 @@
+//= require spree/backend/routes
+//= require spree/backend/collections/line_items
+//= require spree/backend/models/address
+
+Spree.Models.Order = Backbone.Model.extend({
+  urlRoot: Spree.routes.orders_api,
+  idAttribute: "number",
+
+  relations: {
+    "line_items": Spree.Collections.LineItems,
+    "shipments": Backbone.Collection,
+    "bill_address": Spree.Models.Address,
+    "ship_address": Spree.Models.Address
+  },
+
+  advance: function(opts) {
+    var options = {
+      url: Spree.routes.checkouts_api + "/" + this.id + "/advance",
+      type: 'PUT',
+    };
+    _.extend(options, opts);
+    return this.fetch(options)
+  }
+});
+
+Spree.Models.Order.fetch = function(number, opts) {
+  var options = (opts || {});
+  var model = new Spree.Models.Order({
+    number: number,
+    line_items: [],
+    shipments: [],
+    bill_address: {},
+    ship_address: {},
+  });
+  model.fetch(options);
+  return model;
+}

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

@@ -0,0 +1,9 @@
+_.extend(window.Spree, {
+  Models: {},
+  Collections: {},
+  Views: {
+    Order: {},
+    Cart: {},
+    Zones: {}
+  }
+})

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

@@ -0,0 +1,55 @@
+Spree.Order || (Spree.Order = {})
+
+Spree.Order.initCartPage = function(order_number) {
+  var order = new Spree.Models.Order.fetch(order_number)
+  var collection = order.get("line_items")
+
+  new Spree.Views.Order.Summary({
+    el: $('#order_tab_summary'),
+    model: order
+  });
+
+  new Spree.Views.Cart.LineItemTable({
+    el: $("table.line-items > tbody"),
+    collection: collection
+  });
+
+  new Spree.Views.Cart.AddLineItemButton({
+    el: $('.js-add-line-item'),
+    collection: collection
+  });
+
+  new Spree.Views.Order.DetailsTotal({
+    el: $('#order-total'),
+    model: order
+  });
+
+  new Spree.Views.Order.DetailsAdjustments({
+    el: $('.js-order-line-item-adjustments'),
+    model: order,
+    collection: order.get("line_items")
+  });
+
+  new Spree.Views.Order.DetailsAdjustments({
+    el: $('.js-order-shipment-adjustments'),
+    model: order,
+    collection: order.get("shipments")
+  });
+
+  new Spree.Views.Order.DetailsAdjustments({
+    el: $('.js-order-adjustments'),
+    model: order
+  });
+
+  order.on("sync", function() {
+    if(!collection.length) {
+      collection.push({});
+    }
+  })
+}
+
+$(function() {
+  if ($(".js-order-cart-page").length) {
+    Spree.Order.initCartPage($(".js-order-cart-page").data("order-number"));
+  }
+});

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

@@ -0,0 +1,2 @@
+//= require spree/backend/orders/edit
+//= require spree/backend/orders/cart

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

@@ -3,7 +3,6 @@ PaymentRowView = Backbone.View.extend
     "click .js-edit": "onEdit"
     "click .js-save": "onSave"
     "click .js-cancel": "onCancel"
-    "click .js-display-amount": "onEdit"
 
   onEdit: (e) ->
     e.preventDefault()

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

@@ -35,16 +35,5 @@ $(document).ready(function() {
         }
       }
     );
-
-    $('.cvvLink').click(function(event){
-      window_name = 'cvv_info';
-      window_options = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1';
-      window.open($(this).prop('href'), window_name, window_options);
-      event.preventDefault();
-    });
-
-    $('select.jump_menu').change(function(){
-      window.location = this.options[this.selectedIndex].value;
-    });
   }
 });

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

@@ -1,4 +1,49 @@
-window.initProductActions = ->
+
+#
+# Tiered Calculator
+#
+TieredCalculatorView = Backbone.View.extend
+  initialize: ->
+    @calculatorName = @$('.js-tiers').data('calculator')
+    @tierFieldsTemplate = HandlebarsTemplates["promotions/calculators/fields/#{@calculatorName}"]
+    @originalTiers = @$('.js-tiers').data('original-tiers')
+    @formPrefix = @$('.js-tiers').data('form-prefix')
+
+    for base, value of @originalTiers
+      @$('.js-tiers').append @tierFieldsTemplate
+        baseField:
+          value: base
+        valueField:
+          name: @tierInputName(base)
+          value: value
+
+  events:
+    'click .js-add-tier': 'onAdd'
+    'click .js-remove-tier': 'onRemove'
+    'change .js-base-input': 'onChange'
+
+  tierInputName: (base) ->
+    "#{@formPrefix}[calculator_attributes][preferred_tiers][#{base}]"
+
+  onAdd: (event) ->
+    event.preventDefault()
+    @$('.js-tiers').append @tierFieldsTemplate(valueField: name: null)
+
+  onRemove: (event) ->
+    event.preventDefault()
+    $(event.target).parents('.tier').remove()
+
+  onChange: (event) ->
+    valueInput = $(event.target).parents('.tier').find('.js-value-input')
+    valueInput.attr 'name', @tierInputName($(event.target).val())
+
+initTieredCalculators = ->
+  $('.js-tiered-calculator').each ->
+    if !$(this).data('has-view')
+      $(this).data('has-view', true)
+      new TieredCalculatorView(el: this)
+
+window.initPromotionActions = ->
   # Add classes on promotion items for design
   $(document).on 'mouseover', 'a.delete', (event) ->
     $(this).parent().addClass 'action-remove'
@@ -8,23 +53,6 @@ window.initProductActions = ->
 
   $('#promotion-filters').find('.variant_autocomplete').variantAutocomplete()
 
-  $('.calculator-fields').each ->
-    $fields_container = $(this)
-    $type_select = $fields_container.find('.type-select')
-    $settings = $fields_container.find('.settings')
-    $warning = $fields_container.find('.warning')
-    originalType = $type_select.val()
-    $warning.hide()
-    $type_select.change ->
-      if $(this).val() == originalType
-        $warning.hide()
-        $settings.show()
-        $settings.find('input').removeProp 'disabled'
-      else
-        $warning.show()
-        $settings.hide()
-        $settings.find('input').prop 'disabled', 'disabled'
-
   #
   # Option Value Promo Rule
   #
@@ -66,36 +94,6 @@ window.initProductActions = ->
       optionValueSelect.prop('disabled', $(this).val() == '').select2 'val', ''
       return
 
-  #
-  # Tiered Calculator
-  #
-  if $('.js-tiers').length
-    calculatorName = $('.js-tiers').data('calculator')
-    tierFieldsTemplate = HandlebarsTemplates["promotions/calculators/fields/#{calculatorName}"]
-    originalTiers = $('.js-tiers').data('original-tiers')
-    formPrefix = $('.js-tiers').data('form-prefix')
-
-    tierInputName = (base) ->
-      "#{formPrefix}[calculator_attributes][preferred_tiers][#{base}]"
-
-    $.each originalTiers, (base, value) ->
-      $('.js-tiers').append tierFieldsTemplate
-        baseField:
-          value: base
-        valueField:
-          name: tierInputName(base)
-          value: value
-
-    $(document).on 'click', '.js-add-tier', (event) ->
-      event.preventDefault()
-      $('.js-tiers').append tierFieldsTemplate(valueField: name: null)
-
-    $(document).on 'click', '.js-remove-tier', (event) ->
-      event.preventDefault()
-      $(this).parents('.tier').remove()
-
-    $(document).on 'change', '.js-base-input', (event) ->
-      valueInput = $(this).parents('.tier').find('.js-value-input')
-      valueInput.attr 'name', tierInputName($(this).val())
+  initTieredCalculators()
 
-$ initProductActions
+$ initPromotionActions

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

@@ -0,0 +1,26 @@
+Spree.PromotionActivationView = Backbone.View.extend({
+  events: {
+    "change [name=activation_type]": "render"
+  },
+
+  initialize: function(){
+    this.render();
+  },
+
+  render: function(){
+    var activation_type = this.$("[name=activation_type]:checked").val();
+    this.$('[data-activation-type]').each(function(){
+      var selected = ($(this).data('activation-type') === activation_type);
+      $(this).find(':input').prop("disabled", !selected);
+      $(this).toggle(selected);
+    });
+  }
+});
+
+$(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,24 +1,24 @@
 $(document).ready(function() {
-  var formFields = $("[data-hook='admin_customer_return_form_fields'], \
-                     [data-hook='admin_return_authorization_form_fields']");
+  function checkAddItemBox() {
+    $(this).closest('tr').find('input.add-item').attr('checked', 'checked');
+    updateSuggestedAmount();
+  }
 
-  if(formFields.length > 0) {
-    function checkAddItemBox() {
-      $(this).closest('tr').find('input.add-item').attr('checked', 'checked');
-      updateSuggestedAmount();
-    }
+  function updateSuggestedAmount() {
+    var totalPretaxRefund = 0;
+    var checkedItems = formFields.find('input.add-item:checked');
+    $.each(checkedItems, function(i, checkbox) {
+      totalPretaxRefund += parseFloat($(checkbox).parents('tr').find('.refund-amount-input').val());
+    });
 
-    function updateSuggestedAmount() {
-      var totalPretaxRefund = 0;
-      var checkedItems = formFields.find('input.add-item:checked');
-      $.each(checkedItems, function(i, checkbox) {
-        totalPretaxRefund += parseFloat($(checkbox).parents('tr').find('.refund-amount-input').val());
-      });
+    var displayTotal = isNaN(totalPretaxRefund) ? '' : totalPretaxRefund.toFixed(2);
+    formFields.find('span#total_pre_tax_refund').html(displayTotal);
+  }
 
-      var displayTotal = isNaN(totalPretaxRefund) ? '' : totalPretaxRefund.toFixed(2);
-      formFields.find('span#total_pre_tax_refund').html(displayTotal);
-    }
+  var formFields = $("[data-hook='admin_customer_return_form_fields'], \
+                     [data-hook='admin_return_authorization_form_fields']");
 
+  if(formFields.length > 0) {
     updateSuggestedAmount();
 
     formFields.find('input#select-all').on('change', function(ev) {

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

@@ -47,7 +47,7 @@ var ShipShipmentView = Backbone.View.extend({
       type: "PUT",
       url: Spree.routes.shipments_api + "/" + this.shipment_number + "/ship",
       data: {
-        send_mailer: this.$("[name='send_mailer']").val()
+        send_mailer: this.$("[name='send_mailer']").is(":checked")
       },
       success: function(){
         window.location.reload()

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

@@ -1,4 +1,4 @@
-//= require select2
+//= require solidus_admin/select2
 jQuery(function($) {
   // Make select beautiful
   $('select.select2').select2({
@@ -6,9 +6,4 @@ jQuery(function($) {
     dropdownAutoWidth: true,
     minimumResultsForSearch: 8
   });
-
-  function format_taxons(taxon) {
-    new_taxon = taxon.text.replace('->', '<i class="fa fa-arrow-right">')
-    return new_taxon;
-  }
 })

data/app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee

@@ -84,7 +84,7 @@ class VariantForm
       variantId: transferItem.variant.id
       variantDisplayAttributes: formatVariantDisplayAttributes(transferItem.variant)
       variantOptions: formatVariantOptionValues(transferItem.variant)
-      variantImageURL: transferItem.variant.images[0]?.small_url
+      variantImage: transferItem.variant.images[0]
 
     if isReceiving
       templateAttributes["receivedQuantity"] = transferItem.received_quantity

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

@@ -55,8 +55,3 @@ $.fn.taxonAutocomplete = function () {
 $(document).ready(function () {
   $('#product_taxon_ids, .taxon_picker').taxonAutocomplete();
 });
-
-// for backwards compat...
-var set_taxon_select = function() {
-  $('#product_taxon_ids, .taxon_picker').taxonAutocomplete();
-}

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

@@ -86,15 +86,15 @@ get_create_handler = (taxonomy_id) ->
 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)
+    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))
 
 $ ->

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

@@ -23,13 +23,13 @@ $ ->
       lowerDraggable $(e.currentTarget)
 
   saveSort = (event, ui) ->
-   Spree.ajax
-     url: Spree.routes.classifications_api,
-     method: 'PUT',
-     data:
-       product_id: ui.item.data('product-id'),
-       taxon_id: $('#taxon_id').val(),
-       position: ui.item.index()
+    Spree.ajax
+      url: Spree.routes.classifications_api,
+      method: 'PUT',
+      data:
+        product_id: ui.item.data('product-id'),
+        taxon_id: $('#taxon_id').val(),
+        position: ui.item.index()
 
   sortable = $('#taxon_products').sortable()
     .on