spree_backend 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64003f2a6519db60fa7c939b19cbb0a0843f46e
-  data.tar.gz: 01aa9c882c54b3b5ea6ddcac76adceb038c2faa9
+  metadata.gz: 9c28791d3f7243ffae36fe5fa92d3d8ac759d88b
+  data.tar.gz: 1407c077a4ff761036dfc7c4db6cb045d39e9093
 SHA512:
-  metadata.gz: f327dd06a82084cfe7dcbd14bf1042fc44b881d00263065a6549492ab39076a0c75ac442ebfdc8880e21975170ed876b9810813d694b56fb170438f18fdacaa3
-  data.tar.gz: 7704dc393a526fbc4082cb96f98c6d17f3f30caa180f996d3a700079ea5844061c30526f8b01cff747ee198576bf5ed60cf43e7fc59c1758b577ca4584de25c6
+  metadata.gz: f31473246ca26399b5436fe419204235fdb2576da21b0b9a3a3273f669c72cee56edd4f7591ea3448e4affac1ea59a1bc37655553a92c0b5985f039117e268cb
+  data.tar.gz: dc5cb36da3effc2be58c104e3abeb4e24a4dada50c14fa5ae8eb8458cf10ec573bf244f561cd3ff567f8f6250e3f00c8eb7c5bb68c6aa90796001ae49ba56b9a

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

