From aa12fe5036aaaf816cd7ced7a33293e0b6b3929e Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Tue, 28 May 2024 16:48:11 +0800 Subject: [PATCH] Update codebase to save phone number of PIC aside from saving their id --- app/Http/Controllers/TetapanController.php | 2 +- .../unsold-commodity-notifications.blade.php | 52 ++++++++++++++----- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php index cda3aef..05839a6 100644 --- a/app/Http/Controllers/TetapanController.php +++ b/app/Http/Controllers/TetapanController.php @@ -55,7 +55,7 @@ class TetapanController extends Controller $settings = array_combine($key, $values); $days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; - $operasi_users = User::where('cawangan', 'operasi')->get(['id', 'name']); + $operasi_users = User::where('cawangan', 'operasi')->get(['id', 'name', 'no_telefon']); return view('tetapan.unsold-commodity-notifications', compact('api_url', 'auth_user', 'settings', 'operasi_users', 'days')); } diff --git a/resources/views/tetapan/unsold-commodity-notifications.blade.php b/resources/views/tetapan/unsold-commodity-notifications.blade.php index ff0aa78..efa61ad 100644 --- a/resources/views/tetapan/unsold-commodity-notifications.blade.php +++ b/resources/views/tetapan/unsold-commodity-notifications.blade.php @@ -74,22 +74,29 @@ @php $array = json_decode($settings['pic_' .strtolower($day)]); @endphp - @foreach($array as $id) + @foreach($array as $pic)
- id) ? $pic->id : ''; + @endphp + data-telefon-no-selected="{{ $operasi_users->where('id', $pic_id)->first()->no_telefon ?? '' }}" + > @foreach($operasi_users as $user) - + @endforeach @if($loop->index === 0) - + @else - + @endif
@endforeach @@ -160,7 +167,18 @@ let extractUserId = function(pic_array) { return pic_array.reduce((accumulator, nextItem) => { - accumulator.push(nextItem.value); + + let data_object = { + 'id': nextItem.value, + 'no_telefon': nextItem.dataset.telefonNoSelected, + }; + + + if(data_object.id !== ''){ + accumulator.push(data_object); + return accumulator; + } + return accumulator; }, []); }; @@ -180,8 +198,6 @@ 'pic_saturday': extractUserId(pic_saturday), }; - - if (status.checked) { let checkEmpty = x => x.trim() === ''; @@ -325,4 +341,16 @@ }); }); + @endpush