From 6c1039316403b0095d96a64c3d53009fb358242a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 12:19:02 +0530
Subject: [PATCH] fix: use frappe.datetime.str_to_user (backport #45216)
(#45417)
fix: use frappe.datetime.str_to_user (#45216)
* fix: default_datetime_format
* fix: add_format_datetime
* fix: update to str_to_user in point_of_sale/pos_controller.js
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix: convert_to_str_to_user
* fix: linters
* fix: whitespace
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit cd3f03696e4853d9e40bf45a71101552f350f9ba)
Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
---
erpnext/selling/page/point_of_sale/pos_controller.js | 2 +-
erpnext/selling/page/point_of_sale/pos_item_cart.js | 4 ++--
erpnext/selling/page/point_of_sale/pos_past_order_list.js | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index dc7e992f654..8f02c8d0fb2 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -155,7 +155,7 @@ erpnext.PointOfSale.Controller = class {
this.page.set_title_sub(
`
- Opened at ${moment(this.pos_opening_time).format("Do MMMM, h:mma")}
+ Opened at ${frappe.datetime.str_to_user(this.pos_opening_time)}
`
);
diff --git a/erpnext/selling/page/point_of_sale/pos_item_cart.js b/erpnext/selling/page/point_of_sale/pos_item_cart.js
index 28cb1aef339..9de6dbbd429 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_cart.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js
@@ -988,8 +988,8 @@ erpnext.PointOfSale.ItemCart = class {
.html(`${__("Last transacted")} ${__(elapsed_time)}`);
res.forEach((invoice) => {
- const posting_datetime = moment(invoice.posting_date + " " + invoice.posting_time).format(
- "Do MMMM, h:mma"
+ const posting_datetime = frappe.datetime.str_to_user(
+ invoice.posting_date + " " + invoice.posting_time
);
let indicator_color = {
Paid: "green",
diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_list.js b/erpnext/selling/page/point_of_sale/pos_past_order_list.js
index c450d8a109a..ab2fd3e1547 100644
--- a/erpnext/selling/page/point_of_sale/pos_past_order_list.js
+++ b/erpnext/selling/page/point_of_sale/pos_past_order_list.js
@@ -96,8 +96,8 @@ erpnext.PointOfSale.PastOrderList = class {
}
get_invoice_html(invoice) {
- const posting_datetime = moment(invoice.posting_date + " " + invoice.posting_time).format(
- "Do MMMM, h:mma"
+ const posting_datetime = frappe.datetime.str_to_user(
+ invoice.posting_date + " " + invoice.posting_time
);
return `