diff --git a/app/methods/account_cfg_methods.py b/app/methods/account_cfg_methods.py index e473b54..65cbdf3 100644 --- a/app/methods/account_cfg_methods.py +++ b/app/methods/account_cfg_methods.py @@ -28,7 +28,7 @@ def load_account_cfg_obj( else: return False if account_cfg_rec := sql_select( - table_name = 'v_account_cfg_detail', # This view should probably be cleaned up + table_name = 'v_account_cfg', # This view should probably be cleaned up field_name = 'account_id', field_value = account_id ): pass diff --git a/app/methods/order_cart_methods.py b/app/methods/order_cart_methods.py index 2c64328..a30d129 100644 --- a/app/methods/order_cart_methods.py +++ b/app/methods/order_cart_methods.py @@ -410,7 +410,7 @@ def old_get_order_cart_obj(order_cart_id=None, inc_order_cart_line_list=None, in order_cart_rec['order_cart_line_list'] = order_cart_line_rec_li if inc_order_cfg: - if order_cfg_rec := sql_select(table_name='v_account_cfg_detail', field_name='account_id', field_value=order_cart_rec.get('account_id', None)): + if order_cfg_rec := sql_select(table_name='v_account_cfg', field_name='account_id', field_value=order_cart_rec.get('account_id', None)): order_cart_rec['cfg'] = order_cfg_rec log.debug(order_cart_rec) diff --git a/app/methods/order_cfg_methods.py b/app/methods/order_cfg_methods.py index ac9a11a..dfefe4d 100644 --- a/app/methods/order_cfg_methods.py +++ b/app/methods/order_cfg_methods.py @@ -24,7 +24,7 @@ def load_order_cfg_obj( else: return False if order_cfg_rec := sql_select( - table_name = 'v_account_cfg_detail', + table_name = 'v_account_cfg', field_name = 'account_id', field_value = account_id, ): pass diff --git a/app/models/account_cfg_models.py b/app/models/account_cfg_models.py index bea51cd..3ecac9a 100644 --- a/app/models/account_cfg_models.py +++ b/app/models/account_cfg_models.py @@ -56,15 +56,31 @@ class Account_Cfg_Base(BaseModel): confirm_email: Optional[str] confirm_name: Optional[str] + # For general event help (attendees and registration) help_event_email: Optional[str] help_event_name: Optional[str] + # For event exhibit help + help_event_exhibit_email: Optional[str] + help_event_exhibit_name: Optional[str] + + # For event presentation management help (chairs, organizers, persenters) + help_event_presenter_email: Optional[str] + help_event_presenter_name: Optional[str] + + # General catch all help help_general_email: Optional[str] help_general_name: Optional[str] + # For contacting the organizations leadership (board, council, committee) + help_leadership_email: Optional[str] + help_leadership_name: Optional[str] + + # For general membership help help_member_email: Optional[str] help_member_name: Optional[str] + # For general technical support help_tech_email: Optional[str] help_tech_name: Optional[str] diff --git a/app/routers/api_crud.py b/app/routers/api_crud.py index dbd8db0..1844e4c 100644 --- a/app/routers/api_crud.py +++ b/app/routers/api_crud.py @@ -66,7 +66,7 @@ obj_type_li = {} #obj_type_li['api_token'] = {'table_name': 'api_token', 'base_name': Api_Token_Base} obj_type_li['account'] = {'table_name': 'account', 'base_name': Account_Base} -obj_type_li['account_cfg'] = {'table_name': 'v_account_cfg_detail', 'base_name': Account_Cfg_Base} # NOTE check view name: *_detail? +obj_type_li['account_cfg'] = {'table_name': 'v_account_cfg', 'base_name': Account_Cfg_Base} # NOTE check view name: *_detail? obj_type_li['activity_log'] = {'table_name': 'activity_log', 'base_name': Activity_Log_Base} obj_type_li['address'] = {'table_name': 'v_address', 'base_name': Address_Base} obj_type_li['archive'] = {'table_name': 'v_archive', 'base_name': Archive_Base}