Eamco/eamco_money_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bugs

Browse Source
This commit is contained in:
Edwin Eames
2024-09-27 14:13:34 -04:00
parent 6ee78dff2b
commit 033a751441
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/delivery.py
View File

@@ -22,7 +22,7 @@ class Delivery(Base):
gallons_ordered = Column(Integer)
customer_asked_for_fill = Column(Integer)
gallons_delivered = Column(DECIMAL(50, 2))
gallons_delivered = Column(DECIMAL(6, 2))
customer_filled = Column(Integer)
delivery_status = Column(Integer)
@@ -31,20 +31,20 @@ class Delivery(Base):
expected_delivery_date = Column(Date(), default=None)
automatic = Column(Integer)
oil_id = Column(Integer)
supplier_price = Column(DECIMAL(50, 2))
customer_price = Column(DECIMAL(50, 2))
customer_temperature = Column(DECIMAL(50, 2))
supplier_price = Column(DECIMAL(6, 2))
customer_price = Column(DECIMAL(6, 2))
customer_temperature = Column(DECIMAL(6, 2))
dispatcher_notes = Column(Text())
prime = Column(Integer)
same_day = Column(Integer)
payment_type = Column(Integer)
payment_card_id = Column(Integer)
cash_recieved = Column(DECIMAL(50, 2))
cash_recieved = Column(DECIMAL(6, 2))
driver_employee_id = Column(Integer)
driver_first_name = Column(VARCHAR(140))
driver_last_name = Column(VARCHAR(140))
pre_charge_amount = Column(DECIMAL(50, 2))
total_price = Column(DECIMAL(50, 2))
final_price = Column(DECIMAL(50, 2))
pre_charge_amount = Column(DECIMAL(6, 2))
total_price = Column(DECIMAL(6, 2))
final_price = Column(DECIMAL(6, 2))

22
app/models/money.py
View File

@@ -15,14 +15,14 @@ class MoneyDelivery(Base):
delivery_id = Column(Integer)
time_added = Column(TIMESTAMP(), default=datetime.utcnow())
gallons_delivered = Column(DECIMAL(50, 2))
supplier_price = Column(DECIMAL(50, 2))
customer_price = Column(DECIMAL(50, 2))
total_amount_oil = Column(DECIMAL(50, 2))
total_amount_prime = Column(DECIMAL(50, 2))
total_amount_same_day = Column(DECIMAL(50, 2))
total_amount_fee = Column(DECIMAL(50, 2))
total_amount = Column(DECIMAL(50, 2))
taxes_paid = Column(DECIMAL(50, 2))
total_profit = Column(DECIMAL(50, 2))
total_profit_oil = Column(DECIMAL(50, 2))
gallons_delivered = Column(DECIMAL(6, 2))
supplier_price = Column(DECIMAL(6, 2))
customer_price = Column(DECIMAL(6, 2))
total_amount_oil = Column(DECIMAL(6, 2))
total_amount_prime = Column(DECIMAL(6, 2))
total_amount_same_day = Column(DECIMAL(6, 2))
total_amount_fee = Column(DECIMAL(6, 2))
total_amount = Column(DECIMAL(6, 2))
taxes_paid = Column(DECIMAL(6, 2))
total_profit = Column(DECIMAL(6, 2))
total_profit_oil = Column(DECIMAL(6, 2))

14
app/models/pricing.py
View File

@@ -12,11 +12,11 @@ class Pricing_Oil_Oil(Base):
autoincrement=True,
unique=False)
price_from_supplier = Column(DECIMAL(50, 2))
price_for_customer = Column(DECIMAL(50, 2))
price_for_employee = Column(DECIMAL(50, 2))
price_same_day = Column(DECIMAL(50, 2))
price_prime = Column(DECIMAL(50, 2))
price_from_supplier = Column(DECIMAL(6, 2))
price_for_customer = Column(DECIMAL(6, 2))
price_for_employee = Column(DECIMAL(6, 2))
price_same_day = Column(DECIMAL(6, 2))
price_prime = Column(DECIMAL(6, 2))
date = Column(TIMESTAMP(), default=datetime.utcnow())
@@ -30,5 +30,5 @@ class Pricing_Taxes(Base):
autoincrement=True,
unique=False)
state_id = Column(Integer)
taxes_oil = Column(DECIMAL(50, 2))
taxes_other = Column(DECIMAL(50, 2))
taxes_oil = Column(DECIMAL(6, 2))
taxes_other = Column(DECIMAL(6, 2))