@@ -22,7 +22,7 @@ jQuery(function($) {
      # like states_spec and shipping_methods_spec. Let's not do this. %>
   <% unless Rails.env.test? %>
     $('.main-menu-wrapper ul').AdaptiveMenu({
-      text: "<a href='#'><i class='icon-chevron-down'></i> " + Spree.translations.more + "</a>",
+      text: "<a href='#'><i class='fa fa-chevron-down'></i> " + Spree.translations.more + "</a>",
       klass: "dropdown"
     });
   <% end %>

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

@@ -49,7 +49,7 @@ jQuery ($) ->
     $new_button: (action) ->
       $('<a />')
         .attr
-          class: "icon-#{action} icon_link no-text with-tip"
+          class: "fa fa-#{action} icon_link no-text with-tip"
           title: Spree.translations[action]
         .data
           action: action
@@ -66,7 +66,7 @@ jQuery ($) ->
           fadeOutTime:    50
 
     $buttons: ->
-      @$actions().find(".icon-#{@action}, .icon-cancel")
+      @$actions().find(".fa-#{@action}, .fa-cancel")
 
     $actions: ->
       @$el.find('.actions')

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

@@ -59,10 +59,10 @@ $(document).ready(function () {
   });
 
   // handle ship click
-  $('[data-hook=admin_order_edit_form] a.ship').on('click', function () {
+  $('[data-hook=admin_shipment_form] a.ship').on('click', function () {
     var link = $(this);
     var shipment_number = link.data('shipment-number');
-    var url = Spree.url(Spree.routes.orders_api + '/' + order_number + '/shipments/' + shipment_number + '/ship.json');
+    var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '/ship.json');
     $.ajax({
       type: 'PUT',
       url: url
@@ -78,12 +78,12 @@ $(document).ready(function () {
   $('a.cancel-method').click(toggleMethodEdit);
 
   // handle shipping method save
-  $('[data-hook=admin_order_edit_form] a.save-method').on('click', function () {
+  $('[data-hook=admin_shipment_form] a.save-method').on('click', function () {
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     var selected_shipping_rate_id = link.parents('tbody').find("select#selected_shipping_rate_id[data-shipment-number='" + shipment_number + "']").val();
     var unlock = link.parents('tbody').find("input[name='open_adjustment'][data-shipment-number='" + shipment_number + "']:checked").val();
-    var url = Spree.url(Spree.routes.orders_api + '/' + order_number + '/shipments/' + shipment_number + '.json');
+    var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '.json');
 
     $.ajax({
       type: 'PUT',
@@ -106,11 +106,11 @@ $(document).ready(function () {
   $('a.cancel-tracking').on('click', toggleTrackingEdit);
 
   // handle tracking save
-  $('[data-hook=admin_order_edit_form] a.save-tracking').on('click', function () {
+  $('[data-hook=admin_shipment_form] a.save-tracking').on('click', function () {
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     var tracking = link.parents('tbody').find('input#tracking').val();
-    var url = Spree.url(Spree.routes.orders_api + '/' + order_number + '/shipments/' + shipment_number + '.json');
+    var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '.json');
 
     $.ajax({
       type: 'PUT',
@@ -129,12 +129,11 @@ $(document).ready(function () {
 
 });
 
-
 adjustShipmentItems = function(shipment_number, variant_id, quantity){
     var shipment = _.findWhere(shipments, {number: shipment_number + ''});
     var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
 
-    var url = Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number;
+    var url = Spree.routes.shipments_api + "/" + shipment_number;
 
     var new_quantity = 0;
     if(inventory_units.length<quantity){
@@ -242,7 +241,7 @@ completeItemSplit = function(event) {
     $.ajax({
       type: "PUT",
       async: false,
-      url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments/" + original_shipment_number + "/remove.json"),
+      url: Spree.url(Spree.routes.shipments_api + "/" + original_shipment_number + "/remove.json"),
       data: { variant_id: variant_id, quantity: quantity }
     });
 
@@ -250,7 +249,7 @@ completeItemSplit = function(event) {
       $.ajax({
         type: "POST",
         async: false,
-        url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
+        url: Spree.url(Spree.routes.shipments_api + "?shipment[order_id]=" + order_number),
         data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
       }).done(function(msg) {
         advanceOrder();
@@ -259,7 +258,7 @@ completeItemSplit = function(event) {
       $.ajax({
         type: "PUT",
         async: false,
-        url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments/" + target_shipment_number + "/add.json"),
+        url: Spree.url(Spree.routes.shipments_api + "/" + target_shipment_number + "/add.json"),
         data: { variant_id: variant_id, quantity: quantity }
       }).done(function(msg) {
         advanceOrder();
@@ -302,7 +301,7 @@ addVariantFromStockLocation = function() {
   if(shipment==undefined){
     $.ajax({
       type: "POST",
-      url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
+      url: Spree.url(Spree.routes.shipments_api + "?shipment[order_id]=" + order_number),
       data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
     }).done(function( msg ) {
       advanceOrder();

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

@@ -7,7 +7,7 @@ jQuery(function($) {
   });
 
   function format_taxons(taxon) {
-    new_taxon = taxon.text.replace('->', '<i class="icon-arrow-right">')
+    new_taxon = taxon.text.replace('->', '<i class="fa fa-arrow-right">')
     return new_taxon;
   }
 

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

@@ -8,15 +8,15 @@ root.taxon_tree_menu = (obj, context) ->
   edit_url.setPath(edit_url.path() + '/' + obj.attr("id") + "/edit");
 
   create:
-    label: "<i class='icon-plus'></i> " + Spree.translations.add,
+    label: "<i class='fa fa-plus'></i> " + Spree.translations.add,
     action: (obj) -> context.create(obj)
   rename:
-    label: "<i class='icon-pencil'></i> " + Spree.translations.rename,
+    label: "<i class='fa fa-pencil'></i> " + Spree.translations.rename,
     action: (obj) -> context.rename(obj)
   remove:
-    label: "<i class='icon-trash'></i> " + Spree.translations.remove,
+    label: "<i class='fa fa-trash'></i> " + Spree.translations.remove,
     action: (obj) -> context.remove(obj)
   edit:
     separator_before: true,
-    label: "<i class='icon-edit'></i> " + Spree.translations.edit,
+    label: "<i class='fa fa-edit'></i> " + Spree.translations.edit,
     action: (obj) -> window.location = edit_url.toString()

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

@@ -10,8 +10,8 @@ $(document).ready(function() {
 });
 
 formatVariantResult = function(variant) {
-  if (variant["images"][0] != undefined && variant["images"][0].urls != undefined) {
-    variant.image = variant.images[0].urls.mini
+  if (variant["images"][0] != undefined && variant["images"][0].mini_url != undefined) {
+    variant.image = variant.images[0].mini_url
   }
   return variantTemplate({ variant: variant })
 }

data/app/assets/stylesheets/spree/backend/components/_date-picker.scss

@@ -63,14 +63,14 @@
       left: 0;
 
       .ui-icon {
-        @extend .icon-arrow-left;        
+        @extend .fa-arrow-left;        
       }
     }
     .ui-datepicker-next {
       right: 0;
 
       .ui-icon {
-        @extend .icon-arrow-right;
+        @extend .fa-arrow-right;
       }
 
       &:hover {

data/app/assets/stylesheets/spree/backend/hacks/_ie.scss

@@ -2,10 +2,10 @@
 html.ie {
 
   // Properly align icons in circle
-  table td.actions .no-text.icon-edit {
+  table td.actions .no-text.fa-edit {
     padding-top: 3px !important;
   }
-  table td.actions .no-text.icon-envelope-alt {
+  table td.actions .no-text.fa-envelope-alt {
     padding-top: 4px !important;
   }
 

data/app/assets/stylesheets/spree/backend/hacks/_mozilla.scss

@@ -6,7 +6,7 @@ html.firefox {
   }
 
   // Properly align icons in circle
-  table td.actions .no-text.icon-edit {
+  table td.actions .no-text.fa-edit {
     padding-left: 1px;
   }
 

data/app/assets/stylesheets/spree/backend/hacks/_opera.scss

@@ -6,7 +6,7 @@ html.opera {
   }
 
   // Properly align icons in circle
-  table td.actions .no-text.icon-edit {
+  table td.actions .no-text.fa-edit {
     padding-left: 1px;
   }
 

data/app/assets/stylesheets/spree/backend/plugins/_jstree.scss

@@ -8,10 +8,10 @@
   }
 
   .jstree-open > .jstree-icon {    
-    @extend .icon-caret-down;
+    @extend .fa-caret-down;
   }
   .jstree-closed > .jstree-icon {    
-    @extend .icon-caret-right;
+    @extend .fa-caret-right;
   }
 
   li {
@@ -31,7 +31,7 @@
 
       .jstree-icon {
         padding-left: 0px;
-        @extend .icon-move;   
+        @extend .fa-arrows;   
       }
     }
   }
@@ -45,16 +45,16 @@
   @extend [class^="icon-"]:before;   
 }
 #vakata-dragged.jstree-apple .jstree-invalid {
-  @extend .icon-remove;  
+  @extend .fa-bars;  
   color: $color-5;
 }
 #vakata-dragged.jstree-apple .jstree-ok {
-  @extend .icon-ok;
+  @extend .fa-check;
   color: $color-2;
 }
 
 #jstree-marker {
-  @extend .icon-caret-right;
+  @extend .fa-caret-right;
   color: $color-body-text !important;
   width: 4px !important;
 }

data/app/assets/stylesheets/spree/backend/plugins/_select2.scss

@@ -23,9 +23,6 @@
     .select2-search-choice-close {
       background-image: none !important;
       font-size: 100% !important;
-      @extend .icon-remove;
-      @extend [class^="icon-"]:before;
-      margin-top: 2px;
     }
   }
 
@@ -35,7 +32,7 @@
     }
 
     &.select2-dropdown-open .select2-choice div b {
-      @extend .icon-caret-up
+      @extend .fa-caret-up
     }
   }
 }
@@ -53,7 +50,8 @@
 }
 
 .select2-search {
-  @extend .icon-search;
+  @extend .fa; 
+  @extend .fa-search;
 
   font-size: 100%;
   color: darken($color-border, 15);
@@ -174,8 +172,8 @@
       .select2-search-choice-close {
         background-image: none !important;
         font-size: 85% !important;
-        @extend .icon-remove;
-        @extend [class^="icon-"]:before;
+        @extend .fa;
+        @extend .fa-bars;
         margin-left: 2px;
         color: $color-1;
       }

data/app/assets/stylesheets/spree/backend/shared/_icons.scss

@@ -14,12 +14,22 @@
   }
 }
 
-.icon-email:before    { @extend .icon-envelope:before }
-.icon-resume:before   { @extend .icon-refresh:before  }
-.icon-approve:before  { @extend .icon-ok:before       }
+.fa-email:before    { @extend .fa-envelope:before }
+.fa-resume:before   { @extend .fa-refresh:before  }
+.fa-approve:before  { @extend .fa-check:before    }
 
-.icon-cancel:before,
-.icon-void:before     { @extend .icon-remove:before   }
+.fa-cancel:before,
+.fa-void:before     { @extend .fa-times:before   }
 
-.icon-capture:before  { @extend .icon-ok:before       }
-.icon-credit:before   { @extend .icon-ok:before       }
+.fa-trash:before    { @extend .fa-trash-o:before }
+
+.fa-capture:before  { @extend .fa-check:before       }
+.fa-credit:before   { @extend .fa-check:before       }
+.fa-approve:before  { @extend .fa-check:before       }
+
+
+button, a {
+  &.fa:before {
+    padding-right: 5px;
+  }
+}

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -41,7 +41,7 @@ table {
         font-size: $body-font-size;
       }
 
-      [class*='icon-'].no-text {
+      [class*='fa-'].no-text {
         font-size: 120%;
         background-color: very-light($color-3);
         border: 1px solid $color-border;
@@ -49,7 +49,7 @@ table {
         width: 29px;
         height: 29px;
         display: inline-block;
-        padding-top: 2px;
+        padding-top: 6px;
 
         &:before {
           text-align: center !important;
@@ -62,12 +62,12 @@ table {
         }
       }
 
-      button[class*='icon-'] {
+      button[class*='fa-'] {
         color: $color-link;
         padding: 0 !important;
       }
 
-      .icon-envelope-alt, .icon-eye-open {
+      .fa-envelope-alt, .fa-eye-open {
         color: $color-link;
         padding-left: 0px;
 
@@ -76,19 +76,19 @@ table {
           color: $color-1;
         }
       }
-      .icon-trash:hover, .icon-void:hover {
+      .fa-trash:hover, .fa-void:hover {
         background-color: $color-error;
         color: $color-1;
       }
-      .icon-cancel:hover {
+      .fa-cancel:hover {
         background-color: $color-notice;
         color: $color-1;
       }
-      .icon-edit:hover, .icon-capture:hover, .icon-ok:hover, .icon-plus:hover, .icon-save:hover {
+      .fa-edit:hover, .fa-capture:hover, .fa-check:hover, .fa-plus:hover, .fa-save:hover {
         background-color: $color-success;
         color: $color-1;
       }
-      .icon-copy:hover {
+      .fa-copy:hover {
         background-color: $color-notice;
         color: $color-1;
       }
@@ -105,7 +105,7 @@ table {
 
     .handle {
       @extend [class^="icon-"]:before;
-      @extend .icon-reorder;
+      @extend .fa-bars;
       cursor: move;
     }
 

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -21,7 +21,7 @@ module Spree
         def update
           if @order.update_attributes(order_params)
             if params[:guest_checkout] == "false"
-              @order.associate_user!(Spree.user_class.find_by_email(@order.email))
+              @order.associate_user!(Spree.user_class.find(params[:user_id]), @order.email.blank?)
             end
             while @order.next; end
 

data/app/controllers/spree/admin/products_controller.rb

@@ -99,7 +99,7 @@ module Spree
 
           params[:q][:s] ||= "name asc"
           @collection = super
-          @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null).blank?
+          @collection = @collection.with_deleted if params[:q][:deleted_at_null] == '0'
           # @search needs to be defined as this is passed to search_form_for
           @search = @collection.ransack(params[:q])
           @collection = @search.result.

data/app/controllers/spree/admin/promotions_controller.rb

@@ -17,6 +17,7 @@ module Spree
         def collection
           return @collection if @collection.present?
           params[:q] ||= HashWithIndifferentAccess.new
+          params[:q][:s] ||= 'id desc'
 
           @collection = super
           @search = @collection.ransack(params[:q])

data/app/controllers/spree/admin/resource_controller.rb

@@ -59,7 +59,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def update_positions
     params[:positions].each do |id, index|
-      model_class.where(:id => id).update_all(:position => index)
+      model_class.find(id).update_attributes(:position => index)
     end
 
     respond_to do |format|

data/app/controllers/spree/admin/variants_controller.rb

@@ -35,7 +35,7 @@ module Spree
           if @deleted.blank?
             @collection ||= super
           else
-            @collection ||= Variant.where(:product_id => parent.id).deleted
+            @collection ||= Variant.only_deleted.where(:product_id => parent.id)
           end
           @collection
         end