Merge branch 'Waybill' into Debug

This commit is contained in:
2024-12-04 16:39:40 +03:00

View File

@@ -1,7 +1,7 @@
from flask import request, Blueprint, render_template, session, redirect, url_for from flask import request, Blueprint, render_template, session, redirect, url_for
from checker import check_auth from checker import check_auth
from .model import index_waybill, form_waybill, clear, button_click, transaction_order_model from .model import index_waybill, form_waybill, clear, button_click, transaction_order_model
from datetime import date from datetime import datetime
waybill_bp = Blueprint('waybill_bp', __name__, template_folder='templates', static_folder='static') waybill_bp = Blueprint('waybill_bp', __name__, template_folder='templates', static_folder='static')
@@ -37,7 +37,7 @@ def save_order():
return redirect(url_for('waybill_bp.index')) return redirect(url_for('waybill_bp.index'))
user_id = session.get('user_id',"") user_id = session.get('user_id',"")
current_date = date.today().strftime("%Y-%m-%d") + ' ' + date.today().strftime("%H:%M:%S") current_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
result = transaction_order_model(user_id, current_date) result = transaction_order_model(user_id, current_date)
if result.status: if result.status: