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: improve filter badges

Damian Legawiec02c69fbeec2f
diff --git a/admin/app/views/spree/admin/payments/_payment.html.erb b/admin/app/views/spree/admin/payments/_payment.html.erb
index ab588515f1..59697a4532 100644
--- a/admin/app/views/spree/admin/payments/_payment.html.erb
+++ b/admin/app/views/spree/admin/payments/_payment.html.erb
@@ -33,7 +33,8 @@
<%= link_to_with_icon 'credit-card-refund', Spree.t(:refund), spree.new_admin_order_payment_refund_path(@order, payment), class: 'dropdown-item' %>
<% end %>
<% if can?(:cancel, payment) && payment.pending? %>
- <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>
+ <div class="dropdown-divider"></div>
+ <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>
<% end %>
<% if can?(:destroy, payment) && payment.can_be_deleted? %>
<div class="dropdown-divider"></div>
diff --git a/admin/app/views/spree/admin/shared/_filter_badge_template.erb b/admin/app/views/spree/admin/shared/_filter_badge_template.erb
index fd850741bd..1055c46541 100644
--- a/admin/app/views/spree/admin/shared/_filter_badge_template.erb
+++ b/admin/app/views/spree/admin/shared/_filter_badge_template.erb
@@ -1,3 +1,3 @@
<template data-filters-target="badgeTemplate">
- <span class="badge py-1 px-2 bg-light text-dark d-flex-inline align-items-center mb-0">LABEL<a href="DELETE_URL" class="btn-close ml-2" title="Remove"></a></span>
+ <span class="badge py-0 pl-2 pr-0 bg-light text-dark d-flex-inline align-items-center mb-0">LABEL<a href="DELETE_URL" class="btn-close ml-2" title="<%= Spree.t('actions.remove') %>"></a></span>
</template>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 1aef0dd486..2152fbbb2c 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -570,6 +570,7 @@ en:
resend: Resend
resolve: Mark as resolved
save: Save
+ remove: Remove
select_file: Select file
send_invitation: Send invitation
update: Update