Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

/cashier-mini 客向けミニ画面デザイン改善 #400

Merged
merged 5 commits into from
Nov 2, 2024
Merged

/cashier-mini 客向けミニ画面デザイン改善 #400

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
975795a
お釣りのリファクタリング
Astalum Nov 2, 2024
dd38a2f
getCharge使えなさそう
Astalum Nov 2, 2024
3ddda70
進捗確認
Astalum Nov 2, 2024
54c631b
進捗確認
Astalum Nov 2, 2024
6075535
Merge branch 'main' into issue/368
toririm Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions pos/app/routes/cashier-mini.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,21 @@ export default function CasherMini() {
}, [submittedOrderId]);

return (
<div className="wrap flex h-full flex-col px-[35px] pt-[25px]">
<div className="pb-[50px]">
<p className="font-serif text-4xl">No. {orderId}</p>
</div>
<div className="grid grid-cols-2 items-center justify-items-center">
<div className="wrap flex h-full flex-col bg-theme px-[50px] pt-[40px]">
<p className="pb-[50px] font-serif text-5xl text-white">
No. <span className="text-6xl">{orderId}</span>
</p>
<div className="grid grid-cols-2 items-center justify-items-center p-[20px]">
<div>
<p className="sans-serif text-base">
<p className="font-serif text-4xl text-white">
商品点数： {order?.items.length ?? 0} 点
</p>
<p className="sans-serif text-base">小計： {order?.total ?? 0} 円</p>
<p className="sans-serif text-base">
割引： {order?.discount ?? 0} 円
</p>
</div>
<div>
<p className="sans-serif text-base">
<p className="font-serif text-4xl text-white">
合計： {order?.billingAmount ?? 0} 円
</p>
<p className="sans-serif text-base">
お預り： {order?.received ?? 0} 円
</p>
<p className="sans-serif text-base">
<p className="font-serif text-4xl text-white">
お釣り： {order?.getCharge()} 円
</p>
</div>
Expand Down