General code clean up and bug fixes. Still working on order and orders that are carts

This commit is contained in:
Scott Idem
2022-01-22 18:53:21 -05:00
parent ab0b900721
commit 4a8c77d4e0
5 changed files with 11 additions and 10 deletions

View File

@@ -45,7 +45,7 @@ class Order_Line_Base(BaseModel):
product_type_name: Optional[str] # Copied from product record; from look up
product_name: Optional[str] # Copied from product record
product_description: Optional[str] # Copied from product record
# product_description: Optional[str] # Copied from product record
product_unit_price: Optional[int] # Copied from product record
product_recurring: Optional[bool] # Copied from product record
@@ -63,7 +63,7 @@ class Order_Line_Base(BaseModel):
curr_product_type_name: Optional[str] # Dynamic from v_order_line
curr_product_name: Optional[str] # Dynamic from v_order_line
curr_product_description: Optional[str] # Dynamic from v_order_line
# curr_product_description: Optional[str] # Dynamic from v_order_line
curr_product_unit_price: Optional[int] # Dynamic from v_order_line
curr_product_max_quantity: Optional[int] # Dynamic from v_order_line
curr_product_recurring: Optional[bool] # Dynamic from v_order_line
@@ -91,7 +91,7 @@ class Order_Line_Base(BaseModel):
# Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem.
dollar_amount: Optional[str] # From SQL view
dollar_total: int = Optional[str] # From SQL view
dollar_total: Optional[str] # From SQL view
order_status: Optional[str]
order_notes: Optional[str]

View File

@@ -58,8 +58,8 @@ class Order_Base(BaseModel):
# Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem.
dollar_total_bill: Optional[str] # From SQL view
dollar_total_paid: int = Optional[str] # From SQL view
dollar_balance: int = Optional[str] # From SQL view
dollar_total_paid: Optional[str] # From SQL view
dollar_balance: Optional[str] # From SQL view
# Including other related objects
cfg: Optional[Order_Cfg_Base]