Eamco/eamco_office_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 5-tier pricing, market ticker integration, and delivery stats

Browse Source 
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>
This commit is contained in:
Edwin Eames
2026-02-08 17:54:30 -05:00
parent 43a14eba2c
commit 6d5f44db55
18 changed files with 995 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/delivery_data/views.py
View File

@@ -4,7 +4,7 @@ from datetime import datetime
from decimal import Decimal
from app.delivery_data import delivery_data
from app import db
from app.common.responses import success_response
from app.common.responses import success_response, error_response
from app.classes.customer import Customer_Customer, Customer_Description
from app.classes.delivery import Delivery_Delivery
from app.classes.employee import Employee_Employee
@@ -29,8 +29,12 @@ def office_finalize_delivery(delivery_id):
get_delivery = db.session \
.query(Delivery_Delivery) \
.filter(Delivery_Delivery.id == delivery_id) \
.filter(Delivery_Delivery.id == delivery_id) \
.first()
if get_delivery is None:
return error_response("Delivery not found", 404)
get_customer = db.session \
.query(Customer_Customer) \
.filter(Customer_Customer.id == get_delivery.customer_id) \
@@ -60,7 +64,12 @@ def office_finalize_delivery(delivery_id):
.filter(Employee_Employee.id == get_delivery.driver_employee_id)
.first())
get_stats_employee = (db.session
if get_driver is None:
logger.warning(f"Driver with ID {get_delivery.driver_employee_id} not found for delivery {delivery_id}. Proceeding without updating driver stats.")
get_stats_employee = None
if get_driver:
get_stats_employee = (db.session
.query(Stats_Employee_Oil)
.filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id)
.first())
@@ -89,7 +98,7 @@ def office_finalize_delivery(delivery_id):
.filter(Stats_Customer.customer_id == get_customer.id)
.first())
if get_stats_employee is None:
if get_driver and get_stats_employee is None:
create_stats = Stats_Employee_Oil(
employee_id = get_delivery.driver_employee_id,
total_deliveries = 0,
@@ -116,10 +125,11 @@ def office_finalize_delivery(delivery_id):
fill_location = request.json.get("fill_location")
# update driver
get_delivery.driver_last_name = get_driver.employee_last_name
get_delivery.driver_first_name = get_driver.employee_first_name
get_delivery.driver_employee_id = get_driver.id
# update driver if found
if get_driver:
get_delivery.driver_last_name = get_driver.employee_last_name
get_delivery.driver_first_name = get_driver.employee_first_name
get_delivery.driver_employee_id = get_driver.id
# update delivery
get_delivery.when_delivered = now
@@ -128,12 +138,13 @@ def office_finalize_delivery(delivery_id):
get_delivery.check_number = check_number
get_delivery.delivery_status = 10
# update stats employee
current_deliveres = get_stats_employee.total_deliveries + 1
get_stats_employee.total_deliveries = current_deliveres
current_gallons_delivered = Decimal(get_stats_employee.total_gallons_delivered) + Decimal(gallons_delivered)
get_stats_employee.total_gallons_delivered = current_gallons_delivered
# update stats employee if found
if get_stats_employee:
current_deliveres = get_stats_employee.total_deliveries + 1
get_stats_employee.total_deliveries = current_deliveres
current_gallons_delivered = Decimal(get_stats_employee.total_gallons_delivered) + Decimal(gallons_delivered)
get_stats_employee.total_gallons_delivered = current_gallons_delivered
# update stats customer
current_deliveres = int(get_stats_customer.oil_deliveries) + 1
@@ -148,7 +159,8 @@ def office_finalize_delivery(delivery_id):
db.session.add(get_customer_description)
db.session.add(get_stats_customer)
db.session.add(get_stats_employee)
if get_stats_employee:
db.session.add(get_stats_employee)
db.session.add(get_delivery)
db.session.commit()