From e0fe19d46c3a676ab35d8f2978cb0e7b4175db01 Mon Sep 17 00:00:00 2001
From: Aziz <azizerorahman@gmail.com>
Date: Fri, 26 Sep 2025 17:53:16 +0800
Subject: [PATCH 1/2] Refactor getCategoryOptions to return only active
 categories in a tree structure

---
 .../common/src/Repositories/ProductRepo.php   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/innopacks/common/src/Repositories/ProductRepo.php b/innopacks/common/src/Repositories/ProductRepo.php
index fbc9ddd08..72dd0d7e2 100644
--- a/innopacks/common/src/Repositories/ProductRepo.php
+++ b/innopacks/common/src/Repositories/ProductRepo.php
@@ -941,6 +941,27 @@ public function getBundleItems(Product $product): Collection
      */
     public static function getCategoryOptions(): array
     {
-        return CategoryRepo::formatCategoriesForCascader(Category::tree());
+        // Get only active categories and build tree structure
+        $activeCategories = Category::where('active', true)
+            ->with(['translation', 'children.translation'])
+            ->orderBy('position')
+            ->get();
+
+        // Build tree structure manually since we need to filter by active status
+        $tree = collect();
+        $itemsById = $activeCategories->keyBy('id');
+
+        foreach ($activeCategories as $category) {
+            if ($category->parent_id && isset($itemsById[$category->parent_id])) {
+                if (!isset($itemsById[$category->parent_id]->children)) {
+                    $itemsById[$category->parent_id]->children = collect();
+                }
+                $itemsById[$category->parent_id]->children->push($category);
+            } else {
+                $tree->push($category);
+            }
+        }
+
+        return CategoryRepo::formatCategoriesForCascader($tree);
     }
 }

From 3c45e961fa1614d855ed61e8c0c839e538c1cda4 Mon Sep 17 00:00:00 2001
From: Aziz <azizerorahman@gmail.com>
Date: Fri, 26 Sep 2025 17:56:42 +0800
Subject: [PATCH 2/2] Enhance logistics information handling with improved
 error management and input validation

---
 .../settings/_logistics_information.blade.php | 193 ++++++++++++------
 1 file changed, 126 insertions(+), 67 deletions(-)

diff --git a/innopacks/panel/resources/views/settings/_logistics_information.blade.php b/innopacks/panel/resources/views/settings/_logistics_information.blade.php
index 5a960182d..8334693ae 100644
--- a/innopacks/panel/resources/views/settings/_logistics_information.blade.php
+++ b/innopacks/panel/resources/views/settings/_logistics_information.blade.php
@@ -1,81 +1,140 @@
 <!-- Logistics Information Settings -->
 <div class="tab-pane fade" id="tab-setting-logistics-information">
-<div class="container">
-  <div class="row">
-    <div class="ml-4" id="logistics-form">
-      <div class="row col-7">
-        <table class="table table-response align-middle table-bordered">
-          <thead>
-          <tr>
-            <th>{{ __('panel/setting.express_company') }}</th>
-            <th>{{ __('panel/setting.express_code') }}</th>
-            <th></th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr v-for="(item,index) in text" :key="index">
-            <td data-title="State" class="col-5">
-              <el-input v-model="item.company" placeholder="{{ __('panel/setting.express_company') }}"/>
-            </td>
-            <td data-title="Remark" class="col-5">
-              <el-input v-model="item.code" placeholder="{{ __('panel/setting.express_code_hint') }}"/>
-            </td>
-            <td data-title="Update Time" class="col-1">
-              <i class="bi bi-x-circle text-danger cursor-pointer" @click="removeInput(index)"></i>
-            </td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td><i @click="addInput" class="bi bi-plus-circle cursor-pointer"></i></td>
-          </tr>
-          </tbody>
-        </table>
+  <div class="container">
+    <div class="row">
+      <div class="ml-4" id="logistics-form">
+        <div class="row col-7">
+          <table class="table table-response align-middle table-bordered">
+            <thead>
+              <tr>
+                <th>{{ __('panel/setting.express_company') }}</th>
+                <th>{{ __('panel/setting.express_code') }}</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item,index) in text" :key="index">
+                <td data-title="State" class="col-5">
+                  <el-input v-model="item.company" placeholder="{{ __('panel/setting.express_company') }}" />
+                </td>
+                <td data-title="Remark" class="col-5">
+                  <el-input v-model="item.code" placeholder="{{ __('panel/setting.express_code_hint') }}" />
+                </td>
+                <td data-title="Update Time" class="col-1">
+                  <i class="bi bi-x-circle text-danger cursor-pointer" @click="removeInput(index)"></i>
+                </td>
+              </tr>
+              <tr>
+                <td></td>
+                <td></td>
+                <td><i @click="addInput" class="bi bi-plus-circle cursor-pointer"></i></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
     </div>
   </div>
