working money and delivery dates
This commit is contained in:
@@ -15,8 +15,8 @@ class Company_Company(db.Model):
|
||||
company_dba_name = db.Column(db.VARCHAR(250))
|
||||
company_llc_name = db.Column(db.VARCHAR(250))
|
||||
company_town = db.Column(db.VARCHAR(140))
|
||||
company_state = db.Column(db.VARCHAR(140))
|
||||
company_zip = db.Column(db.INTEGER)
|
||||
company_state = db.Column(db.INTEGER)
|
||||
company_zip = db.Column(db.VARCHAR(25))
|
||||
|
||||
|
||||
class Company_Company_schema(ma.SQLAlchemyAutoSchema):
|
||||
|
||||
@@ -13,7 +13,7 @@ class Money_delivery(db.Model):
|
||||
unique=False)
|
||||
|
||||
delivery_id = db.Column(db.INTEGER)
|
||||
time_added = db.Column(db.TIMESTAMP(), datetime.now(timezone.utc).replace(tzinfo=None))
|
||||
time_added = db.Column(db.TIMESTAMP(), default=datetime.utcnow())
|
||||
gallons_delivered = db.Column(db.DECIMAL(50, 2))
|
||||
supplier_price = db.Column(db.DECIMAL(50, 2))
|
||||
customer_price = db.Column(db.DECIMAL(50, 2))
|
||||
@@ -23,7 +23,7 @@ class Money_delivery(db.Model):
|
||||
total_amount_same_day = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount_fee = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount = db.Column(db.DECIMAL(50, 2))
|
||||
|
||||
total_profit_oil = db.Column(db.DECIMAL(50, 2))
|
||||
taxes_paid = db.Column(db.DECIMAL(50, 2))
|
||||
total_profit = db.Column(db.DECIMAL(50, 2))
|
||||
|
||||
@@ -39,7 +39,7 @@ class Pricing_Taxes(db.Model):
|
||||
__bind_key__ = 'eamco'
|
||||
__table_args__ = {"schema": "public"}
|
||||
|
||||
id = db.Column(dn.Integer,
|
||||
id = db.Column(db.Integer,
|
||||
primary_key=True,
|
||||
autoincrement=True,
|
||||
unique=False)
|
||||
|
||||
16
app/classes/taxes.py
Normal file
16
app/classes/taxes.py
Normal file
@@ -0,0 +1,16 @@
|
||||
from app import db, ma
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
class Pricing_Taxes(db.Model):
|
||||
__tablename__ = 'taxes_pricing'
|
||||
__bind_key__ = 'eamco'
|
||||
__table_args__ = {"schema": "public"}
|
||||
|
||||
id = db.Column(db.Integer,
|
||||
primary_key=True,
|
||||
autoincrement=True,
|
||||
unique=False)
|
||||
state_id = db.Column(db.Integer)
|
||||
taxes_oil = db.Column(db.DECIMAL(50, 2))
|
||||
taxes_other = db.Column(db.DECIMAL(50, 2))
|
||||
Reference in New Issue
Block a user