Marbes/Luncher
9
2
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: podpora neplatících osob u objednávek
CI / Generate TypeScript types (push) Successful in 14s
Details
CI / Server unit tests (push) Successful in 20s
Details
CI / Build server (push) Successful in 24s
Details
CI / Build client (push) Successful in 33s
Details
CI / Playwright E2E tests (push) Successful in 1m17s
Details
CI / Build and push Docker image (push) Successful in 39s
Details
CI / Notify (push) Successful in 2s
Details

Browse Source
This commit is contained in:
mates
2026-06-05 11:31:55 +02:00
parent c2bbf7ea60
commit c85842267a
5 changed files with 103 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/pages/OrderGroupsPage.tsx
+7 -13
View File
@@ -7,6 +7,7 @@ import {
ClientData, GroupState, MealSlot, OrderGroup, OrderGroupMember, PendingQr,
getData, createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState, updateGroupTimes,
} from '../../../types';
import { computeFeeShare, computeMemberTotal, countActiveMembers } from '../utils/groupFees';
import { EVENT_MESSAGE, EVENT_PENDING_QR, SocketContext } from '../context/socket';
import { useAuth } from '../context/auth';
import { useSettings } from '../context/settings';
@@ -254,22 +255,15 @@ export default function OrderGroupsPage() {
const isOrdered = group.state === GroupState.ORDERED;
const isLocked = group.state === GroupState.LOCKED;
const memberEntries = Object.entries(group.members) as [string, OrderGroupMember][];
const memberCount = memberEntries.length;
const editingTimes = group.id in editTimes;
const totalFees = (group.fees ?? 0) + (group.shipping ?? 0) + (group.tip ?? 0);
const feeShare = memberCount > 0 ? Math.round(totalFees / memberCount) : 0;
const getMemberTotal = (m: OrderGroupMember) => {
const base = m.amount ?? 0;
const surcharge = m.surchargeAmount ?? 0;
const dv = group.discountValue ?? 0;
const discount = dv > 0
? (group.discountType === 'percent'
? Math.round((base + surcharge) * dv / 100)
: Math.round(dv / memberCount))
: 0;
return base + surcharge + feeShare - discount;
};
// Poplatky se dělí jen mezi aktivní strávníky (kdo si reálně něco objednal).
const activeCount = countActiveMembers(group.members);
const feeShare = computeFeeShare(totalFees, activeCount);
const feeParams = { totalFees, discountType: group.discountType, discountValue: group.discountValue ?? 0 };
const getMemberTotal = (m: OrderGroupMember) =>
computeMemberTotal(m, feeParams, feeShare, activeCount);
return (
<Card key={group.id} className="mb-3 fade-in">