From 8c7aa31cdf1f13f5212a5afabeed8e08874b2936 Mon Sep 17 00:00:00 2001
From: "Tommy\\2Fi-Staff" <tommy.lu@2fi-solutions.com.hk>
Date: Tue, 13 Jan 2026 11:59:48 +0800
Subject: [PATCH] TrucklaneDetail add shop branches

---
 src/components/CreateItem/CreateItem.tsx |  3 +--
 src/components/Shop/TruckLaneDetail.tsx  | 24 ++++++++++++++++++++++--
 src/i18n/en/common.json                  |  3 +++
 src/i18n/zh/common.json                  |  1 +
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/components/CreateItem/CreateItem.tsx b/src/components/CreateItem/CreateItem.tsx
index 69b8e9e..f4fd8e2 100644
--- a/src/components/CreateItem/CreateItem.tsx
+++ b/src/components/CreateItem/CreateItem.tsx
@@ -159,9 +159,8 @@ const CreateItem: React.FC<Props> = ({
         console.log(qcCheck);
         // return
         // do api
-        console.log("asdad");
         const responseI = await saveItem(data);
-        console.log("asdad");
+      
         const responseQ = await saveItemQcChecks(qcCheck);
         if (responseI && responseQ) {
           if (!Boolean(responseI.id)) {
diff --git a/src/components/Shop/TruckLaneDetail.tsx b/src/components/Shop/TruckLaneDetail.tsx
index 21b5536..e8eef0f 100644
--- a/src/components/Shop/TruckLaneDetail.tsx
+++ b/src/components/Shop/TruckLaneDetail.tsx
@@ -69,6 +69,7 @@ const TruckLaneDetail: React.FC = () => {
   const [uniqueRemarks, setUniqueRemarks] = useState<string[]>([]);
   const [uniqueShopCodes, setUniqueShopCodes] = useState<string[]>([]);
   const [uniqueShopNames, setUniqueShopNames] = useState<string[]>([]);
+  const [shopNameByCodeMap, setShopNameByCodeMap] = useState<Map<string, string>>(new Map());
   const [addShopDialogOpen, setAddShopDialogOpen] = useState<boolean>(false);
   const [newShop, setNewShop] = useState({
     shopName: "",
@@ -86,11 +87,12 @@ const TruckLaneDetail: React.FC = () => {
   useEffect(() => {
     const fetchAutocompleteData = async () => {
       try {
-        const [shopData, remarks, codes, names] = await Promise.all([
+        const [shopData, remarks, codes, names, allShopsFromShopTable] = await Promise.all([
           findAllUniqueShopNamesAndCodesFromTrucksClient() as Promise<Array<{ name: string; code: string }>>,
           findAllUniqueRemarksFromTrucksClient() as Promise<string[]>,
           findAllUniqueShopCodesFromTrucksClient() as Promise<string[]>,
           findAllUniqueShopNamesFromTrucksClient() as Promise<string[]>,
+          fetchAllShopsClient() as Promise<ShopAndTruck[]>,
         ]);
 
         // Convert to Shop format (id will be 0 since we don't have shop IDs from truck table)
@@ -105,6 +107,15 @@ const TruckLaneDetail: React.FC = () => {
         setUniqueRemarks(remarks || []);
         setUniqueShopCodes(codes || []);
         setUniqueShopNames(names || []);
+
+        // Create lookup map: shopCode -> shopName from shop table
+        const shopNameMap = new Map<string, string>();
+        (allShopsFromShopTable || []).forEach((shop) => {
+          if (shop.code) {
+            shopNameMap.set(String(shop.code).trim().toLowerCase(), String(shop.name || "").trim());
+          }
+        });
+        setShopNameByCodeMap(shopNameMap);
       } catch (err) {
         console.error("Failed to load autocomplete data:", err);
       }
@@ -700,6 +711,7 @@ const TruckLaneDetail: React.FC = () => {
                 <TableHead>
                   <TableRow>
                     <TableCell>{t("Shop Name")}</TableCell>
+                    <TableCell>{t("Shop Branch")}</TableCell>
                     <TableCell>{t("Shop Code")}</TableCell>
                     <TableCell>{t("Remark")}</TableCell>
                     <TableCell>{t("Loading Sequence")}</TableCell>
@@ -709,7 +721,7 @@ const TruckLaneDetail: React.FC = () => {
                 <TableBody>
                   {shopsData.length === 0 ? (
                     <TableRow>
-                      <TableCell colSpan={5} align="center">
+                      <TableCell colSpan={6} align="center">
                         <Typography variant="body2" color="text.secondary">
                           {t("No shops found using this truck lane")}
                         </Typography>
@@ -719,6 +731,14 @@ const TruckLaneDetail: React.FC = () => {
                     shopsData.map((shop, index) => (
                       <TableRow key={shop.id ?? `shop-${index}`}>
                         <TableCell>
+                          {/* Shop Name from shop table (read-only, looked up by shop code) */}
+                          {(() => {
+                            const shopCode = String(shop.code || "").trim().toLowerCase();
+                            return shopNameByCodeMap.get(shopCode) || "-";
+                          })()}
+                        </TableCell>
+                        <TableCell>
+                          {/* Shop Branch from truck table (editable) */}
                           {editingRowIndex === index ? (
                             <Autocomplete
                               freeSolo
diff --git a/src/i18n/en/common.json b/src/i18n/en/common.json
index 08e0da5..625748a 100644
--- a/src/i18n/en/common.json
+++ b/src/i18n/en/common.json
@@ -26,6 +26,9 @@
     "Shop added to truck lane successfully": "Shop added to truck lane successfully",
     "Failed to create shop in truck lane": "Failed to create shop in truck lane",
     "Add Shop": "Add Shop",
+    "Shop Name": "Shop Name",
+    "Shop Branch": "Shop Branch",
+    "Shop Code": "Shop Code",
     "Search or select shop name": "Search or select shop name",
     "Search or select shop code": "Search or select shop code",
     "Search or select remark": "Search or select remark",
diff --git a/src/i18n/zh/common.json b/src/i18n/zh/common.json
index 7354605..b3ad1f6 100644
--- a/src/i18n/zh/common.json
+++ b/src/i18n/zh/common.json
@@ -317,6 +317,7 @@
     "ShopAndTruck": "店鋪路線管理",
     "Shop Information": "店鋪資訊",
     "Shop Name": "店鋪名稱",
+    "Shop Branch": "店鋪分店",
     "Shop Code": "店鋪編號",
     "Truck Lane": "卡車路線",
     "Truck Lane Detail": "卡車路線詳情",