diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 9f3e5e3..914c8f9 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -3869,6 +3869,25 @@ class KhazanahController extends Controller
}
+ public function TuntutBakiByBatchNo(Request $request)
+ {
+ $auth_user = Auth::user();
+ $api_url = config('api.url');
+
+ $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+ $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+ $cawangan_detail=$cawangan[0];
+
+ $current = Carbon::now();
+ $current = new Carbon();
+
+ $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraituntutbaki/aktif_batch/'. $auth_user['cawangan'])->json();
+
+ return view('khazanah.tuntutbaki_notis', compact('cawangan_detail','api_url','lelong','cawangan_info'));
+
+ }
+
public function NotisTuntutBaki(Request $request)
{
@@ -3884,15 +3903,29 @@ class KhazanahController extends Controller
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
+ $taxation = config('app.taxation');
- $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraituntutbaki/laporan/'. $auth_user['cawangan'])->json();
+ $jenis = $request->jeniscetakan;
+ $batchno = $request->batchno;
+
+ $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraituntutbaki/laporan/'. $auth_user['cawangan'],[
+ 'jenis' => $jenis,
+ 'batchno' => $batchno
+ ])->json();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
- $pdf=PDF::loadView('print.notistuntutbaki', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait');
- return $pdf->download('notistuntutbaki_'.$tarikh_cetak.'_'.$auth_user['cawangan'].'.pdf');
+ if($jenis == 'tuntutbaki')
+ {
+ $pdf=PDF::loadView('print.notistuntutbaki', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak','taxation'))->setPaper('A4','potrait');
+ return $pdf->download('notistuntutbaki_'.$tarikh_cetak.'_'.$auth_user['cawangan'] . '_' . $batchno.'.pdf');
+ }else{
+ $pdf=PDF::loadView('print.notisrugi', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak','taxation'))->setPaper('A4','potrait');
+ return $pdf->download('notisrugi_'.$tarikh_cetak.'_'.$auth_user['cawangan'] . '_' . $batchno.'.pdf');
+ }
+
}
}
diff --git a/config/app.php b/config/app.php
index 13caaaf..abb1b86 100644
--- a/config/app.php
+++ b/config/app.php
@@ -240,4 +240,6 @@ return [
'api_verify' => env('API_VERIFY',true),
+ 'taxation' => env('TAX_AROS',true),
+
];
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index a7c340b..3a15c57 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -361,8 +361,8 @@
-
-
+
+
@@ -2040,7 +2040,7 @@
{
$('#btnkemaskini').addClass('btn-danger');
$('#btnkemaskini').removeClass('btn-primary');
- $('#btnkemaskini').text('Cancel');
+ $('#btnkemaskini').text('Batal');
$('#btnkemaskini').attr('onclick','cancelbutton()');
$('#btnsave').show();
$('#btnotp').css('display','none');
@@ -2058,7 +2058,7 @@
function cancelbutton(){
$('#btnkemaskini').removeClass('btn-danger');
$('#btnkemaskini').addClass('btn-primary');
- $('#btnkemaskini').text('Kemaskini');
+ $('#btnkemaskini').text('Ubah');
$('#btnkemaskini').attr('onclick','kemaskinifunc()');
$('#btnsave').css('display','none');
$('#btnotp').show();
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index 3b10ebc..ca05497 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -355,8 +355,8 @@
-
-
+
+
@@ -1169,7 +1169,7 @@
{
$('#btnkemaskini').addClass('btn-danger');
$('#btnkemaskini').removeClass('btn-primary');
- $('#btnkemaskini').text('Cancel');
+ $('#btnkemaskini').text('Batal');
$('#btnkemaskini').attr('onclick','cancelbutton()');
$('#btnsave').show();
$('#btnotp').css('display','none');
@@ -1187,7 +1187,7 @@
function cancelbutton(){
$('#btnkemaskini').removeClass('btn-danger');
$('#btnkemaskini').addClass('btn-primary');
- $('#btnkemaskini').text('Kemaskini');
+ $('#btnkemaskini').text('Ubah');
$('#btnkemaskini').attr('onclick','kemaskinifunc()');
$('#btnsave').css('display','none');
$('#btnotp').show();
@@ -1231,6 +1231,7 @@
method:"put",
url: api_url + "/api/customers/update/khazanah/" + nokp,
data:{
+ "namakhazanah" : ppc,
"telefon1": telefon1,
"telefon2": telefon2,
"kodbank":kodbank,
@@ -1238,7 +1239,8 @@
'nota':nota,
'nama':nama,
'alamat':alamat,
- 'poskod':poskod
+ 'poskod':poskod,
+ 'kodcaw':kodcaw
},
success: function(success){
$('#btnsave').css('display','none');
@@ -1292,7 +1294,7 @@
if(errortelefon1 <= 0 && errortelefon2 <= 0){
$('#btnkemaskini').removeClass('btn-danger');
$('#btnkemaskini').addClass('btn-primary');
- $('#btnkemaskini').text('Kemaskini');
+ $('#btnkemaskini').text('Ubah');
$('#btnkemaskini').attr('onclick','kemaskinifunc()');
$('#btnotp').text('Daftar Akuan Online');
$('#btnotp').attr('onclick','#');
diff --git a/resources/views/khazanah/lelong.blade.php b/resources/views/khazanah/lelong.blade.php
index cb20f18..6c92c9e 100644
--- a/resources/views/khazanah/lelong.blade.php
+++ b/resources/views/khazanah/lelong.blade.php
@@ -22,7 +22,7 @@
-
Notis Tuntut Baki
+
Notis Tuntut Baki
@if(sizeof($senaraibatchfasa1) !== 0 || sizeof($senaraibatchfasa2) !== 0)
diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php
index 19c8ad4..69e4ad9 100644
--- a/resources/views/khazanah/permohonanwang.blade.php
+++ b/resources/views/khazanah/permohonanwang.blade.php
@@ -405,7 +405,7 @@
let mid = $(e).data("mohonid");
console.log(mid);
$.ajax({
- method: 'put',
+ method: 'post',
url: api_url + '/admin/permohonan/updatejanapc',
data: {
"_token": "{{ csrf_token() }}",
diff --git a/resources/views/khazanah/tuntutbaki_notis.blade.php b/resources/views/khazanah/tuntutbaki_notis.blade.php
new file mode 100644
index 0000000..6a01aae
--- /dev/null
+++ b/resources/views/khazanah/tuntutbaki_notis.blade.php
@@ -0,0 +1,100 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+
+
+
+
+
+
+
+ @if(sizeof($lelong) !== 0)
+
+
+
+ | No. |
+ Batch No. |
+ Bilangan Tuntut Baki |
+ Bilangan Rugi |
+ Tarikh Lelong |
+ Action |
+
+
+
+ @foreach($lelong as $index=>$lel)
+
+ | {{ $loop->iteration }} |
+ {{ $lel['batchno'] }} |
+ {{ $lel['bilangantuntutbaki'] }} |
+ {{ $lel['bilanganrugi'] }} |
+ {{ $lel['tarikhlelong'] }} |
+
+ Notis Tuntut
+ Notis Rugi
+ |
+
+ @endforeach
+
+
+ @else
+
+ Tiada Data dalam lelong!
+
+ @endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+@endsection
+
diff --git a/resources/views/modal/agh.blade.php b/resources/views/modal/agh.blade.php
index 731c5ce..242dd34 100644
--- a/resources/views/modal/agh.blade.php
+++ b/resources/views/modal/agh.blade.php
@@ -15,7 +15,7 @@
@csrf
-
+
-
+