diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php index b1ccffa..05839a6 100644 --- a/app/Http/Controllers/TetapanController.php +++ b/app/Http/Controllers/TetapanController.php @@ -2,43 +2,61 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; +use App\Models\User; +use Illuminate\Support\Arr; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Http; -use Illuminate\Support\Facades\Storage; -use Carbon\Carbon; 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'); + $auth_user = Auth::user(); + + $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); + + $days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + $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/public/img/notifications.png b/public/img/notifications.png new file mode 100644 index 0000000..97ba7e7 Binary files /dev/null and b/public/img/notifications.png differ diff --git a/resources/views/tetapan/home.blade.php b/resources/views/tetapan/home.blade.php index 9871db6..1b50948 100644 --- a/resources/views/tetapan/home.blade.php +++ b/resources/views/tetapan/home.blade.php @@ -57,6 +57,11 @@

Ubah Status Pembayaran Ujrah

+ + Windster Logo +

Notifikasi Jualan Komoditi

+
+ diff --git a/resources/views/tetapan/unsold-commodity-notifications.blade.php b/resources/views/tetapan/unsold-commodity-notifications.blade.php new file mode 100644 index 0000000..efa61ad --- /dev/null +++ b/resources/views/tetapan/unsold-commodity-notifications.blade.php @@ -0,0 +1,356 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ + + +
+
+
+
+
+ + + +
+
+ + +
+
+ + +
+
+ +
+ + +
+ + +
+ +
+ + + + + + + + + @foreach($days as $day) + + + + + @endforeach + +
+ Hari + + PIC +
+
+
+

{{ $day }}

+
+
+
+
+ @php + $array = json_decode($settings['pic_' .strtolower($day)]); + @endphp + @foreach($array as $pic) +
+ + @if($loop->index === 0) + + @else + + @endif +
+ @endforeach +
+
+
+
+ + + +
+
+
+
+
+
+
+ @include('layouts.footer') + @endsection + + @push('additional_scripts') + + + + + + @endpush diff --git a/routes/web.php b/routes/web.php index 2a2b130..583326d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -158,6 +158,7 @@ Route::get('/tetapan',['as'=>'tetapan','uses'=>'App\Http\Controllers\TetapanCont Route::get('/tetapanhome',['as'=>'tetapan.home','uses'=>'App\Http\Controllers\TetapanController@home'])->middleware(['roleChecker:null,null,operasi,null,null']); Route::get('/tetapanmargin',['as'=>'tetapan.margin','uses'=>'App\Http\Controllers\TetapanController@margin'])->middleware(['roleChecker:null,null,operasi,null,null']); Route::get('/tetapan-payable-ujrah-branches',['as'=>'tetapan.payable-ujrah-branches','uses'=>'App\Http\Controllers\TetapanController@PayableUjrahBranches'])->middleware(['roleChecker:null,null,operasi,null,null']); +Route::get('/tetapan-unsold-commodity-notification',['as'=>'tetapan.unsold-commodity-notifications','uses'=>'App\Http\Controllers\TetapanController@UnsoldCommodityNotification'])->middleware(['roleChecker:null,null,operasi,null,null']); //Pengguna