Edwin Eames
6d5f44db55
Major update spanning pricing, market data, and analytics: - Pricing: Replace single-price service fees with 5-tier pricing for same-day, prime, and emergency deliveries across create/edit/finalize - Market: Add Ticker_Price and CompanyPrice models with endpoints for live commodity prices (HO, CL, RB) and competitor price tracking - Stats: Add daily/weekly/monthly gallons endpoints with multi-year comparison and YoY totals for the stats dashboard - Delivery: Add map and history endpoints, fix finalize null-driver crash - Schema: Change fill_location from INTEGER to VARCHAR(250), add pre_load normalization for customer updates, fix admin auth check Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
54 lines
1.8 KiB
Python
Executable File
54 lines
1.8 KiB
Python
Executable File
from app import db, ma, login_manager
|
|
from datetime import datetime
|
|
|
|
|
|
|
|
|
|
|
|
class Pricing_Oil_Oil(db.Model):
|
|
__tablename__ = 'pricing_oil_oil'
|
|
__table_args__ = {"schema": "public"}
|
|
|
|
id = db.Column(db.Integer,
|
|
primary_key=True,
|
|
autoincrement=True,
|
|
unique=False)
|
|
|
|
price_from_supplier = db.Column(db.DECIMAL(6, 2))
|
|
price_for_customer = db.Column(db.DECIMAL(6, 2))
|
|
price_for_employee = db.Column(db.DECIMAL(6, 2))
|
|
|
|
# Legacy single-tier pricing (kept for backward compatibility)
|
|
price_same_day = db.Column(db.DECIMAL(6, 2))
|
|
price_prime = db.Column(db.DECIMAL(6, 2))
|
|
price_emergency = db.Column(db.DECIMAL(6, 2))
|
|
|
|
# New 5-tier pricing for same_day service
|
|
price_same_day_tier1 = db.Column(db.DECIMAL(6, 2))
|
|
price_same_day_tier2 = db.Column(db.DECIMAL(6, 2))
|
|
price_same_day_tier3 = db.Column(db.DECIMAL(6, 2))
|
|
price_same_day_tier4 = db.Column(db.DECIMAL(6, 2))
|
|
price_same_day_tier5 = db.Column(db.DECIMAL(6, 2))
|
|
|
|
# New 5-tier pricing for prime service
|
|
price_prime_tier1 = db.Column(db.DECIMAL(6, 2))
|
|
price_prime_tier2 = db.Column(db.DECIMAL(6, 2))
|
|
price_prime_tier3 = db.Column(db.DECIMAL(6, 2))
|
|
price_prime_tier4 = db.Column(db.DECIMAL(6, 2))
|
|
price_prime_tier5 = db.Column(db.DECIMAL(6, 2))
|
|
|
|
# New 5-tier pricing for emergency service
|
|
price_emergency_tier1 = db.Column(db.DECIMAL(6, 2))
|
|
price_emergency_tier2 = db.Column(db.DECIMAL(6, 2))
|
|
price_emergency_tier3 = db.Column(db.DECIMAL(6, 2))
|
|
price_emergency_tier4 = db.Column(db.DECIMAL(6, 2))
|
|
price_emergency_tier5 = db.Column(db.DECIMAL(6, 2))
|
|
|
|
date = db.Column(db.TIMESTAMP(), default=datetime.utcnow())
|
|
|
|
|
|
class Pricing_Oil_Oil_schema(ma.SQLAlchemyAutoSchema):
|
|
class Meta:
|
|
model = Pricing_Oil_Oil
|
|
|