diff --git a/app/Http/Controllers/PhoneViewController.php b/app/Http/Controllers/PhoneViewController.php index 49ca8bb..fb1e7b9 100644 --- a/app/Http/Controllers/PhoneViewController.php +++ b/app/Http/Controllers/PhoneViewController.php @@ -17,6 +17,11 @@ public function index(Request $request): \Inertia\Response $search = $request->input('search'); $clientFilter = $request->input('client'); + // On full page loads, always start from page 1 + if (! $request->header('X-Inertia-Partial-Data')) { + $request->merge(['pending' => 1, 'processed' => 1]); + } + $eagerLoad = [ 'contract' => function ($q) { $q->with([ @@ -97,6 +102,11 @@ public function completedToday(Request $request): \Inertia\Response $search = $request->input('search'); $clientFilter = $request->input('client'); + // On full page loads, always start from page 1 + if (! $request->header('X-Inertia-Partial-Data')) { + $request->merge(['completed' => 1]); + } + $start = now()->startOfDay(); $end = now()->endOfDay(); diff --git a/resources/js/Components/PersonInfo/PersonInfoSmsDialog.vue b/resources/js/Components/PersonInfo/PersonInfoSmsDialog.vue index 764c20f..46fc69b 100644 --- a/resources/js/Components/PersonInfo/PersonInfoSmsDialog.vue +++ b/resources/js/Components/PersonInfo/PersonInfoSmsDialog.vue @@ -25,6 +25,7 @@ import { } from "@/Components/ui/select"; import { Switch } from "@/Components/ui/switch"; import { Button } from "@/Components/ui/button"; +import { ScrollArea } from "@/Components/ui/scroll-area"; const props = defineProps({ show: { type: Boolean, default: false }, @@ -452,11 +453,57 @@ const open = computed({ -
-
- + + +
+ + + Profil + + + + + + + + Pošiljatelj + + + + +
+ + - Profil + Pogodba +

+ Uporabi podatke pogodbe (in računa) za zapolnitev {contract.*} in + {account.*} mest. +

- + - Pošiljatelj + Predloga -
- - - Pogodba -