bonamin
9da396b82a
Backend:
- WaiterShift: add counted_cash_end (physical cash handed over) + cash_discrepancy (computed)
- BusinessDay: add store_opening_cash, store_closing_cash, store_cash_discrepancy
- EndShiftRequest: accept counted_cash_end (optional)
- CloseBusinessDayRequest: accept store_closing_cash (optional)
- Shift end (both /end and /manager/end/{id}): compute cash_discrepancy =
counted_cash_end - (starting_cash + total_collected); negative = short, positive = over
- Business day close: compute store_cash_discrepancy = store_closing_cash - expected;
expected = store_opening_cash + sum(shift.total_collected for day)
- _enrich_shift: expose counted_cash_end + cash_discrepancy in all shift responses
- Business day summary: expose store cash fields + store_expected_closing + total_waiter_collected
- BusinessDayOut schema: expose new store cash fields
- Shifts CSV export: add counted_cash_end + cash_discrepancy columns
Frontend:
- EndShiftConfirmModal: 2-step flow — step 1 notes, step 2 cash handover with live discrepancy
(shows ✓ clean / ⚠ short / ⚠ over in real time before confirming)
- WorkdaySummaryModal close flow: new Ταμείο tab with store cash count + live discrepancy;
footer navigates overview → Ταμείο → Έλεγχοι; store_closing_cash included in close payload
- ShiftsOverview report: Ταμείο column showing counted_cash_end + discrepancy badge
- ShiftDetailModal row 2: replaces Εξ.Τραπεζιών with Παραδόθηκαν + Ταμείο discrepancy
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
40 lines
1.1 KiB
Python
40 lines
1.1 KiB
Python
from pydantic import BaseModel
|
|
from typing import Optional, List
|
|
from schemas.base import UTCDatetime
|
|
|
|
|
|
class ShiftBreakOut(BaseModel):
|
|
id: int
|
|
shift_id: int
|
|
started_at: UTCDatetime
|
|
ended_at: Optional[UTCDatetime] = None
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class WaiterShiftOut(BaseModel):
|
|
id: int
|
|
waiter_id: int
|
|
waiter_name: Optional[str] = None
|
|
business_day_id: int
|
|
started_at: UTCDatetime
|
|
ended_at: Optional[UTCDatetime] = None
|
|
starting_cash: Optional[float] = None
|
|
total_collected: Optional[float] = None
|
|
net_to_deliver: Optional[float] = None
|
|
is_active: bool = True
|
|
notes: Optional[str] = None
|
|
breaks: List[ShiftBreakOut] = []
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class StartShiftRequest(BaseModel):
|
|
starting_cash: Optional[float] = None
|
|
waiter_id: Optional[int] = None # manager use: start shift for a specific waiter
|
|
|
|
|
|
class EndShiftRequest(BaseModel):
|
|
notes: Optional[str] = None
|
|
counted_cash_end: Optional[float] = None # Phase 2E: physical cash waiter hands over
|