From 9e67c72bf7cd2ffd4f656ae0f2c432935b62f6f9 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 7 Oct 2024 13:56:27 +0800 Subject: [PATCH 1/6] Fix not showing all customer marhuns --- app/Services/MarhunService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/MarhunService.php b/app/Services/MarhunService.php index c86ccdb..6a7d99c 100644 --- a/app/Services/MarhunService.php +++ b/app/Services/MarhunService.php @@ -32,7 +32,7 @@ class MarhunService $marhunDetailPipelines = [ fn($x) => $getMarhunDetails($x), fn($x) => $x == null ? [] : $x, - fn($x) => array_map(fn($y) => array_merge([], ...$y), $x), + fn($x) => $x[0], fn($x) => $formatMarhunDetailData($x), ]; From 5a40e9f0e28bfcd1c677bf65678b63c5816a856c Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 7 Oct 2024 14:32:56 +0800 Subject: [PATCH 2/6] Add loader when opening marhun modals --- resources/views/modal/marhun.blade.php | 135 +++++++++++++++++-------- 1 file changed, 92 insertions(+), 43 deletions(-) diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php index e2c6acf..9dfbcef 100644 --- a/resources/views/modal/marhun.blade.php +++ b/resources/views/modal/marhun.blade.php @@ -1,5 +1,7 @@ + +