spree_backend 2.2.4 → 2.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/payments/new.js +4 -0
  3. data/app/assets/javascripts/spree/backend/select_payments.js.coffee +1 -1
  4. data/app/assets/javascripts/spree/backend/shipments.js.erb +3 -3
  5. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +1 -0
  6. data/app/controllers/spree/admin/products_controller.rb +1 -1
  7. data/app/helpers/spree/admin/adjustments_helper.rb +1 -1
  8. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +1 -1
  9. data/app/views/spree/admin/shipping_methods/_form.html.erb +1 -1
  10. data/app/views/spree/admin/taxons/index.html.erb +1 -1
  11. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d7759da9ebea2887d4844ded41d9c052c19c74ef
4
- data.tar.gz: 27d17dcca113ec1013a0cad52d59d9dd5e441af3
3
+ metadata.gz: d2b51bd0bcd3317420ed383267011db6e1ac08ac
4
+ data.tar.gz: f1ce52319ab952bb7971625fb0d37ed256198b7e
5
5
  SHA512:
6
- metadata.gz: c08e701c0e486bfbd31c5a1d14996c30b1bfd64183b69f5cfeca7ec627890894bbd7e054a2506c0c43f296c0d93ed314d843313d939bdc9cfc9460cd9e12e6b5
7
- data.tar.gz: 9231a23b39e4bcf78eddaa47b2a26b7809885144102dd9b26908935398d13d4377ffddb2192655a2fbc7391ab5228c677febdfb4c5b2ed4b3f18e8c9ce08ce63
6
+ metadata.gz: f8fc536ec2860dd54383b77abab18a9ade9f2edfe364dc32e22dcfd471ad555aa5407e849e038b2b5ffd09e686173adf1d5bb7a38d09cd1120e3402b482d5c53
7
+ data.tar.gz: 5f7a3e06cf5c229f1536867e249046b96c6a27c6067d6836a7104f7d69265b1114182c37ea4a7182ff6c1bb349d5a3c68bf95b731ba5d102b8a14837e98c3714
data/app/assets/javascripts/spree/backend/payments/new.js CHANGED
@@ -12,7 +12,9 @@ $(document).ready(function() {
12
12
  $('.payment_methods_radios').click(
13
13
  function() {
14
14
  $('.payment-methods').hide();
15
+ $('.payment-methods input').prop('disabled', true);
15
16
  if (this.checked) {
17
+ $('#payment_method_' + this.value).prop('disabled', false);
16
18
  $('#payment_method_' + this.value).show();
17
19
  }
18
20
  }
@@ -21,9 +23,11 @@ $(document).ready(function() {
21
23
  $('.payment_methods_radios').each(
22
24
  function() {
23
25
  if (this.checked) {
26
+ $('#payment_method_' + this.value).prop('disabled', false);
24
27
  $('#payment_method_' + this.value).show();
25
28
  } else {
26
29
  $('#payment_method_' + this.value).hide();
30
+ $('#payment_method_' + this.value).prop('disabled', true);
27
31
  }
28
32
 
29
33
  if ($("#card_new" + this.value).is("*")) {
data/app/assets/javascripts/spree/backend/select_payments.js.coffee CHANGED
@@ -4,4 +4,4 @@ $ ->
4
4
  $('input[name="payment[payment_method_id]"]').click ()->
5
5
  $('.payment-method-settings fieldset').addClass('hidden')
6
6
  id = $(this).parents('li').data('id')
7
- $("fieldset##{id}").removeClass('hidden')
7
+ $("fieldset[data-id='#{id}']").removeClass('hidden')
data/app/assets/javascripts/spree/backend/shipments.js.erb CHANGED
@@ -151,7 +151,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
151
151
  url: Spree.url(url),
152
152
  data: { variant_id: variant_id, quantity: new_quantity }
153
153
  }).done(function( msg ) {
154
- advanceOrder();
154
+ window.location.reload();
155
155
  });
156
156
  }
157
157
  }
@@ -304,7 +304,7 @@ addVariantFromStockLocation = function() {
304
304
  url: Spree.url(Spree.routes.shipments_api + "?shipment[order_id]=" + order_number),
305
305
  data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
306
306
  }).done(function( msg ) {
307
- advanceOrder();
307
+ window.location.reload();
308
308
  }).error(function( msg ) {
309
309
  console.log(msg);
310
310
  });
@@ -313,4 +313,4 @@ addVariantFromStockLocation = function() {
313
313
  adjustShipmentItems(shipment.number, variant_id, quantity);
314
314
  }
315
315
  return 1
316
- }
316
+ }
data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb CHANGED
@@ -20,6 +20,7 @@ $(document).ready(function () {
20
20
  return {
21
21
  per_page: 50,
22
22
  page: page,
23
+ without_children: true,
23
24
  q: {
24
25
  name_cont: term
25
26
  },
data/app/controllers/spree/admin/products_controller.rb CHANGED
@@ -59,7 +59,7 @@ module Spree
59
59
  if @new.save
60
60
  flash[:success] = Spree.t('notice_messages.product_cloned')
61
61
  else
62
- flash[:success] = Spree.t('notice_messages.product_not_cloned')
62
+ flash[:error] = Spree.t('notice_messages.product_not_cloned')
63
63
  end
64
64
 
65
65
  redirect_to edit_admin_product_url(@new)
data/app/helpers/spree/admin/adjustments_helper.rb CHANGED
@@ -4,7 +4,7 @@ module Spree
4
4
  def adjustment_state(adjustment)
5
5
  state = adjustment.state.to_sym
6
6
  icon = { closed: 'lock', open: 'unlock' }
7
- content_tag(:span, '', class: icon[state])
7
+ content_tag(:span, '', class: "fa fa-#{ icon[state] }")
8
8
  end
9
9
 
10
10
  def display_adjustable(adjustable)
data/app/views/spree/admin/payments/source_forms/_gateway.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <fieldset class="no-border-bottom">
1
+ <fieldset data-id='credit-card' class="no-border-bottom">
2
2
  <div class="field" data-hook="previous_cards">
3
3
  <% if previous_cards.any? %>
4
4
  <% previous_cards.each do |card| %>
data/app/views/spree/admin/shipping_methods/_form.html.erb CHANGED
@@ -77,7 +77,7 @@
77
77
  <fieldset class="tax_categories no-border-bottom">
78
78
  <legend align="center"><%= Spree.t(:tax_category) %></legend>
79
79
  <%= f.field_container :categories do %>
80
- <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {}, :class => "select2 fullwidth" %>
80
+ <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
81
81
  <%= error_message_on :shipping_method, :tax_category_id %>
82
82
  <% end %>
83
83
  </fieldset>
data/app/views/spree/admin/taxons/index.html.erb CHANGED
@@ -9,7 +9,7 @@
9
9
  <% end %>
10
10
 
11
11
  <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
12
- <span id='sorting_explanation' style='display:none'>Click &amp; drag on the products to sort them.</span>
12
+ <span id='sorting_explanation' style='display:none'><%= Spree.t(:click_and_drag_on_the_products_to_sort_them) %></span>
13
13
  <ul id='taxon_products'></ul>
14
14
 
15
15
  <%= render :partial => "spree/admin/products/autocomplete", :formats => :js %>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.4
4
+ version: 2.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-01 00:00:00.000000000 Z
11
+ date: 2014-08-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,40 +16,40 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.2.4
19
+ version: 2.2.5
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 2.2.4
26
+ version: 2.2.5
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 2.2.4
33
+ version: 2.2.5
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 2.2.4
40
+ version: 2.2.5
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - '='
46
46
  - !ruby/object:Gem::Version
47
47
  version: 3.1.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - '='
53
53
  - !ruby/object:Gem::Version
54
54
  version: 3.1.0
55
55
  - !ruby/object:Gem::Dependency