-</div>
 
-<input type="hidden" name="logistics" :value="JSON.stringify(text)" />
+  <input type="hidden" name="logistics" :value="JSON.stringify(text)" />
+
+  <script>
+    document.addEventListener('DOMContentLoaded', function() {
+      // Ensure Vue and ElementPlus are available
+      if (typeof Vue === 'undefined' || typeof ElementPlus === 'undefined') {
+        console.error('Vue.js or ElementPlus is not loaded');
+        return;
+      }
+
+      const {createApp, ref, watch, onMounted} = Vue;
+      const {CirclePlusFilled} = ElementPlus;
+
+      // Get logistics data with better error handling
+      let logisticsData = [];
+      try {
+        const rawData = @json(system_setting('logistics'));
+        logisticsData = Array.isArray(rawData) ? rawData : [];
+      } catch (error) {
+        console.error('Error loading logistics data:', error);
+        logisticsData = [];
+      }
+
+      const logisticsApp = createApp({
+        setup() {
+          // Initialize with proper data structure
+          const text = ref(logisticsData.map(logistic => ({
+            company: logistic.company || '',
+            code: logistic.code || ''
+          })));
+
+          // Ensure we have at least one empty row if no data exists
+          if (text.value.length === 0) {
+            text.value.push({
+              company: '',
+              code: ''
+            });
+          }
 
-<script>
-  const {createApp, ref, watch} = Vue;
-  const {CirclePlusFilled} = ElementPlus;
+          const addInput = () => {
+            text.value.push({
+              company: '',
+              code: ''
+            });
+          };
 
-  const logisticsApp = createApp({
-    setup() {
-      const logisticsData = @json(system_setting('logistics')) || [];
-      const text = ref(Array.isArray(logisticsData) ? logisticsData.map(logistic => ({
-        company: logistic.company || '',
-        code: logistic.code || ''
-      })) : []);
+          const removeInput = (index) => {
+            if (text.value.length > 1) {
+              text.value.splice(index, 1);
+            }
+          };
 
-      const addInput = () => {
-        text.value.push({
-          company: '',
-          code: ''
-        });
-      };
+          // Watch for changes and update hidden input
+          watch(text, (newValue) => {
+            try {
+              const logisticsInput = document.querySelector('input[name="logistics"]');
+              if (logisticsInput) {
+                // Filter out empty entries before saving
+                const filteredData = newValue.filter(item =>
+                  item.company && item.company.trim() !== '' &&
+                  item.code && item.code.trim() !== ''
+                );
+                logisticsInput.value = JSON.stringify(filteredData);
+              }
+            } catch (error) {
+              console.error('Error updating logistics input:', error);
+            }
+          }, { deep: true });
 
-      const removeInput = (index) => {
-        text.value.splice(index, 1);
-      };
+          // Initialize the hidden input on mount
+          onMounted(() => {
+            try {
+              const logisticsInput = document.querySelector('input[name="logistics"]');
+              if (logisticsInput) {
+                const filteredData = text.value.filter(item =>
+                  item.company && item.company.trim() !== '' &&
+                  item.code && item.code.trim() !== ''
+                );
+                logisticsInput.value = JSON.stringify(filteredData);
+              }
+            } catch (error) {
+              console.error('Error initializing logistics input:', error);
+            }
+          });
 
-      watch(text, (newValue) => {
-        const logisticsInput = document.querySelector('input[name="logistics"]');
-        if (logisticsInput) {
-          logisticsInput.value = JSON.stringify(newValue || []);
+          return {
+            text,
+            addInput,
+            removeInput
+          };
         }
-      }, { deep: true });
+      });
 
-      return {
-        text,
-        addInput,
-        removeInput
-      };
-    }
-  });
-  logisticsApp.use(ElementPlus);
-  logisticsApp.mount('#logistics-form');
-</script>
+      try {
+        logisticsApp.use(ElementPlus);
+        logisticsApp.mount('#logistics-form');
+      } catch (error) {
+        console.error('Error mounting logistics Vue app:', error);
+      }
+    });
+  </script>
 </div>