spree_backend 3.1.2 → 3.1.3

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/products_controller.rb +1 -0
  3. data/app/views/spree/admin/promotion_categories/new.html.erb +1 -1
  4. data/app/views/spree/admin/reports/sales_total.html.erb +3 -3
  5. data/spec/features/admin/orders/payments_spec.rb +1 -0
  6. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 462c24c0ea7bcd330a6eeaf3e8f27dae6d0cc954
4
- data.tar.gz: 1a9790046c08cfcf4b89c48011da4fbbf53dc055
3
+ metadata.gz: 8e5508c1e6162bbbfd4ef16977be9cbc9270f1c4
4
+ data.tar.gz: 4dd10a908bc145ea65564b4fd9d2ab1284e6fa98
5
5
  SHA512:
6
- metadata.gz: 491105783d07bc80c285e9651071ead3444b1972997b1c9cc5d4271c5260e7a70f4ae96181375956497b1d8eb7d27f4ffa12ed0468573c08266b17361b6228a6
7
- data.tar.gz: 1ef421f821223485b55ea00d3d5a2d7e973942b2a8de53f83838aa4227853ed34d1e051be28fda8c15a3f3707d6f41c86e8ba27ecd0a3e4e4b1e040b1f04e9ee
6
+ metadata.gz: 013d4b32776f0e76d02b7ebaebeabd8aca422f7d6e0c0d4be77ccb30aebff372ebcbfd67668e5c6d7390afb60779892de4ac5c88e0e024066026ca341b58be4e
7
+ data.tar.gz: 2989e5377557f6b2ac1b1ecd5e91efd8dd826d629a75200afc960220d5cab2736eb4b281f429fd692e388bf811df2b27fe60fb8e0bec10a7e47f211873e601dd
data/app/controllers/spree/admin/products_controller.rb CHANGED
@@ -105,6 +105,7 @@ module Spree
105
105
  return @collection if @collection.present?
106
106
  params[:q] ||= {}
107
107
  params[:q][:deleted_at_null] ||= "1"
108
+ params[:q][:discontinue_on_null] ||= "1"
108
109
 
109
110
  params[:q][:s] ||= "name asc"
110
111
  @collection = super
data/app/views/spree/admin/promotion_categories/new.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <% content_for :page_title do %>
2
- <%= link_to Spree.t(:promotion_categories), spree.admin_promotion_categories_url %> /
2
+ <%= link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_url %> /
3
3
  <%= Spree.t(:new_promotion_category) %>
4
4
  <% end %>
5
5
 
data/app/views/spree/admin/reports/sales_total.html.erb CHANGED
@@ -20,9 +20,9 @@
20
20
  <% @totals.each do |key, row| %>
21
21
  <tr>
22
22
  <td><%= key %></td>
23
- <td><%= row[:item_total].format %></td>
24
- <td><%= row[:adjustment_total].format %></td>
25
- <td><%= row[:sales_total].format %></td>
23
+ <td><%= Spree::Money.new(row[:item_total], { currency: key }) %></td>
24
+ <td><%= Spree::Money.new(row[:adjustment_total], { currency: key }) %></td>
25
+ <td><%= Spree::Money.new(row[:sales_total], { currency: key }) %></td>
26
26
  </tr>
27
27
  <% end %>
28
28
  </tbody>
data/spec/features/admin/orders/payments_spec.rb CHANGED
@@ -85,6 +85,7 @@ describe 'Payments', type: :feature, js: true do
85
85
  expect(page).to have_content('successfully created!')
86
86
 
87
87
  click_icon(:capture)
88
+ wait_for_ajax
88
89
  expect(find('#payment_status').text).to eq('paid')
89
90
 
90
91
  expect(page).not_to have_selector('#new_payment_section')
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.2
4
+ version: 3.1.3
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-11-15 00:00:00.000000000 Z
11
+ date: 2016-11-30 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.2
19
+ version: 3.1.3
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.2
26
+ version: 3.1.3
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.2
33
+ version: 3.1.3
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.2
40
+ version: 3.1.3
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement