1. User account page error fix

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 # ' -- 
 );
 
 */

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 (

static/MySQL/3200_tri_Shop_Category.sql.bak

@@ -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 ;

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
 );
+*/

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
 );
+*/

templates/_page_user.html

@@ -8,7 +8,8 @@
 
     <!-- HTML content -->
     <div>
-        <h2 style="font-size: 24px; color: white; font-weight: normal;">Welcome, {{ 'new user' if user.firstname is None else user.firstname }}</h2>
+        {% set firstname = 'new user' if user.firstname is none else user.firstname %}
+        <h2 style="font-size: 24px; color: white; font-weight: normal;">Welcome, {{ firstname }}</h2>
         {% set block_id = 'button_get_in_touch' %}
         {% include '_shared.html' %}
     </div>