solidus_backend 2.3.1 → 2.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9267767b77867cdd475ff526fbfd6f23c575b14e
-  data.tar.gz: 42a48647faa434e8d57298e099bf2c9f5c6e024e
+  metadata.gz: 148c53ce6a46afe15947d57805fb318d8ed920d1
+  data.tar.gz: 1c23abb395e91434d1fd502ec0a699bacbd170d2
 SHA512:
-  metadata.gz: 7df370816a66ef3bb793455edd72e0b1d460e26f22387f97c74f79483cd162245744c3afb1c8611cc28adc1ef724f151786dccd2095198a94cffd24ef44cfd96
-  data.tar.gz: 5811a1f4042c3388c147c77477fce7615aa0fde39f372ea2a80f850590cf6b4b9634f8fea4ba4939403bb9ffe35a7a0780f4aae9c725fb7a4c6fb93fd7a3f110
+  metadata.gz: f0a79ea6b8190d67af09c4001d2c10f7bbc72518ad8e3fd28c9a53b753467bdee145adf42e97933df89ad6603cfc530a567b55efd10dad6983442749628a0330
+  data.tar.gz: 7534be6e10ce9ccc30082ef98ddeb12b139004468359966d9956cc29fa210d759143537717616575e9e56655b64fced1d9ca81c6c7bb8f341cc0ff813c37de85

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

