spree_backend 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7759da9ebea2887d4844ded41d9c052c19c74ef
-  data.tar.gz: 27d17dcca113ec1013a0cad52d59d9dd5e441af3
+  metadata.gz: d2b51bd0bcd3317420ed383267011db6e1ac08ac
+  data.tar.gz: f1ce52319ab952bb7971625fb0d37ed256198b7e
 SHA512:
-  metadata.gz: c08e701c0e486bfbd31c5a1d14996c30b1bfd64183b69f5cfeca7ec627890894bbd7e054a2506c0c43f296c0d93ed314d843313d939bdc9cfc9460cd9e12e6b5
-  data.tar.gz: 9231a23b39e4bcf78eddaa47b2a26b7809885144102dd9b26908935398d13d4377ffddb2192655a2fbc7391ab5228c677febdfb4c5b2ed4b3f18e8c9ce08ce63
+  metadata.gz: f8fc536ec2860dd54383b77abab18a9ade9f2edfe364dc32e22dcfd471ad555aa5407e849e038b2b5ffd09e686173adf1d5bb7a38d09cd1120e3402b482d5c53
+  data.tar.gz: 5f7a3e06cf5c229f1536867e249046b96c6a27c6067d6836a7104f7d69265b1114182c37ea4a7182ff6c1bb349d5a3c68bf95b731ba5d102b8a14837e98c3714

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

@@ -12,7 +12,9 @@ $(document).ready(function() {
     $('.payment_methods_radios').click(
       function() {
         $('.payment-methods').hide();
+        $('.payment-methods input').prop('disabled', true);
         if (this.checked) {
+          $('#payment_method_' + this.value).prop('disabled', false);
           $('#payment_method_' + this.value).show();
         }
       }
@@ -21,9 +23,11 @@ $(document).ready(function() {
     $('.payment_methods_radios').each(
       function() {
         if (this.checked) {
+          $('#payment_method_' + this.value).prop('disabled', false);
           $('#payment_method_' + this.value).show();
         } else {
           $('#payment_method_' + this.value).hide();
+          $('#payment_method_' + this.value).prop('disabled', true);
         }
 
         if ($("#card_new" + this.value).is("*")) {

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

@@ -4,4 +4,4 @@ $ ->
     $('input[name="payment[payment_method_id]"]').click ()->
       $('.payment-method-settings fieldset').addClass('hidden')
       id = $(this).parents('li').data('id')
-      $("fieldset##{id}").removeClass('hidden')
+      $("fieldset[data-id='#{id}']").removeClass('hidden')

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

@@ -151,7 +151,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
         url: Spree.url(url),
         data: { variant_id: variant_id, quantity: new_quantity }
       }).done(function( msg ) {
-        advanceOrder();
+        window.location.reload();
       });
     }
 }
@@ -304,7 +304,7 @@ addVariantFromStockLocation = function() {
       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();
+      window.location.reload();
     }).error(function( msg ) {
       console.log(msg);
     });
@@ -313,4 +313,4 @@ addVariantFromStockLocation = function() {
     adjustShipmentItems(shipment.number, variant_id, quantity);
   }
   return 1
-}
+}

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

@@ -20,6 +20,7 @@ $(document).ready(function () {
           return {
             per_page: 50,
             page: page,
+            without_children: true,
             q: {
               name_cont: term
             },

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

@@ -59,7 +59,7 @@ module Spree
         if @new.save
           flash[:success] = Spree.t('notice_messages.product_cloned')
         else
-          flash[:success] = Spree.t('notice_messages.product_not_cloned')
+          flash[:error] = Spree.t('notice_messages.product_not_cloned')
         end
 
         redirect_to edit_admin_product_url(@new)

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -4,7 +4,7 @@ module Spree
       def adjustment_state(adjustment)
         state = adjustment.state.to_sym
         icon = { closed: 'lock', open: 'unlock' }
-        content_tag(:span, '', class: icon[state])
+        content_tag(:span, '', class: "fa fa-#{ icon[state] }")
       end
 
       def display_adjustable(adjustable)

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -1,4 +1,4 @@
-<fieldset class="no-border-bottom">
+<fieldset data-id='credit-card' class="no-border-bottom">
   <div class="field" data-hook="previous_cards">
     <% if previous_cards.any? %>
       <% previous_cards.each do |card| %>

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -77,7 +77,7 @@
     <fieldset class="tax_categories no-border-bottom">
       <legend align="center"><%= Spree.t(:tax_category) %></legend>
         <%= f.field_container :categories do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {}, :class => "select2 fullwidth" %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
           <%= error_message_on :shipping_method, :tax_category_id %>
         <% end %>
     </fieldset>

data/app/views/spree/admin/taxons/index.html.erb

@@ -9,7 +9,7 @@
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-<span id='sorting_explanation' style='display:none'>Click &amp; drag on the products to sort them.</span>
+<span id='sorting_explanation' style='display:none'><%= Spree.t(:click_and_drag_on_the_products_to_sort_them) %></span>
 <ul id='taxon_products'></ul>
 
 <%= render :partial => "spree/admin/products/autocomplete", :formats => :js %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency