diff --git a/app/models/delivery.py b/app/models/delivery.py index c1ff949..c7fd51e 100644 --- a/app/models/delivery.py +++ b/app/models/delivery.py @@ -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)) \ No newline at end of file + pre_charge_amount = Column(DECIMAL(6, 2)) + total_price = Column(DECIMAL(6, 2)) + final_price = Column(DECIMAL(6, 2)) \ No newline at end of file diff --git a/app/models/money.py b/app/models/money.py index e77d0fb..23501ac 100644 --- a/app/models/money.py +++ b/app/models/money.py @@ -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)) \ No newline at end of file + 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)) \ No newline at end of file diff --git a/app/models/pricing.py b/app/models/pricing.py index 4a55718..624a3c0 100644 --- a/app/models/pricing.py +++ b/app/models/pricing.py @@ -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)) \ No newline at end of file + taxes_oil = Column(DECIMAL(6, 2)) + taxes_other = Column(DECIMAL(6, 2)) \ No newline at end of file