1차완료
This commit is contained in:
@@ -40,9 +40,14 @@ def list_costs(
|
||||
"completed_at": repair.completed_at.isoformat() if repair.completed_at else None,
|
||||
"root_cause": cost.root_cause, "admin_note": cost.admin_note,
|
||||
"cost_party_type": cost.cost_party_type,
|
||||
"cost_party_manufacturer_id": cost.cost_party_manufacturer_id,
|
||||
"cost_party_custom": cost.cost_party_custom,
|
||||
"cost_manufacturer_name": cost.cost_manufacturer.name if cost.cost_manufacturer else None,
|
||||
"recv_party_type": cost.recv_party_type,
|
||||
"recv_party_manufacturer_id": cost.recv_party_manufacturer_id,
|
||||
"recv_party_custom": cost.recv_party_custom,
|
||||
"recv_manufacturer_name": cost.recv_manufacturer.name if cost.recv_manufacturer else None,
|
||||
"cost_amount": cost.cost_amount, "cost_status": cost.cost_status,
|
||||
"manufacturer_name": cost.manufacturer.name if cost.manufacturer else None,
|
||||
"reviewed_by_name": cost.reviewer.name if cost.reviewer else None,
|
||||
"reviewed_at": cost.reviewed_at.isoformat() if cost.reviewed_at else None,
|
||||
})
|
||||
@@ -79,6 +84,9 @@ def upsert_cost(
|
||||
cost_party_type: str = Form(...),
|
||||
cost_party_manufacturer_id: Optional[int] = Form(None),
|
||||
cost_party_custom: str = Form(""),
|
||||
recv_party_type: str = Form(""),
|
||||
recv_party_manufacturer_id: Optional[int] = Form(None),
|
||||
recv_party_custom: str = Form(""),
|
||||
cost_amount: int = Form(0),
|
||||
cost_status: str = Form("pending"),
|
||||
db: Session = Depends(get_db),
|
||||
@@ -93,6 +101,9 @@ def upsert_cost(
|
||||
cost.cost_party_type = cost_party_type
|
||||
cost.cost_party_manufacturer_id = cost_party_manufacturer_id or None
|
||||
cost.cost_party_custom = cost_party_custom or None
|
||||
cost.recv_party_type = recv_party_type or None
|
||||
cost.recv_party_manufacturer_id = recv_party_manufacturer_id or None
|
||||
cost.recv_party_custom = recv_party_custom or None
|
||||
cost.cost_amount = cost_amount; cost.cost_status = cost_status
|
||||
cost.reviewed_by = current_user.id; cost.reviewed_at = datetime.now()
|
||||
else:
|
||||
@@ -101,6 +112,9 @@ def upsert_cost(
|
||||
cost_party_type=cost_party_type,
|
||||
cost_party_manufacturer_id=cost_party_manufacturer_id or None,
|
||||
cost_party_custom=cost_party_custom or None,
|
||||
recv_party_type=recv_party_type or None,
|
||||
recv_party_manufacturer_id=recv_party_manufacturer_id or None,
|
||||
recv_party_custom=recv_party_custom or None,
|
||||
cost_amount=cost_amount, cost_status=cost_status,
|
||||
reviewed_by=current_user.id, reviewed_at=datetime.now()
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user