sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

production #1

Merged
sipo merged 45 commits from production into master 2026-01-27 18:02:44 +00:00
Conversation 0 Commits 45 Files Changed 553 +7 -6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fc5b54b8a - Show all commits

10
app/Http/Controllers/ImportTemplateController.php
View File

@ -763,19 +763,19 @@ public function import(Request $request)
// Replace IDs in meta if provided
$meta = $json['meta'] ?? [];
if (! empty($data['segment_id'])) {
$meta['segment_id'] = $data['segment_id'];
$meta['segment_id'] = (int) $data['segment_id'];
}
if (! empty($data['decision_id'])) {
$meta['decision_id'] = $data['decision_id'];
$meta['decision_id'] = (int) $data['decision_id'];
}
if (! empty($data['action_id'])) {
$meta['action_id'] = $data['action_id'];
$meta['action_id'] = (int) $data['action_id'];
}
if (! empty($data['activity_action_id'])) {
$meta['activity_action_id'] = $data['activity_action_id'];
$meta['activity_action_id'] = (int) $data['activity_action_id'];
}
if (! empty($data['activity_decision_id'])) {
$meta['activity_decision_id'] = $data['activity_decision_id'];
$meta['activity_decision_id'] = (int) $data['activity_decision_id'];
}
$template = null;

3
resources/js/Pages/Imports/Templates/Index.vue
View File

@ -127,7 +127,8 @@ function handleFileChange(event) {
function performImport() {
// Convert string IDs to integers before submitting
const formData = {
...importForm.data(),
file: importForm.file,
client_uuid: importForm.client_uuid || null,
segment_id: importForm.segment_id ? parseInt(importForm.segment_id) : null,
decision_id: importForm.decision_id ? parseInt(importForm.decision_id) : null,
action_id: importForm.action_id ? parseInt(importForm.action_id) : null,