solidus_auth_devise 2.5.1 → 2.5.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_auth_devise might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +29 -3
- data/README.md +1 -42
- data/db/migrate/20200417153503_add_unconfirmed_email_to_spree_users.rb +1 -1
- data/lib/spree/auth/version.rb +1 -1
- data/lib/views/backend/spree/admin/shared/_navigation_footer.html.erb +2 -2
- data/lib/views/backend/spree/admin/user_passwords/edit.html.erb +4 -4
- data/lib/views/backend/spree/admin/user_passwords/new.html.erb +4 -4
- data/lib/views/backend/spree/admin/user_sessions/authorization_failure.html.erb +1 -1
- data/lib/views/backend/spree/admin/user_sessions/new.html.erb +7 -7
- data/lib/views/backend/spree/layouts/admin/_login_nav.html.erb +4 -4
- data/lib/views/frontend/spree/checkout/registration.html.erb +4 -4
- data/lib/views/frontend/spree/shared/_login.html.erb +4 -4
- data/lib/views/frontend/spree/shared/_login_bar_items.html.erb +3 -3
- data/lib/views/frontend/spree/shared/_user_form.html.erb +3 -3
- data/lib/views/frontend/spree/user_passwords/edit.html.erb +4 -4
- data/lib/views/frontend/spree/user_passwords/new.html.erb +4 -4
- data/lib/views/frontend/spree/user_registrations/new.html.erb +3 -3
- data/lib/views/frontend/spree/user_sessions/authorization_failure.html.erb +1 -1
- data/lib/views/frontend/spree/user_sessions/new.html.erb +2 -2
- data/lib/views/frontend/spree/users/edit.html.erb +2 -2
- data/lib/views/frontend/spree/users/show.html.erb +13 -13
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f2f512d028190d0c6f7af3805c12e287b7c2d7e50cb54f1f9fdec1bbf9750d12
|
4
|
+
data.tar.gz: 99f5dec472c7e5a747663ffc573438115e37d7af63281aa91401083b467c69b3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 53ccda88e87c185ff0a4a9606e1e7a8d938d8f3a0fd26a23ac2593dd5a1f9c0f8bf51b0916a1fc0042268ca83f437e265269480636100c27b9c135131dfe3731
|
7
|
+
data.tar.gz: 3d8558a0b3fbe9ea959649df8c46401e01b6f2c80b29e79141277a962e242b0bed6ef2ad39db816730bcd9ddce0e896c0964f3d0864852dbd82c63e3f6076c09
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,31 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## [v2.5.2](https://github.com/solidusio/solidus_auth_devise/tree/v2.5.2) (2020-11-11)
|
4
|
+
|
5
|
+
[Full Changelog](https://github.com/solidusio/solidus_auth_devise/compare/v2.5.1...v2.5.2)
|
6
|
+
|
7
|
+
**Implemented enhancements:**
|
8
|
+
|
9
|
+
- Replace `I18n.t` with `t` in views [\#200](https://github.com/solidusio/solidus_auth_devise/pull/200) ([spaghetticode](https://github.com/spaghetticode))
|
10
|
+
|
11
|
+
**Merged pull requests:**
|
12
|
+
|
13
|
+
- Update migrations to support Rails 5.1 [\#201](https://github.com/solidusio/solidus_auth_devise/pull/201) ([brchristian](https://github.com/brchristian))
|
14
|
+
- Point to Solidus wiki for gem release [\#199](https://github.com/solidusio/solidus_auth_devise/pull/199) ([spaghetticode](https://github.com/spaghetticode))
|
15
|
+
|
16
|
+
## [v2.5.1](https://github.com/solidusio/solidus_auth_devise/tree/v2.5.1) (2020-10-23)
|
17
|
+
|
18
|
+
[Full Changelog](https://github.com/solidusio/solidus_auth_devise/compare/v2.5.0...v2.5.1)
|
19
|
+
|
20
|
+
**Closed issues:**
|
21
|
+
|
22
|
+
- Asset compilation crashes on 2.5.0 [\#196](https://github.com/solidusio/solidus_auth_devise/issues/196)
|
23
|
+
|
24
|
+
**Merged pull requests:**
|
25
|
+
|
26
|
+
- Use proper name for add\_migrations [\#198](https://github.com/solidusio/solidus_auth_devise/pull/198) ([peterberkenbosch](https://github.com/peterberkenbosch))
|
27
|
+
- Move AuthConfiguration out of autoloading paths [\#197](https://github.com/solidusio/solidus_auth_devise/pull/197) ([elia](https://github.com/elia))
|
28
|
+
|
3
29
|
## [v2.5.0](https://github.com/solidusio/solidus_auth_devise/tree/v2.5.0) (2020-10-07)
|
4
30
|
|
5
31
|
[Full Changelog](https://github.com/solidusio/solidus_auth_devise/compare/v2.4.0...v2.5.0)
|
@@ -116,7 +142,7 @@
|
|
116
142
|
- Add Solidus v2.7 to .travis.yml [\#127](https://github.com/solidusio/solidus_auth_devise/pull/127) ([jacobherrington](https://github.com/jacobherrington))
|
117
143
|
- Fix spree routes [\#125](https://github.com/solidusio/solidus_auth_devise/pull/125) ([jtapia](https://github.com/jtapia))
|
118
144
|
- Remove unnecessary decorator [\#122](https://github.com/solidusio/solidus_auth_devise/pull/122) ([jhawthorn](https://github.com/jhawthorn))
|
119
|
-
-
|
145
|
+
- Disable backend footer profile edit link if role cannot edit users [\#120](https://github.com/solidusio/solidus_auth_devise/pull/120) ([gianlucarizzo](https://github.com/gianlucarizzo))
|
120
146
|
|
121
147
|
## [v2.1.0](https://github.com/solidusio/solidus_auth_devise/tree/v2.1.0) (2018-01-22)
|
122
148
|
|
@@ -131,6 +157,8 @@
|
|
131
157
|
- Remove unused helper include [\#118](https://github.com/solidusio/solidus_auth_devise/pull/118) ([jhawthorn](https://github.com/jhawthorn))
|
132
158
|
- update spec according new solidus behaviour for 404 [\#115](https://github.com/solidusio/solidus_auth_devise/pull/115) ([ccarruitero](https://github.com/ccarruitero))
|
133
159
|
- Don't require deface for solidus 2.5+ [\#114](https://github.com/solidusio/solidus_auth_devise/pull/114) ([jhawthorn](https://github.com/jhawthorn))
|
160
|
+
- Test that we are acting as paranoid not it's behaviour [\#113](https://github.com/solidusio/solidus_auth_devise/pull/113) ([tvdeyen](https://github.com/tvdeyen))
|
161
|
+
- Remove references to dash [\#104](https://github.com/solidusio/solidus_auth_devise/pull/104) ([jhawthorn](https://github.com/jhawthorn))
|
134
162
|
- Reset api key when assigning password [\#99](https://github.com/solidusio/solidus_auth_devise/pull/99) ([jhawthorn](https://github.com/jhawthorn))
|
135
163
|
- RFC: Support Backend-Only Stores [\#96](https://github.com/solidusio/solidus_auth_devise/pull/96) ([stewart](https://github.com/stewart))
|
136
164
|
|
@@ -140,14 +168,12 @@
|
|
140
168
|
|
141
169
|
**Merged pull requests:**
|
142
170
|
|
143
|
-
- Disable backend footer profile edit link if role cannot edit users [\#120](https://github.com/solidusio/solidus_auth_devise/pull/120) ([gianlucarizzo](https://github.com/gianlucarizzo))
|
144
171
|
- Drop Solidus v1.0, v1.1 support [\#111](https://github.com/solidusio/solidus_auth_devise/pull/111) ([swcraig](https://github.com/swcraig))
|
145
172
|
- Stop raising an exception when callback in UsersController is undefined [\#110](https://github.com/solidusio/solidus_auth_devise/pull/110) ([swcraig](https://github.com/swcraig))
|
146
173
|
- Add ffaker dependency to gemspec [\#109](https://github.com/solidusio/solidus_auth_devise/pull/109) ([swcraig](https://github.com/swcraig))
|
147
174
|
- Remove has\_many orders [\#107](https://github.com/solidusio/solidus_auth_devise/pull/107) ([jhawthorn](https://github.com/jhawthorn))
|
148
175
|
- Use base spec\_helper from solidus\_support [\#106](https://github.com/solidusio/solidus_auth_devise/pull/106) ([jhawthorn](https://github.com/jhawthorn))
|
149
176
|
- Extract \*\_available? to solidus\_support [\#105](https://github.com/solidusio/solidus_auth_devise/pull/105) ([jhawthorn](https://github.com/jhawthorn))
|
150
|
-
- Remove references to dash [\#104](https://github.com/solidusio/solidus_auth_devise/pull/104) ([jhawthorn](https://github.com/jhawthorn))
|
151
177
|
- match logout route to devise configuration [\#103](https://github.com/solidusio/solidus_auth_devise/pull/103) ([BenMorganIO](https://github.com/BenMorganIO))
|
152
178
|
|
153
179
|
## [v1.6.4](https://github.com/solidusio/solidus_auth_devise/tree/v1.6.4) (2017-07-24)
|
data/README.md
CHANGED
@@ -98,45 +98,4 @@ bundle exec rake
|
|
98
98
|
|
99
99
|
## Releasing a new version
|
100
100
|
|
101
|
-
|
102
|
-
|
103
|
-
We use [gem-release](https://github.com/svenfuchs/gem-release) to release this
|
104
|
-
extension with ease.
|
105
|
-
|
106
|
-
Supposing you are on the master branch and you are working on a fork of this
|
107
|
-
extension, `upstream` is the main remote and you have write access to it, you
|
108
|
-
can simply run:
|
109
|
-
|
110
|
-
```bash
|
111
|
-
gem bump --version minor --tag --release
|
112
|
-
```
|
113
|
-
|
114
|
-
This command will:
|
115
|
-
|
116
|
-
- bump the gem version to the next minor (changing the `version.rb` file)
|
117
|
-
- commit the change and push it to upstream master
|
118
|
-
- create a git tag
|
119
|
-
- push the tag to the upstream remote
|
120
|
-
- release the new version on RubyGems
|
121
|
-
|
122
|
-
Or you can run these commands individually:
|
123
|
-
|
124
|
-
```bash
|
125
|
-
gem bump --version minor
|
126
|
-
gem tag
|
127
|
-
gem release
|
128
|
-
```
|
129
|
-
|
130
|
-
#### 2. Publish the updated CHANGELOG
|
131
|
-
|
132
|
-
After the release is done we can generate the updated CHANGELOG
|
133
|
-
using
|
134
|
-
[github-changelog-generator](https://github.com/github-changelog-generator/github-changelog-generator)
|
135
|
-
by running the following command:
|
136
|
-
|
137
|
-
|
138
|
-
```bash
|
139
|
-
bundle exec github_changelog_generator solidusio/solidus_auth_devise --token YOUR_GITHUB_TOKEN
|
140
|
-
git commit -am 'Update CHANGELOG'
|
141
|
-
git push upstream master
|
142
|
-
```
|
101
|
+
Please refer to the dedicated [page](https://github.com/solidusio/solidus/wiki/How-to-release-extensions) on Solidus wiki.
|
data/lib/spree/auth/version.rb
CHANGED
@@ -16,7 +16,7 @@
|
|
16
16
|
<li data-hook="user-logout-link">
|
17
17
|
<%= link_to spree.admin_logout_path, method: Devise.sign_out_via do %>
|
18
18
|
<i class='fa fa-sign-out'></i>
|
19
|
-
<%=
|
19
|
+
<%= t('spree.logout') %>
|
20
20
|
<% end %>
|
21
21
|
</li>
|
22
22
|
|
@@ -24,7 +24,7 @@
|
|
24
24
|
<li data-hook="store-frontend-link">
|
25
25
|
<%= link_to spree.root_path, target: '_blank' do %>
|
26
26
|
<i class='fa fa-external-link'></i>
|
27
|
-
<%=
|
27
|
+
<%= t('spree.back_to_store') %>
|
28
28
|
<% end %>
|
29
29
|
</li>
|
30
30
|
<% end %>
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @spree_user } %>
|
2
|
-
<h2><%=
|
2
|
+
<h2><%= t('spree.change_my_password') %></h2>
|
3
3
|
|
4
4
|
<%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
|
5
5
|
<p>
|
6
|
-
<%= f.label :password,
|
6
|
+
<%= f.label :password, t('spree.password') %><br />
|
7
7
|
<%= f.password_field :password %><br />
|
8
8
|
</p>
|
9
9
|
<p>
|
10
|
-
<%= f.label :password_confirmation,
|
10
|
+
<%= f.label :password_confirmation, t('spree.confirm_password') %><br />
|
11
11
|
<%= f.password_field :password_confirmation %><br />
|
12
12
|
</p>
|
13
13
|
<%= f.hidden_field :reset_password_token %>
|
14
|
-
<%= f.submit
|
14
|
+
<%= f.submit t('spree.update'), class: 'button primary' %>
|
15
15
|
<% end %>
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<div id="forgot-password">
|
2
|
-
<h6><%=
|
2
|
+
<h6><%= t('spree.forgot_password') %></h6>
|
3
3
|
|
4
|
-
<p><%=
|
4
|
+
<p><%= t('spree.instructions_to_reset_password') %></p>
|
5
5
|
|
6
6
|
<%= form_for Spree::User.new, as: :spree_user, url: spree.admin_reset_password_path do |f| %>
|
7
7
|
<p>
|
8
|
-
<%= f.label :email,
|
8
|
+
<%= f.label :email, t('spree.email') %><br />
|
9
9
|
<%= f.email_field :email, required: true %>
|
10
10
|
</p>
|
11
11
|
<p>
|
12
|
-
<%= f.submit
|
12
|
+
<%= f.submit t('spree.reset_password'), class: 'button primary' %>
|
13
13
|
</p>
|
14
14
|
<% end %>
|
15
15
|
</div>
|
@@ -4,28 +4,28 @@
|
|
4
4
|
|
5
5
|
<% @body_id = 'login' %>
|
6
6
|
<div id="existing-customer">
|
7
|
-
<h6><%=
|
7
|
+
<h6><%= t('spree.admin_login') %></h6>
|
8
8
|
<div data-hook="login">
|
9
9
|
<%= form_for Spree::User.new, as: :spree_user, url: spree.admin_create_new_session_path do |f| %>
|
10
10
|
<div id="password-credentials">
|
11
11
|
<p>
|
12
|
-
<%= f.label :email,
|
12
|
+
<%= f.label :email, t('spree.email') %><br />
|
13
13
|
<%= f.email_field :email, class: 'title', tabindex: 1, autocomplete: 'username' %>
|
14
14
|
</p>
|
15
15
|
<p>
|
16
|
-
<%= f.label :password,
|
16
|
+
<%= f.label :password, t('spree.password') %><br />
|
17
17
|
<%= f.password_field :password, class: 'title', tabindex: 2, autocomplete: 'current-password' %>
|
18
18
|
</p>
|
19
19
|
</div>
|
20
20
|
<p>
|
21
21
|
<%= f.check_box :remember_me, tabindex: 3 %>
|
22
|
-
<%= f.label :remember_me,
|
22
|
+
<%= f.label :remember_me, t('spree.remember_me') %>
|
23
23
|
</p>
|
24
24
|
|
25
|
-
<p><%= f.submit
|
25
|
+
<p><%= f.submit t('spree.login'), class: 'btn btn-primary', tabindex: 4 %></p>
|
26
26
|
<% end %>
|
27
|
-
<%=
|
28
|
-
<%= link_to
|
27
|
+
<%= t('spree.or') %>
|
28
|
+
<%= link_to t('spree.forgot_password'), spree.admin_recover_password_path %>
|
29
29
|
</div>
|
30
30
|
</div>
|
31
31
|
<div data-hook="login_extras"></div>
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<% if spree_current_user %>
|
2
2
|
<ul id="login-nav" class="inline-menu">
|
3
|
-
<li data-hook="user-logged-in-as"><%=
|
4
|
-
<li data-hook="user-account-link" class='fa fa-user'><%= link_to
|
5
|
-
<li data-hook="user-logout-link" class='fa fa-sign-out'><%= link_to
|
3
|
+
<li data-hook="user-logged-in-as"><%= t('spree.logged_in_as') %>: <%= spree_current_user.email %></li>
|
4
|
+
<li data-hook="user-account-link" class='fa fa-user'><%= link_to t('spree.account'), spree.edit_admin_user_path(spree_current_user) %></li>
|
5
|
+
<li data-hook="user-logout-link" class='fa fa-sign-out'><%= link_to t('spree.logout'), spree.admin_logout_path %></li>
|
6
6
|
|
7
7
|
<% if spree.respond_to? :root_path %>
|
8
8
|
<li data-hook="store-frontend-link" class='fa fa-external-link'>
|
9
|
-
<%= link_to
|
9
|
+
<%= link_to t('spree.back_to_store'), spree.root_path, target: '_blank' %>
|
10
10
|
</li>
|
11
11
|
<% end %>
|
12
12
|
</ul>
|
@@ -1,21 +1,21 @@
|
|
1
1
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
|
2
|
-
<h1><%=
|
2
|
+
<h1><%= t('spree.registration') %></h1>
|
3
3
|
<div id="registration" data-hook>
|
4
4
|
<div id="account" class="columns alpha eight">
|
5
5
|
<%= render template: 'spree/user_sessions/new' %>
|
6
6
|
</div>
|
7
7
|
<% if Spree::Config[:allow_guest_checkout] %>
|
8
8
|
<div id="guest_checkout" data-hook class="columns omega eight">
|
9
|
-
<h6><%=
|
9
|
+
<h6><%= t('spree.guest_user_account') %></h6>
|
10
10
|
<% if flash[:registration_error] %>
|
11
11
|
<div class='flash error'><%= flash[:registration_error] %></div>
|
12
12
|
<% end %>
|
13
13
|
<%= form_for @order, url: update_checkout_registration_path, method: :put, html: { id: 'checkout_form_registration' } do |f| %>
|
14
14
|
<p>
|
15
|
-
<%= f.label :email,
|
15
|
+
<%= f.label :email, t('spree.email') %><br />
|
16
16
|
<%= f.email_field :email, class: 'title' %>
|
17
17
|
</p>
|
18
|
-
<p><%= f.submit
|
18
|
+
<p><%= f.submit t('spree.continue'), class: 'button primary' %></p>
|
19
19
|
<% end %>
|
20
20
|
</div>
|
21
21
|
<% end %>
|
@@ -1,18 +1,18 @@
|
|
1
1
|
<%= form_for Spree::User.new, as: :spree_user, url: spree.create_new_session_path do |f| %>
|
2
2
|
<div id="password-credentials">
|
3
3
|
<p>
|
4
|
-
<%= f.label :email,
|
4
|
+
<%= f.label :email, t('spree.email') %><br />
|
5
5
|
<%= f.email_field :email, class: 'title', tabindex: 1, autofocus: true %>
|
6
6
|
</p>
|
7
7
|
<p>
|
8
|
-
<%= f.label :password,
|
8
|
+
<%= f.label :password, t('spree.password') %><br />
|
9
9
|
<%= f.password_field :password, class: 'title', tabindex: 2 %>
|
10
10
|
</p>
|
11
11
|
</div>
|
12
12
|
<p>
|
13
13
|
<%= f.check_box :remember_me, tabindex: 3 %>
|
14
|
-
<%= f.label :remember_me,
|
14
|
+
<%= f.label :remember_me, t('spree.remember_me') %>
|
15
15
|
</p>
|
16
16
|
|
17
|
-
<p><%= f.submit
|
17
|
+
<p><%= f.submit t('spree.login'), class: 'button primary', tabindex: 4 %></p>
|
18
18
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<% if spree_current_user %>
|
2
|
-
<li><%= link_to
|
3
|
-
<li><%= link_to
|
2
|
+
<li><%= link_to t('spree.my_account'), spree.account_path %></li>
|
3
|
+
<li><%= link_to t('spree.logout'), spree.logout_path, method: Devise.sign_out_via %></li>
|
4
4
|
<% else %>
|
5
|
-
<li id="link-to-login"><%= link_to
|
5
|
+
<li id="link-to-login"><%= link_to t('spree.login'), spree.login_path %></li>
|
6
6
|
<% end %>
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<p>
|
2
|
-
<%= f.label :email,
|
2
|
+
<%= f.label :email, t('spree.email') %><br />
|
3
3
|
<%= f.email_field :email, class: 'title' %>
|
4
4
|
</p>
|
5
5
|
<div id="password-credentials">
|
6
6
|
<p>
|
7
|
-
<%= f.label :password,
|
7
|
+
<%= f.label :password, t('spree.password') %><br />
|
8
8
|
<%= f.password_field :password, class: 'title' %>
|
9
9
|
</p>
|
10
10
|
|
11
11
|
<p>
|
12
|
-
<%= f.label :password_confirmation,
|
12
|
+
<%= f.label :password_confirmation, t('spree.confirm_password') %><br />
|
13
13
|
<%= f.password_field :password_confirmation, class: 'title' %>
|
14
14
|
</p>
|
15
15
|
</div>
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @spree_user } %>
|
2
2
|
<div id="change-password">
|
3
|
-
<h6><%=
|
3
|
+
<h6><%= t('spree.change_my_password') %></h6>
|
4
4
|
|
5
5
|
<%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
|
6
6
|
<p>
|
7
|
-
<%= f.label :password,
|
7
|
+
<%= f.label :password, t('spree.password') %><br />
|
8
8
|
<%= f.password_field :password %><br />
|
9
9
|
</p>
|
10
10
|
<p>
|
11
|
-
<%= f.label :password_confirmation,
|
11
|
+
<%= f.label :password_confirmation, t('spree.confirm_password') %><br />
|
12
12
|
<%= f.password_field :password_confirmation %><br />
|
13
13
|
</p>
|
14
14
|
<%= f.hidden_field :reset_password_token %>
|
15
|
-
<%= f.submit
|
15
|
+
<%= f.submit t('spree.update'), class: 'button primary' %>
|
16
16
|
<% end %>
|
17
17
|
</div>
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<div id="forgot-password">
|
2
|
-
<h6><%=
|
2
|
+
<h6><%= t('spree.forgot_password') %></h6>
|
3
3
|
|
4
|
-
<p><%=
|
4
|
+
<p><%= t('spree.instructions_to_reset_password') %></p>
|
5
5
|
|
6
6
|
<%= form_for Spree::User.new, as: :spree_user, url: spree.reset_password_path do |f| %>
|
7
7
|
<p>
|
8
|
-
<%= f.label :email,
|
8
|
+
<%= f.label :email, t('spree.email') %><br />
|
9
9
|
<%= f.email_field :email, required: true %>
|
10
10
|
</p>
|
11
11
|
<p>
|
12
|
-
<%= f.submit
|
12
|
+
<%= f.submit t('spree.reset_password'), class: 'button primary' %>
|
13
13
|
</p>
|
14
14
|
<% end %>
|
15
15
|
</div>
|
@@ -3,16 +3,16 @@
|
|
3
3
|
<%= render 'spree/shared/error_messages', target: resource %>
|
4
4
|
|
5
5
|
<div id="new-customer">
|
6
|
-
<h6><%=
|
6
|
+
<h6><%= t('spree.new_customer') %></h6>
|
7
7
|
|
8
8
|
<div data-hook="signup">
|
9
9
|
<%= form_for resource, as: :spree_user, url: spree.registration_path(resource) do |f| %>
|
10
10
|
<div data-hook="signup_inside_form">
|
11
11
|
<%= render partial: 'spree/shared/user_form', locals: { f: f } %>
|
12
|
-
<p><%= f.submit
|
12
|
+
<p><%= f.submit t('spree.create'), class: 'button primary' %></p>
|
13
13
|
</div>
|
14
14
|
<% end %>
|
15
|
-
<%=
|
15
|
+
<%= t('spree.or') %> <%= link_to t('spree.login_as_existing'), spree.login_path %>
|
16
16
|
|
17
17
|
</div>
|
18
18
|
|
@@ -4,10 +4,10 @@
|
|
4
4
|
|
5
5
|
<% @body_id = 'login' %>
|
6
6
|
<div id="existing-customer">
|
7
|
-
<h6><%=
|
7
|
+
<h6><%= t('spree.login_as_existing') %></h6>
|
8
8
|
<div data-hook="login">
|
9
9
|
<%= render partial: 'spree/shared/login' %>
|
10
|
-
<%=
|
10
|
+
<%= t('spree.or') %> <%= link_to t('spree.create_a_new_account'), spree.signup_path %> | <%= link_to t('spree.forgot_password'), spree.recover_password_path %>
|
11
11
|
</div>
|
12
12
|
</div>
|
13
13
|
<div data-hook="login_extras"></div>
|
@@ -1,13 +1,13 @@
|
|
1
1
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
|
2
2
|
|
3
3
|
<div id="edit-account">
|
4
|
-
<h1><%=
|
4
|
+
<h1><%= t('spree.editing_user') %></h1>
|
5
5
|
|
6
6
|
<div data-hook="account_edit">
|
7
7
|
<%= form_for Spree::User.new, as: @user, url: spree.user_path(@user), method: :put do |f| %>
|
8
8
|
<%= render partial: 'spree/shared/user_form', locals: { f: f } %>
|
9
9
|
<p>
|
10
|
-
<%= f.submit
|
10
|
+
<%= f.submit t('spree.update'), class: 'button primary' %>
|
11
11
|
</p>
|
12
12
|
<% end %>
|
13
13
|
</div>
|
@@ -2,24 +2,24 @@
|
|
2
2
|
|
3
3
|
<div data-hook="account_summary" class="account-summary">
|
4
4
|
<dl id="user-info">
|
5
|
-
<dt><%=
|
6
|
-
<dd><%= @user.email %> (<%= link_to
|
5
|
+
<dt><%= t('spree.email') %></dt>
|
6
|
+
<dd><%= @user.email %> (<%= link_to t('spree.edit'), spree.edit_account_path %>)</dd>
|
7
7
|
</dl>
|
8
8
|
</div>
|
9
9
|
|
10
10
|
<div data-hook="account_my_orders" class="account-my-orders">
|
11
11
|
|
12
|
-
<h3><%=
|
12
|
+
<h3><%= t('spree.my_orders') %></h3>
|
13
13
|
<% if @orders.present? %>
|
14
14
|
<table class="order-summary">
|
15
15
|
<thead>
|
16
16
|
<tr>
|
17
|
-
<th class="order-number"><%=
|
18
|
-
<th class="order-date"><%=
|
19
|
-
<th class="order-status"><%=
|
20
|
-
<th class="order-payment-state"><%=
|
21
|
-
<th class="order-shipment-state"><%=
|
22
|
-
<th class="order-total"><%=
|
17
|
+
<th class="order-number"><%= t(:number, scope: 'activerecord.attributes.spree/order') %></th>
|
18
|
+
<th class="order-date"><%= t('spree.date') %></th>
|
19
|
+
<th class="order-status"><%= t('spree.status') %></th>
|
20
|
+
<th class="order-payment-state"><%= t('spree.payment_state') %></th>
|
21
|
+
<th class="order-shipment-state"><%= t('spree.shipment_state') %></th>
|
22
|
+
<th class="order-total"><%= t('spree.total') %></th>
|
23
23
|
</tr>
|
24
24
|
</thead>
|
25
25
|
<tbody>
|
@@ -27,16 +27,16 @@
|
|
27
27
|
<tr class="<%= cycle('even', 'odd') %>">
|
28
28
|
<td class="order-number"><%= link_to order.number, order_url(order) %></td>
|
29
29
|
<td class="order-date"><%= l order.completed_at.to_date %></td>
|
30
|
-
<td class="order-status"><%=
|
31
|
-
<td class="order-payment-state"><%=
|
32
|
-
<td class="order-shipment-state"><%=
|
30
|
+
<td class="order-status"><%= t("spree.order_state.#{order.state}").titleize %></td>
|
31
|
+
<td class="order-payment-state"><%= t("spree.payment_states.#{order.payment_state}").titleize if order.payment_state %></td>
|
32
|
+
<td class="order-shipment-state"><%= t("spree.shipment_states.#{order.shipment_state}").titleize if order.shipment_state %></td>
|
33
33
|
<td class="order-total"><%= order.display_total %></td>
|
34
34
|
</tr>
|
35
35
|
<% end %>
|
36
36
|
</tbody>
|
37
37
|
</table>
|
38
38
|
<% else %>
|
39
|
-
<p><%=
|
39
|
+
<p><%= t('spree.you_have_no_orders_yet') %></p>
|
40
40
|
<% end %>
|
41
41
|
<br />
|
42
42
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: solidus_auth_devise
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.5.
|
4
|
+
version: 2.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-11-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: deface
|