Skip to content

Bugfix logistics management #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
azizerorahman wants to merge 2 commits into from
Closed

Bugfix logistics management #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0fe19d
Refactor getCategoryOptions to return only active categories in a tre…
azizerorahman Sep 26, 2025
3c45e96
Enhance logistics information handling with improved error management…
azizerorahman Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion innopacks/common/src/Repositories/ProductRepo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
193 changes: 126 additions & 67 deletions innopacks/panel/resources/views/settings/_logistics_information.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>