From 5d021d768380f442bcf1df46b39d8119b437a72b Mon Sep 17 00:00:00 2001
From: Thanakorn <thanakorn.inbox@gmail.com>
Date: Mon, 14 Sep 2026 13:31:26 +0700
Subject: [PATCH] Accept uppercase channel names in onboarding and company
 settings

---
 app/assets/utils/classes/CompanyProfileManager.php | 2 +-
 app/login/api/engine/onboarding.php                | 6 +++---
 app/login/onboarding.php                           | 3 ++-
 app/setting/company.php                            | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/utils/classes/CompanyProfileManager.php b/app/assets/utils/classes/CompanyProfileManager.php
index ef048f0..bd17d2c 100644
--- a/app/assets/utils/classes/CompanyProfileManager.php
+++ b/app/assets/utils/classes/CompanyProfileManager.php
@@ -99,7 +99,7 @@ class CompanyProfileManager
 
     public function saveProfile(array $data, string $company_logo, string $company_seal): void
     {
-        $channel = strtolower(preg_replace('/[^a-z0-9\-_]/', '', $data['channel_name'] ?? ''));
+        $channel = preg_replace('/[^a-z0-9\-_]/', '', strtolower(trim($data['channel_name'] ?? '')));
 
         $sth = $this->pdo->prepare(
             "UPDATE company_list SET
diff --git a/app/login/api/engine/onboarding.php b/app/login/api/engine/onboarding.php
index db7984a..9a6c465 100644
--- a/app/login/api/engine/onboarding.php
+++ b/app/login/api/engine/onboarding.php
@@ -97,9 +97,9 @@ try {
     $company_name  = trim($data['company_name']  ?? '');
     $company_name2 = trim($data['company_name2'] ?? '');
 
-    // channel_name is the URL slug / identifier — strip everything except
-    // lowercase letters, digits, hyphens, and underscores.
-    $channel_name  = strtolower(preg_replace('/[^a-z0-9\-_]/', '', $data['channel_name'] ?? ''));
+    // channel_name is the URL slug / identifier — lowercase first, then strip
+    // everything except lowercase letters, digits, hyphens, and underscores.
+    $channel_name  = preg_replace('/[^a-z0-9\-_]/', '', strtolower(trim($data['channel_name'] ?? '')));
 
     $branch    = trim($data['branch']    ?? 'สำนักงานใหญ่');
     $branch_no = trim($data['branch_no'] ?? '00000');
diff --git a/app/login/onboarding.php b/app/login/onboarding.php
index 1d5adda1..d9d62c7 100644
--- a/app/login/onboarding.php
+++ b/app/login/onboarding.php
@@ -48,7 +48,8 @@
           </div>
           <div class="col-md-6">
             <label class="form-label">Channel Name <span class="text-danger">*</span></label>
-            <input type="text" class="form-control" id="channel_name" placeholder="e.g. my-shop">
+            <input type="text" class="form-control" id="channel_name" placeholder="e.g. my-shop"
+                   oninput="this.value=this.value.toLowerCase().replace(/[^a-z0-9_-]/g,'')">
             <div class="form-text">Unique identifier. Lowercase, no spaces.</div>
           </div>
           <div class="col-md-3">
diff --git a/app/setting/company.php b/app/setting/company.php
index 9f37e9e..2a60c6e 100644
--- a/app/setting/company.php
+++ b/app/setting/company.php
@@ -121,7 +121,8 @@
 
                     <div class="col-md-6 mb-3">
                       <label class="form-label">Nickname / Channel Name</label>
-                      <input type="text" class="form-control" id="channel_name" placeholder="e.g. my-shop">
+                      <input type="text" class="form-control" id="channel_name" placeholder="e.g. my-shop"
+                             oninput="this.value=this.value.toLowerCase().replace(/[^a-z0-9_-]/g,'')">
                       <div class="form-text">Unique identifier. Lowercase, no spaces.</div>
                     </div>
                     <div class="col-md-3 mb-3">