spree_admin 5.3.2 → 5.3.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.
- checksums.yaml +4 -4
- data/app/controllers/spree/admin/addresses_controller.rb +4 -16
- data/app/controllers/spree/admin/policies_controller.rb +5 -0
- data/app/views/spree/admin/addresses/_edit_form.html.erb +13 -0
- data/app/views/spree/admin/addresses/_new_form.html.erb +22 -0
- data/app/views/spree/admin/addresses/create.turbo_stream.erb +21 -0
- data/app/views/spree/admin/addresses/edit.html.erb +1 -12
- data/app/views/spree/admin/addresses/new.html.erb +1 -16
- data/app/views/spree/admin/addresses/update.turbo_stream.erb +26 -0
- metadata +9 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f53aab5bf5de0f40206a80c2a2375cc915973139dec1a0ca669a36f4d98a6469
|
|
4
|
+
data.tar.gz: c3c5c6babf054c33dc7027464c9c38bc5e27eb1fcb41d7ff4891a223291dcde0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 30e6161df15f8ba37bfe8b41c7920f63352f344cf7176941a44ce0d43952347ac22aca27d2ddb9209e6423bebb5f089b0b9c9cf51238752ff25552e9ca8440f6
|
|
7
|
+
data.tar.gz: 6a14594a4adf0b59a58f0dcae7607e0e65bc945bd99134895889ba312e26a56702712f25f148879b48d250d2edb27c026f89d9ad2b3824a6aac50930852d9c77
|
|
@@ -15,14 +15,8 @@ module Spree
|
|
|
15
15
|
|
|
16
16
|
@address = @object = result.value
|
|
17
17
|
|
|
18
|
-
if result.success?
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
flash[:success] = flash_message_for(@address, :successfully_created)
|
|
22
|
-
redirect_to location_after_save, status: :see_other
|
|
23
|
-
else
|
|
24
|
-
render action: :edit, status: :unprocessable_entity
|
|
25
|
-
end
|
|
18
|
+
set_current_store if result.success?
|
|
19
|
+
flash.now[:success] = flash_message_for(@address, :successfully_created) if result.success?
|
|
26
20
|
end
|
|
27
21
|
|
|
28
22
|
def update
|
|
@@ -37,14 +31,8 @@ module Spree
|
|
|
37
31
|
|
|
38
32
|
@address = @object = result.value
|
|
39
33
|
|
|
40
|
-
if result.success?
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
flash[:success] = flash_message_for(@address, :successfully_updated)
|
|
44
|
-
redirect_to location_after_save, status: :see_other
|
|
45
|
-
else
|
|
46
|
-
render action: :edit, status: :unprocessable_entity
|
|
47
|
-
end
|
|
34
|
+
set_current_store if result.success?
|
|
35
|
+
flash.now[:success] = flash_message_for(@address, :successfully_updated) if result.success?
|
|
48
36
|
end
|
|
49
37
|
|
|
50
38
|
private
|
|
@@ -27,6 +27,11 @@ module Spree
|
|
|
27
27
|
target = object || @object
|
|
28
28
|
spree.admin_policy_url(target&.id, options)
|
|
29
29
|
end
|
|
30
|
+
|
|
31
|
+
def edit_object_url(object = nil, options = {})
|
|
32
|
+
target = object || @object
|
|
33
|
+
spree.edit_admin_policy_url(target&.id, options)
|
|
34
|
+
end
|
|
30
35
|
end
|
|
31
36
|
end
|
|
32
37
|
end
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<%= turbo_frame_tag "edit_address_#{params[:type]}" do %>
|
|
2
|
+
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>
|
|
3
|
+
|
|
4
|
+
<%= form_for [:admin, @address], as: :address, url: spree.admin_address_path(@address), method: :put do |f| %>
|
|
5
|
+
<%= render 'spree/addresses/form',
|
|
6
|
+
address_name: 'address',
|
|
7
|
+
address_form: f,
|
|
8
|
+
address_type: 'shipping',
|
|
9
|
+
address: @address %>
|
|
10
|
+
<%= hidden_field_tag :type, params[:type] %>
|
|
11
|
+
<%= render 'spree/admin/shared/edit_resource_links', f: f %>
|
|
12
|
+
<% end %>
|
|
13
|
+
<% end %>
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
<% frame_id = local_assigns.fetch(:frame_id, "new_address_#{params[:type]}") %>
|
|
2
|
+
<% user_id_value = local_assigns.fetch(:user_id, params[:user_id]) %>
|
|
3
|
+
<% default_shipping_value = local_assigns.fetch(:default_shipping, params[:default_shipping]) %>
|
|
4
|
+
<% default_billing_value = local_assigns.fetch(:default_billing, params[:default_billing]) %>
|
|
5
|
+
|
|
6
|
+
<%= turbo_frame_tag frame_id do %>
|
|
7
|
+
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>
|
|
8
|
+
|
|
9
|
+
<%= form_for [:admin, @address], as: :address, url: spree.admin_addresses_path, method: :post do |f| %>
|
|
10
|
+
<%= render 'spree/addresses/form',
|
|
11
|
+
address_name: 'address',
|
|
12
|
+
address_form: f,
|
|
13
|
+
address_type: 'shipping',
|
|
14
|
+
address: @address %>
|
|
15
|
+
<%= hidden_field_tag :user_id, user_id_value %>
|
|
16
|
+
<%= hidden_field_tag :default_shipping, default_shipping_value %>
|
|
17
|
+
<%= hidden_field_tag :default_billing, default_billing_value %>
|
|
18
|
+
<%= hidden_field_tag :type, params[:type] %>
|
|
19
|
+
|
|
20
|
+
<%= render 'spree/admin/shared/new_resource_links', f: f %>
|
|
21
|
+
<% end %>
|
|
22
|
+
<% end %>
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
<% @user = @address.user %>
|
|
2
|
+
|
|
3
|
+
<% if @address.valid? %>
|
|
4
|
+
<%= turbo_render_alerts %>
|
|
5
|
+
|
|
6
|
+
<% if params[:default_shipping].to_b %>
|
|
7
|
+
<%= turbo_stream.replace 'user-ship-address' do %>
|
|
8
|
+
<%= render 'spree/admin/users/shipping' %>
|
|
9
|
+
<% end %>
|
|
10
|
+
<% end %>
|
|
11
|
+
|
|
12
|
+
<% if params[:default_billing].to_b %>
|
|
13
|
+
<%= turbo_stream.replace 'user-bill-address' do %>
|
|
14
|
+
<%= render 'spree/admin/users/billing' %>
|
|
15
|
+
<% end %>
|
|
16
|
+
<% end %>
|
|
17
|
+
<% else %>
|
|
18
|
+
<%= turbo_stream.replace "new_address_#{params[:type]}" do %>
|
|
19
|
+
<%= render 'spree/admin/addresses/new_form' %>
|
|
20
|
+
<% end %>
|
|
21
|
+
<% end %>
|
|
@@ -1,12 +1 @@
|
|
|
1
|
-
<%=
|
|
2
|
-
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>
|
|
3
|
-
|
|
4
|
-
<%= form_for [:admin, @address], as: :address, url: spree.admin_address_path(@address), method: :put, data: { turbo_frame: '_top' } do |f| %>
|
|
5
|
-
<%= render 'spree/addresses/form',
|
|
6
|
-
address_name: 'address',
|
|
7
|
-
address_form: f,
|
|
8
|
-
address_type: 'shipping',
|
|
9
|
-
address: @address %>
|
|
10
|
-
<%= render 'spree/admin/shared/edit_resource_links', f: f, turbo_frame: '_top' %>
|
|
11
|
-
<% end %>
|
|
12
|
-
<% end %>
|
|
1
|
+
<%= render 'spree/admin/addresses/edit_form' %>
|
|
@@ -1,16 +1 @@
|
|
|
1
|
-
<%=
|
|
2
|
-
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>
|
|
3
|
-
|
|
4
|
-
<%= form_for [:admin, @address], as: :address, url: spree.admin_addresses_path, method: :post, data: { turbo_frame: '_top' } do |f| %>
|
|
5
|
-
<%= render 'spree/addresses/form',
|
|
6
|
-
address_name: 'address',
|
|
7
|
-
address_form: f,
|
|
8
|
-
address_type: 'shipping',
|
|
9
|
-
address: @address %>
|
|
10
|
-
<%= hidden_field_tag :user_id, params[:user_id] %>
|
|
11
|
-
<%= hidden_field_tag :default_shipping, params[:default_shipping] %>
|
|
12
|
-
<%= hidden_field_tag :default_billing, params[:default_billing] %>
|
|
13
|
-
|
|
14
|
-
<%= render 'spree/admin/shared/new_resource_links', f: f %>
|
|
15
|
-
<% end %>
|
|
16
|
-
<% end %>
|
|
1
|
+
<%= render 'spree/admin/addresses/new_form' %>
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
<% @user = @address.user %>
|
|
2
|
+
|
|
3
|
+
<% if @address.valid? %>
|
|
4
|
+
<%= turbo_render_alerts %>
|
|
5
|
+
|
|
6
|
+
<%= turbo_stream.replace 'user-ship-address' do %>
|
|
7
|
+
<%= render 'spree/admin/users/shipping' %>
|
|
8
|
+
<% end %>
|
|
9
|
+
|
|
10
|
+
<%= turbo_stream.replace 'user-bill-address' do %>
|
|
11
|
+
<%= render 'spree/admin/users/billing' %>
|
|
12
|
+
<% end %>
|
|
13
|
+
<% else %>
|
|
14
|
+
<%# Update service may return a new address without ID when original isn't editable %>
|
|
15
|
+
<%= turbo_stream.replace "edit_address_#{params[:type]}" do %>
|
|
16
|
+
<% if @address.persisted? %>
|
|
17
|
+
<%= render 'spree/admin/addresses/edit_form' %>
|
|
18
|
+
<% else %>
|
|
19
|
+
<%= render 'spree/admin/addresses/new_form',
|
|
20
|
+
frame_id: "edit_address_#{params[:type]}",
|
|
21
|
+
user_id: @user&.id,
|
|
22
|
+
default_shipping: params[:type] == 'shipping',
|
|
23
|
+
default_billing: params[:type] == 'billing' %>
|
|
24
|
+
<% end %>
|
|
25
|
+
<% end %>
|
|
26
|
+
<% end %>
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_admin
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.3.
|
|
4
|
+
version: 5.3.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Vendo Connect Inc.
|
|
@@ -15,14 +15,14 @@ dependencies:
|
|
|
15
15
|
requirements:
|
|
16
16
|
- - ">="
|
|
17
17
|
- !ruby/object:Gem::Version
|
|
18
|
-
version: 5.3.
|
|
18
|
+
version: 5.3.3
|
|
19
19
|
type: :runtime
|
|
20
20
|
prerelease: false
|
|
21
21
|
version_requirements: !ruby/object:Gem::Requirement
|
|
22
22
|
requirements:
|
|
23
23
|
- - ">="
|
|
24
24
|
- !ruby/object:Gem::Version
|
|
25
|
-
version: 5.3.
|
|
25
|
+
version: 5.3.3
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: active_link_to
|
|
28
28
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -506,8 +506,12 @@ files:
|
|
|
506
506
|
- app/views/layouts/spree/admin_settings.html.erb
|
|
507
507
|
- app/views/layouts/spree/admin_wizard.html.erb
|
|
508
508
|
- app/views/layouts/spree/minimal.html.erb
|
|
509
|
+
- app/views/spree/admin/addresses/_edit_form.html.erb
|
|
510
|
+
- app/views/spree/admin/addresses/_new_form.html.erb
|
|
511
|
+
- app/views/spree/admin/addresses/create.turbo_stream.erb
|
|
509
512
|
- app/views/spree/admin/addresses/edit.html.erb
|
|
510
513
|
- app/views/spree/admin/addresses/new.html.erb
|
|
514
|
+
- app/views/spree/admin/addresses/update.turbo_stream.erb
|
|
511
515
|
- app/views/spree/admin/admin_users/_admin_user.html.erb
|
|
512
516
|
- app/views/spree/admin/admin_users/_audit_log.html.erb
|
|
513
517
|
- app/views/spree/admin/admin_users/_form.html.erb
|
|
@@ -1253,9 +1257,9 @@ licenses:
|
|
|
1253
1257
|
- AGPL-3.0-or-later
|
|
1254
1258
|
metadata:
|
|
1255
1259
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
|
1256
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.
|
|
1260
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.3
|
|
1257
1261
|
documentation_uri: https://docs.spreecommerce.org/
|
|
1258
|
-
source_code_uri: https://github.com/spree/spree/tree/v5.3.
|
|
1262
|
+
source_code_uri: https://github.com/spree/spree/tree/v5.3.3
|
|
1259
1263
|
rdoc_options: []
|
|
1260
1264
|
require_paths:
|
|
1261
1265
|
- lib
|