diff --git a/app/Http/Controllers/ClientCaseContoller.php b/app/Http/Controllers/ClientCaseContoller.php index f727c4f..0476580 100644 --- a/app/Http/Controllers/ClientCaseContoller.php +++ b/app/Http/Controllers/ClientCaseContoller.php @@ -872,7 +872,7 @@ public function show(ClientCase $clientCase) ->get(['id', 'name', 'color_tag', 'segment_id']), 'types' => $types, 'segments' => $case->segments()->wherePivot('active', true)->get(['segments.id', 'segments.name']), - 'all_segments' => \App\Models\Segment::query()->where('active', true)->get(['id', 'name']), + 'all_segments' => Segment::query()->where('active', true)->get(['id', 'name']), 'current_segment' => $currentSegment, 'sms_profiles' => \App\Models\SmsProfile::query() ->select(['id', 'name', 'default_sender_id']) @@ -1345,10 +1345,10 @@ public function sendSmsToPhone(ClientCase $clientCase, Request $request, int $ph if (! empty($validated['sender_id'])) { $sender = \App\Models\SmsSender::query()->find($validated['sender_id']); if (! $sender) { - return back()->with('error', 'Izbran po┼íiljatelj ne obstaja.'); + return back()->with('error', 'Izbran pošiljatelj ne obstaja.'); } if ($profile && (int) $sender->profile_id !== (int) $profile->id) { - return back()->with('error', 'Izbran po┼íiljatelj ne pripada izbranemu profilu.'); + return back()->with('error', 'Izbran pošiljatelj ne pripada izbranemu profilu.'); } } if (! $profile) { @@ -1391,7 +1391,7 @@ public function sendSmsToPhone(ClientCase $clientCase, Request $request, int $ph } // Create an activity before sending - $activityNote = sprintf('┼át: %s | Telo: %s', (string) $phone->nu, (string) $validated['message']); + $activityNote = sprintf('Št: %s | Telo: %s', (string) $phone->nu, (string) $validated['message']); $activityData = [ 'note' => $activityNote, 'user_id' => optional($request->user())->id, diff --git a/resources/js/Components/DatePicker.vue b/resources/js/Components/DatePicker.vue index 998130c..a053dfc 100644 --- a/resources/js/Components/DatePicker.vue +++ b/resources/js/Components/DatePicker.vue @@ -2,11 +2,7 @@ import { computed, ref, useAttrs } from "vue"; import { Button } from "@/Components/ui/button"; import { Calendar } from "@/Components/ui/calendar"; -import { - Popover, - PopoverContent, - PopoverTrigger, -} from "@/Components/ui/popover"; +import { Popover, PopoverContent, PopoverTrigger } from "@/Components/ui/popover"; import { cn } from "@/lib/utils"; import { CalendarIcon } from "lucide-vue-next"; import { format } from "date-fns"; @@ -86,7 +82,9 @@ const toCalendarDate = (value) => { // Convert CalendarDate to ISO string (YYYY-MM-DD) const fromCalendarDate = (calendarDate) => { if (!calendarDate) return null; - return `${String(calendarDate.year).padStart(4, "0")}-${String(calendarDate.month).padStart(2, "0")}-${String(calendarDate.day).padStart(2, "0")}`; + return `${String(calendarDate.year).padStart(4, "0")}-${String( + calendarDate.month + ).padStart(2, "0")}-${String(calendarDate.day).padStart(2, "0")}`; }; const calendarDate = computed({ @@ -142,11 +140,10 @@ const open = ref(false); - +

{{ Array.isArray(error) ? error[0] : error }}

- diff --git a/resources/js/Pages/Cases/Partials/ActivityDrawer.vue b/resources/js/Pages/Cases/Partials/ActivityDrawer.vue index 1213ea8..b826ace 100644 --- a/resources/js/Pages/Cases/Partials/ActivityDrawer.vue +++ b/resources/js/Pages/Cases/Partials/ActivityDrawer.vue @@ -480,7 +480,7 @@ watch( />

- {{ doc.original_name || doc.name }} + {{ doc.name }}.{{ doc.extension }}

({{ doc.extension?.toUpperCase() || "" }},