From b0ffdcfd82a3d5088a39129c3e3c8fb3507400a9 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 27 May 2024 20:24:51 +0800 Subject: [PATCH] Update unsold commodity notification settings Add parameters to determine PIC for each day --- app/Http/Controllers/TetapanController.php | 40 ++-- .../unsold-commodity-notifications.blade.php | 173 +++++++++++++++--- 2 files changed, 170 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php index 26c30e0..cda3aef 100644 --- a/app/Http/Controllers/TetapanController.php +++ b/app/Http/Controllers/TetapanController.php @@ -2,59 +2,61 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Http; -use Illuminate\Support\Facades\Storage; -use Carbon\Carbon; +use App\Models\User; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Http; class TetapanController extends Controller { - public function home(){ + public function home() + { $auth_user = Auth::user(); - return view('tetapan.home',compact('auth_user')); + return view('tetapan.home', compact('auth_user')); } - public function index(){ + public function index() + { $api_url = config('api.url'); $auth_user = Auth::user(); - return view('tetapan.index',compact('api_url','auth_user')); + return view('tetapan.index', compact('api_url', 'auth_user')); } - public function margin(){ + public function margin() + { $api_url = config('api.url'); $auth_user = Auth::user(); - return view('tetapan.margin',compact('api_url','auth_user')); + return view('tetapan.margin', compact('api_url', 'auth_user')); } public function payableUjrahBranches() { - $api_url = config('api.url'); + $api_url = config('api.url'); $auth_user = Auth::user(); - $payable_cawangan = json_decode( Http::get(config('api.url').'/api/payable-ujrah-branches')->json() ); - return view('tetapan.payable-ujrah-branches',compact('api_url','auth_user', 'payable_cawangan')); + $payable_cawangan = json_decode(Http::get(config('api.url') . '/api/payable-ujrah-branches')->json()); + return view('tetapan.payable-ujrah-branches', compact('api_url', 'auth_user', 'payable_cawangan')); } - public function unsoldCommodityNotification() { - $api_url = config('api.url'); + $api_url = config('api.url'); $auth_user = Auth::user(); - $settings = Http::get(config('api.url').'/api/settings/unsold-commodity-notifications')->json(); + $settings = Http::get(config('api.url') . '/api/settings/unsold-commodity-notifications')->json(); $key = Arr::pluck($settings, 'key'); $values = Arr::pluck($settings, 'value'); $settings = array_combine($key, $values); - return view('tetapan.unsold-commodity-notifications',compact('api_url','auth_user', 'settings')); + $days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + $operasi_users = User::where('cawangan', 'operasi')->get(['id', 'name']); + + 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 3dc4619..ff0aa78 100644 --- a/resources/views/tetapan/unsold-commodity-notifications.blade.php +++ b/resources/views/tetapan/unsold-commodity-notifications.blade.php @@ -44,6 +44,65 @@ + +
+ +
+ + + + + + + + + @foreach($days as $day) + + + + + @endforeach + +
+ Hari + + PIC +
+
+
+

{{ $day }}

+
+
+
+
+ @php + $array = json_decode($settings['pic_' .strtolower($day)]); + @endphp + @foreach($array as $id) +
+ + @if($loop->index === 0) + + @else + + @endif +
+ @endforeach +
+
+
+
+ + @@ -56,11 +115,6 @@ @endsection @push('additional_scripts') - + @endpush