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 fixes

Damian Legawiecb97ec5c5afa3
diff --git a/admin/app/views/spree/admin/refund_reasons/index.html.erb b/admin/app/views/spree/admin/refund_reasons/index.html.erb
index 27888390bc..dffb43b009 100644
--- a/admin/app/views/spree/admin/refund_reasons/index.html.erb
+++ b/admin/app/views/spree/admin/refund_reasons/index.html.erb
@@ -2,20 +2,20 @@
<%= button_link_to Spree.t(:new_refund_reason), new_object_url, { icon: 'plus', id: 'admin_new_named_type', class: "btn-primary" } %>
<% end if can? :create, Spree::RefundReason %>
-<%= render partial: 'spree/admin/shared/returns_and_refunds_nav' %>
+<%= render 'spree/admin/shared/returns_and_refunds_nav' %>
<% if @collection.any? %>
<div class="table-responsive card-lg p-0">
- <table class="table" id='listing_named_types">
+ <table class="table">
<thead class="text-muted">
- <tr>
- <th><%= Spree.t(:name) %></th>
- <th><%= Spree.t(:status) %></th>
- <th><%= Spree.t(:mutable) %></th>
- <th></th>
- </tr>
+ <tr>
+ <th><%= Spree.t(:name) %></th>
+ <th><%= Spree.t(:status) %></th>
+ <th><%= Spree.t(:mutable) %></th>
+ <th></th>
+ </tr>
</thead>
- <tbody id="<%= plural_resource_name(Spree::RefundReason).to_s.parameterize.underscore %>">
+ <tbody>
<% @collection.each do |refund_reason| %>
<tr id="<%= spree_dom_id refund_reason %>">
<td class="w-40 align-center">
diff --git a/admin/app/views/spree/admin/shared/_filters_button.html.erb b/admin/app/views/spree/admin/shared/_filters_button.html.erb
index 7535df0591..5d57263ca4 100644
--- a/admin/app/views/spree/admin/shared/_filters_button.html.erb
+++ b/admin/app/views/spree/admin/shared/_filters_button.html.erb
@@ -1,5 +1,5 @@
<button
- class="btn btn-light h-100"
+ class="btn btn-light h-100 py-2"
type="button"
data-action="reveal#toggle"
>
diff --git a/admin/app/views/spree/admin/stock_items/index.html.erb b/admin/app/views/spree/admin/stock_items/index.html.erb
index 72a21ac7b6..e7cd780e61 100644
--- a/admin/app/views/spree/admin/stock_items/index.html.erb
+++ b/admin/app/views/spree/admin/stock_items/index.html.erb
@@ -30,7 +30,7 @@
</div>
<% else %>
<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
- <%= Spree.t(:no_resource_found, resource: Spree.t("admin.stock_items.plural_resource_name")) %>
+ <%= Spree.t(:no_resource_found, resource: Spree.t(:stock)) %>
</div>
<% end %>
diff --git a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
index 8cd3c27874..b22c870b24 100644
--- a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
+++ b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
@@ -1,46 +1,44 @@
<%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
<div class="d-flex flex-column flex-lg-row gap-2">
<%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
-
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">
- <div class="row">
- <div class="col-12 col-lg-6">
- <div class="form-group">
- <%= f.label :reference_cont, Spree.t(:reference) %>
- <%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-control", data: { filters_target: :input } %>
- </div>
- </div>
- <div class="col-12 col-lg-6">
- <div class="form-group">
- <%= f.label :source_location_id_eq, Spree.t(:source) %>
- <%= f.select :source_location_id_eq,
- available_stock_locations_list,
- { include_blank: true },
- class: "custom-select",
- data: {
- filters_target: :input,
- } %>
- </div>
+ <div data-reveal-target="item" class="d-none mt-4" id="table-filter">
+ <div class="row">
+ <div class="col-12 col-lg-6">
+ <div class="form-group">
+ <%= f.label :reference_cont, Spree.t(:reference) %>
+ <%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-control", data: { filters_target: :input } %>
</div>
- <div class="col-12 col-lg-6">
- <div class="form-group">
- <%= f.label :destination_location_id_eq, Spree.t(:destination) %>
- <%= f.select :destination_location_id_eq,
- available_stock_locations_list,
- { include_blank: true },
- class: "custom-select",
- data: {
- filters_target: :input,
- } %>
- </div>
+ </div>
+ <div class="col-12 col-lg-6">
+ <div class="form-group">
+ <%= f.label :source_location_id_eq, Spree.t(:source) %>
+ <%= f.select :source_location_id_eq,
+ available_stock_locations_list,
+ { include_blank: true },
+ class: "custom-select",
+ data: {
+ filters_target: :input,
+ } %>
</div>
</div>
- <div class="form-actions">
- <%= button Spree.t(:search), "search" %>
+ <div class="col-12 col-lg-6">
+ <div class="form-group">
+ <%= f.label :destination_location_id_eq, Spree.t(:destination) %>
+ <%= f.select :destination_location_id_eq,
+ available_stock_locations_list,
+ { include_blank: true },
+ class: "custom-select",
+ data: {
+ filters_target: :input,
+ } %>
+ </div>
</div>
</div>
+ <div class="form-actions">
+ <%= button Spree.t(:search), "search" %>
+ </div>
</div>
<%= render "spree/admin/shared/filter_badge_template" %>
diff --git a/admin/app/views/spree/admin/stock_transfers/index.html.erb b/admin/app/views/spree/admin/stock_transfers/index.html.erb
index bd6a2cfbda..39b38d50fa 100644
--- a/admin/app/views/spree/admin/stock_transfers/index.html.erb
+++ b/admin/app/views/spree/admin/stock_transfers/index.html.erb
@@ -32,9 +32,7 @@
</table>
</div>
<% else %>
- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
- <%= Spree.t(:no_resource_found, resource: Spree.t(:stock_transfers)) %>
- </div>
+ <%= render 'spree/admin/shared/no_resource_found' %>
<% end %>
<%= render 'spree/admin/shared/index_table_options', collection: @stock_transfers, simple: true if @stock_transfers.any? %>
</div>