spree_backend 3.1.0.rc3 → 3.1.0.rc4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
  3. data/app/views/spree/admin/search/products.rabl +1 -1
  4. data/app/views/spree/admin/shared/_head.html.erb +1 -1
  5. data/spec/features/admin/orders/adjustments_spec.rb +2 -2
  6. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a5c059de70ae651a7733db19c605b1422b266a48
4
- data.tar.gz: ec8123eccea3071fa66e51b6b6d5af0859dea6db
3
+ metadata.gz: b13e87f01f7607ced0b515ed357de161fe6ffe2a
4
+ data.tar.gz: affd41ed1d8b4334e286a524e0cf05230c75aff2
5
5
  SHA512:
6
- metadata.gz: ed9a7446bc7aad6d81b835794ed3dbdcc32af3d53aa6318deb2c802e4e4b52ca4d699648d8093cbb4b9d03cdf9146bf80c371a41585f83feabe78809d69ddcb9
7
- data.tar.gz: cfb2d98770096f2c799e28abb8ed12a775d5605e2b835ce6507c11ad73da57433938a94ce51f0217640022260739891697081e567edca39955752937882a2f37
6
+ metadata.gz: 1f4c701476f4303e87d9f7eded7b9667d6c1f1bcc060aec5707991c7f46b2e42089748422f66578d0c560fcf3c7da37df7c947fe6b02a8e1cce1ee21f5a0ff61
7
+ data.tar.gz: 69e1a1ff7288dc0a7d468fd306629a015ba638441fc610a7774f23c604f809d70193b3077eae772b24d83f5d304131f7313857ee3de2365b30185f11549c36e0
data/app/views/spree/admin/orders/customer_details/_form.html.erb CHANGED
@@ -81,7 +81,7 @@
81
81
  <%= f.fields_for :ship_address do |sa_form| %>
82
82
  <div class="form-group">
83
83
  <span data-hook="use_billing">
84
- <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
84
+ <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
85
85
  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
86
86
  </span>
87
87
  </div>
data/app/views/spree/admin/search/products.rabl CHANGED
@@ -3,7 +3,7 @@ node(:count) { @products.count }
3
3
  node(:total_count) { @products.total_count }
4
4
  node(:current_page) { params[:page] ? params[:page].to_i : 1 }
5
5
  node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
6
- node(:pages) { @products.num_pages }
6
+ node(:pages) { @products.total_pages }
7
7
  child(@products => :products) do
8
8
  attributes :id, :name
9
9
  end
data/app/views/spree/admin/shared/_head.html.erb CHANGED
@@ -13,7 +13,7 @@
13
13
  <% end %>
14
14
  </title>
15
15
 
16
- <%= stylesheet_link_tag 'spree/backend/all' %>
16
+ <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
17
17
 
18
18
  <%= javascript_include_tag 'spree/backend/all' %>
19
19
  <%= render "spree/admin/shared/translations" %>
data/spec/features/admin/orders/adjustments_spec.rb CHANGED
@@ -62,7 +62,7 @@ describe "Adjustments", type: :feature do
62
62
  fill_in "adjustment_label", with: "rebate"
63
63
  click_button "Continue"
64
64
  expect(page).to have_content("successfully created!")
65
- expect(page).to have_content("Total: $180.00")
65
+ expect(page).to have_content("Total: $80.00")
66
66
  end
67
67
  end
68
68
 
@@ -94,7 +94,7 @@ describe "Adjustments", type: :feature do
94
94
  expect(page).to have_content("$99.00")
95
95
  end
96
96
 
97
- expect(page).to have_content("Total: $259.00")
97
+ expect(page).to have_content("Total: $159.00")
98
98
  end
99
99
  end
100
100
 
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: 3.1.0.rc3
4
+ version: 3.1.0.rc4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-05-12 00:00:00.000000000 Z
11
+ date: 2016-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.1.0.rc3
19
+ version: 3.1.0.rc4
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: 3.1.0.rc3
26
+ version: 3.1.0.rc4
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: 3.1.0.rc3
33
+ version: 3.1.0.rc4
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: 3.1.0.rc3
40
+ version: 3.1.0.rc4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement