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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Set Flatpicker to allow human friendly formatting without effecting token formatting.
Matthew Kennedy00207beacb00
diff --git a/backend/app/assets/javascripts/spree/backend/admin.js b/backend/app/assets/javascripts/spree/backend/admin.jsindex 4238bb7340..c81868312e 100644--- a/backend/app/assets/javascripts/spree/backend/admin.js+++ b/backend/app/assets/javascripts/spree/backend/admin.js@@ -120,7 +120,7 @@ jQuery(function ($) {$('.js-filterable').each(function () {var $this = $(this)- if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0) {+ if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0 && $this.prop('readonly') !== true) {var ransackValue, filtervar ransackFieldId = $this.attr('id')var label = $('label[for="' + ransackFieldId + '"]')@@ -226,6 +226,7 @@ document.addEventListener('DOMContentLoaded', function() {var dateFrom = flatpickr('.datePickerFrom', {locale: Spree.translations.flatpickr_locale,time_24hr: true,+ altInput: true,monthSelectorType: 'static',onChange: function(selectedDates) {dateTo.set('minDate', selectedDates[0])@@ -236,6 +237,7 @@ document.addEventListener('DOMContentLoaded', function() {locale: Spree.translations.flatpickr_locale,monthSelectorType: 'static',time_24hr: true,+ altInput: true,onChange: function(selectedDates) {dateFrom.set('maxDate', selectedDates[0])}@@ -244,7 +246,8 @@ document.addEventListener('DOMContentLoaded', function() {flatpickr('.datepicker', {locale: Spree.translations.flatpickr_locale,monthSelectorType: 'static',- time_24hr: true+ time_24hr: true,+ altInput: true})})diff --git a/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss b/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scssindex 635beadc24..ddb641c158 100644--- a/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss+++ b/backend/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss@@ -5,7 +5,7 @@}}-input.flatpickr-input {+input.input {-webkit-appearance: none;-moz-appearance: none;appearance: none;@@ -51,7 +51,7 @@ input.flatpickr-input {}// Fix Flatpickr bug where things jusy highlight for no reason.-input.flatpickr-input[readonly] {+input.input[readonly] {-webkit-touch-callout: none; /* iOS Safari */-webkit-user-select: none; /* Safari */-khtml-user-select: none; /* Konqueror HTML */@@ -61,6 +61,7 @@ input.flatpickr-input[readonly] {supported by Chrome, Edge, Opera and Firefox */}+.flatpickr-months .flatpickr-prev-month:hover svg,.flatpickr-months .flatpickr-next-month:hover svg {fill: $primary;diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erbindex c49a067ee9..160dc82717 100644--- a/backend/app/views/spree/admin/orders/index.html.erb+++ b/backend/app/views/spree/admin/orders/index.html.erb@@ -23,7 +23,7 @@<div class="col-12 col-md-6 mb-3 mb-md-0"><div class="input-group datePickerFrom"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"data-max-date="<%= params[:q][:created_at_lt] %>"><%= f.text_field :created_at_gt,class: 'form-control js-filterable shadow-none',@@ -37,7 +37,7 @@<div class="col-12 col-md-6 mt-3 mt-md-0"><div class="input-group datePickerTo"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"data-min-date="<%= params[:q][:created_at_gt] %>"><%= f.text_field :created_at_lt,diff --git a/backend/app/views/spree/admin/products/_form.html.erb b/backend/app/views/spree/admin/products/_form.html.erbindex 5e88a03696..19d8f9fd62 100644--- a/backend/app/views/spree/admin/products/_form.html.erb+++ b/backend/app/views/spree/admin/products/_form.html.erb@@ -66,7 +66,7 @@<div class="input-group datePickerFrom"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"data-max-date="<%= @product.discontinue_on %>"><%= f.text_field :available_on,@@ -87,7 +87,7 @@<div class="input-group datePickerTo"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"data-min-date="<%= @product.available_on %>"><%= f.text_field :discontinue_on,diff --git a/backend/app/views/spree/admin/products/new.html.erb b/backend/app/views/spree/admin/products/new.html.erbindex 04db38c3cc..1b0d403273 100644--- a/backend/app/views/spree/admin/products/new.html.erb+++ b/backend/app/views/spree/admin/products/new.html.erb@@ -46,7 +46,7 @@<div class="input-group datepicker"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>">+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"><%= f.text_field :available_on,value: datepicker_field_value(@product.available_on),placeholder: Spree.t(:select_a_date),diff --git a/backend/app/views/spree/admin/promotions/_form.html.erb b/backend/app/views/spree/admin/promotions/_form.html.erbindex a91c98b720..10009ff765 100644--- a/backend/app/views/spree/admin/promotions/_form.html.erb+++ b/backend/app/views/spree/admin/promotions/_form.html.erb@@ -57,13 +57,12 @@<%= Spree.t(:current_promotion_usage, count: @promotion.credits_count) %></small></div>-<div id="starts_at_field" class="form-group"><%= f.label :starts_at %><div class="input-group datePickerFrom"data-wrap="true"data-enable-time="true"- data-date-format="<%= Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_time_format, scope: 'date_picker', default: 'M j, Y H:i') %>"data-max-date="<%= @promotion.expires_at %>"><%= f.datetime_field :starts_at,class: 'form-control shadow-none',@@ -79,7 +78,7 @@<div class="input-group datePickerTo"data-wrap="true"data-enable-time='true'- data-date-format="<%= Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_time_format, scope: 'date_picker', default: 'M j, Y H:i') %>"data-min-date="<%= @promotion.starts_at %>"><%= f.datetime_field :expires_at,placeholder:Spree.t('ends_at'),diff --git a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erbindex ad3bd04392..83a8cb479a 100644--- a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb+++ b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb@@ -5,7 +5,7 @@<div class="col-12 col-md-6 mb-3 mb-md-0"><div class="input-group datePickerFrom"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"data-max-date="<%= params[:q][:completed_at_lt] %>"><%= s.text_field :completed_at_gt,class: 'form-control shadow-none',@@ -20,7 +20,7 @@<div class="col-12 col-md-6 mt-3 mt-md-0"><div class="input-group datePickerTo"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"data-min-date="<%= params[:q][:completed_at_gt] %>"><%= s.text_field :completed_at_lt,diff --git a/backend/app/views/spree/admin/shared/_translations.html.erb b/backend/app/views/spree/admin/shared/_translations.html.erbindex 5fa1585dee..5660015af2 100644--- a/backend/app/views/spree/admin/shared/_translations.html.erb+++ b/backend/app/views/spree/admin/shared/_translations.html.erb@@ -24,8 +24,6 @@no_results: Spree.t(:no_results),option_type_placeholder: Spree.t(:option_type_placeholder),paste: Spree.t(:paste),- date_format: Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d'),- date_time_format: Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i'),previous: Spree.t(:previous),remove: Spree.t(:remove),rename: Spree.t(:rename),@@ -45,6 +43,7 @@# Substitute - for _ converting zh-tw to zh_tw# Flatpickr not making things easy here.flatpickr_locale: "#{flatpickr_local_fallback.sub("-", "_")}"+}.to_json%></script>diff --git a/backend/app/views/spree/admin/variants/_form.html.erb b/backend/app/views/spree/admin/variants/_form.html.erbindex 4b3d3b26a7..fdf2f551ea 100644--- a/backend/app/views/spree/admin/variants/_form.html.erb+++ b/backend/app/views/spree/admin/variants/_form.html.erb@@ -44,7 +44,7 @@<%= f.error_message_on :discontinue_on %><div class="input-group datepicker"data-wrap="true"- data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>">+ data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"><%= f.text_field :discontinue_on,value: datepicker_field_value(@variant.discontinue_on),placeholder: Spree.t(:select_a_date),diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex f8857d48a2..928afedb32 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -759,10 +759,14 @@ en:date: Datedate_completed: Date Completeddate_picker:+ # Legacy formatting pre 4.2 (Flatpickr)first_day: 0format: ! '%Y/%m/%d'- js_format: Y/m/d- js_date_time: Y/m/d - H:i+ 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:idate_range: Date Rangedefault: Defaultdefault_country_cannot_be_deleted: Default country cannot be deleted