From 01b0d1057e6fed3b414d7a55e85279869e35ea33 Mon Sep 17 00:00:00 2001 From: mahsem <137205921+mahsem@users.noreply.github.com> Date: Wed, 21 May 2025 12:46:36 +0200 Subject: [PATCH 1/6] fix: translate_pos_buttons (cherry picked from commit ce45d1664db996bcdb220fe0ffe09076defa3aeb) --- .../selling/page/point_of_sale/pos_past_order_summary.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js index cf775176c07..ed1abc97b51 100644 --- a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js +++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js @@ -321,17 +321,17 @@ erpnext.PointOfSale.PastOrderSummary = class { get_condition_btn_map(after_submission) { if (after_submission) - return [{ condition: true, visible_btns: ["Print Receipt", "Email Receipt", "New Order"] }]; + return [{ condition: true, visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")] }]; return [ - { condition: this.doc.docstatus === 0, visible_btns: ["Edit Order", "Delete Order"] }, + { condition: this.doc.docstatus === 0, visible_btns: [__("Edit Order"), __("Delete Order")] }, { condition: !this.doc.is_return && this.doc.docstatus === 1, - visible_btns: ["Print Receipt", "Email Receipt", "Return"], + visible_btns: [__("Print Receipt"), __("Email Receipt"), __("Return")], }, { condition: this.doc.is_return && this.doc.docstatus === 1, - visible_btns: ["Print Receipt", "Email Receipt"], + visible_btns: [__("Print Receipt"), __("Email Receipt")], }, ]; } From c44493fd7e5acebb59748321a0a68bc59fe2c894 Mon Sep 17 00:00:00 2001 From: mahsem <137205921+mahsem@users.noreply.github.com> Date: Wed, 21 May 2025 12:54:25 +0200 Subject: [PATCH 2/6] fix: linter (cherry picked from commit 4a6b5b99931c2bedbb4fc12dfb16790bccc53733) --- .../selling/page/point_of_sale/pos_past_order_summary.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js index ed1abc97b51..c346f7dc257 100644 --- a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js +++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js @@ -321,7 +321,12 @@ erpnext.PointOfSale.PastOrderSummary = class { get_condition_btn_map(after_submission) { if (after_submission) - return [{ condition: true, visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")] }]; + return [ + { + condition: true, + visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")] + }, + ]; return [ { condition: this.doc.docstatus === 0, visible_btns: [__("Edit Order"), __("Delete Order")] }, From 2c8db092a0f0280dcdb20bb3c0c922310aa52248 Mon Sep 17 00:00:00 2001 From: mahsem <137205921+mahsem@users.noreply.github.com> Date: Wed, 21 May 2025 12:59:07 +0200 Subject: [PATCH 3/6] fix: prettier (cherry picked from commit 1953c8489ccd86fcc27a7d492fd618b138fbf8f2) --- erpnext/selling/page/point_of_sale/pos_past_order_summary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js index c346f7dc257..ac28a5e18b0 100644 --- a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js +++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js @@ -324,7 +324,7 @@ erpnext.PointOfSale.PastOrderSummary = class { return [ { condition: true, - visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")] + visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")], }, ]; From 194e41a2d99895dd5f34277729e446e84043c952 Mon Sep 17 00:00:00 2001 From: mahsem <137205921+mahsem@users.noreply.github.com> Date: Wed, 21 May 2025 13:01:11 +0200 Subject: [PATCH 4/6] fix: space (cherry picked from commit a442ec4e80e9d5839f742081f6233bf0371cd3ec) --- .../selling/page/point_of_sale/pos_past_order_summary.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js index ac28a5e18b0..d14fbd4c7d4 100644 --- a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js +++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js @@ -322,10 +322,10 @@ erpnext.PointOfSale.PastOrderSummary = class { get_condition_btn_map(after_submission) { if (after_submission) return [ - { - condition: true, - visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")], - }, + { + condition: true, + visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")], + }, ]; return [ From fe78bb60c4a24b8bd087b01ba88f4d355f529472 Mon Sep 17 00:00:00 2001 From: mahsem <137205921+mahsem@users.noreply.github.com> Date: Wed, 21 May 2025 13:04:08 +0200 Subject: [PATCH 5/6] fix: space (cherry picked from commit 50a5b5190902be01deb3e3ceddb7d881da06d379) --- erpnext/selling/page/point_of_sale/pos_past_order_summary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js index d14fbd4c7d4..6d27ba4568d 100644 --- a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js +++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js @@ -324,7 +324,7 @@ erpnext.PointOfSale.PastOrderSummary = class { return [ { condition: true, - visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")], + visible_btns: [__("Print Receipt"), __("Email Receipt"), __("New Order")], }, ]; From 0f2264658f798b97185985378280b929b8183ef7 Mon Sep 17 00:00:00 2001 From: mahsem <137205921+mahsem@users.noreply.github.com> Date: Wed, 21 May 2025 13:21:55 +0200 Subject: [PATCH 6/6] fix: prettier (cherry picked from commit 2839fc94607bc3e2063675d8d5927c3c435a2fed) --- erpnext/selling/page/point_of_sale/pos_past_order_summary.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js index 6d27ba4568d..0ad25b0a473 100644 --- a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js +++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js @@ -329,7 +329,10 @@ erpnext.PointOfSale.PastOrderSummary = class { ]; return [ - { condition: this.doc.docstatus === 0, visible_btns: [__("Edit Order"), __("Delete Order")] }, + { + condition: this.doc.docstatus === 0, + visible_btns: [__("Edit Order"), __("Delete Order")], + }, { condition: !this.doc.is_return && this.doc.docstatus === 1, visible_btns: [__("Print Receipt"), __("Email Receipt"), __("Return")],