Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Admin UI update: improve the uploader component, cards, forms

Damian Legawiec193da468285e
diff --git a/admin/app/views/active_storage/_upload_form.html.erb b/admin/app/views/active_storage/_upload_form.html.erb
index 6fea5d1518..ec82f5f8de 100644
--- a/admin/app/views/active_storage/_upload_form.html.erb
+++ b/admin/app/views/active_storage/_upload_form.html.erb
@@ -14,7 +14,7 @@
data-active-storage-upload-field-name-value="<%= form.object_name %>[<%= field_name %>]"
data-active-storage-upload-allowed-file-types-value="<%= Rails.application.config.active_storage.web_image_content_types %>"
class="d-flex flex-column justify-content-center w-100 position-relative">
- <div class="mb-3 rounded-lg overflow-hidden thumb-preview cursor-pointer bg-light"
+ <div class="mb-3 rounded-lg overflow-hidden thumb-preview cursor-pointer border border-dashed bg-gray-25 hover-gray-50 p-2 d-flex align-items-center justify-content-center"
data-action="click->active-storage-upload#open"
>
<% if form.object.send(field_name).attached? && form.object.send(field_name).variable? %>
@@ -34,13 +34,13 @@
<img data-active-storage-upload-target="thumb" class="img-fluid rounded-lg" style="display: none" />
<% end %>
- <div class="d-flex justify-content-center align-items-center h-100 p-5 text-muted border border-dashed bg-gray-25 rounded-lg <%= css %>" data-active-storage-upload-target="placeholder" <% if form.object.send(field_name).attached? && form.object.send(field_name).variable? %>style="display: none !important"<% end %>>
- <%= icon('camera', class: 'mr-2') %>
+ <div class="d-flex flex-column justify-content-center align-items-center h-100 p-5 text-muted rounded-lg <%= css %>" data-active-storage-upload-target="placeholder" <% if form.object.send(field_name).attached? && form.object.send(field_name).variable? %>style="display: none !important"<% end %>>
+ <%= icon('upload', class: 'mr-0 mb-3', style: 'font-size: 2rem;') %>
<%= Spree.t(:upload_image) %>
<% if crop %>
- <span class="text-muted ml-2">
- (Recommended size: <%= width %>x<%= height %>)
+ <span class="text-muted ml-2 text-center small mt-2">
+ Recommended size: <%= width %>x<%= height %>px
</span>
<% end %>
</div>
@@ -48,8 +48,8 @@
<div class="d-flex align-items-center" data-active-storage-upload-target="toolbar" <% unless form.object.send(field_name).attached? && form.object.send(field_name).variable? %>style="display: none !important"<% end %>>
<button type="button" class="btn btn-light" data-action="active-storage-upload#open">
- <%= icon('camera') %>
- Select file
+ <%= icon('upload') %>
+ <%= Spree.t('actions.select_file') %>
</button>
<% if can_delete %>
diff --git a/admin/app/views/spree/admin/option_types/_form.html.erb b/admin/app/views/spree/admin/option_types/_form.html.erb
index 65a1c8557f..630a26dc2c 100644
--- a/admin/app/views/spree/admin/option_types/_form.html.erb
+++ b/admin/app/views/spree/admin/option_types/_form.html.erb
@@ -3,7 +3,7 @@
<h5 class="mb-0"><%= Spree.t(:general_information) %></h5>
</div>
<div class="card-body" data-controller="slug-form">
- <div class="row">
+ <div class="row mb-3">
<div class="col-md-6">
<div class="form-group">
<%= f.label :presentation, raw(Spree.t(:presentation) + required_span_tag) %>
@@ -28,7 +28,7 @@
</div>
<div class="row">
<div class="col-12 col-md-6">
- <div class="form-group mb-0">
+ <div class="form-group">
<div class="custom-control custom-checkbox mb-3">
<%= f.check_box :filterable, class: "custom-control-input", id: "option_type_filterable" %>
<%= f.label :filterable, Spree.t(:filterable), class: "custom-control-label", for: "option_type_filterable" %>
@@ -52,11 +52,11 @@
<div class="card-header d-flex justify-content-between align-items-center">
<h5 class="mb-0"><%= Spree.t(:option_values) %></h5>
</div>
- <div class="card-body p-0">
+ <div class="card-body px-0 pb-0">
<div class="table-responsive">
- <table class="table table-condensed">
+ <table class="table border-top">
<thead>
- <tr>
+ <tr class="border-bottom">
<th></th>
<th><%= raw(Spree.t(:presentation) + required_span_tag) %></th>
<th><%= raw(Spree.t(:internal_name) + required_span_tag) %></th>
diff --git a/admin/app/views/spree/admin/orders/_line_items.html.erb b/admin/app/views/spree/admin/orders/_line_items.html.erb
index 8e5064ab89..5be1bc226a 100644
--- a/admin/app/views/spree/admin/orders/_line_items.html.erb
+++ b/admin/app/views/spree/admin/orders/_line_items.html.erb
@@ -1,7 +1,7 @@
<%= turbo_frame_tag dom_id(@order, :line_items), class: "card mb-4 overflow-hidden" do %>
<% if @line_items.any? %>
- <div class="card-header d-flex justify-content-between align-items-center">
+ <div class="card-header d-flex justify-content-between align-items-center pb-3">
<h5 class="card-title d-flex align-items-center">
<%= Spree.t(:line_items) %>
<span class="badge badge-info ml-2"><%= @line_items.count %></span>
@@ -22,7 +22,7 @@
</div>
<div class="card-body mb-0 p-0 <% if @order.completed? && params[:line_item_updated].blank? %>collapse<% else %>show<% end %>" id="line-items">
<div class="order-line-items">
- <div class="text-muted text-center border-bottom py-2 px-3 font-weight-bold font-size-sm order-line-items__row">
+ <div class="text-muted text-center border-bottom border-top py-2 px-3 font-size-sm order-line-items__row">
<span class="text-left">
<%= Spree.t(:item_description) %>
</span>
diff --git a/admin/app/views/spree/admin/orders/_payments.html.erb b/admin/app/views/spree/admin/orders/_payments.html.erb
index f86e26a7a5..d26825fe66 100644
--- a/admin/app/views/spree/admin/orders/_payments.html.erb
+++ b/admin/app/views/spree/admin/orders/_payments.html.erb
@@ -11,7 +11,7 @@
<%= local_time(@payments.first.updated_at, class: 'badge badge-light with-tipl') %>
</div>
<% end %>
- <div class="card-body p-0">
+ <div class="card-body px-0 pb-0">
<% @payments.each do |payment| %>
<div class="p-3 border-bottom">
<%= render 'spree/admin/shared/payment', payment: payment %>
diff --git a/admin/app/views/spree/admin/orders/_shipment.html.erb b/admin/app/views/spree/admin/orders/_shipment.html.erb
index 80bd684909..fdfbe9ad65 100644
--- a/admin/app/views/spree/admin/orders/_shipment.html.erb
+++ b/admin/app/views/spree/admin/orders/_shipment.html.erb
@@ -20,7 +20,7 @@
</div>
<div class="card-body mb-0 p-0">
<div class="shipment-line-items">
- <div class="text-muted text-center border-bottom py-2 px-3 font-size-sm shipment-line-items__row">
+ <div class="text-muted text-center border-bottom border-top py-2 px-3 font-size-sm shipment-line-items__row">
<span class="text-left">
<%= Spree.t(:item_description) %>
</span>
diff --git a/admin/app/views/spree/admin/products/form/_inventory.html.erb b/admin/app/views/spree/admin/products/form/_inventory.html.erb
index 94d2dc00a3..04b7dc78e5 100644
--- a/admin/app/views/spree/admin/products/form/_inventory.html.erb
+++ b/admin/app/views/spree/admin/products/form/_inventory.html.erb
@@ -1,6 +1,10 @@
<div class="card mb-4">
- <div class="card-header">
+ <div class="card-header d-flex align-items-center justify-content-between">
<h5 class="card-title"><%= Spree.t(:inventory) %></h5>
+
+ <% if can?(:manage, Spree::StockLocation) %>
+ <%= link_to_with_icon 'adjustments', Spree.t(:manage_stock_locations), spree.admin_stock_locations_path, class: 'btn btn-sm btn-light' %>
+ <% end %>
</div>
<div class="card-body">
<div class="custom-control custom-checkbox mb-4">
diff --git a/admin/app/views/spree/admin/products/form/_properties.html.erb b/admin/app/views/spree/admin/products/form/_properties.html.erb
index 70342feb72..1873b4a463 100644
--- a/admin/app/views/spree/admin/products/form/_properties.html.erb
+++ b/admin/app/views/spree/admin/products/form/_properties.html.erb
@@ -1,9 +1,13 @@
<div class="card mb-4">
- <div class="card-header">
+ <div class="card-header d-flex align-items-center justify-content-between">
<h5 class="card-title"><%= Spree.t(:properties) %></h5>
+
+ <% if can?(:manage, Spree::Property) %>
+ <%= link_to_with_icon 'adjustments', Spree.t(:manage_properties), spree.admin_properties_path, class: 'btn btn-sm btn-light' %>
+ <% end %>
</div>
- <div class="card-body p-0">
- <table class="table">
+ <div class="card-body px-0 pb-0">
+ <table class="table border-top mb-1">
<thead>
<tr>
<th><%= Spree.t(:property) %></th>
@@ -16,10 +20,10 @@
<%= product_property_form.hidden_field :id %>
<%= product_property_form.hidden_field :property_id %>
<tr>
- <td class="align-top pt-3">
- <%= property.presentation %>
+ <td class="align-top pt-3 w-25">
+ <code><%= property.name %></code>
</td>
- <td>
+ <td class="w-75">
<div class="form-group">
<% if property.long_text? %>
<%= product_property_form.text_area :value, { class: 'form-control', data: { controller: 'textarea-autogrow'} } %>
@@ -39,7 +43,4 @@
</tbody>
</table>
</div>
- <div class="card-footer text-center bg-gray-25 text-muted border-top">
- <%= Spree.t('admin.products.properties.link', link: spree.admin_properties_path).html_safe %>
- </div>
</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/products/form/_shipping.html.erb b/admin/app/views/spree/admin/products/form/_shipping.html.erb
index 296b309bbf..6c934cd811 100644
--- a/admin/app/views/spree/admin/products/form/_shipping.html.erb
+++ b/admin/app/views/spree/admin/products/form/_shipping.html.erb
@@ -2,21 +2,15 @@
<div class="card-header">
<h5 class="card-title"><%= Spree.t(:shipping) %></h5>
</div>
- <div class="card-body pb-0 mb-0">
+ <div class="card-body">
<% unless @product.has_variants? %>
<%= render 'spree/admin/variants/form/dimensions', f: f %>
<% end %>
- <div class="row">
- <div class="col-12">
- <div data-hook="admin_product_form_shipping_categories">
- <div class="form-group">
- <%= f.label :shipping_category_id, Spree.t(:shipping_category) %>
- <%= f.select(:shipping_category_id, @shipping_categories.pluck(:name, :id), { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
- <%= f.error_message_on :shipping_category %>
- </div>
- </div>
- </div>
+ <div class="form-group">
+ <%= f.label :shipping_category_id, Spree.t(:shipping_category) %>
+ <%= f.select(:shipping_category_id, @shipping_categories.pluck(:name, :id), { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+ <%= f.error_message_on :shipping_category %>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/products/form/_status.html.erb b/admin/app/views/spree/admin/products/form/_status.html.erb
index c7eb1556a6..62ccbdccb1 100644
--- a/admin/app/views/spree/admin/products/form/_status.html.erb
+++ b/admin/app/views/spree/admin/products/form/_status.html.erb
@@ -2,7 +2,7 @@
<div class="card-header">
<h5 class="card-title"><%= Spree.t(:status) %></h5>
</div>
- <div class="card-body pb-0 mb-0">
+ <div class="card-body">
<div class="row">
<div data-hook="new_product_status" class="col-6">
<div class="form-group">
diff --git a/admin/app/views/spree/admin/products/form/_stores.html.erb b/admin/app/views/spree/admin/products/form/_stores.html.erb
index 77727d73eb..d1aa3b5c27 100644
--- a/admin/app/views/spree/admin/products/form/_stores.html.erb
+++ b/admin/app/views/spree/admin/products/form/_stores.html.erb
@@ -4,7 +4,7 @@
<%= Spree.t(:stores) %>
</h5>
</div>
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="form-group">
<% if can? :modify, Spree::StoreProduct %>
<p class="form-text"><%= Spree.t('admin.products.stores.choose_stores') %>.</p>
diff --git a/admin/app/views/spree/admin/products/form/_variants.html.erb b/admin/app/views/spree/admin/products/form/_variants.html.erb
index 36a3a43625..d62301f416 100644
--- a/admin/app/views/spree/admin/products/form/_variants.html.erb
+++ b/admin/app/views/spree/admin/products/form/_variants.html.erb
@@ -4,7 +4,7 @@
<h5 class="card-title"><%= Spree.t(:variants) %></h5>
</div>
<% option_types_for_select = @option_types.pluck(:presentation, :id) %>
- <div class="card-body p-0">
+ <div class="card-body px-0 pb-0">
<div
data-controller="variants-form"
class="variants-form"
@@ -62,7 +62,7 @@
<span class="label"><%= Spree.t(:option_values) %></span>
<div data-controller="multi-input" class="values-inputs" data-variants-form-target="newOptionValuesInput">
<div class="values-inputs__input" data-multi-input-target="input">
- <input class="form-control form-control-sm" name="new_option_values[]" data-action="multi-input#handleInput keydown->multi-input#handleKeyDown keydown.enter->variants-form#handleNewOption:prevent">
+ <input class="form-control" name="new_option_values[]" data-action="multi-input#handleInput keydown->multi-input#handleKeyDown keydown.enter->variants-form#handleNewOption:prevent">
</div>
</div>
</div>
diff --git a/admin/app/views/spree/admin/products/form/variants/_option_template.html.erb b/admin/app/views/spree/admin/products/form/variants/_option_template.html.erb
index 28976c56d4..11b1835bde 100644
--- a/admin/app/views/spree/admin/products/form/variants/_option_template.html.erb
+++ b/admin/app/views/spree/admin/products/form/variants/_option_template.html.erb
@@ -30,7 +30,7 @@
<span class="label"><%= Spree.t(:option_values) %></span>
<div data-controller="multi-input" class="values-inputs" data-slot="optionValuesInput">
<div class="values-inputs__input" data-multi-input-target="input">
- <input class="form-control form-control-sm" data-variants-form-option-id-param="" name="new_option_values[]" data-action="multi-input#handleInput keydown->multi-input#handleKeyDown keydown.enter->variants-form#saveOption:prevent">
+ <input class="form-control" data-variants-form-option-id-param="" name="new_option_values[]" data-action="multi-input#handleInput keydown->multi-input#handleKeyDown keydown.enter->variants-form#saveOption:prevent">
</div>
</div>
</div>
diff --git a/admin/app/views/spree/admin/reimbursement_types/_form.html.erb b/admin/app/views/spree/admin/reimbursement_types/_form.html.erb
index 45af14ff28..dc3191a33e 100644
--- a/admin/app/views/spree/admin/reimbursement_types/_form.html.erb
+++ b/admin/app/views/spree/admin/reimbursement_types/_form.html.erb
@@ -1,5 +1,5 @@
<div class="card mb-4">
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="form-group">
<%= f.label :name, Spree.t(:name) %>
<%= f.text_field :name, class:'form-control' %>
diff --git a/admin/app/views/spree/admin/shipping_categories/_form.html.erb b/admin/app/views/spree/admin/shipping_categories/_form.html.erb
index 5d6297bd0b..f2e8591e26 100644
--- a/admin/app/views/spree/admin/shipping_categories/_form.html.erb
+++ b/admin/app/views/spree/admin/shipping_categories/_form.html.erb
@@ -1,5 +1,5 @@
<div class="card mb-4">
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="form-group">
<%= f.label :name, Spree.t(:name) %>
<%= f.text_field :name, class: 'form-control' %>
diff --git a/admin/app/views/spree/admin/shipping_methods/_form.html.erb b/admin/app/views/spree/admin/shipping_methods/_form.html.erb
index 5aa2172f54..cf9f6e3b25 100644
--- a/admin/app/views/spree/admin/shipping_methods/_form.html.erb
+++ b/admin/app/views/spree/admin/shipping_methods/_form.html.erb
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-lg-6">
<div class="card mb-4">
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="row">
<div class="col-lg-6">
<div class="form-group">
@@ -32,7 +32,7 @@
<%= Spree.t(:tracking_url) %>
</h5>
</div>
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="form-group">
<%= f.url_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
<%= f.error_message_on :tracking_url %>
@@ -51,10 +51,10 @@
<%= Spree.t(:zones) %>
</h5>
- <%= link_to_with_icon('settings', Spree.t(:manage_zones), spree.admin_zones_path, class: 'btn btn-sm btn-link ml-auto h-100') if can?(:manage, Spree::Zone) %>
+ <%= link_to_with_icon('adjustments', Spree.t(:manage_zones), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>
</div>
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="form-group">
<% @available_zones.each do |zone| %>
<div class="custom-control custom-checkbox mb-2">
@@ -79,7 +79,7 @@
</h5>
</div>
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="form-group">
<% @shipping_categories.each do |category| %>
<div class="custom-control custom-checkbox mb-2">
@@ -102,7 +102,7 @@
</h5>
</div>
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="form-group">
<%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
<%= f.error_message_on :tax_category %>
diff --git a/admin/app/views/spree/admin/stock_transfers/new.html.erb b/admin/app/views/spree/admin/stock_transfers/new.html.erb
index 8ac07aca7f..ce1edd4d7a 100644
--- a/admin/app/views/spree/admin/stock_transfers/new.html.erb
+++ b/admin/app/views/spree/admin/stock_transfers/new.html.erb
@@ -60,7 +60,7 @@
<% end %>
</span>
</div>
- <div class="card-body p-0" style="min-height: 300px">
+ <div class="card-body px-0 pb-0" style="min-height: 300px">
<div class="d-flex flex-column gap-3 overflow-y-auto overflow-x-hidden p-3" style="max-height: 300px">
<%= f.fields_for :stock_movements do |smf| %>
<% if smf.object.errors[:quantity].present? %>
diff --git a/admin/app/views/spree/admin/stock_transfers/show.html.erb b/admin/app/views/spree/admin/stock_transfers/show.html.erb
index 558ee8e4fc..91f7c54cca 100644
--- a/admin/app/views/spree/admin/stock_transfers/show.html.erb
+++ b/admin/app/views/spree/admin/stock_transfers/show.html.erb
@@ -13,7 +13,7 @@
<%= Spree.t(:products) %>
</h5>
</div>
- <div class="card-body p-0" style="min-height: 300px">
+ <div class="card-body px-0 pb-0" style="min-height: 300px">
<div class="d-block overflow-y-auto overflow-x-hidden" style="max-height: 300px">
<div class="table-responsive rounded bg-white">
<table class="table sortable">
diff --git a/admin/app/views/spree/admin/taxons/_form.html.erb b/admin/app/views/spree/admin/taxons/_form.html.erb
index bcd3c9c67d..2bd8f85392 100644
--- a/admin/app/views/spree/admin/taxons/_form.html.erb
+++ b/admin/app/views/spree/admin/taxons/_form.html.erb
@@ -122,7 +122,7 @@
<%= Spree.t(:navigation) %>
</h5>
</div>
- <div class="card-body pb-0">
+ <div class="card-body">
<% if @taxon.new_record? %>
<% disabled = false %>
<% else %>
diff --git a/admin/app/views/spree/admin/variants/form/_inventory.html.erb b/admin/app/views/spree/admin/variants/form/_inventory.html.erb
index aec8fb77b3..019cac63bb 100644
--- a/admin/app/views/spree/admin/variants/form/_inventory.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_inventory.html.erb
@@ -4,7 +4,7 @@
<%= Spree.t(:inventory) %>
</h5>
</div>
- <div class="card-body p-0">
+ <div class="card-body px-0 pb-0">
<table class="table">
<thead>
<tr>
diff --git a/admin/app/views/spree/admin/variants/form/_media.html.erb b/admin/app/views/spree/admin/variants/form/_media.html.erb
index 596729fd3f..82abc5810f 100644
--- a/admin/app/views/spree/admin/variants/form/_media.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_media.html.erb
@@ -13,7 +13,7 @@
data-sortable-resource-name-value="asset"
data-sortable-response-kind-value="json">
<%= render partial: 'spree/admin/variants/form/media_asset', collection: media_form_assets(viewable), as: :asset, cached: spree_base_cache_scope %>
- <%= button_tag class: 'text-muted border border-dashed bg-gray-25 rounded-lg media-form__add-button font-size-lg', data: {
+ <%= button_tag class: 'text-muted border border-dashed bg-gray-25 hover-gray-50 rounded-lg media-form__add-button h-100', data: {
controller: 'asset-uploader',
asset_uploader_multiple_value: true,
asset_uploader_viewable_id_value: viewable&.id,
@@ -22,7 +22,7 @@
action: 'asset-uploader#open',
media_form_target: 'addButton'
} do %>
- <%= icon('circle-plus') %>
+ <%= icon('upload', class: 'my-5', style: 'font-size: 2rem;') %>
<% end %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/variants/form/_pricing.html.erb b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
index 9d95c625b0..edcb645231 100644
--- a/admin/app/views/spree/admin/variants/form/_pricing.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
@@ -1,11 +1,15 @@
<div class="card mb-4" data-product-form-target="pricesForm">
- <div class="card-header">
+ <div class="card-header d-flex align-items-center justify-content-between">
<h5 class="mb-0">
<%= Spree.t(:pricing) %>
</h5>
+
+ <% if can?(:manage, Spree::Store) %>
+ <%= link_to_with_icon 'adjustments', Spree.t(:manage_currencies), spree.edit_admin_store_path, class: 'btn btn-sm btn-light' %>
+ <% end %>
</div>
- <div class="card-body p-0">
- <table class="table">
+ <div class="card-body px-0 pb-0">
+ <table class="table border-top">
<thead>
<tr>
<th><%= Spree.t(:currency) %></th>
@@ -40,8 +44,5 @@
<% end %>
</tbody>
</table>
- <div class="card-footer text-center bg-gray-25 text-muted border-top">
- <%= Spree.t('admin.variants.currencies_link', link: spree.edit_admin_store_path(current_store)).html_safe %>
- </div>
</div>
</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb b/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb
index 0aad346fa1..0a914af17e 100644
--- a/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb
+++ b/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb
@@ -6,7 +6,7 @@
<%= Spree.t(:general_settings) %>
</h5>
</div>
- <div class="card-body pb-0">
+ <div class="card-body">
<div class="row">
<div class="form-group col-12">
<%= f.label :url, raw(Spree.t('admin.url') + required_span_tag) %>
@@ -30,7 +30,7 @@
<%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
</h5>
</div>
- <div class="card-body pb-0" data-controller="webhooks-subscriber-events">
+ <div class="card-body" data-controller="webhooks-subscriber-events">
<div class="form-group">
<div>
<div class="radio my-2">
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index 29558095e9..ca3be4c4d1 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -139,7 +139,8 @@ module Spree
:preferred_digital_asset_authorized_clicks, :preferred_digital_asset_authorized_days,
:preferred_limit_digital_download_count, :preferred_limit_digital_download_days,
:preferred_digital_asset_link_expire_time,
- :mailer_logo, :import_products_from_store_id, :import_payment_methods_from_store_id,
+ :logo, :mailer_logo, :social_logo, :favicon_image,
+ :import_products_from_store_id, :import_payment_methods_from_store_id,
:checkout_message, :customer_terms_of_service, :customer_privacy_policy,
:customer_returns_policy, :customer_shipping_policy]