From 975795a3d5881a4bd874d2f96fdd1e6b63bdfe11 Mon Sep 17 00:00:00 2001 From: Astalum Date: Sat, 2 Nov 2024 14:43:46 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=81=8A=E9=87=A3=E3=82=8A=E3=81=AE?= =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pos/app/routes/casher-mini.phone.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pos/app/routes/casher-mini.phone.tsx b/pos/app/routes/casher-mini.phone.tsx index 6f9f37a..b94fd9e 100644 --- a/pos/app/routes/casher-mini.phone.tsx +++ b/pos/app/routes/casher-mini.phone.tsx @@ -34,7 +34,8 @@ export default function CasherMini() { お預り: {order?.received ?? 0} 円

- お釣り: {(order?.received ?? 0) - (order?.billingAmount ?? 0)} 円 + {/* お釣り: {(order?.received ?? 0) - (order?.billingAmount ?? 0)} 円 */} + お釣り: {order?.getCharge() ?? 0} 円

From dd38a2f93859dae2564c171befbf9709877ef21c Mon Sep 17 00:00:00 2001 From: Astalum Date: Sat, 2 Nov 2024 14:58:18 +0900 Subject: [PATCH 2/4] =?UTF-8?q?getCharge=E4=BD=BF=E3=81=88=E3=81=AA?= =?UTF-8?q?=E3=81=95=E3=81=9D=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pos/app/routes/casher-mini.phone.tsx | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pos/app/routes/casher-mini.phone.tsx b/pos/app/routes/casher-mini.phone.tsx index b94fd9e..94cdeef 100644 --- a/pos/app/routes/casher-mini.phone.tsx +++ b/pos/app/routes/casher-mini.phone.tsx @@ -21,21 +21,14 @@ export default function CasherMini() {

商品点数: {order?.items.length ?? 0} 点

-

小計: {order?.total ?? 0} 円

-

- 割引: {order?.discount ?? 0} 円 -

合計: {order?.billingAmount ?? 0} 円

- お預り: {order?.received ?? 0} 円 -

-

- {/* お釣り: {(order?.received ?? 0) - (order?.billingAmount ?? 0)} 円 */} - お釣り: {order?.getCharge() ?? 0} 円 + お釣り: {(order?.received ?? 0) - (order?.billingAmount ?? 0)} 円 + {/* お釣り: {order?.getCharge() ?? 0} 円 */}

From 3ddda70475652528570c974a5eb768eda7e3f21c Mon Sep 17 00:00:00 2001 From: Astalum Date: Sun, 3 Nov 2024 00:46:55 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=B2=E6=8D=97=E7=A2=BA=E8=AA=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pos/app/routes/casher-mini.phone.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pos/app/routes/casher-mini.phone.tsx b/pos/app/routes/casher-mini.phone.tsx index 94cdeef..e346227 100644 --- a/pos/app/routes/casher-mini.phone.tsx +++ b/pos/app/routes/casher-mini.phone.tsx @@ -12,21 +12,21 @@ export default function CasherMini() { const order = orderState?.edittingOrder; return ( -
-
-

No. {order?.orderId}

-
-
+
+

+ No. {order?.orderId} +

+
-

+

商品点数: {order?.items.length ?? 0} 点

-

+

合計: {order?.billingAmount ?? 0} 円

-

+

お釣り: {(order?.received ?? 0) - (order?.billingAmount ?? 0)} 円 {/* お釣り: {order?.getCharge() ?? 0} 円 */}

From 54c631b074ba7b878cb082d8276c3bb31f69bc6f Mon Sep 17 00:00:00 2001 From: Astalum Date: Sun, 3 Nov 2024 00:47:14 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E9=80=B2=E6=8D=97=E7=A2=BA=E8=AA=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pos/app/routes/casher-mini.phone.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos/app/routes/casher-mini.phone.tsx b/pos/app/routes/casher-mini.phone.tsx index e346227..37c7f12 100644 --- a/pos/app/routes/casher-mini.phone.tsx +++ b/pos/app/routes/casher-mini.phone.tsx @@ -14,7 +14,7 @@ export default function CasherMini() { return (

- No. {order?.orderId} + No. {order?.orderId}