From 1d743abd87beaa0ef46f533447820d83a68ab910 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 4 Oct 2023 13:58:53 +0800 Subject: [PATCH] Fix saving of the enye character. #762 --- src/Command/GetJobOrderArchiveDataCommand.php | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/Command/GetJobOrderArchiveDataCommand.php b/src/Command/GetJobOrderArchiveDataCommand.php index cd764e56..b289cff6 100644 --- a/src/Command/GetJobOrderArchiveDataCommand.php +++ b/src/Command/GetJobOrderArchiveDataCommand.php @@ -403,7 +403,8 @@ class GetJobOrderArchiveDataCommand extends Command `initial_concern_notes` longtext COLLATE utf8_unicode_ci DEFAULT NULL, `gender` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL, `caller_classification` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL, - `inventory_count` smallint(6) NOT NULL, PRIMARY KEY (`id`))'; + `inventory_count` smallint(6) NOT NULL, PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; $create_stmt = $db->prepare($create_sql); @@ -435,7 +436,8 @@ class GetJobOrderArchiveDataCommand extends Command `total_price` decimal(9,2) NOT NULL, `status` varchar(40) COLLATE utf8_unicode_ci NOT NULL, `promo_id` int(11) DEFAULT NULL, - `used_customer_tag_id` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`))'; + `used_customer_tag_id` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; $create_stmt = $db->prepare($create_sql); @@ -457,7 +459,8 @@ class GetJobOrderArchiveDataCommand extends Command `title` varchar(80) COLLATE utf8_unicode_ci NOT NULL, `qty` smallint(6) NOT NULL, `price` decimal(9,2) NOT NULL, - `battery_id` int(11) DEFAULT NULL, PRIMARY KEY (`id`))'; + `battery_id` int(11) DEFAULT NULL, PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; $create_stmt = $db->prepare($create_sql); @@ -491,7 +494,8 @@ class GetJobOrderArchiveDataCommand extends Command `subticket_type_id` int(11) DEFAULT NULL, `source_of_awareness` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL, `remarks` longtext COLLATE utf8_unicode_ci DEFAULT NULL, - `other_description` longtext COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`))'; + `other_description` longtext COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; $create_stmt = $db->prepare($create_sql); @@ -515,7 +519,8 @@ class GetJobOrderArchiveDataCommand extends Command `date_create` datetime NOT NULL, `reason` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `remarks` longtext COLLATE utf8_unicode_ci DEFAULT NULL, - `contact_person` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`))'; + `contact_person` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; $create_stmt = $db->prepare($create_sql); @@ -538,7 +543,8 @@ class GetJobOrderArchiveDataCommand extends Command `jo_id` int(11) DEFAULT NULL, `date_create` datetime NOT NULL, `rating` int(11) NOT NULL, - `comment` longtext COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`))'; + `comment` longtext COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; $create_stmt = $db->prepare($create_sql); @@ -561,7 +567,8 @@ class GetJobOrderArchiveDataCommand extends Command `date_create` datetime NOT NULL, `date_happen` datetime NOT NULL, `type_id` varchar(30) COLLATE utf8_unicode_ci NOT NULL, - `rider_id` int(11) DEFAULT NULL, PRIMARY KEY (`id`))'; + `rider_id` int(11) DEFAULT NULL, PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; $create_stmt = $db->prepare($create_sql); @@ -741,7 +748,8 @@ class GetJobOrderArchiveDataCommand extends Command if ($tname == 'job_order') { // load statement for job order - $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + CHARACTER SET UTF8 FIELDS TERMINATED BY \'|\' ESCAPED BY \'\b\' LINES TERMINATED BY \'\\r\\n\' @@ -762,6 +770,7 @@ class GetJobOrderArchiveDataCommand extends Command if ($tname == 'jo_event') { $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + CHARACTER SET UTF8 FIELDS TERMINATED BY \'|\' ESCAPED BY \'\b\' LINES TERMINATED BY \'\\r\\n\' @@ -770,6 +779,7 @@ class GetJobOrderArchiveDataCommand extends Command if ($tname == 'jo_rejection') { $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + CHARACTER SET UTF8 FIELDS TERMINATED BY \'|\' ESCAPED BY \'\b\' LINES TERMINATED BY \'\\r\\n\' @@ -778,6 +788,7 @@ class GetJobOrderArchiveDataCommand extends Command if ($tname == 'invoice') { $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + CHARACTER SET UTF8 FIELDS TERMINATED BY \'|\' ESCAPED BY \'\b\' LINES TERMINATED BY \'\\r\\n\' @@ -787,6 +798,7 @@ class GetJobOrderArchiveDataCommand extends Command if ($tname == 'rider_rating') { $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + CHARACTER SET UTF8 FIELDS TERMINATED BY \'|\' ESCAPED BY \'\b\' LINES TERMINATED BY \'\\r\\n\' @@ -795,6 +807,7 @@ class GetJobOrderArchiveDataCommand extends Command if ($tname == 'ticket') { $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + CHARACTER SET UTF8 FIELDS TERMINATED BY \'|\' ESCAPED BY \'\b\' LINES TERMINATED BY \'\\r\\n\' @@ -805,6 +818,7 @@ class GetJobOrderArchiveDataCommand extends Command if ($tname == 'invoice_item') { $load_stmt = 'LOAD DATA LOCAL INFILE \'' . $file . '\' INTO TABLE ' . $archive_tname . ' + CHARACTER SET UTF8 FIELDS TERMINATED BY \'|\' ESCAPED BY \'\b\' LINES TERMINATED BY \'\\r\\n\' @@ -874,7 +888,7 @@ class GetJobOrderArchiveDataCommand extends Command $update_active_sql = 'UPDATE rider SET active_jo_id = NULL WHERE active_jo_id IN (' . $jo_ids . ')'; $update_active_stmt = $db->prepare($update_active_sql); - error_log('Updating active rider job orders...'); + // error_log('Updating active rider job orders...'); $update_active_stmt->execute($jo_id_list); @@ -891,7 +905,7 @@ class GetJobOrderArchiveDataCommand extends Command $update_curr_sql = 'UPDATE rider SET current_jo_id = NULL WHERE current_jo_id IN (' . $jo_ids . ')'; $update_curr_stmt = $db->prepare($update_curr_sql); - error_log('Updating current rider job orders...'); + // error_log('Updating current rider job orders...'); $update_curr_stmt->execute($jo_id_list);