@@ -69,18 +69,6 @@ var handle_date_picker_fields = function(){
 
 $(document).ready(function(){
   handle_date_picker_fields();
-  $(".observe_field").on('change', function() {
-    var target = $(this).data("update");
-    $(target).hide();
-    Spree.ajax({ dataType: 'html',
-             url: $(this).data("base-url")+encodeURIComponent($(this).val()),
-             type: 'get',
-             success: function(data){
-               $(target).html(data);
-               $(target).show();
-             }
-    });
-  });
   var uniqueId = 1;
   $('.spree_add_fields').click(function() {
     var target = $(this).data("target");

data/app/assets/javascripts/spree/backend/number_field_updater.coffee

@@ -19,19 +19,19 @@ class NumberFieldUpdater
 
   toggleReadOnly = (id, show) ->
     toggleButtonVisibility('edit', id, show)
-    toggleButtonVisibility('trash', id, show)
+    toggleButtonVisibility('remove', id, show)
     cssDisplay = if show then 'block' else 'none'
     $("#number-update-#{id} span").css('display', cssDisplay)
 
   toggleForm = (id, show) ->
-    toggleButtonVisibility('void', id, show)
-    toggleButtonVisibility('check', id, show)
+    toggleButtonVisibility('cancel', id, show)
+    toggleButtonVisibility('save', id, show)
     cssDisplay = if show then 'block' else 'none'
     $("#number-update-#{id} input[type='number']").css('display', cssDisplay)
 
-  toggleButtonVisibility = (buttonIcon, id, show) ->
+  toggleButtonVisibility = (buttonAction, id, show) ->
     cssDisplay = if show then 'inline-block' else 'none'
-    $(".fa-#{buttonIcon}[data-id='#{id}']").css('display', cssDisplay)
+    $("[data-action='#{buttonAction}'][data-id='#{id}']").css('display', cssDisplay)
 
   resetInput = (id) ->
     tableCell = $("#number-update-#{id}")

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

@@ -189,8 +189,12 @@ var ShipmentSplitItemView = Backbone.View.extend({
     }
     jqXHR.error(function(msg) {
       alert(Spree.t("split_failed"));
-    }).done(function() {
-      window.Spree.advanceOrder();
+    }).done(function(response) {
+      if (response.success) {
+        window.Spree.advanceOrder();
+      } else {
+        alert(response.message);
+      };
     });
   },
 
@@ -224,8 +228,8 @@ var ShipmentItemView = Backbone.View.extend({
   },
 
   events: {
-    "click .delete-item": "onDelete",
-    "click .split-item": "onSplit",
+    "click button.delete-item": "onDelete",
+    "click button.split-item": "onSplit",
   },
 
   removeSplit: function() {
@@ -286,13 +290,13 @@ var ShipmentEditView = Backbone.View.extend({
   },
 
   events: {
-    "click a.edit-method": "toggleMethodEdit",
-    "click a.cancel-method": "toggleMethodEdit",
-    "click a.save-method": "saveMethod",
+    "click button.edit-method": "toggleMethodEdit",
+    "click button.cancel-method": "toggleMethodEdit",
+    "click button.save-method": "saveMethod",
 
-    "click a.edit-tracking": "toggleTrackingEdit",
-    "click a.cancel-tracking": "toggleTrackingEdit",
-    "click a.save-tracking": "saveTracking",
+    "click button.edit-tracking": "toggleTrackingEdit",
+    "click button.cancel-tracking": "toggleTrackingEdit",
+    "click button.save-tracking": "saveTracking",
   },
 
   toggleMethodEdit: function(e){
@@ -328,10 +332,8 @@ var ShipmentEditView = Backbone.View.extend({
 
       var show = _this.$('tr.show-tracking');
       show.toggle()
-          .find('.tracking-value')
-          .html($("<strong>")
-          .html(Spree.translations.tracking + ": "))
-          .append(document.createTextNode(data.tracking));
+        .find('.tracking-value')
+        .text(data.tracking);
     });
   }
 });

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

@@ -1,21 +1,21 @@
 class CountUpdateForms
   @beginListening: (isReceiving) ->
     # Edit
-    $('body').on 'click', '#listing_transfer_items .fa-edit', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="edit"]', (ev) =>
       ev.preventDefault()
       transferItemId = $(ev.currentTarget).data('id')
       Spree.NumberFieldUpdater.hideReadOnly(transferItemId)
       Spree.NumberFieldUpdater.showForm(transferItemId)
 
     # Cancel
-    $('body').on 'click', '#listing_transfer_items .fa-void', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="cancel"]', (ev) =>
       ev.preventDefault()
       transferItemId = $(ev.currentTarget).data('id')
       Spree.NumberFieldUpdater.hideForm(transferItemId)
       Spree.NumberFieldUpdater.showReadOnly(transferItemId)
 
     # Submit
-    $('body').on 'click', '#listing_transfer_items .fa-check', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="save"]', (ev) =>
       ev.preventDefault()
       transferItemId = $(ev.currentTarget).data('id')
       stockTransferNumber = $("#stock_transfer_number").val()

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

@@ -1,6 +1,6 @@
 class TransferItemDeleting
   @beginListening: ->
-    $('body').on 'click', '#listing_transfer_items .fa-trash', (ev) =>
+    $('body').on 'click', '#listing_transfer_items [data-action="remove"]', (ev) =>
       ev.preventDefault()
       if confirm(Spree.translations.are_you_sure_delete)
         transferItemId = $(ev.currentTarget).data('id')

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

@@ -44,7 +44,7 @@ TaxonTreeView = Backbone.View.extend
     })
 
   resize_placeholder: (e, ui) ->
-    handleHeight = ui.helper.find('.sortable-handle').outerHeight()
+    handleHeight = ui.helper.find('.taxon').outerHeight()
     ui.placeholder.height(handleHeight)
 
   restore_sort_targets: ->

data/app/assets/javascripts/spree/backend/templates/orders/details_adjustment_row.hbs

@@ -1,4 +1,4 @@
 <tr>
-  <td><strong>{{ label }}:</strong></td>
-  <td class="total align-center"><span>{{ amount }}</span></td>
+  <td>{{ label }}:</td>
+  <td class="total"><span>{{ amount }}</span></td>
 </tr>

data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs

@@ -14,7 +14,7 @@
     <strong>{{ t "sku" }}:</strong> {{ line_item.variant.sku }}
   </td>
 {{/if}}
-<td class="line-item-price align-center">
+<td class="line-item-price">
   {{ line_item.single_display_amount }}
 </td>
 {{#if editing}}
@@ -22,11 +22,11 @@
     <input type="number" name="quantity" value="{{ line_item.quantity }}" min="0" class="line_item_quantity" size="5">
   </td>
 {{else}}
-  <td class="line-item-qty-show align-center">
+  <td class="line-item-qty-show">
     {{ line_item.quantity }}
   </td>
 {{/if}}
-<td class="line-item-total align-center">
+<td class="line-item-total">
   {{ line_item.display_amount }}
 </td>
 <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete">

data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs

@@ -1,5 +1,5 @@
-<td class="align-center">{{stockLocationName}}</td>
-<td class="align-center">
+<td>{{stockLocationName}}</td>
+<td>
   <input id="backorderable-{{id}}"
          name="backorderable"
          type="checkbox"
@@ -8,7 +8,7 @@
          {{#if backorderable}} checked="checked" {{/if}}
    >
 </td>
-<td class="align-center">
+<td>
   {{#if editing}}
     <input class="fullwidth" name="count_on_hand" type="number" value="{{count_on_hand}}">
   {{else}}
@@ -17,8 +17,8 @@
 </td>
 <td class="actions">
   {{#if editing}}
-    <a class="submit fa fa-check icon_link with-tip no-text" data-action="green" href="#"></a>
-    <a class="cancel fa fa-void icon_link with-tip no-text" data-action="red" href="#"></a>
+    <a class="submit fa fa-check icon_link with-tip no-text" data-action="save" href="#"></a>
+    <a class="cancel fa fa-cancel icon_link with-tip no-text" data-action="cancel" href="#"></a>
   {{else}}
     <a class="edit fa fa-edit icon_link with-tip no-text" data-action="edit" href="#"></a>
   {{/if}}

data/app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs

@@ -1,5 +1,5 @@
 <tr class='new-row' data-transfer-item-id="{{id}}">
-  <td class="align-center no-padding">
+  <td class="no-padding">
     <div class='variant-container' data-variant-id="{{variantId}}">
       <div class='variant-image'>
         {{> _image image=variantImage size="small" alt=variantName }}
@@ -18,7 +18,7 @@
       </div>
     </div>
   </td>
-  <td class="align-center">
+  <td>
     <table class='stock-variant-field-table'>
       {{#each variantOptions}}
         <tr>
@@ -28,7 +28,7 @@
       {{/each}}
     </table>
   </td>
-  <td class='align-center' id="number-update-{{id}}">
+  <td id="number-update-{{id}}">
     {{#if isReceiving }}
       <span class='js-number-update-text'>{{receivedQuantity}}</span>
       <input class="fullwidth js-number-update-input" name="received_quantity" type="number" value="">
@@ -39,8 +39,8 @@
   </td>
   <td class="actions">
     <a class="fa fa-edit icon_link with-tip no-text" data-action="edit" data-id="{{id}}" href="#"></a>
-    <a class="fa fa-check icon_link with-tip no-text" data-action="green" data-id="{{id}}" href="#"></a>
-    <a class="fa fa-void icon_link with-tip no-text" data-action="red" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-check icon_link with-tip no-text" data-action="save" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-cancel icon_link with-tip no-text" data-action="cancel" data-id="{{id}}" href="#"></a>
     {{#unless isReceiving }}
       <a class="fa fa-trash icon_link with-tip no-text" data-action="remove" data-id="{{id}}" href="#"></a>
     {{/unless}}

data/app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs

@@ -1,9 +1,13 @@
 {{#each taxons}}
   <li data-taxon-id="{{id}}" data-taxon-taxonomy-id="{{taxonomy_id}}">
-    <div  class="sortable-handle">
-      {{#if (isRootTaxon) }}{{else}}<i class="fa fa-arrows"></i>{{/if}}
+    {{#if (isRootTaxon) }}
+    <div class="taxon">
+    {{else}}
+    <div class="taxon sortable">
+      <i class="fa fa-arrows"></i>
+    {{/if}}
       {{name}}
-      <div class="actions right">
+      <div class="actions float-right">
         <a href="#" class="js-taxon-add-child fa fa-plus icon_link no-text"></a>
         <a href="{{admin_url}}/taxonomies/{{taxonomy_id}}/taxons/{{id}}/edit" class="fa fa-edit icon_link no-text"></a>
         <a href="#" class="js-taxon-delete fa fa-trash icon_link no-text"></a>

data/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs

@@ -20,7 +20,7 @@
 
   <fieldset class="no-border-bottom">
     <legend align="center" class="stock-location">
-      <button class="add_variant"  title="{{ t "add" }}" data-action="add">{{ t "add" }}</button>
+      <button class="add_variant" title="{{ t "add" }}" data-action="add">{{ t "add" }}</button>
     </legend>
   </fieldset>
 </fieldset>

data/app/assets/javascripts/spree/backend/templates/variants/split.hbs

@@ -20,6 +20,6 @@
   <input class="quantity" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
 </td>
 <td class='actions'>
-  <a href='#' class='save-split icon_link fa fa-ok no-text with-tip' title='Save'></a>
-  <a href='#' class='cancel-split icon_link fa fa-cancel no-text with-tip' title='Cancel'></a>
+  <button class="save-split icon_link fa fa-ok no-text with-tip" data-action="save" title="{{ t "save" }}" data-original-title="{{ t "save" }}"></button>
+  <button class="cancel-split icon_link fa fa-cancel no-text with-tip" data-action="cancel" title="{{ t "cancel" }}" data-original-title="{{ t "cancel" }}"></button>
 </td>

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

@@ -53,7 +53,7 @@ Spree.Views.Order.CustomerDetails = Backbone.View.extend({
   },
 
   render: function() {
-    var user_id = this.model.get("user_id")
+    var user_id = this.model.get("user_id") || $("#user_id").val()
     this.$("#user_id").val(user_id);
     this.$('#guest_checkout_true')
       .prop("checked", !user_id);
@@ -65,4 +65,3 @@ Spree.Views.Order.CustomerDetails = Backbone.View.extend({
     this.$('#order_email').val(this.model.get("email"))
   }
 })
-

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

@@ -10,7 +10,7 @@
 //= require solidus_admin/underscore
 //= require solidus_admin/backbone
 //= require solidus_admin/backbone-nested-models
-//= require solidus_admin/tether
+//= require solidus_admin/popover
 //= require solidus_admin/bootstrap
 //= require prism
 //= require spree