From c219a29deb5068c4e45c642614da8c8bd6649422 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 20 May 2024 10:49:48 +0800 Subject: [PATCH 1/3] Add module to determine ujrah payment can be paid or not using parameters --- app/Http/Controllers/TetapanController.php | 11 +- resources/views/tetapan/home.blade.php | 23 ++- resources/views/tetapan/index.blade.php | 19 +- .../tetapan/payable-ujrah-branches.blade.php | 185 ++++++++++++++++++ routes/web.php | 1 + 5 files changed, 221 insertions(+), 18 deletions(-) create mode 100644 resources/views/tetapan/payable-ujrah-branches.blade.php diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php index 6f39440..b1ccffa 100644 --- a/app/Http/Controllers/TetapanController.php +++ b/app/Http/Controllers/TetapanController.php @@ -11,7 +11,7 @@ use Carbon\Carbon; class TetapanController extends Controller { - + public function home(){ $auth_user = Auth::user(); @@ -32,4 +32,13 @@ class TetapanController extends Controller return view('tetapan.margin',compact('api_url','auth_user')); } + + public function payableUjrahBranches() + { + $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')); + } } diff --git a/resources/views/tetapan/home.blade.php b/resources/views/tetapan/home.blade.php index d9efb32..9871db6 100644 --- a/resources/views/tetapan/home.blade.php +++ b/resources/views/tetapan/home.blade.php @@ -6,10 +6,10 @@
- + - + @if (Session::has('type')) @endif - +
- + Windster Logo

Scan Barcode

- @if ($auth_user->id == 355) + @if ($auth_user->id == 355) Windster Logo

Ubah Margin

@else - + @endif - +
+ + +
@include('layouts.footer') diff --git a/resources/views/tetapan/index.blade.php b/resources/views/tetapan/index.blade.php index 1678963..5074d06 100644 --- a/resources/views/tetapan/index.blade.php +++ b/resources/views/tetapan/index.blade.php @@ -1,18 +1,17 @@ - @extends('layouts.app') @section('content')
-
+
-
- - +
- + -
-
- @include('layouts.footer') -@endsection + + +
+ + @include('layouts.footer') + @endsection diff --git a/resources/views/tetapan/payable-ujrah-branches.blade.php b/resources/views/tetapan/payable-ujrah-branches.blade.php new file mode 100644 index 0000000..3e7f6ec --- /dev/null +++ b/resources/views/tetapan/payable-ujrah-branches.blade.php @@ -0,0 +1,185 @@ +@extends('layouts.app') + +@section('content') + +
+
+ +
+ + + +
+
+
+
+ +
+
+
+
+ + +
+ + + + + + + + + + + @foreach($payable_cawangan as $cawangan) + + + + + + + @endforeach + +
+ Cawangan Name + + Cawangan Code + + Gadaian Ujrah Payable + + Tawarruq Version +
+
+
+

{{ $cawangan->details_caw }}

+
+
+
+
+
+

{{ $cawangan->kodcaw }}

+
+
+
+
+
+
+ gadaian_ujrah_payable === 1 ? 'checked' : '' }} name="checkbox-gadai-ujrah-payable" data-gadai-ujrah-payable-branch="{{ $cawangan->kodcaw }}" id="checked-checkbox" type="checkbox" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"> +
+
+
+
+
+
+
+ @php + $selected = $cawangan->cawangan_information->version; + @endphp + +
+
+
+
+
+ + +
+
+
+
+ +
+
+
+
+ +
+
+ @include('layouts.footer') + @endsection + + @push('additional_scripts') + + @endpush diff --git a/routes/web.php b/routes/web.php index e9b1ee2..2a2b130 100644 --- a/routes/web.php +++ b/routes/web.php @@ -157,6 +157,7 @@ Route::get('/audit/cetakan', ['as'=>'audit.cetak','uses'=>'App\Http\Controllers\ Route::get('/tetapan',['as'=>'tetapan','uses'=>'App\Http\Controllers\TetapanController@index'])->middleware(['roleChecker:null,null,operasi,null,null']); 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']); //Pengguna From e6cda8920bfac47fda9b989ec70276ac3c223fe7 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 20 May 2024 11:00:40 +0800 Subject: [PATCH 2/3] Add missing icon --- public/img/shop-branches.png | Bin 0 -> 964 bytes public/mix-manifest.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 public/img/shop-branches.png diff --git a/public/img/shop-branches.png b/public/img/shop-branches.png new file mode 100644 index 0000000000000000000000000000000000000000..9b71590eb0e42b0f37b10907f4148324c0527638 GIT binary patch literal 964 zcmeAS@N?(olHy`uVBq!ia0vp^DIm&t z0U=3SF8JkKmhxQ8q19C1(8Mvxqr>gXsb;}xr)Qsiw`cF~wDj}*Y}39!yHkFD&fMS6 zY8hGtoH!IA#FFL>3uh)fI15~#-_^FDMmU4R>V&{02@@5g43Crx6HY8poG93;D9Vt{ z)EAm59IIS#v-{KZZF~3~+a)$xHVIESa?3%`xzDA5X;Or=Zqf-?(Kng0Qga>ldMw(N zzUsfF$b(LO{+OQa8UahYXID0sEY@oK%~0V|db z-mJeE7n}yEh-DC)n#Rs#v99TiwCWwsU6o5MyBN-`QZR1gT)wV)jY+z|0bS82s}c{b ze62Pmjf-(lfa5V9VZT`OWhUnZ56s~*%9#N)H*slYCxhK8h26YBsqOBWb_xypS|`K~ zw*+6$4V`tKBO#LYrJ;{SX>9+cl;qn6`$Hz=f#kkwo%Lt=;LCb51!Txvug{{4dqN%g zq}1l@$_vT7r@&BKUU}01)GkHbtXYRrheiOR2x@HP33Y zTzIc%cePRP>Wlrd2UgE%*(`k~SMa47(~Pqh&+e){d+qF#H5<$nCTNPj(QmM3__nJ) zNxp%ZA#d05&yO;1?vq}ZAJ4ffj^Q_B4Eu+@ZF;xMc@Nkv=e+uLck=zRnCd{mEC?GFb3GU~0Ipd*N?>Yvz-Lo4+4T)Oy^v_yqY?^Xwt<p%BL5EygQ2O~-zYVk2`>>xPtz0*NO-kt?<7 zRKt|JH6?Gt)l<#oOU<-i=&%zopr0Pl#F`v3p{ literal 0 HcmV?d00001 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 2d60117..1cc3d6f 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/js/app.js": "/js/app.js", - "/css/app.css": "/css/app.css" + "/js/app.js": "/js/app.js?id=41f31e4c4d0a3f1615de3f2a5b78988c", + "/css/app.css": "/css/app.css?id=9cdabf7932d415c4f5598da3580b0fa1" } From bfda43022a82260784668e0c0616f06a82f94c6d Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 20 May 2024 11:22:38 +0800 Subject: [PATCH 3/3] Add default value empty string if no calculation version is assigned on cawangan --- resources/views/tetapan/payable-ujrah-branches.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/tetapan/payable-ujrah-branches.blade.php b/resources/views/tetapan/payable-ujrah-branches.blade.php index 3e7f6ec..a4a8494 100644 --- a/resources/views/tetapan/payable-ujrah-branches.blade.php +++ b/resources/views/tetapan/payable-ujrah-branches.blade.php @@ -69,7 +69,7 @@
@php - $selected = $cawangan->cawangan_information->version; + $selected = $cawangan->cawangan_information->version ?? ''; @endphp