diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 97d9353..e101d2a 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -182,7 +182,7 @@ class KhazanahController extends Controller array_push($arraygadaitebus,$gadai_tebus); array_push($arraytuntutbaki,$tuntutbaki); - array_push($addtunai,$addtunai); + array_push($arrayaddtunai,$addtunai); array_push($arraytunaiharini,$tunai); array_push($arraytunai,$tunaipast); @@ -192,7 +192,7 @@ class KhazanahController extends Controller $petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json(); - return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki')); + return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki','arrayaddtunai')); } public function gadaian() @@ -623,6 +623,8 @@ class KhazanahController extends Controller { $auth_user = Auth::user(); + // dd(request()->all()); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bakiperubatan = 0; @@ -649,7 +651,7 @@ class KhazanahController extends Controller $tag = 1; break; case "pos": - $kategori = "Belanja AM -Postage"; + $kategori = "Belanja AM - Postage"; $tag = 1; break; } @@ -668,11 +670,13 @@ class KhazanahController extends Controller ])->json(); - $updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[ + $updateVault = Http::put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[ 'totpanjar'=>$request->bayaran ]); + + - return response($panjar); + return response($updateVault); } public function pendahuluan() @@ -1645,7 +1649,18 @@ class KhazanahController extends Controller $usercawangan = User::where('cawangan','=',$auth_user['cawangan'])->get(); - return view('khazanah.panjar',compact('cawangan_info','api_url','usercawangan')); + $denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json(); + + if(sizeof($denominasi) == 0) + { + $denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json(); + } + else + { + $denominasi=$denominasi[0]; + } + + return view('khazanah.panjar',compact('cawangan_info','api_url','usercawangan','denominasi')); } public function unjuran() diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 21a3628..84b0c98 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -11,10 +11,10 @@ @@ -30,16 +30,16 @@
-
+
- - + + - - + + @@ -68,16 +68,16 @@
AmbilanTotalPeti BesiJumlah (RM) AmbilanTotal (RM)Peti BesiJumlah (RM)
RM1
-
+
- - + + - - + + @@ -297,9 +297,9 @@ $('#ringgit100').val(val.txtring100); $('#totalring100').val(formatter.format(val.k100)); - $('#amaunkeping').val(formatter.format(val.jumlahkeping)); - $('#amaunbundle').val(formatter.format(val.jumlahbundle)); - $('#amaunkeseluruhan').val(formatter.format(val.txtjumlah)); + $('#amaunkeping').val("RM " + formatter.format(val.jumlahkeping)); + $('#amaunbundle').val("RM " + formatter.format(val.jumlahbundle)); + $('#amaunkeseluruhan').val("RM " + formatter.format(val.txtjumlah)); }); } diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index caba75e..329de77 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -65,8 +65,10 @@ @if($index1 == 0)
-
-
+
+ Hari Ini +
+
@@ -147,162 +149,197 @@
-
-
-
-
- +
-
- -
-
AmbilanTotalPeti BesiJumlah (RM) AmbilanTotal (RM)Peti BesiJumlah (RM)
- - - - - - - - - - - - - - @foreach ($arraytunai[$index1] as $tunai) - - - - - - - - - - - @endforeach - -
bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
{{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ number_format($tunai['bakiawal'],2) }}{{ number_format($tunai['tambah'],2) }}{{ number_format($tunai['kurang'],2) }}{{ number_format($tunai['keluar'],2) }}{{ number_format($tunai['masuk'],2) }}{{ number_format($tunai['baki'],2) }}
-
+ - + - - - - -
-
+
+
+ + + + + +
+
@else
+
+ Hari Ini +
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
- -

Baki Awal Tunai

-
-
-
+ +
+
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
+ +

Baki Awal Tunai

+
+
- -
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
- -

Tunai Diterima

-
-
-
+
+ +
+ +
+
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
+ +

Tunai Diterima

+
+
- -
- +
+ +
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
@@ -312,167 +349,203 @@
-
+
+ +
+
+ +
+
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}
+ +

Baki Akhir Tunai

