Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on order and Strip related. Also general code clean up

Browse Source
This commit is contained in:
Scott Idem
2022-01-25 20:01:46 -05:00
parent 86b06226cb
commit 59b263e5b8
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/methods/order_methods.py
View File

@@ -345,7 +345,7 @@ def get_order_id_cart_for_person_id_v3(
FROM `order` AS `order`
WHERE
`order`.person_id = :person_id
AND `order`.status = 'open'
AND `order`.status IN ('open', 'locked')
{sql_enabled}
ORDER BY `order`.created_on DESC, `order`.updated_on DESC
{sql_limit};
@@ -534,7 +534,7 @@ def get_order_rec_list(
from_datetime: datetime.datetime = None,
to_datetime: datetime.datetime = None,
# balance_gt: int = 0, # $0 to $99999
status: str = 'closed', # started, in progress, complete, all
status: list|str = 'closed', # started, in progress, complete, all
# checkout_status: str = 'none', # none, canceled, waiting, success, failed, unknown
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 500,
@@ -560,7 +560,10 @@ def get_order_rec_list(
# allowed_status_li = ['open', 'locked', 'reopened', 'closed', 'canceled', 'other'] # NEW list
allowed_status_li = ['open', 'locked', 'in progress', 'reopened', 'closed', 'complete', 'canceled', 'other'] # TEMPORARY list...
sql_status = ''
if status in allowed_status_li:
if isinstance(status, list):
data['status'] = status
sql_status = f'AND `order`.status IN :status'
elif status in allowed_status_li:
if status == 'closed' or status == 'complete':
data['status'] = ['closed', 'complete']
sql_status = f'AND `order`.status IN :status'