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.

Fix CC issues.

Matthew Kennedy684013e547e9
diff --git a/backend/app/helpers/spree/admin/stores_helper.rb b/backend/app/helpers/spree/admin/stores_helper.rb
index 5722a960e8..9df64d1c0d 100644
--- a/backend/app/helpers/spree/admin/stores_helper.rb
+++ b/backend/app/helpers/spree/admin/stores_helper.rb
@@ -2,15 +2,15 @@ module Spree
module Admin
module StoresHelper
def admin_current_store_products_path
- spree.admin_products_path(q: {stores_id_in: current_store.id})
+ spree.admin_products_path(q: { stores_id_in: current_store.id })
end
def admin_current_store_orders_path
- spree.admin_orders_path(q: {store_id_in: current_store.id})
+ spree.admin_orders_path(q: { store_id_in: current_store.id })
end
def admin_current_store_payment_methods_path
- spree.admin_payment_methods_path(q: {stores_id_in: current_store.id})
+ spree.admin_payment_methods_path(q: { stores_id_in: current_store.id })
end
def selected_checkout_zone(store)
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb
index 23e6e2e717..e59086b17f 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.first? %>
<li class="first page-item">
- <%= link_to_unless current_page.first?, svg_icon(name: "double-chevron-left.svg", width: '13', height: '20', classes: 'spree-icon-arrow-left mb-0'), url, remote: remote, class: 'page-link d-flex', 'aria-label': 'First page' %>
+ <%= link_to_unless current_page.first?, svg_icon(name: "double-chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
</li>
<% end %>
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb
index 6c457fad96..3b56140331 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.last? %>
<li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
- <%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '20', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link d-flex', 'aria-label': 'Last page' %>
+ <%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
</li>
<% end %>
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb
index 8299eea29d..c4fb9882ec 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.last? %>
<li class="next_page page-item">
- <%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '20', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link d-flex', 'aria-label': 'Next page' %>
+ <%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
</li>
<% end %>
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb
index 13a6f359ce..0512c58066 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.first? %>
<li class="prev page-item">
- <%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '20', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link d-flex', 'aria-label': 'Previous page' %>
+ <%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
</li>
<% end %>