solidus_backend 2.2.0.beta1 → 2.2.0.rc1
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.
Potentially problematic release.
This version of solidus_backend might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +2 -2
- data/app/assets/stylesheets/spree/backend/components/_table-filter.scss +5 -1
- data/app/assets/stylesheets/spree/backend/shared/_typography.scss +0 -1
- data/app/controllers/spree/admin/orders_controller.rb +2 -2
- data/app/views/kaminari/solidus_admin/_paginator.html.erb +2 -2
- data/spec/controllers/spree/admin/orders_controller_spec.rb +4 -4
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2969081da681633c7dce7e1676d7afcd84a2e42d
|
4
|
+
data.tar.gz: ef72fedc9a55167bf7049a8e0fe8e0e7a5c4df5b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2349ac38e3b884ed73c1581492fa4c0419dbcbb73e386bcb7b585e8aa666a9358de0bdf7a14c5f4539b736048f85b1d531dfe4cd62b47d3c5ea23d78deea4fef
|
7
|
+
data.tar.gz: c8b9346af0a568d128df9af94a98d9a7606bad333aa6fb9b0028c54c5a288a15c26d20bfd76ddf8628ef8677ec56999b65947d9a2f5520ea15b262c3272613ce
|
@@ -1,13 +1,13 @@
|
|
1
1
|
body:not(.new-layout) #sidebar {
|
2
2
|
overflow: visible;
|
3
|
-
|
4
|
-
margin-top: 17px;
|
3
|
+
margin-top: 1.5rem;
|
5
4
|
|
6
5
|
.sidebar-title {
|
7
6
|
color: $color-2;
|
8
7
|
text-align: center;
|
9
8
|
font-size: 16px;
|
10
9
|
font-weight: $font-weight-bold;
|
10
|
+
border-top: 1px solid $color-border;
|
11
11
|
|
12
12
|
> span {
|
13
13
|
display: inline;
|
@@ -1,6 +1,10 @@
|
|
1
1
|
#table-filter {
|
2
2
|
|
3
|
-
|
3
|
+
/* This is needed to avoid overriding the bootstrap's styles for
|
4
|
+
* .input-group, which sets the form-control's width to 1%.
|
5
|
+
* Without this, the date range overflows its container on firefox.
|
6
|
+
*/
|
7
|
+
.field:not(.date-range-filter) {
|
4
8
|
input[type="text"], input[type="phone"],
|
5
9
|
input[type="email"], input[type="number"],
|
6
10
|
input[type="url"] {
|
@@ -98,7 +98,7 @@ module Spree
|
|
98
98
|
else
|
99
99
|
@order.contents.advance
|
100
100
|
|
101
|
-
if @order.
|
101
|
+
if @order.can_complete?
|
102
102
|
flash[:success] = Spree.t('order_ready_for_confirm')
|
103
103
|
else
|
104
104
|
flash[:error] = @order.errors.full_messages
|
@@ -111,7 +111,7 @@ module Spree
|
|
111
111
|
def confirm
|
112
112
|
if @order.completed?
|
113
113
|
redirect_to edit_admin_order_url(@order)
|
114
|
-
elsif !@order.
|
114
|
+
elsif !@order.can_complete?
|
115
115
|
render template: 'spree/admin/orders/confirm_advance'
|
116
116
|
end
|
117
117
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<%= paginator.render do %>
|
2
|
-
<nav
|
3
|
-
<ul class="pagination">
|
2
|
+
<nav>
|
3
|
+
<ul class="pagination justify-content-center">
|
4
4
|
<%= first_page_tag unless current_page.first? %>
|
5
5
|
<%= prev_page_tag unless current_page.first? %>
|
6
6
|
<% each_page do |page| %>
|
@@ -163,7 +163,7 @@ describe Spree::Admin::OrdersController, type: :controller do
|
|
163
163
|
end
|
164
164
|
|
165
165
|
context 'when successful' do
|
166
|
-
before { allow(order).to receive(:
|
166
|
+
before { allow(order).to receive(:can_complete?).and_return(true) }
|
167
167
|
|
168
168
|
it 'messages and redirects' do
|
169
169
|
subject
|
@@ -174,7 +174,7 @@ describe Spree::Admin::OrdersController, type: :controller do
|
|
174
174
|
|
175
175
|
context 'when unsuccessful' do
|
176
176
|
before do
|
177
|
-
allow(order).to receive(:
|
177
|
+
allow(order).to receive(:can_complete?).and_return(false)
|
178
178
|
allow(order).to receive(:errors).and_return(double(full_messages: ['failed']))
|
179
179
|
end
|
180
180
|
|
@@ -203,7 +203,7 @@ describe Spree::Admin::OrdersController, type: :controller do
|
|
203
203
|
end
|
204
204
|
|
205
205
|
context 'when in confirm' do
|
206
|
-
before { allow(order).to receive_messages completed?: false,
|
206
|
+
before { allow(order).to receive_messages completed?: false, can_complete?: true }
|
207
207
|
|
208
208
|
it 'renders the confirm page' do
|
209
209
|
subject
|
@@ -213,7 +213,7 @@ describe Spree::Admin::OrdersController, type: :controller do
|
|
213
213
|
end
|
214
214
|
|
215
215
|
context 'when before confirm' do
|
216
|
-
before { allow(order).to receive_messages completed?: false,
|
216
|
+
before { allow(order).to receive_messages completed?: false, can_complete?: false }
|
217
217
|
|
218
218
|
it 'renders the confirm_advance template (to allow refreshing of the order)' do
|
219
219
|
subject
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: solidus_backend
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.0.
|
4
|
+
version: 2.2.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-04-
|
11
|
+
date: 2017-04-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: solidus_api
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 2.2.0.
|
19
|
+
version: 2.2.0.rc1
|
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.0.
|
26
|
+
version: 2.2.0.rc1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: solidus_core
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 2.2.0.
|
33
|
+
version: 2.2.0.rc1
|
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.0.
|
40
|
+
version: 2.2.0.rc1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: sass-rails
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|