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 address state zip fields on page load for admin address.

Matthew Kennedy31ff51d4adde
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
index e4971d7f9f..31154e9982 100644
--- a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
+++ b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
@@ -3,7 +3,6 @@ table.table {
th {
padding: 0.5rem;
- padding-left: 0;
&.handel-head {
width: 50px;
@@ -15,7 +14,6 @@ table.table {
td {
padding: 0.5rem;
- padding-left: 0;
}
td.move-handle {
@@ -31,7 +29,6 @@ table.table {
text-transform: uppercase;
font-size: $small-font-size;
padding: 0.5rem;
- padding-left: 0;
padding-top: 14px;
padding-bottom: 14px;
vertical-align: top;
diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_base.scss b/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
index 9aac222628..495ab71624 100644
--- a/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
+++ b/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
@@ -36,10 +36,6 @@
cursor: grab;
}
-.badge {
- padding: 0.5em 0.6em;
-}
-
.badge-light-muted-text {
color: rgba(0, 0, 0, 0.50);
}
diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb
index 83ae559349..3417493db8 100644
--- a/backend/app/views/spree/admin/orders/index.html.erb
+++ b/backend/app/views/spree/admin/orders/index.html.erb
@@ -52,7 +52,7 @@
</div>
<div class="col-12 col-lg-4">
<div class="form-group">
- <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
+ <%= label_tag :q_number_cont, Spree.t(:search_order_number) %>
<%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
</div>
</div>
diff --git a/backend/app/views/spree/admin/shared/_address_form.html.erb b/backend/app/views/spree/admin/shared/_address_form.html.erb
index cbf2cf8b06..6471c2387e 100644
--- a/backend/app/views/spree/admin/shared/_address_form.html.erb
+++ b/backend/app/views/spree/admin/shared/_address_form.html.erb
@@ -37,8 +37,9 @@
<% content_for :head do %>
<script>
- $(document).ready(function(){
+ document.addEventListener('DOMContentLoaded', function() {
+ updateAddressState('<%= s_or_b %>');
$('#<%= s_or_b %>country select').on('change', function() { updateAddressState('<%= s_or_b %>'); });
- });
+ })
</script>
<% end %>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 9778b9ae6b..55e43b9d36 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1539,6 +1539,7 @@ en:
scope: Scope
search: Search
search_by: 'Search by:'
+ search_order_number: Order Number
search_results: Search results for '%{keywords}'
searching: Searching
secure_connection_type: Secure Connection Type