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: display price editing fields in correct locale (#12571)

Caio Câmara67ddfbea9741
diff --git a/admin/app/javascript/spree/admin/controllers/variants_form_controller.js b/admin/app/javascript/spree/admin/controllers/variants_form_controller.js
index cb36480f7e..a4e9f39ae8 100644
--- a/admin/app/javascript/spree/admin/controllers/variants_form_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/variants_form_controller.js
@@ -36,7 +36,8 @@ export default class extends CheckboxSelectAll {
variantIds: Object,
currentStockLocationId: String,
stockLocations: Array,
- optionValuesSelectOptions: Array
+ optionValuesSelectOptions: Array,
+ locale: String
}
connect() {
@@ -403,7 +404,7 @@ export default class extends CheckboxSelectAll {
pricesVariation.delete(null)
if (pricesVariation.size === 0) {
- parentPriceEl.value = this.priceForVariant(variantName, currency).amount
+ parentPriceEl.value = this.priceForVariant(variantName, currency).amount?.toLocaleString(this.localeValue) || ''
parentPriceEl.placeholder = ''
return
}
@@ -668,7 +669,7 @@ export default class extends CheckboxSelectAll {
}
const existingPrice = this.priceForVariant(internalName, currency)
- priceInput.value = existingPrice.amount
+ priceInput.value = existingPrice.amount?.toLocaleString(this.localeValue) || ''
currencyInput.value = currency
if (existingPrice.id) {
idInput.value = existingPrice.id
diff --git a/admin/app/views/spree/admin/products/form/_variants.html.erb b/admin/app/views/spree/admin/products/form/_variants.html.erb
index 6650a21be8..7182cddcf1 100644
--- a/admin/app/views/spree/admin/products/form/_variants.html.erb
+++ b/admin/app/views/spree/admin/products/form/_variants.html.erb
@@ -9,6 +9,7 @@
data-controller="variants-form"
class="variants-form"
data-action="product-form:toggle-quantity-tracked@window->variants-form#toggleQuantityTracked"
+ data-variants-form-locale-value="<%= I18n.locale %>"
<% if @product.persisted? %> data-variants-form-product-id-value="<%= @product.slug %>" <% end %>
data-variants-form-current-currency-value="<%= current_currency %>"
data-variants-form-currencies-value="<%= supported_currencies.map(&:to_s).to_json %>"
diff --git a/admin/app/views/spree/admin/variants/form/_pricing.html.erb b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
index 81e8474280..3dbab83587 100644
--- a/admin/app/views/spree/admin/variants/form/_pricing.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
@@ -30,13 +30,13 @@
<td><%= price_form.object.currency %></td>
<td>
<div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container d-flex">
- <%= price_form.text_field :amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object) %>
+ <%= price_form.text_field :amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object), value: price_form.object.amount.present? ? Spree::Money.new(price_form.object.amount, currency: price_form.object.currency, symbol: '').to_s : '' %>
<span><%= currency_symbol(price_form.object.currency) %></span>
</div>
</td>
<td>
<div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container d-flex">
- <%= price_form.text_field :compare_at_amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object) %>
+ <%= price_form.text_field :compare_at_amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object), value: price_form.object.compare_at_amount.present? ? Spree::Money.new(price_form.object.compare_at_amount, currency: price_form.object.currency, symbol: '').to_s : '' %>
<span><%= currency_symbol(price_form.object.currency) %></span>
</div>
</td>
@@ -45,4 +45,5 @@
</tbody>
</table>
</div>
-</div>
\ No newline at end of file
+</div>
+