fix: new deal statuses, delivery date, receiving slot date
This commit is contained in:
@@ -40,6 +40,7 @@ class DealSummary(BaseSchema):
|
||||
|
||||
delivery_date: Optional[datetime.datetime] = None
|
||||
receiving_slot_date: Optional[datetime.datetime] = None
|
||||
bill_request: Optional[DealBillRequestSchema] = None
|
||||
|
||||
|
||||
class DealServiceSchema(BaseSchema):
|
||||
|
||||
@@ -208,6 +208,7 @@ class DealService(BaseService):
|
||||
selectinload(Deal.status_history),
|
||||
joinedload(Deal.client),
|
||||
joinedload(Deal.shipping_warehouse),
|
||||
joinedload(Deal.bill_request)
|
||||
)
|
||||
.outerjoin(
|
||||
price_subquery, Deal.id == price_subquery.c.deal_id,
|
||||
@@ -252,7 +253,8 @@ class DealService(BaseService):
|
||||
shipment_warehouse_name=shipment_warehouse_name,
|
||||
total_products=products_count,
|
||||
delivery_date=deal.delivery_date,
|
||||
receiving_slot_date=deal.receiving_slot_date
|
||||
receiving_slot_date=deal.receiving_slot_date,
|
||||
bill_request=deal.bill_request
|
||||
)
|
||||
)
|
||||
return DealSummaryResponse(summaries=summaries)
|
||||
|
||||
Reference in New Issue
Block a user