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
Added `spree_date` / `spree_time`
Damian Legawiecdffff06e8ac6
diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rbindex b4bcfd93dc..cbf93aa46f 100644--- a/admin/app/helpers/spree/admin/base_helper.rb+++ b/admin/app/helpers/spree/admin/base_helper.rb@@ -309,6 +309,27 @@ module Spreedef allowed_file_types_for_uploadRails.application.config.active_storage.web_image_content_typesend++ # returns the local date for a given date+ # @param date [Date] the date to format+ # @return [String] the local date+ def spree_date(date, options = {})+ local_date(date, options)+ end++ # returns the local time for a given time+ # @param time [Time] the time to format+ # @return [String] the local time+ def spree_time(time, options = {})+ local_time(time, options)+ end++ # returns the local time ago for a given time+ # @param time [Time] the time to format+ # @return [String] the local time ago+ def spree_time_ago(time, options = {})+ local_time_ago(time, options)+ endendendenddiff --git a/admin/app/views/spree/admin/admin_users/_admin_user.html.erb b/admin/app/views/spree/admin/admin_users/_admin_user.html.erbindex 92a5cde094..de621abef8 100644--- a/admin/app/views/spree/admin/admin_users/_admin_user.html.erb+++ b/admin/app/views/spree/admin/admin_users/_admin_user.html.erb@@ -14,6 +14,6 @@<% end %></td><td class="w-20">- <%= local_time(admin_user.created_at) %>+ <%= spree_time(admin_user.created_at) %></td></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/admin_users/show.html.erb b/admin/app/views/spree/admin/admin_users/show.html.erbindex cb4b72f548..6bb2243440 100644--- a/admin/app/views/spree/admin/admin_users/show.html.erb+++ b/admin/app/views/spree/admin/admin_users/show.html.erb@@ -67,7 +67,7 @@<%= I18n.t('activerecord.attributes.user.last_sign_in') %><span><% if @admin_user.last_sign_in_at %>- <%= local_time(@admin_user.last_sign_in_at) %>+ <%= spree_time(@admin_user.last_sign_in_at) %><% else %><%= Spree.t(:not_available) %><% end %>@@ -79,7 +79,7 @@<%= I18n.t('activerecord.attributes.user.current_sign_in') %><span><% if @admin_user.current_sign_in_at %>- <%= local_time(@admin_user.current_sign_in_at) %>+ <%= spree_time(@admin_user.current_sign_in_at) %><% else %><%= Spree.t(:not_available) %><% end %>@@ -89,13 +89,13 @@<li class="list-group-item d-flex justify-content-between align-items-center"><%= Spree.t(:created_at) %><span>- <%= local_time(@admin_user.created_at) %>+ <%= spree_time(@admin_user.created_at) %></span></li><li class="list-group-item d-flex justify-content-between align-items-center"><%= Spree.t(:updated_at) %><span>- <%= local_time(@admin_user.updated_at) %>+ <%= spree_time(@admin_user.updated_at) %></span></li><% if @admin_user.invited_by %>diff --git a/admin/app/views/spree/admin/coupon_codes/_table_row.html.erb b/admin/app/views/spree/admin/coupon_codes/_table_row.html.erbindex 81ddff6d7e..6d9d2ca706 100644--- a/admin/app/views/spree/admin/coupon_codes/_table_row.html.erb+++ b/admin/app/views/spree/admin/coupon_codes/_table_row.html.erb@@ -4,5 +4,5 @@<%= clipboard_component(coupon_code.code.upcase) %></td><td class="w-25 font-size-sm"><%= active_badge(coupon_code.state == 'used') %></td>- <td class="w-25 font-size-sm"><%= local_time(coupon_code.created_at) %></td>+ <td class="w-25 font-size-sm"><%= spree_time(coupon_code.created_at) %></td></tr>diff --git a/admin/app/views/spree/admin/customer_returns/_table_row.html.erb b/admin/app/views/spree/admin/customer_returns/_table_row.html.erbindex ab5aeaa4ed..a571927b04 100644--- a/admin/app/views/spree/admin/customer_returns/_table_row.html.erb+++ b/admin/app/views/spree/admin/customer_returns/_table_row.html.erb@@ -15,7 +15,7 @@<%= customer_return.number %><% end %></td>- <td data-action="click->row-link#openLink"><%= local_time(customer_return.created_at) %></td>+ <td data-action="click->row-link#openLink"><%= spree_time(customer_return.created_at) %></td><td data-action="click->row-link#openLink"><%= render "spree/admin/orders/customer_summary", order: customer_return.order %></td><td data-action="click->row-link#openLink"><%= link_to customer_return.order.number,spree.edit_admin_order_path(customer_return.order) %></td>diff --git a/admin/app/views/spree/admin/exports/_export.html.erb b/admin/app/views/spree/admin/exports/_export.html.erbindex 5ab936679f..19592b0e99 100644--- a/admin/app/views/spree/admin/exports/_export.html.erb+++ b/admin/app/views/spree/admin/exports/_export.html.erb@@ -29,7 +29,7 @@<td><%= export.attachment.filename if export.done? %></td>- <td class="w-15"><%= local_time_ago(export.created_at, class: 'with-tip') %></td>+ <td class="w-15"><%= spree_time_ago(export.created_at, class: 'with-tip') %></td><td><%= number_to_human_size(export.attachment.byte_size) if export.done? %></td>diff --git a/admin/app/views/spree/admin/gift_cards/_gift_card.html.erb b/admin/app/views/spree/admin/gift_cards/_gift_card.html.erbindex 462db3e6a8..30f23321fc 100644--- a/admin/app/views/spree/admin/gift_cards/_gift_card.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_gift_card.html.erb@@ -10,7 +10,7 @@<td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= active_badge(gift_card.active?, label: gift_card.display_state) %></td><td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><% if gift_card.expires_at.present? %>- <%= local_date(gift_card.expires_at) %>+ <%= spree_date(gift_card.expires_at) %><% else %><span class="text-muted"><%= Spree.t(:not_available) %>diff --git a/admin/app/views/spree/admin/gift_cards/show.html.erb b/admin/app/views/spree/admin/gift_cards/show.html.erbindex 7ba55654ec..f572fe07d2 100644--- a/admin/app/views/spree/admin/gift_cards/show.html.erb+++ b/admin/app/views/spree/admin/gift_cards/show.html.erb@@ -164,7 +164,7 @@<%= Spree.t(:expires_at) %></span><% if @object.expires_at %>- <span><%= local_time(@object.expires_at) %></span>+ <span><%= spree_time(@object.expires_at) %></span><% else %><span class="text-muted"><%= Spree.t(:not_available) %></span><% end %>@@ -189,7 +189,7 @@<span class="text-muted"><%= Spree.t(:created_at) %></span>- <span><%= local_time(@object.created_at) %></span>+ <span><%= spree_time(@object.created_at) %></span></li></ul></div>diff --git a/admin/app/views/spree/admin/invitations/_invitation.html.erb b/admin/app/views/spree/admin/invitations/_invitation.html.erbindex ddf8d9f533..fc4f96b276 100644--- a/admin/app/views/spree/admin/invitations/_invitation.html.erb+++ b/admin/app/views/spree/admin/invitations/_invitation.html.erb@@ -21,11 +21,11 @@<span class="badge badge-warning"><%= Spree.t(:expired) %></span><% else %><span class="badge badge-light"><%= Spree.t(:pending) %></span>- <p class="text-muted font-size-sm mb-0 mt-2 pl-1">Expires at: <%= local_time(invitation.expires_at) %></p>+ <p class="text-muted font-size-sm mb-0 mt-2 pl-1">Expires at: <%= spree_time(invitation.expires_at) %></p><% end %></td><td class="w-10">- <%= local_time(invitation.created_at) %>+ <%= spree_time(invitation.created_at) %></td><td class="w-10 actions"><% if invitation.pending? && !invitation.expired? %>diff --git a/admin/app/views/spree/admin/oauth_applications/_table_row.html.erb b/admin/app/views/spree/admin/oauth_applications/_table_row.html.erbindex 255100caf0..7b9effe32a 100644--- a/admin/app/views/spree/admin/oauth_applications/_table_row.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/_table_row.html.erb@@ -23,7 +23,7 @@</td><td class="w-15"><% if oauth_application.last_used_at %>- <%= local_time(oauth_application.last_used_at) %>+ <%= spree_time(oauth_application.last_used_at) %><% else %><span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span><% end %>diff --git a/admin/app/views/spree/admin/orders/_header.html.erb b/admin/app/views/spree/admin/orders/_header.html.erbindex 9dccc1c50f..794899dc25 100644--- a/admin/app/views/spree/admin/orders/_header.html.erb+++ b/admin/app/views/spree/admin/orders/_header.html.erb@@ -10,7 +10,7 @@<% if @order.completed? %><span class="text-muted font-size-sm font-weight-normal with-tip"><%= I18n.t('activerecord.attributes.spree/order.completed_at') %>- <%= local_time(@order.completed_at) %>+ <%= spree_time(@order.completed_at) %></span><% end %><% end %>diff --git a/admin/app/views/spree/admin/orders/_order.html.erb b/admin/app/views/spree/admin/orders/_order.html.erbindex 51e140a9b5..1461461cbb 100644--- a/admin/app/views/spree/admin/orders/_order.html.erb+++ b/admin/app/views/spree/admin/orders/_order.html.erb@@ -3,7 +3,7 @@<%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-weight-bolder d-block p-2 px-3 text-decoration-none', data: { 'turbo-frame': '_top', row_link_target: :link } %></td><td class="w-15 cursor-pointer" data-action="click->row-link#openLink">- <%= local_time_ago(order.completed? ? order.completed_at : order.created_at, format: '%b %e, %Y %l:%M%P', class: 'with-tip') %>+ <%= spree_time_ago(order.completed? ? order.completed_at : order.created_at, format: '%b %e, %Y %l:%M%P', class: 'with-tip') %></td><td class="d-customer w-15 cursor-pointer" data-action="click->row-link#openLink"><%= render 'spree/admin/orders/customer_summary', order: order %>diff --git a/admin/app/views/spree/admin/orders/_refunds.html.erb b/admin/app/views/spree/admin/orders/_refunds.html.erbindex 3c678279a1..13585326f7 100644--- a/admin/app/views/spree/admin/orders/_refunds.html.erb+++ b/admin/app/views/spree/admin/orders/_refunds.html.erb@@ -31,7 +31,7 @@<% end %></td><td><%= truncate(refund.reason.name, length: 100) %></td>- <td><%= local_time(refund.created_at) %></td>+ <td><%= spree_time(refund.created_at) %></td><% if refund.editable? && can?(:edit, refund) %><td class="actions"><span data-toggle="modal" data-target="#modal">diff --git a/admin/app/views/spree/admin/orders/_shipment.html.erb b/admin/app/views/spree/admin/orders/_shipment.html.erbindex f1740d4dce..7ece84c1cf 100644--- a/admin/app/views/spree/admin/orders/_shipment.html.erb+++ b/admin/app/views/spree/admin/orders/_shipment.html.erb@@ -6,7 +6,7 @@<strong class="shipment-number"><%= shipment.number %></strong><% if shipment.shipped_at.present? %><small class="text-muted">- <%= local_time_ago(shipment.shipped_at, class: 'with-tip') %>+ <%= spree_time_ago(shipment.shipped_at, class: 'with-tip') %></small><% end %></div>diff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erbindex 476174b183..6f1d4fac41 100644--- a/admin/app/views/spree/admin/orders/_summary.html.erb+++ b/admin/app/views/spree/admin/orders/_summary.html.erb@@ -7,7 +7,7 @@<li class="list-group-item d-flex justify-content-between align-items-center border-0"><span><%= Spree.t(:canceled_at) %></span><span class="text-rightfont-weight-bold">- <%= local_time(@order.canceled_at) %>+ <%= spree_time(@order.canceled_at) %></span></li><% if @order.canceler.present? %>diff --git a/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb b/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erbindex 47c5de5b0e..e513bb2599 100644--- a/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb@@ -25,7 +25,7 @@<% end %></td><td data-action="click->row-link#openLink"><%= customer_return.display_pre_tax_total.to_html %></td>- <td data-action="click->row-link#openLink"><%= local_time(customer_return.created_at) %></td>+ <td data-action="click->row-link#openLink"><%= spree_time(customer_return.created_at) %></td><td class="text-right"><% if can_create_reimbursement %><span class="dropdown">diff --git a/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb b/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erbindex 79c7d8400b..1b5f3c18b6 100644--- a/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb@@ -33,7 +33,7 @@<%= reimbursement.reimbursement_status %></span></td>- <td data-action="click->row-link#openLink"><%= local_time(reimbursement.created_at) %></td>+ <td data-action="click->row-link#openLink"><%= spree_time(reimbursement.created_at) %></td></tr><% end %></tbody>diff --git a/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erb b/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erbindex 5020e1714c..c9f66f5704 100644--- a/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erb+++ b/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erb@@ -22,7 +22,7 @@</small></td><td data-action="click->row-link#openLink"><%= return_authorization.display_pre_tax_total.to_html %></td>- <td data-action="click->row-link#openLink"><%= local_time(return_authorization.created_at) %></td>+ <td data-action="click->row-link#openLink"><%= spree_time(return_authorization.created_at) %></td><td data-action="click->row-link#openLink" class="text-right"><%= link_to_edit(return_authorization,diff --git a/admin/app/views/spree/admin/orders/return_authorizations/show.html.erb b/admin/app/views/spree/admin/orders/return_authorizations/show.html.erbindex 0c1b02d365..055ba09588 100644--- a/admin/app/views/spree/admin/orders/return_authorizations/show.html.erb+++ b/admin/app/views/spree/admin/orders/return_authorizations/show.html.erb@@ -6,7 +6,7 @@<span class="badge badge-<%= @return_authorization.state %>"><%= Spree.t("return_authorization_states.#{@return_authorization.state}") %></span>- <%= local_time(+ <%= spree_time(@return_authorization.created_at,class: "badge badge-light with-tip",) %>diff --git a/admin/app/views/spree/admin/pages/_table_row.html.erb b/admin/app/views/spree/admin/pages/_table_row.html.erbindex 43f60c760d..e2b6b2121a 100644--- a/admin/app/views/spree/admin/pages/_table_row.html.erb+++ b/admin/app/views/spree/admin/pages/_table_row.html.erb@@ -3,10 +3,10 @@<%= link_to page.name, spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), data: { row_link_target: :link, turbo_frame: '_top' } %></td><td data-action="click->row-link#openLink" class="w-15">- <%= local_time_ago(page.created_at, class: 'with-tip') %>+ <%= spree_time_ago(page.created_at, class: 'with-tip') %></td><td data-action="click->row-link#openLink" class="w-15">- <%= local_time_ago(page.updated_at, class: 'with-tip') %>+ <%= spree_time_ago(page.updated_at, class: 'with-tip') %></td><td class="w-10 text-right"><div class="dropdown">diff --git a/admin/app/views/spree/admin/payments/_payment.html.erb b/admin/app/views/spree/admin/payments/_payment.html.erbindex 4e3829c13e..626407423e 100644--- a/admin/app/views/spree/admin/payments/_payment.html.erb+++ b/admin/app/views/spree/admin/payments/_payment.html.erb@@ -14,7 +14,7 @@<%= payment_method_icon_tag(payment.payment_method.payment_icon_name) %><% end %><strong><%= payment.number.upcase %></strong>- <%= local_time(payment.created_at, class: 'ml-auto text-muted font-size-sm') %>+ <%= spree_time(payment.created_at, class: 'ml-auto text-muted font-size-sm') %><div class="dropdown"><button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false">diff --git a/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb b/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erbindex 852e06c384..10fbdb8957 100644--- a/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb+++ b/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb@@ -24,7 +24,7 @@</tr><tr><th scope="col"><%= Spree.t(:issued_on) %>:</th>- <td><%= local_time(payment.source.created_at) %></td>+ <td><%= spree_time(payment.source.created_at) %></td></tr></table></div>diff --git a/admin/app/views/spree/admin/posts/_table_row.html.erb b/admin/app/views/spree/admin/posts/_table_row.html.erbindex c2953acf4d..60b3edea0c 100644--- a/admin/app/views/spree/admin/posts/_table_row.html.erb+++ b/admin/app/views/spree/admin/posts/_table_row.html.erb@@ -14,7 +14,7 @@<td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.post_category_title || '-' %></td><td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.author_name %></td>- <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.published_at.present? ? local_date(post.published_at) : '-' %></td>+ <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.published_at.present? ? spree_date(post.published_at) : '-' %></td><td class="actions"><%= link_to_edit(post, class: 'btn btn-light btn-sm', data: { 'turbo-frame': '_top' }) if can? :edit, post %>diff --git a/admin/app/views/spree/admin/promotions/_sidebar.html.erb b/admin/app/views/spree/admin/promotions/_sidebar.html.erbindex f17f01d732..f95a03840e 100644--- a/admin/app/views/spree/admin/promotions/_sidebar.html.erb+++ b/admin/app/views/spree/admin/promotions/_sidebar.html.erb@@ -49,7 +49,7 @@<%= Spree.t(:created_at) %></span><span>- <%= local_time(@promotion.created_at, format: :long) %>+ <%= spree_time(@promotion.created_at, format: :long) %></span></li>@@ -58,7 +58,7 @@<%= Spree.t(:updated_at) %></span><span>- <%= local_time(@promotion.updated_at, format: :long) %>+ <%= spree_time(@promotion.updated_at, format: :long) %></span></li>@@ -106,7 +106,7 @@<%= I18n.t('activerecord.attributes.spree/promotion.starts_at') %></span><% if @promotion.starts_at %>- <span><%= local_time(@promotion.starts_at) %></span>+ <span><%= spree_time(@promotion.starts_at) %></span><% else %><span class="text-muted"><%= Spree.t(:not_available) %></span><% end %>@@ -116,7 +116,7 @@<%= Spree.t(:expires_at) %></span><% if @promotion.expires_at %>- <span><%= local_time(@promotion.expires_at) %></span>+ <span><%= spree_time(@promotion.expires_at) %></span><% else %><span class="text-muted"><%= Spree.t(:not_available) %></span><% end %>diff --git a/admin/app/views/spree/admin/reimbursements/show.html.erb b/admin/app/views/spree/admin/reimbursements/show.html.erbindex d4c65fd577..f2a7f4245c 100644--- a/admin/app/views/spree/admin/reimbursements/show.html.erb+++ b/admin/app/views/spree/admin/reimbursements/show.html.erb@@ -77,7 +77,7 @@ locals: {<% @reimbursement.refunds.includes(:reason).each do |refund| %><tr id="<%= spree_dom_id(refund) %>"><td><%= refund.display_amount %></td>- <td><%= local_time(refund.created_at) %></td>+ <td><%= spree_time(refund.created_at) %></td><td><%= refund.reason&.name %></td></tr><% end %>diff --git a/admin/app/views/spree/admin/return_authorizations/_table_row.html.erb b/admin/app/views/spree/admin/return_authorizations/_table_row.html.erbindex 9e0200c8a1..099eaa72d6 100644--- a/admin/app/views/spree/admin/return_authorizations/_table_row.html.erb+++ b/admin/app/views/spree/admin/return_authorizations/_table_row.html.erb@@ -27,7 +27,7 @@} %></td><td data-action="click->row-link#openLink">- <%= link_to local_time_ago(return_authorization.created_at, class: "with-tip"),+ <%= link_to spree_time_ago(return_authorization.created_at, class: "with-tip"),return_url,class: "text-dark" %></td>diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erbindex 4133d4a1a8..4ff40b34d4 100644--- a/admin/app/views/spree/admin/shared/_content_header.html.erb+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb@@ -3,7 +3,7 @@<% show_record_subtitle = record && record.persisted? && record.has_attribute?(:updated_at) %><% content_for(:page_subtitle) do %>- <%= local_time record.updated_at, class: 'badge badge-light with-tip', title: 'Last update' %>+ <%= spree_time record.updated_at, class: 'badge badge-light with-tip', title: 'Last update' %><% end if show_record_subtitle && !content_for(:page_subtitle) %><% if content_for?(:page_title) %>diff --git a/admin/app/views/spree/admin/shared/_refunds.html.erb b/admin/app/views/spree/admin/shared/_refunds.html.erbindex 179cea905b..4da8c19fe5 100644--- a/admin/app/views/spree/admin/shared/_refunds.html.erb+++ b/admin/app/views/spree/admin/shared/_refunds.html.erb@@ -13,7 +13,7 @@<tbody><% refunds.each do |refund| %><tr id="<%= spree_dom_id(refund) %>">- <td><%= local_time(refund.created_at) %></td>+ <td><%= spree_time(refund.created_at) %></td><td class="amount"><%= refund.display_amount %></td><td><%= truncate(refund.reason.name, length: 100) %></td><% if show_actions && !refund.payment.order.canceled? %>diff --git a/admin/app/views/spree/admin/stock_transfers/_table_row.html.erb b/admin/app/views/spree/admin/stock_transfers/_table_row.html.erbindex 93af38cc39..8320ba4970 100644--- a/admin/app/views/spree/admin/stock_transfers/_table_row.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_table_row.html.erb@@ -4,7 +4,7 @@<td data-action="click->row-link#openLink"><%= stock_transfer.source_location&.display_name.presence || Spree.t(:none) %></td><td data-action="click->row-link#openLink"><%= stock_transfer.destination_location.display_name %></td><td data-action="click->row-link#openLink"><%= stock_transfer.destination_movements.size %></td>- <td data-action="click->row-link#openLink"><%= local_time_ago(stock_transfer.created_at) %></td>+ <td data-action="click->row-link#openLink"><%= spree_time_ago(stock_transfer.created_at) %></td><td class="actions" data-action="click->row-link#openLink"><%= link_to '', admin_stock_transfer_path(stock_transfer), data: { row_link_target: 'link' }, class: 'd-none' %></td>diff --git a/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erb b/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erbindex 89f8a31549..440e8bfdc6 100644--- a/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erb+++ b/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erb@@ -24,6 +24,6 @@<% end %></td><td class="w-20">- <%= local_date(store_credit_event.created_at) %>+ <%= spree_date(store_credit_event.created_at) %></td></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/store_credits/_store_credit.html.erb b/admin/app/views/spree/admin/store_credits/_store_credit.html.erbindex 393756e006..7bfbf6ce51 100644--- a/admin/app/views/spree/admin/store_credits/_store_credit.html.erb+++ b/admin/app/views/spree/admin/store_credits/_store_credit.html.erb@@ -7,5 +7,5 @@<td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.display_amount_remaining.to_html %></td><td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.currency %></td><td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.created_by_email %></td>- <td class="cursor-pointer" data-action="click->row-link#openLink"><%= local_date(store_credit.created_at) %></td>+ <td class="cursor-pointer" data-action="click->row-link#openLink"><%= spree_date(store_credit.created_at) %></td></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/store_credits/show.html.erb b/admin/app/views/spree/admin/store_credits/show.html.erbindex 152dffdde7..86208ab0a3 100644--- a/admin/app/views/spree/admin/store_credits/show.html.erb+++ b/admin/app/views/spree/admin/store_credits/show.html.erb@@ -75,7 +75,7 @@</span><span>- <%= local_time(@store_credit.created_at) %>+ <%= spree_time(@store_credit.created_at) %></span></li>diff --git a/admin/app/views/spree/admin/themes/_theme.html.erb b/admin/app/views/spree/admin/themes/_theme.html.erbindex d6091d8a26..1ed6515a12 100644--- a/admin/app/views/spree/admin/themes/_theme.html.erb+++ b/admin/app/views/spree/admin/themes/_theme.html.erb@@ -10,7 +10,7 @@<p class="mb-0 mt-1"><span class="text-muted"><%= Spree.t(:updated_at) %>:- <%= local_time_ago(theme.updated_at, class: 'with-tip') %>+ <%= spree_time_ago(theme.updated_at, class: 'with-tip') %></span></p></div>diff --git a/admin/app/views/spree/admin/users/_last_order.html.erb b/admin/app/views/spree/admin/users/_last_order.html.erbindex c1956be14c..0edd1a16eb 100644--- a/admin/app/views/spree/admin/users/_last_order.html.erb+++ b/admin/app/views/spree/admin/users/_last_order.html.erb@@ -17,7 +17,7 @@<%= order_shipment_state(@last_order, class: 'ml-2') %></p><span class="text-muted">- <%= local_time_ago(@last_order.completed_at, class: 'with-tip') %>+ <%= spree_time_ago(@last_order.completed_at, class: 'with-tip') %></span></div><div class="col-lg-3 text-lg-right font-weight-bold">diff --git a/admin/app/views/spree/admin/users/_lifetime_stats.html.erb b/admin/app/views/spree/admin/users/_lifetime_stats.html.erbindex 9908a4dbaf..17116035c0 100644--- a/admin/app/views/spree/admin/users/_lifetime_stats.html.erb+++ b/admin/app/views/spree/admin/users/_lifetime_stats.html.erb@@ -45,7 +45,7 @@<div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right"><span class="text-muted"><%= Spree.t(:created_at) %></span><span class="font-size-lg text-dark font-weight-bold mt-1 me-3">- <%= local_time(@user.created_at) %>+ <%= spree_time(@user.created_at) %></span></div></div>diff --git a/admin/app/views/spree/admin/users/_user.html.erb b/admin/app/views/spree/admin/users/_user.html.erbindex af0013e175..4ca8362aa9 100644--- a/admin/app/views/spree/admin/users/_user.html.erb+++ b/admin/app/views/spree/admin/users/_user.html.erb@@ -14,5 +14,5 @@</td><td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td><td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>- <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= local_time(user.created_at) %></td>+ <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= spree_time(user.created_at) %></td></tr>diff --git a/admin/app/views/spree/admin/webhook_events/_webhook_event.html.erb b/admin/app/views/spree/admin/webhook_events/_webhook_event.html.erbindex 9c625462b7..3ebae9fc08 100644--- a/admin/app/views/spree/admin/webhook_events/_webhook_event.html.erb+++ b/admin/app/views/spree/admin/webhook_events/_webhook_event.html.erb@@ -1,7 +1,7 @@<tr id="<%= spree_dom_id webhook_event %>"><td><span class="badge badge-light"><%= webhook_event.name %></span></td><td><%= active_badge(webhook_event.success) %></td>- <td><%= local_time(webhook_event.created_at) %></td>+ <td><%= spree_time(webhook_event.created_at) %></td><td><% if webhook_event.response_code%><code><%= webhook_event.response_code %></code></td>diff --git a/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erb b/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erbindex 4af42eef35..71b9a703fe 100644--- a/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erb+++ b/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erb@@ -10,7 +10,7 @@</td><td class="w-10" data-action="click->row-link#openLink"><% if webhooks_subscriber.latest_event_at %>- <%= local_time(webhooks_subscriber.latest_event_at) %>+ <%= spree_time(webhooks_subscriber.latest_event_at) %><% else %><span class="text-muted"><%= Spree.t(:not_available) %></span><% end %>diff --git a/storefront/app/views/themes/default/spree/account/_order.html.erb b/storefront/app/views/themes/default/spree/account/_order.html.erbindex e62fc09c14..37027abdae 100644--- a/storefront/app/views/themes/default/spree/account/_order.html.erb+++ b/storefront/app/views/themes/default/spree/account/_order.html.erb@@ -2,7 +2,7 @@<td class="mb-4 w-1/2 md:w-auto -order-1 md:px-4 md:border-y border-accent md:border-l font-medium"><%= link_to "##{order.number}", spree.account_order_path(order) %></td>- <td class="mb-4 w-full md:w-auto md:px-4 md:border-y border-accent"><%= local_date(order.completed_at.to_date) %></td>+ <td class="mb-4 w-full md:w-auto md:px-4 md:border-y border-accent"><%= spree_date(order.completed_at.to_date) %></td><td class="md:w-auto pr-2 md:px-4 md:border-y border-accent"><% if order.payment_state %><% if order.payment_state == 'void' %>diff --git a/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb b/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erbindex 1f2945b5f0..65cb9a8b69 100644--- a/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb+++ b/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb@@ -21,6 +21,6 @@<td class="w-full md:w-auto md:px-4 md:border-y md:border-r border-accent"><span class="md:hidden font-medium mr-1"><%= Spree.t(:expires_at) %>:</span>- <%= gift_card.expires_at.present? ? local_date(gift_card.expires_at) : '-' %>+ <%= gift_card.expires_at.present? ? spree_date(gift_card.expires_at) : '-' %></td></tr>diff --git a/storefront/app/views/themes/default/spree/account/store_credits/_store_credit_event.html.erb b/storefront/app/views/themes/default/spree/account/store_credits/_store_credit_event.html.erbindex cdde63825a..b018b6915d 100644--- a/storefront/app/views/themes/default/spree/account/store_credits/_store_credit_event.html.erb+++ b/storefront/app/views/themes/default/spree/account/store_credits/_store_credit_event.html.erb@@ -1,6 +1,6 @@<tr class="flex flex-wrap w-full md:table-row md:h-[72px] border border-accent md:border-none mb-4 p-4 md:p-0 hover:bg-accent-100" id="<%= dom_id(store_credit_event) %>"><td class="mb-2 w-full md:w-auto md:px-4 md:border-y border-accent md:border-l font-medium">- <%= local_date(store_credit_event.created_at) %>+ <%= spree_date(store_credit_event.created_at) %></td><td class="w-full md:w-auto md:px-4 md:border-y border-accent">diff --git a/storefront/app/views/themes/default/spree/page_sections/_post_details.html.erb b/storefront/app/views/themes/default/spree/page_sections/_post_details.html.erbindex 262ea6f9e2..1bdd2cad35 100644--- a/storefront/app/views/themes/default/spree/page_sections/_post_details.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_post_details.html.erb@@ -8,7 +8,7 @@<h1 class="uppercase text-2xl font-medium mt-4"><%= post.title %></h1><% if post.published? %>- <div class="mt-2 text-sm"><%= local_time(post.published_at, '%B %e, %Y') %></div>+ <div class="mt-2 text-sm"><%= spree_time(post.published_at, '%B %e, %Y') %></div><% end %><div class="mt-8 post-details-content"><%= post.content %></div>diff --git a/storefront/app/views/themes/default/spree/posts/_post.html.erb b/storefront/app/views/themes/default/spree/posts/_post.html.erbindex 21f28f641e..0995d8d8cd 100644--- a/storefront/app/views/themes/default/spree/posts/_post.html.erb+++ b/storefront/app/views/themes/default/spree/posts/_post.html.erb@@ -15,7 +15,7 @@</div><h1 class="uppercase text-lg font-medium mt-4"><%= post.title %></h1>- <div class="mt-2 text-sm"><%= local_time(post.published_at, "%B %e, %Y") %></div>+ <div class="mt-2 text-sm"><%= spree_time(post.published_at, "%B %e, %Y") %></div><div class="mt-4"><%= post.shortened_description %></div><% end %></div>diff --git a/storefront/app/views/themes/default/spree/shared/_order_details.html.erb b/storefront/app/views/themes/default/spree/shared/_order_details.html.erbindex 9549cf24df..85cccd3f6a 100644--- a/storefront/app/views/themes/default/spree/shared/_order_details.html.erb+++ b/storefront/app/views/themes/default/spree/shared/_order_details.html.erb@@ -15,7 +15,7 @@<% end %><p class="mb-6">- <%= I18n.t('activerecord.attributes.spree/order.completed_at') %> <%= local_time(order.completed_at) %>+ <%= I18n.t('activerecord.attributes.spree/order.completed_at') %> <%= spree_time(order.completed_at) %></p><%== color_options_style_for_line_items(shipments.flat_map(&:line_items)) %>