Eamco/eamco_auto_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:23 -04:00
parent 4640b9cb29
commit bcd2ab6113
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -9,6 +9,7 @@ RUN mkdir -p /app
COPY requirements.txt /app COPY requirements.txt /app
WORKDIR /app WORKDIR /app
RUN pip3 install setuptools
RUN pip3 install fastapi RUN pip3 install fastapi
RUN pip3 install sqlalchemy RUN pip3 install sqlalchemy
RUN pip3 install -r requirements.txt RUN pip3 install -r requirements.txt

2
Dockerfile.prod
View File

@@ -9,7 +9,7 @@ RUN mkdir -p /app
COPY requirements.txt /app COPY requirements.txt /app
WORKDIR /app WORKDIR /app
RUN pip3 install setuptools
RUN pip3 install -r requirements.txt RUN pip3 install -r requirements.txt
EXPOSE 8001 EXPOSE 8001

16
app/models/delivery.py
View File

@@ -22,7 +22,7 @@ class Delivery(Base):
gallons_ordered = Column(INTEGER) gallons_ordered = Column(INTEGER)
customer_asked_for_fill = Column(INTEGER) customer_asked_for_fill = Column(INTEGER)
gallons_delivered = Column(DECIMAL(50, 2)) gallons_delivered = Column(DECIMAL(6, 2))
customer_filled = Column(INTEGER) customer_filled = Column(INTEGER)
delivery_status = Column(INTEGER) delivery_status = Column(INTEGER)
@@ -32,20 +32,20 @@ class Delivery(Base):
automatic = Column(INTEGER) automatic = Column(INTEGER)
automatic_id = Column(INTEGER) automatic_id = Column(INTEGER)
oil_id = Column(INTEGER) oil_id = Column(INTEGER)
supplier_price = Column(DECIMAL(50, 2)) supplier_price = Column(DECIMAL(6, 2))
customer_price = Column(DECIMAL(50, 2)) customer_price = Column(DECIMAL(6, 2))
customer_temperature = Column(DECIMAL(50, 2)) customer_temperature = Column(DECIMAL(6, 2))
dispatcher_notes = Column(TEXT()) dispatcher_notes = Column(TEXT())
prime = Column(INTEGER) prime = Column(INTEGER)
same_day = Column(INTEGER) same_day = Column(INTEGER)
payment_type = Column(INTEGER) payment_type = Column(INTEGER)
payment_card_id = 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_employee_id = Column(INTEGER)
driver_first_name = Column(VARCHAR(140)) driver_first_name = Column(VARCHAR(140))
driver_last_name = Column(VARCHAR(140)) driver_last_name = Column(VARCHAR(140))
pre_charge_amount = Column(DECIMAL(50, 2)) pre_charge_amount = Column(DECIMAL(6, 2))
total_price = Column(DECIMAL(50, 2)) total_price = Column(DECIMAL(6, 2))
final_price = Column(DECIMAL(50, 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) delivery_id = Column(Integer)
time_added = Column(TIMESTAMP(), default=datetime.utcnow()) time_added = Column(TIMESTAMP(), default=datetime.utcnow())
gallons_delivered = Column(DECIMAL(50, 2)) gallons_delivered = Column(DECIMAL(6, 2))
supplier_price = Column(DECIMAL(50, 2)) supplier_price = Column(DECIMAL(6, 2))
customer_price = Column(DECIMAL(50, 2)) customer_price = Column(DECIMAL(6, 2))
total_amount_oil = Column(DECIMAL(50, 2)) total_amount_oil = Column(DECIMAL(6, 2))
total_amount_prime = Column(DECIMAL(50, 2)) total_amount_prime = Column(DECIMAL(6, 2))
total_amount_same_day = Column(DECIMAL(50, 2)) total_amount_same_day = Column(DECIMAL(6, 2))
total_amount_fee = Column(DECIMAL(50, 2)) total_amount_fee = Column(DECIMAL(6, 2))
total_amount = Column(DECIMAL(50, 2)) total_amount = Column(DECIMAL(6, 2))
taxes_paid = Column(DECIMAL(50, 2)) taxes_paid = Column(DECIMAL(6, 2))
total_profit = Column(DECIMAL(50, 2)) total_profit = Column(DECIMAL(6, 2))
total_profit_oil = Column(DECIMAL(50, 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, autoincrement=True,
unique=False) unique=False)
price_from_supplier = Column(DECIMAL(50, 2)) price_from_supplier = Column(DECIMAL(6, 2))
price_for_customer = Column(DECIMAL(50, 2)) price_for_customer = Column(DECIMAL(6, 2))
price_for_employee = Column(DECIMAL(50, 2)) price_for_employee = Column(DECIMAL(6, 2))
price_same_day = Column(DECIMAL(50, 2)) price_same_day = Column(DECIMAL(6, 2))
price_prime = Column(DECIMAL(50, 2)) price_prime = Column(DECIMAL(6, 2))
date = Column(TIMESTAMP(), default=datetime.utcnow()) date = Column(TIMESTAMP(), default=datetime.utcnow())
@@ -30,5 +30,5 @@ class Pricing_Taxes(Base):
autoincrement=True, autoincrement=True,
unique=False) unique=False)
state_id = Column(Integer) state_id = Column(Integer)
taxes_oil = Column(DECIMAL(50, 2)) taxes_oil = Column(DECIMAL(6, 2))
taxes_other = Column(DECIMAL(50, 2)) taxes_other = Column(DECIMAL(6, 2))