From cb5169f76371228d330c68fd0fb296a83cd6a9d2 Mon Sep 17 00:00:00 2001 From: teddy Date: Sun, 4 Aug 2024 22:16:47 +0100 Subject: [PATCH] 1. User account page error fix --- static/MySQL/0000_combine.sql | 29 +++++++++- static/MySQL/1200_tbl_Shop_Category.sql | 1 - static/MySQL/3200_tri_Shop_Category.sql.bak | 57 ------------------- static/MySQL/7101_p_shop_get_many_region.sql | 3 + .../MySQL/7116_p_shop_get_many_currency.sql | 2 + templates/_page_user.html | 3 +- 6 files changed, 34 insertions(+), 61 deletions(-) delete mode 100644 static/MySQL/3200_tri_Shop_Category.sql.bak diff --git a/static/MySQL/0000_combine.sql b/static/MySQL/0000_combine.sql index 66657f6b..207d46cf 100644 --- a/static/MySQL/0000_combine.sql +++ b/static/MySQL/0000_combine.sql @@ -962,7 +962,6 @@ CREATE TABLE IF NOT EXISTS Shop_Unit_Measurement_Conversion_Audit ( # Categories - SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Category'; CREATE TABLE IF NOT EXISTS Shop_Category ( @@ -6697,9 +6696,12 @@ BEGIN END // DELIMITER ; + +/* CALL p_shop_get_many_region ( 0 # a_get_inactive_region ); +*/ @@ -6741,9 +6743,11 @@ END // DELIMITER ; +/* CALL p_shop_get_many_currency ( 0 # a_get_inactive_currency ); +*/ @@ -10334,6 +10338,7 @@ DROP PROCEDURE IF EXISTS p_get_many_user; DELIMITER // CREATE PROCEDURE p_get_many_user ( IN a_id_user INT + , IN a_id_user_auth0 VARCHAR(200) , IN a_get_all_user BIT , IN a_get_inactive_user BIT , IN a_get_first_user_only BIT @@ -10379,6 +10384,25 @@ BEGIN msg VARCHAR(4000) NOT NULL ); + IF ISNULL(a_id_user) AND NOT ISNULL(a_id_user_auth0) THEN + SET a_id_user := (SELECT U.id_user FROM Shop_User U WHERE U.id_user_auth0 LIKE CONCAT('%', a_id_user_auth0, '%') LIMIT 1); + END IF; + + IF ISNULL(a_id_user) THEN + INSERT INTO tmp_Msg_Error ( + guid, + id_type, + code, + msg + ) + VALUES ( + v_guid, + v_id_type_error_data, + v_code_error_data, + CONCAT('User ID required for authorisation.') + ) + ; + END IF; SET v_has_filter_user := CASE WHEN a_ids_user = '' AND a_ids_user_auth0= '' THEN 0 ELSE 1 END; @@ -10547,11 +10571,12 @@ DELIMITER ; CALL p_get_many_user ( NULL # a_id_user + , 'auth0|6582b95c895d09a70ba10fef' # a_id_user_auth0 , 0 # a_get_all_user , 0 # a_get_inactive_user , 0 # a_get_first_user_only , NULL # a_ids_user - , '' -- auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 + , 'auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 # ' -- ); */ diff --git a/static/MySQL/1200_tbl_Shop_Category.sql b/static/MySQL/1200_tbl_Shop_Category.sql index 299990fd..19b0c4d6 100644 --- a/static/MySQL/1200_tbl_Shop_Category.sql +++ b/static/MySQL/1200_tbl_Shop_Category.sql @@ -2,7 +2,6 @@ # Categories - SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Category'; CREATE TABLE IF NOT EXISTS Shop_Category ( diff --git a/static/MySQL/3200_tri_Shop_Category.sql.bak b/static/MySQL/3200_tri_Shop_Category.sql.bak deleted file mode 100644 index bc7cfb0c..00000000 --- a/static/MySQL/3200_tri_Shop_Category.sql.bak +++ /dev/null @@ -1,57 +0,0 @@ - -# Shop Category - -USE PARTSLTD_PROD; - -DROP TRIGGER IF EXISTS before_insert_Shop_Category; -DROP TRIGGER IF EXISTS before_update_Shop_Category; - -DELIMITER // -CREATE TRIGGER before_insert_Shop_Category -BEFORE INSERT ON Shop_Category -FOR EACH ROW -BEGIN - SET NEW.created_on = NOW(); - SET NEW.created_by = CURRENT_USER(); -END // -DELIMITER ; - -DELIMITER // -CREATE TRIGGER before_update_Shop_Category -BEFORE UPDATE ON Shop_Category -FOR EACH ROW -BEGIN - IF OLD.id_change_set <=> NEW.id_change_set THEN - SIGNAL SQLSTATE '45000' - SET MESSAGE_TEXT = 'New change Set ID must be provided.'; - END IF; - - INSERT INTO Shop_Category_Audit ( - id_category, - name_field, - value_prev, - value_new, - id_change_set - ) - # Changed code - SELECT NEW.id_category, 'code', OLD.code, NEW.code, NEW.id_change_set - WHERE NOT OLD.code <=> NEW.code - UNION - # Changed name - SELECT NEW.id_category, 'name', OLD.name, NEW.name, NEW.id_change_set - WHERE NOT OLD.name <=> NEW.name - UNION - # Changed description - SELECT NEW.id_category, 'description', OLD.description, NEW.description, NEW.id_change_set - WHERE NOT OLD.description <=> NEW.description - UNION - # Changed active - SELECT NEW.id_category, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set - WHERE NOT (OLD.active <=> NEW.active) - UNION - # Changed display_order - SELECT NEW.id_category, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set - WHERE NOT OLD.display_order <=> NEW.display_order - ; -END // -DELIMITER ; diff --git a/static/MySQL/7101_p_shop_get_many_region.sql b/static/MySQL/7101_p_shop_get_many_region.sql index d51a779d..fc9f6f2c 100644 --- a/static/MySQL/7101_p_shop_get_many_region.sql +++ b/static/MySQL/7101_p_shop_get_many_region.sql @@ -37,6 +37,9 @@ BEGIN END // DELIMITER ; + +/* CALL p_shop_get_many_region ( 0 # a_get_inactive_region ); +*/ diff --git a/static/MySQL/7116_p_shop_get_many_currency.sql b/static/MySQL/7116_p_shop_get_many_currency.sql index 5354955d..6e81c95b 100644 --- a/static/MySQL/7116_p_shop_get_many_currency.sql +++ b/static/MySQL/7116_p_shop_get_many_currency.sql @@ -39,6 +39,8 @@ END // DELIMITER ; +/* CALL p_shop_get_many_currency ( 0 # a_get_inactive_currency ); +*/ diff --git a/templates/_page_user.html b/templates/_page_user.html index c90be08d..53dd9318 100644 --- a/templates/_page_user.html +++ b/templates/_page_user.html @@ -8,7 +8,8 @@
-

Welcome, {{ 'new user' if user.firstname is None else user.firstname }}

+ {% set firstname = 'new user' if user.firstname is none else user.firstname %} +

Welcome, {{ firstname }}

{% set block_id = 'button_get_in_touch' %} {% include '_shared.html' %}