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.

Clean up CSS and lock format as it is set behind the human readable format.

Matthew Kennedyd08bbb0cf817
diff --git a/backend/app/assets/javascripts/spree/backend/admin.js b/backend/app/assets/javascripts/spree/backend/admin.js
index a4b1c75bf2..a0c5226e83 100644
--- a/backend/app/assets/javascripts/spree/backend/admin.js
+++ b/backend/app/assets/javascripts/spree/backend/admin.js
@@ -224,9 +224,9 @@ $.fn.radioControlsVisibilityOfElement = function (dependentElementSelector) {
document.addEventListener('DOMContentLoaded', function() {
var dateFrom = flatpickr('.datePickerFrom', {
- locale: Spree.translations.flatpickr_locale,
- time_24hr: true,
altInput: true,
+ time_24hr: true,
+ locale: Spree.translations.flatpickr_locale,
onChange: function(selectedDates) {
dateTo.set('minDate', selectedDates[0])
}
diff --git a/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss b/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss
index 0513798fc8..62d9a663f4 100644
--- a/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss
+++ b/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss
@@ -10,7 +10,6 @@ input.input {
-moz-appearance: none;
appearance: none;
background-color: white !important;
- border-radius:10px;
}
.flatpickr-current-month .numInputWrapper {
@@ -31,7 +30,7 @@ input.input {
}
.input-group {
- input.flatpickr-input{
+ input.input{
@include swith-appended-icon {
opacity: 0;
}
diff --git a/backend/app/helpers/spree/admin/base_helper.rb b/backend/app/helpers/spree/admin/base_helper.rb
index cbbe5a1f47..7a96e38f2a 100644
--- a/backend/app/helpers/spree/admin/base_helper.rb
+++ b/backend/app/helpers/spree/admin/base_helper.rb
@@ -58,7 +58,7 @@ module Spree
def datepicker_field_value(date)
unless date.blank?
- l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
+ l(date, format: '%Y/%m/%d')
end
end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 928afedb32..2e7f62180b 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -759,11 +759,6 @@ en:
date: Date
date_completed: Date Completed
date_picker:
- # Legacy formatting pre 4.2 (Flatpickr)
- first_day: 0
- format: ! '%Y/%m/%d'
- js_format: yy/mm/dd
-
# FlatPickr human friendly formatting
fpr_human_friendly_date_format: M j, Y
fpr_human_friendly_date_time_format: M j, Y H:i