added checks emergency fixed bugs
This commit is contained in:
@@ -13,10 +13,10 @@ class Auto_Temp(db.Model):
|
||||
autoincrement=True,
|
||||
unique=False)
|
||||
todays_date = db.Column(db.TIMESTAMP(), default=datetime.utcnow())
|
||||
temp = db.Column(db.DECIMAL(50, 2))
|
||||
temp_max = db.Column(db.DECIMAL(50, 2))
|
||||
temp_min = db.Column(db.DECIMAL(50, 2))
|
||||
temp_avg = db.Column(db.DECIMAL(50, 2))
|
||||
temp = db.Column(db.DECIMAL(6, 2))
|
||||
temp_max = db.Column(db.DECIMAL(6, 2))
|
||||
temp_min = db.Column(db.DECIMAL(6, 2))
|
||||
temp_avg = db.Column(db.DECIMAL(6, 2))
|
||||
degree_day = db.Column(db.INTEGER())
|
||||
|
||||
class Auto_Temp_schema(ma.SQLAlchemyAutoSchema):
|
||||
|
||||
@@ -23,6 +23,7 @@ class Card_Card(db.Model):
|
||||
security_number = db.Column(db.INTEGER())
|
||||
accepted_or_declined = db.Column(db.INTEGER())
|
||||
main_card = db.Column(db.BOOLEAN())
|
||||
zip_code = db.Column(db.VARCHAR(20))
|
||||
|
||||
class Card_Card_schema(ma.SQLAlchemyAutoSchema):
|
||||
class Meta:
|
||||
|
||||
@@ -24,7 +24,7 @@ class Delivery_Delivery(db.Model):
|
||||
# if customer asked for a fill
|
||||
customer_asked_for_fill = db.Column(db.INTEGER)
|
||||
# integer value if delivered, waiting, cancelled etc
|
||||
gallons_delivered =db.Column(db.DECIMAL(50, 2))
|
||||
gallons_delivered =db.Column(db.DECIMAL(6, 2))
|
||||
# if customer has a full tank
|
||||
customer_filled = db.Column(db.INTEGER)
|
||||
# integer value if delivered, waiting, cancelled etc
|
||||
@@ -36,9 +36,9 @@ class Delivery_Delivery(db.Model):
|
||||
# issue = 5
|
||||
# finalized = 10
|
||||
delivery_status = db.Column(db.INTEGER)
|
||||
emergency = db.Column(db.INTEGER)
|
||||
|
||||
# when the call to order took place
|
||||
when_ordered = db.Column(db.DATE(), default=datetime.utcnow())
|
||||
when_ordered = db.Column(db.DATE(), default=None)
|
||||
# when the delivery date happened
|
||||
when_delivered = db.Column(db.DATE(), default=None)
|
||||
# when the delivery is expected ie what day
|
||||
@@ -48,14 +48,18 @@ class Delivery_Delivery(db.Model):
|
||||
automatic_id = db.Column(db.INTEGER)
|
||||
# OIL info and id from table
|
||||
oil_id = db.Column(db.INTEGER)
|
||||
supplier_price = db.Column(db.DECIMAL(50, 2))
|
||||
customer_price = db.Column(db.DECIMAL(50, 2))
|
||||
supplier_price = db.Column(db.DECIMAL(6, 2))
|
||||
customer_price = db.Column(db.DECIMAL(6, 2))
|
||||
# weather
|
||||
customer_temperature = db.Column(db.DECIMAL(50, 2))
|
||||
customer_temperature = db.Column(db.DECIMAL(6, 2))
|
||||
# services
|
||||
dispatcher_notes = db.Column(db.TEXT())
|
||||
|
||||
|
||||
prime = db.Column(db.INTEGER)
|
||||
same_day = db.Column(db.INTEGER)
|
||||
emergency = db.Column(db.INTEGER)
|
||||
|
||||
# cash = 0
|
||||
# credit = 1
|
||||
# credit/cash = 2
|
||||
@@ -63,15 +67,15 @@ class Delivery_Delivery(db.Model):
|
||||
# other = 4
|
||||
payment_type = db.Column(db.INTEGER)
|
||||
payment_card_id = db.Column(db.INTEGER)
|
||||
cash_recieved = db.Column(db.DECIMAL(50, 2))
|
||||
cash_recieved = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
driver_employee_id = db.Column(db.INTEGER)
|
||||
driver_first_name = db.Column(db.VARCHAR(140))
|
||||
driver_last_name = db.Column(db.VARCHAR(140))
|
||||
|
||||
pre_charge_amount = db.Column(db.DECIMAL(50, 2))
|
||||
total_price = db.Column(db.DECIMAL(50, 2))
|
||||
final_price = db.Column(db.DECIMAL(50, 2))
|
||||
pre_charge_amount = db.Column(db.DECIMAL(6, 2))
|
||||
total_price = db.Column(db.DECIMAL(6, 2))
|
||||
final_price = db.Column(db.DECIMAL(6, 2))
|
||||
check_number = db.Column(db.VARCHAR(20))
|
||||
|
||||
class Delivery_Delivery_schema(ma.SQLAlchemyAutoSchema):
|
||||
|
||||
@@ -64,7 +64,7 @@ class Employee_Vacation(db.Model):
|
||||
employee_id = db.Column(db.INTEGER)
|
||||
employee_name = db.Column(db.VARCHAR(140))
|
||||
employee_total_days_off = db.Column(db.INTEGER)
|
||||
employee_days_off_multiplier = db.Column(db.DECIMAL(50, 2))
|
||||
employee_days_off_multiplier = db.Column(db.DECIMAL(6, 2))
|
||||
employee_days_off_per_year = db.Column(db.INTEGER)
|
||||
|
||||
|
||||
|
||||
@@ -14,18 +14,18 @@ class Money_delivery(db.Model):
|
||||
|
||||
delivery_id = db.Column(db.INTEGER)
|
||||
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))
|
||||
gallons_delivered = db.Column(db.DECIMAL(6, 2))
|
||||
supplier_price = db.Column(db.DECIMAL(6, 2))
|
||||
customer_price = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
total_amount_oil = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount_prime = db.Column(db.DECIMAL(50, 2))
|
||||
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))
|
||||
total_amount_oil = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount_prime = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount_same_day = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount_fee = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount = db.Column(db.DECIMAL(6, 2))
|
||||
total_profit_oil = db.Column(db.DECIMAL(6, 2))
|
||||
taxes_paid = db.Column(db.DECIMAL(6, 2))
|
||||
total_profit = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
|
||||
class Money_delivery_schema(ma.SQLAlchemyAutoSchema):
|
||||
@@ -44,5 +44,5 @@ class Pricing_Taxes(db.Model):
|
||||
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))
|
||||
taxes_oil = db.Column(db.DECIMAL(6, 2))
|
||||
taxes_other = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
@@ -12,17 +12,17 @@ class Stats_Customer(db.Model):
|
||||
primary_key=True,
|
||||
autoincrement=True,
|
||||
unique=False)
|
||||
|
||||
customer_id = db.Column(db.INTEGER)
|
||||
total_calls = db.Column(db.INTEGER)
|
||||
service_calls_total = db.Column(db.INTEGER)
|
||||
service_calls_total_spent = db.Column(db.DECIMAL(50, 2))
|
||||
service_calls_total_profit = db.Column(db.DECIMAL(50, 2))
|
||||
service_calls_total_spent = db.Column(db.DECIMAL(6, 2))
|
||||
service_calls_total_profit = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
|
||||
oil_deliveries = db.Column(db.INTEGER)
|
||||
oil_total_gallons = db.Column(db.INTEGER)
|
||||
oil_total_spent = db.Column(db.DECIMAL(50, 2))
|
||||
oil_total_profit = db.Column(db.DECIMAL(50, 2))
|
||||
oil_total_gallons = db.Column(db.DECIMAL(6, 2))
|
||||
oil_total_spent = db.Column(db.DECIMAL(6, 2))
|
||||
oil_total_profit = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
class Stats_Customer_schema(ma.SQLAlchemyAutoSchema):
|
||||
class Meta:
|
||||
|
||||
@@ -15,11 +15,11 @@ class Delivery_Payment(db.Model):
|
||||
|
||||
delivery_id = db.Column(db.INTEGER)
|
||||
time_added = db.Column(db.TIMESTAMP(), default=datetime.utcnow())
|
||||
total_amount_oil = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount_emergency = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount_prime = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount_fee = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount = db.Column(db.DECIMAL(50, 2))
|
||||
total_amount_oil = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount_emergency = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount_prime = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount_fee = db.Column(db.DECIMAL(6, 2))
|
||||
total_amount = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
class Delivery_Payment_schema(ma.SQLAlchemyAutoSchema):
|
||||
class Meta:
|
||||
|
||||
@@ -12,5 +12,5 @@ class Pricing_Taxes(db.Model):
|
||||
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))
|
||||
taxes_oil = db.Column(db.DECIMAL(6, 2))
|
||||
taxes_other = db.Column(db.DECIMAL(6, 2))
|
||||
|
||||
Reference in New Issue
Block a user