+
+
+
+
+
-
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}
- -

Baki Akhir Tunai

-
-
-
+ +
+
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}
+ +

Gadaian

+
+
- -
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}
- -

Gadaian

-
-
-
-
-
- -
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
- -

Tebusan

-
-
-
-
-
-
- - - - -
-
- - - -
- + + + + + +
+
+
- - - - - - - - - @if(is_object($arraygadaitebus) || is_array($arraygadaitebus)) - @foreach($arraygadaitebus[$index1] as $gt) - - - - - - - - @endforeach - @endif - -
BilNo RujukanPinjaman (RM)Nilai Marhun (RM)Jenis Transaksi
{{ $loop->iteration }} {{ $gt['norujukan'] }} {{ number_format($gt['pinjaman'],2) }} {{ number_format($gt['nilaimarhun'],2) }} @php if($gt['jenistebus'] == ''){ - echo '

Gadai

'; - }else{ - echo '

Tebus

'; - } - @endphp
- -
- - + + + -
- @@ -543,6 +616,9 @@ var tabletuntutbaki = $('#tabletuntutbaki-' + element).DataTable({ }); + + var tableaddtunai = $('#tableaddtunai-' + element).DataTable({ + }); }); var tablecapaian = $('#table-PetiBesi').DataTable({ diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index f8ad3e3..b7772ed 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -3,6 +3,7 @@ @section('content') @include('modal.panjar') +@include('modal.denopanjar')
@@ -32,19 +33,19 @@ {{-- --}} - +
- - - - - - + + + + + +
@@ -67,6 +68,7 @@ + @endsection diff --git a/resources/views/modal/denominasimodal.blade.php b/resources/views/modal/denominasimodal.blade.php index 3a8c053..be352f7 100644 --- a/resources/views/modal/denominasimodal.blade.php +++ b/resources/views/modal/denominasimodal.blade.php @@ -30,10 +30,10 @@ - + - + @@ -68,10 +68,10 @@ - + - + diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php index 31c2563..2c9179d 100644 --- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php +++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php @@ -27,11 +27,11 @@ - + - + {{-- diff --git a/resources/views/modal/denopanjar.blade.php b/resources/views/modal/denopanjar.blade.php new file mode 100644 index 0000000..570aea4 --- /dev/null +++ b/resources/views/modal/denopanjar.blade.php @@ -0,0 +1,113 @@ +
AmbilanTotalJumlah (RM) AmbilanTotal (RM)Jumlah (RM)
RM1
AmbilanTotalJumlah (RM) AmbilanTotal (RM)Jumlah (RM)
AmbilanTotalJumlah (RM) AmbilanTotal (RM)Jumlah (RM)
RM1
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AmbilanJumlah (RM)AmbilanJumlah (RM)
RM0.01 RM1
RM0.05 RM5
RM0.10 RM10
RM0.20 RM20
RM0.50 RM50
RM100
+ +
+
+ + + + + +
+
+ + +
+ + + + + + diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php index dbeafa8..aea7a68 100644 --- a/resources/views/modal/panjar.blade.php +++ b/resources/views/modal/panjar.blade.php @@ -8,37 +8,61 @@ -
+ @csrf
- - - - - - - - - {{-- --}} - - - - - - - - - +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + {{-- --}} +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
- - + +
@@ -55,36 +79,61 @@ -
+ @csrf
-
- - + +
@@ -101,37 +150,62 @@ -
+ @csrf
- - - - - - - - {{-- --}} - - - - - - - - - +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + {{-- --}} +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
- - + +
@@ -149,37 +223,62 @@ -
+ @csrf
- - - - - - - - {{-- --}} - - - - - - - - - +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + {{-- --}} +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
- - + +
@@ -196,37 +295,62 @@ -
+ @csrf
- - - - - - - - - {{-- --}} - - - - - - - - - +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ + {{-- --}} +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
- - + +
@@ -238,34 +362,57 @@
- +
-
+ @csrf
- - - - - - - - - - - - - +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ {{-- --}} + +
+
+ +
+
+
+ + +
+
+
- - + +