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.

Fixed dropdowns styles and translations for some actions (#12366)

Damian Legawiecc51281496f2c
diff --git a/admin/app/views/spree/admin/orders/_payments.html.erb b/admin/app/views/spree/admin/orders/_payments.html.erb
index f86e26a7a5..0b5dcc81ae 100644
--- a/admin/app/views/spree/admin/orders/_payments.html.erb
+++ b/admin/app/views/spree/admin/orders/_payments.html.erb
@@ -19,7 +19,7 @@
<% end %>
</div>
<div class="card-body">
- <h6 class="d-flex justify-content-between align-items-center mb-0" id="risk-analysis-header">
+ <p class="d-flex justify-content-between align-items-center mb-0" id="risk-analysis-header">
<span>
<%= Spree.t(:risk_analysis) %>
&nbsp;
@@ -33,7 +33,7 @@
<%= Spree.t(:show_details) %>
<%= icon('selector', height: 12, class: 'mr-0 ml-1') %>
<% end %>
- </h6>
+ </p>
<%= render 'spree/admin/orders/risk_analysis', latest_payment: @payments.first %>
</div>
@@ -54,11 +54,11 @@
<div class="card-body">
<div class="d-flex mb-3 w-100 gap-3">
<%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %>
- <%= link_to_with_icon 'send', Spree.t(:send_payment_link), spree.admin_order_payment_links_path(@order), data: { turbo_method: :post }, class: 'btn btn-outline-primary with-tip', title: Spree.t(:send_payment_link_title) %>
+ <%= link_to_with_icon 'send', Spree.t(:send_payment_link), spree.admin_order_payment_links_path(@order), data: { turbo_method: :post }, class: 'btn btn-light with-tip', title: Spree.t(:send_payment_link_title) %>
<div data-controller="clipboard">
<input type="hidden" value="<%= spree.checkout_state_url(@order.token, :payment, host: current_store.url_or_custom_domain) %>" readonly data-clipboard-target="source">
- <button class="btn btn-outline-primary" type="button" data-action="click->clipboard#copy">
+ <button class="btn btn-light" type="button" data-action="click->clipboard#copy">
<%= icon('copy') %>
<%= Spree.t(:copy_payment_link) %>
</button>
diff --git a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb
index 7b7a71e4e1..656684d18f 100644
--- a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb
+++ b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb
@@ -1,8 +1,10 @@
<% if controller_name == 'orders' %>
<div class="dropdown h-100 mr-2">
- <button class="btn btn-light h-100" type="button" data-toggle="dropdown" aria-expanded="false">
- <span class="text-muted font-weight-normal">Show:</span> <%= order_filter_dropdown_value %>
- <%= icon('chevron-down', class: 'arrow ml-1 mr-0 mr-0') %>
+ <button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+ <span class="text-muted font-weight-normal">
+ <%= Spree.t(:show) %>
+ </span>
+ <%= order_filter_dropdown_value %>
</button>
<div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">
<%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %>
diff --git a/admin/app/views/spree/admin/orders/user/new.html.erb b/admin/app/views/spree/admin/orders/user/new.html.erb
index 3d20e81d91..8d157f4702 100644
--- a/admin/app/views/spree/admin/orders/user/new.html.erb
+++ b/admin/app/views/spree/admin/orders/user/new.html.erb
@@ -4,7 +4,7 @@
<h5 class="card-title">
<%= Spree.t(:customer) %>
</h5>
- <%= link_to Spree.t(:discard), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
</div>
<div class="card-body">
<% if show_form %>
@@ -12,8 +12,8 @@
<%= render 'spree/admin/shared/error_messages', target: @user %>
<%= render 'spree/admin/users/form', f: f %>
<div class="d-flex justify-content-between">
- <%= link_to Spree.t(:discard), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
- <%= turbo_save_button_tag Spree.t(:save), data: { turbo_frame: dom_id(@order, :edit) }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+ <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@order, :edit) }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
</div>
<% end %>
<% else %>
diff --git a/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb
index b25555b9b3..67968e05a3 100644
--- a/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb
+++ b/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb
@@ -1,6 +1,8 @@
<div class="dropdown h-100 mr-2">
- <button class="btn btn-light h-100" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
- <span class="text-muted font-weight-normal"><%= Spree.t(:show) %>:</span>
+ <button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
+ <span class="text-muted font-weight-normal">
+ <%= Spree.t(:show) %>
+ </span>
<% if product_filter_status_dropdown_value == Spree.t('admin.products.all_statuses') && product_filter_stock_dropdown_value == Spree.t('admin.products.any_stock') %>
<%= Spree.t(:all_products) %>
<% else %>
@@ -10,7 +12,6 @@
<% end %>
<%= product_filter_stock_dropdown_value if product_filter_stock_dropdown_value != Spree.t('admin.products.any_stock') %>
<% end %>
- <%= icon('chevron-down', class: 'arrow ml-1 mr-0') %>
</button>
<div class="dropdown-menu w-100" style="min-width: 200px">
<h6 class="dropdown-header"><%= Spree.t('admin.products.by_status') %>:</h6>
diff --git a/admin/app/views/spree/admin/shared/_head.html.erb b/admin/app/views/spree/admin/shared/_head.html.erb
index 6b688d85b0..801d7a3240 100644
--- a/admin/app/views/spree/admin/shared/_head.html.erb
+++ b/admin/app/views/spree/admin/shared/_head.html.erb
@@ -30,7 +30,7 @@
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Castoro:ital@0;1&family=Inter:[email protected]&display=swap" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap" rel="stylesheet">
<%= stylesheet_link_tag 'spree/admin/application', media: :all, data: { turbo_track: "reload" } %>
<%= stylesheet_link_tag 'spree/admin/actiontext', media: :all, data: { turbo_track: "reload" } %>
diff --git a/admin/app/views/spree/admin/shipments/edit.html.erb b/admin/app/views/spree/admin/shipments/edit.html.erb
index 9e8602cf4d..bdebfb56e3 100644
--- a/admin/app/views/spree/admin/shipments/edit.html.erb
+++ b/admin/app/views/spree/admin/shipments/edit.html.erb
@@ -6,7 +6,7 @@
</div>
<div class="d-flex h-100 align-items-center">
<% if can? :update, @shipment %>
- <%= turbo_save_button_tag Spree.t(:save), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
+ <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
<%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
<% end %>
</div>
@@ -20,7 +20,7 @@
</div>
<div class="d-flex h-100 align-items-center">
<% if can? :update, @shipment %>
- <%= turbo_save_button_tag Spree.t(:save), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
+ <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
<%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
<% end %>
</div>
diff --git a/admin/app/views/spree/admin/shipments/split.html.erb b/admin/app/views/spree/admin/shipments/split.html.erb
index 3098d704f8..6f7561a20b 100644
--- a/admin/app/views/spree/admin/shipments/split.html.erb
+++ b/admin/app/views/spree/admin/shipments/split.html.erb
@@ -10,7 +10,7 @@
<% if can?(:split, @shipment) %>
<%= turbo_save_button_tag Spree.t(:move), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
<% end %>
- <%= link_to Spree.t(:discard), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
</span>
<% end %>
<% end %>