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>
29 lines
1.3 KiB
Python
29 lines
1.3 KiB
Python
from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Text
|
|
from sqlalchemy.orm import relationship
|
|
from datetime import datetime, timezone
|
|
from database import Base
|
|
|
|
|
|
def _utcnow():
|
|
return datetime.now(timezone.utc)
|
|
|
|
|
|
class BusinessDay(Base):
|
|
__tablename__ = "business_days"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
status = Column(String, default="open", nullable=False) # 'open' | 'closed'
|
|
opened_at = Column(DateTime(timezone=True), default=_utcnow, nullable=False)
|
|
opened_by_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
closed_at = Column(DateTime(timezone=True), nullable=True)
|
|
closed_by_id = Column(Integer, ForeignKey("users.id"), nullable=True)
|
|
notes = Column(Text, nullable=True)
|
|
# Phase 2E — store-level cash reconciliation
|
|
store_opening_cash = Column(Float, nullable=True) # physical cash when day opens
|
|
store_closing_cash = Column(Float, nullable=True) # physical cash counted at close
|
|
store_cash_discrepancy = Column(Float, nullable=True) # store_closing - expected
|
|
|
|
opener = relationship("User", foreign_keys=[opened_by_id])
|
|
closer = relationship("User", foreign_keys=[closed_by_id])
|
|
shifts = relationship("WaiterShift", back_populates="business_day")
|