diff --git a/app/Events/NotifikasiKelulusan.php b/app/Events/NotifikasiKelulusan.php new file mode 100644 index 0000000..9b8b081 --- /dev/null +++ b/app/Events/NotifikasiKelulusan.php @@ -0,0 +1,33 @@ +norujukan = $norujukan; + $this->kelulusan = $kelulusan; + $this->siri = $siri; + $this->komen = $komen; + } + + public function broadcastOn() + { + return ['notice-kelulusan']; + } + + public function broadcastAs() + { + return 'my-kelulusan'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 08a1140..72b738a 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -332,11 +332,7 @@ class GadaianController extends Controller $totaltransaction = 0; - $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json(); - - - if(sizeof($transaction) != 0) - $transaction = $transaction[0]; + $transaction = Http::get(config('api.url') . '/api/transaction/one/'. $id)->json(); $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); @@ -346,7 +342,7 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + $customers_info = $customers_info[0]; return view('print.resitansuran',compact('transaction','gadai','customers_info')); @@ -585,10 +581,21 @@ class GadaianController extends Controller $norujukan = $request->norujukan; - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $gadai_info = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); + + dd($gadai_info); + + $pinjaman = $gadai_info['pinjaman']; + + + $nilaimarhun = $gadai_info['nilaimarhun']; + $berat = $gadai_info['berat']; + $margin = $gadai_info['percentpinj']; + + $messagemohon = $request->mohon . '|' . $pinjaman . '|' . $nilaimarhun . '|' . $berat . '|' . $margin . '|'; $createlulus = Http::post(config('api.url') . '/api/CreateLulus/' . $auth_user['cawangan'] . '/' . $norujukan, [ - 'mohon' => $request->mohon, + 'mohon' => $messagemohon, 'teller' => $auth_user['name'] ])->json(); diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 3eda978..aa14ae1 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -7,6 +7,7 @@ use App\Events\StatusLiked; use App\Events\NotifikasiPembayaran; use App\Events\OperasiNotice; use App\Events\PendahuluanSerahan; +use App\Events\NotifikasiKelulusan; use App\User; @@ -112,20 +113,25 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); - $tunai = Http::get( config('api.url') .'/api/TunaiController/'. $auth_user['cawangan'])->json(); + $arraytunaiharini = []; + $arraytunai = []; - if(sizeof($tunai) > 0) - $tunai = $tunai[0]; + $listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get(); - $addtunai = Http::get( config('api.url') .'/api/getAddTunai/'. $auth_user['cawangan'])->json(); + foreach($listUser as $index1 => $ls) + { + $tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json(); + $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json(); - // if(sizeof($addtunai) > 0) - // $addtunai = $addtunai[0]; + array_push($arraytunaiharini,$tunai); + array_push($arraytunai,$tunaipast); + } $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + - return view('khazanah.alirantunai',compact('cawangan_info','api_url','tunai','addtunai')); + return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser')); } public function gadaian() @@ -312,7 +318,7 @@ class KhazanahController extends Controller $kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json(); $kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json(); - + foreach($kelulusan as $index=>$k) { $komen = explode("|",$k['komen']); @@ -322,7 +328,7 @@ class KhazanahController extends Controller unset($komen[$results]); } - array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]); + array_push($arraykelulusan,['norujukan' => $k['norujukan'],'siri' => $k['siri'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]); } return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid')); @@ -422,24 +428,57 @@ class KhazanahController extends Controller { $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ - "pengesahan" => "khazanah" + "pengesahan" => "khazanah", + 'siri' => $request->siri ])->json(); + if($updatelulus) + { + event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan)); + } + }else{ $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "khazanah", + 'siri' => $request->siri, "pembatalan" => "batal" ])->json(); + if($updatelulus) + { + event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan)); + } + } } else - { - $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ - "pengesahan" => "operasi" + { + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $auth_user['cawangan'] . '/' . $norujukan,[ + "komen" => $request->komen, + 'siri' => $request->siri ])->json(); + if($request->pembatalan == null) + { + + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ + "pengesahan" => "operasi", + 'siri' => $request->siri + ])->json(); + + }else{ + + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ + "pengesahan" => "operasi", + 'siri' => $request->siri, + "pembatalan" => "batal" + ])->json(); + + event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan)); + + } + event(new OperasiNotice($auth_user['cawangan'],$auth_user['name'])); } } @@ -483,7 +522,7 @@ class KhazanahController extends Controller event(new StatusLiked($auth_user['cawangan'],$auth_user['name'])); - return response()->json($createlulus,201); + return response()->json($siri,201); } ///END KELULUSAN/// diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index 06581c7..73f1d57 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -6,9 +6,13 @@ namespace App\Http\Controllers; //Events use App\Events\OperasiNotice; use App\Events\StatusLiked; +use App\Events\NotifikasiKelulusan; + use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; +use Illuminate\Support\Facades\Hash; + use Carbon\Carbon; @@ -40,10 +44,11 @@ class OperasiController extends Controller unset($komen[$results]); } - array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'], "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $kel['pelulus']]); + array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $kel['pelulus']]); } } + return view('operasi.kelulusan',compact('cawangan_info','api_url','arraykelulusan')); } @@ -79,11 +84,33 @@ class OperasiController extends Controller $norujukan = $request->norujukan; - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + if($request->pembatalan == null) + { + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[ + 'sahkan' => 1, + 'siri' => $request->siri + ])->json(); + + if($updatelulus) + { + event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan)); + } + } + else + { + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[ + 'sahkan' => 2, + 'siri' => $request->siri + ])->json(); + + if($updatelulus) + { + event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan)); + } + } + + - $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[ - 'sahkan' => 1 - ])->json(); return response()->json($updatelulus,200); } @@ -100,10 +127,20 @@ class OperasiController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $getsiri = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); + + if(isset($getsiri['siri'])) + { + $siri = $getsiri['siri'] + 1; + }else{ + $siri = 1; + } + $createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/operasi', [ 'komen' => $request->komen, 'dategadai' => $current->toDateString(), 'bilgadai' => 1, + 'siri' => $siri, 'jumpinjam' => $request->jumpinjam, 'jenistebus' => "G", 'teller' => $request->teller, @@ -113,7 +150,21 @@ class OperasiController extends Controller event(new StatusLiked($auth_user['cawangan'],$auth_user['name'])); - return response()->json($createlulus,201); + return response()->json($siri,201); + } + + public function mintakatalaluansemula(Request $request) + { + + if(Hash::check($request->passsemula, Auth::user()->password)) + { + return "True"; + } + else + { + return "False"; + } + } public function parameter() diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index ed4fadc..b885e0a 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -735,6 +735,7 @@ }, success:function(data){ console.log(data); + if(data != 0){ console.log('berjaya'); clearInterval(timerInterval); @@ -795,26 +796,26 @@ if($("input[name='options']:checked").val() == 'belum_tebus'){ let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); - if(+harini !== +tarikhgadai2){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Hapus Gadai Tidak Dibenarkan' - }); - return false; - } + // if(+harini !== +tarikhgadai2){ + // Swal.fire({ + // icon: 'error', + // title: 'Amaran', + // text: 'Hapus Gadai Tidak Dibenarkan' + // }); + // return false; + // } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); - if(+harini !== +tarikhgadai1){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Hapus Gadai Tidak Dibenarkan' - }); - return false; - } + // if(+harini !== +tarikhgadai1){ + // Swal.fire({ + // icon: 'error', + // title: 'Amaran', + // text: 'Hapus Gadai Tidak Dibenarkan' + // }); + // return false; + // } } const swalWithBootstrapButtons = Swal.mixin({ diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 3a04a65..0bd089b 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -745,7 +745,7 @@ reverseButtons: true }).then((result) => { if (result.isConfirmed) { - + let norujukan = $('#norujukan').val(); let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|"; @@ -764,7 +764,7 @@ allowEscapeKey: false, allowEnterKey: false }) - + let siricreated = 0; $.ajax({ method:'post', url: "{{ route('operasi.createkelulusan') }}", @@ -777,6 +777,7 @@ }, success:function(data){ console.log(data); + siricreated = data; }, error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); @@ -784,36 +785,48 @@ } }); - //TIME INTERVAL - let timerInterval; - - timerInterval = setInterval(function(){ - $.ajax({ - method:'get', - url: "{{ route('operasi.getkelulusan') }}", - data: { - "norujukan" : norujukan - - }, - success:function(data){ - if(data != ''){ - clearInterval(timerInterval); - Swal.fire({ + var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + cluster: 'ap1', + encrypted: true + }); + + var channel = pusher.subscribe('notice-kelulusan'); + channel.bind('my-kelulusan', function(data) { + + + if(data.norujukan == norujukan && data.siri == siricreated) + { + if(data.kelulusan == 'lulus') + { + Swal.fire({ icon: 'success', - title: 'Telah Disahkan' - }).then(function(){ - $(func).attr("onSubmit","return true;"); - $(func).submit(); - return true; - }); - } - }, - error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - }, 3000); + title: 'Telah Disahkan', + text: `Komen : ${data.komen}` + }).then(function(){ + $(func).attr("onSubmit","return true;"); + $(func).submit(); + return true; + }); + + } + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan', + text: `Komen : ${data.komen}` + }).then(function(){ + $("#terima_gadai").prop('disabled', false); + return false; + }); + } + } + + + + }); + + }else if (result.dismiss === Swal.DismissReason.cancel){ $("#terima_gadai").prop('disabled', false); swalWithBootstrapButtons.fire( @@ -822,6 +835,7 @@ 'error' ) } + }); event.preventDefault(); return false; @@ -864,6 +878,7 @@ allowEnterKey: false }) + let siricreated = 0; $.ajax({ method:'post', url: "{{ route('khazanah.createkelulusan') }}", @@ -876,6 +891,7 @@ }, success:function(data){ console.log(data); + siricreated = data; }, error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); @@ -883,55 +899,52 @@ } }); - //TIME INTERVAL - let timerInterval; - - timerInterval = setInterval(function(){ - $.ajax({ - method:'get', - url: "{{ route('khazanah.getkelulusan') }}", - data: { - "norujukan" : norujukan - }, - success:function(data){ - - if(data != '') - { - clearInterval(timerInterval); + //Try Pusher - if(data == 'batal') - { - Swal.fire({ - icon: 'warning', - title: 'Telah Dibatalkan' - }).then(function(){ - $("#terima_gadai").prop('disabled', false); - return false; + var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + cluster: 'ap1', + encrypted: true + }); - }); + var channel = pusher.subscribe('notice-kelulusan'); + channel.bind('my-kelulusan', function(data) { + // let message = JSON.stringify(data); - }else{ + // console.log(message); - Swal.fire({ - icon: 'success', - title: 'Telah Disahkan' - }).then(function(){ + if(data.norujukan == norujukan && data.siri == siricreated) + { + if(data.kelulusan == 'lulus') + { + Swal.fire({ + icon: 'success', + title: 'Telah Disahkan' + }).then(function(){ - $(func).attr("onSubmit","return true;"); - $(func).submit(); - return true; + $(func).attr("onSubmit","return true;"); + $(func).submit(); + return true; + + }); + } + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan' + }).then(function(){ + $("#terima_gadai").prop('disabled', false); + return false; + }); + } + } + + + + }); - }); - } - } - },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - }, 3000); } else if (result.dismiss === Swal.DismissReason.cancel) { $("#terima_gadai").prop('disabled', false); swalWithBootstrapButtons.fire( diff --git a/resources/views/homepage/teller/home.blade.php b/resources/views/homepage/teller/home.blade.php index 1fb07fb..f2db23e 100644 --- a/resources/views/homepage/teller/home.blade.php +++ b/resources/views/homepage/teller/home.blade.php @@ -34,6 +34,8 @@ }, success:function(data){ + + if(jQuery.isEmptyObject(data)) { console.log('empty'); diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 86849b4..e1e6434 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -9,133 +9,314 @@ {{-- {{ dd($tunai) }} --}}
-
-

Aliran Tunai

+

Aliran Tunai - Peti Besi

-
-
- -
-
-
RM {{ number_format($tunai['bakiawal'],2) }}
- -

Baki Awal Tunai

-
-
-
- {{-- More info --}} -
-
+
-
- -
-
-
RM {{ number_format($tunai['tambah'],2) }}
- -

Tunai Diterima

-
-
-
- {{-- More info --}} -
-
+ {{-- {{ dd($arraytunai) }} --}} -
- -
-
-
RM {{ number_format($tunai['kurang'],2) }}
- -

Tunai Dikeluar

-
-
-
- {{-- More info --}} -
-
-
+ + + -
- -
-
-
RM {{ number_format($tunai['keluar'],2) }}
- -

Gadaian

-
-
-
- {{-- More info --}} -
-
+
-
- -
-
-
RM {{ number_format($tunai['masuk'],2) }}
- -

Tebusan

-
-
-
- {{-- More info --}} -
-
-
+ @foreach($listUser as $index1=>$ls) + + {{-- {{ dd(empty($arraytunai[1])) }} --}} + @if($index1 == 0) +
-
- - - - - - - - - - - - - @foreach ($addtunai as $tunai) - - - - - - - - @endforeach - -
BilTarikhDebitKreditNota
{{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['tambah'] }}{{ $tunai['kurang'] }}{{ $tunai['nota'] }}
- -
+
+
+ +
+
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
+

Baki Awal Tunai

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

Tunai Diterima

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

Tunai Dikeluar

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

Baki Akhir Tunai

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

Gadaian

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

Tebusan

+
+
+
+ {{-- More info --}} +
+
+
+ +
+ + + + + + + + + + + + + + + + @foreach ($arraytunai[$index1] as $tunai) + + + + + + + + + + + @endforeach + +
bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
{{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['tambah'] }}{{ $tunai['kurang'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['baki'] }}
+ +
+ +
+ @else +
+ +
+ +
+
+ +
+
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
+ +

Baki Awal Tunai

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

Tunai Diterima

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

Tunai Dikeluar

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

Baki Akhir Tunai

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

Gadaian

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

Tebusan

+
+
+
+ {{-- More info --}} +
+
+
+ + +
+ + + + + + + + + + + + + + + + @foreach ($arraytunai[$index1] as $tunai) + + + + + + + + + + + @endforeach + +
bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
{{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['tambah'] }}{{ $tunai['kurang'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['baki'] }}
+ +
+ + +
+ +
+ @endif + + @endforeach + + + {{--
...
--}} +
+ + +
+ @@ -143,9 +324,11 @@ diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 944fbda..5f1ddd6 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -1,6 +1,86 @@ @extends('layouts.app') @section('content') + + + +
@@ -26,8 +106,8 @@ No Rujukan Teller Komen - Nilai Pembiayaan - Nilai Marhun + Nilai Pembiayaan (RM) + Nilai Marhun (RM) Berat Margin Tindakan @@ -36,15 +116,15 @@ @foreach($arraykelulusan as $index=>$k) - {{ $k['norujukan'] }} + {{ $k['norujukan'] }} {{ $k['namateller'] }} {{ $k['komen'] }} {{ number_format($k['pinjaman'],2) }} {{ $k['nilaimarhun'] }} {{ $k['berat'] }} {{ $k['margin'] }} - - + + @endforeach @foreach($kelulusanmohonid as $index=>$km) @@ -81,7 +161,186 @@ "scrollX": true }); + let api = "{{ config('api.url') }}"; + var kodcaw = "{{ Auth::user()->cawangan }}"; + + const formatter = new Intl.NumberFormat('en-US', { + minimumFractionDigits: 2 + }); + + $('#kelulusanmodal').on('show.bs.modal', function(event) { + let button = $(event.relatedTarget); + let norujukan = $(button).data('norujukan'); + + $.ajax({ + method:'GET', + url: api + '/api/gadai/norujukan/' + norujukan, + dataType: 'json', + success:function(datagadaiwithnorujukan){ + + let nokp = datagadaiwithnorujukan[0][0].nokp; + + $.ajax({ + method:'GET', + url: api + '/api/customers/' + nokp, + dataType: 'json', + success:function(datagadaiwithnokp){ + + let nama = datagadaiwithnokp[0].nama; + + $('#namalanjut').text(nama); + $('#nokplanjut').text(nokp); + + $.ajax({ + method:'GET', + url: api + '/api/gadai/customers/' + nokp + '/outstandingsemasa/' + kodcaw, + dataType: 'json', + success:function(outstandingsemasa){ + + $('#pinjterkumpul').text('RM' + formatter.format(outstandingsemasa)); + + } + }); + + + } + }); + + $.ajax({ + method:'GET', + url: api + '/api/customers/' + nokp + '/gadai/belum_tebus', + dataType: 'json', + success:function(data){ + let bilanganaktif = 0; + if(data == null) + { + bilanganaktif = 0; + }else{ + bilanganaktif = data[0].length; + } + + $('#bilaktif').text(bilanganaktif); + + + } + }); + + + $.ajax({ + method:'GET', + url: api + '/api/customers/' + nokp + '/gadai/lelong', + dataType: 'json', + success:function(data){ + + let bilanganlelong = 0; + + if(data == null) + { + bilanganlelong = 0; + }else{ + bilanganlelong = data.length; + } + + + $('#billelong').text(bilanganlelong); + } + }); + + + } + }); + + }); + + async function updatelulus(e) + { + let api = "{{ config('api.url') }}"; + let kodcaw = " {{ Auth::user()->cawangan }}"; + + const { value: katalaluan } = await Swal.fire({ + title: 'Masukkan Katalaluan Semula', + input: 'password', + inputPlaceholder: 'Katalaluan', + confirmButtonText: 'Hantar', + showCancelButton:true, + cancelButtonText:'Batal', + allowOutsideClick: true + }) + + let dataminta = ''; + + $.ajax({ + method:'get', + url: "{{ route('khazanah.getmintasemulakelulusan') }}", + async:false, + data:{ passsemula : katalaluan }, + success:function(data) + { + if(data == "False") + { + dataminta = data; + } + } + }); + + if(dataminta == 'False') + { + Swal.fire({ + icon: 'error', + title: 'Pengesahan Katalaluan Tidak Berjaya' + }) + event.preventDefault(); + return false; + } + + const { value: komenkelulusan } = await Swal.fire({ + title: 'Masukkan Komen!', + input: 'text', + inputPlaceholder: 'Komen', + confirmButtonText: 'Hantar', + showCancelButton:false, + allowOutsideClick: false + }) + + let nm = $(e).closest('tr').children('td:eq(4)').text(); + let ber = $(e).closest('tr').children('td:eq(5)').text(); + let marg = $(e).closest('tr').children('td:eq(6)').text(); + + let komen = komenkelulusan + '|' + nm + "|" + ber + "|" + marg + "|"; + + let norujukan = $(e).data('norujukan'); + let pelulus = $(e).data('pelulus'); + let siri = $(e).data('siri'); + + $.ajax({ + method:'put', + url: "{{ route('khazanah.updatekelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan, + "pelulus" : pelulus, + "siri" : siri, + 'komen' : komen + }, + success:function(data){ + + Swal.fire({ + icon: 'success', + title: 'Pengesahan Berjaya' + }).then(function(){ + location.reload(); + + }); + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + } + + async function updatebatal(e) { const { value: katalaluan } = await Swal.fire({ title: 'Masukkan Katalaluan Semula', @@ -118,39 +377,19 @@ event.preventDefault(); return false; } - - let norujukan = $(e).data('norujukan'); - let pelulus = $(e).data('pelulus'); - - $.ajax({ - method:'put', - url: "{{ route('khazanah.updatekelulusan') }}", - data: { - "_token": "{{ csrf_token() }}", - "norujukan" : norujukan, - "pelulus" : pelulus - }, - success:function(data){ - console.log(data); - Swal.fire({ - icon: 'success', - title: 'Pengesahan Berjaya' - }).then(function(){ - location.reload(); - - }); - - },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - } - - function updatebatal(e) - { + + const { value: komenkelulusan } = await Swal.fire({ + title: 'Masukkan Komen Daripada Khazanah', + input: 'text', + inputPlaceholder: 'Komen', + confirmButtonText: 'Hantar', + showCancelButton:false, + allowOutsideClick: false + }) + let norujukan = $(e).data('norujukan'); let pelulus = $(e).data('pelulus'); + let siri = $(e).data('siri'); $.ajax({ method:'put', @@ -159,9 +398,12 @@ "_token": "{{ csrf_token() }}", "norujukan" : norujukan, "pelulus" : pelulus, + "siri" : siri, + "komenkelulusan" : komenkelulusan, "pembatalan" : "batal" }, success:function(data){ + console.log(data); Swal.fire({ icon: 'success', diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 21f32bb..1a33976 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -1,6 +1,86 @@ @extends('layouts.app_operasi') @section('content') + + + +
@@ -25,6 +105,7 @@ No Rujukan Cawangan + Teller Komen Nilai Pembiayaan Nilai Marhun @@ -35,17 +116,18 @@ @foreach($arraykelulusan as $index=>$k) - - {{ $k['norujukan'] }} - {{ $k['cawangan'] }} - {{ $k['komen'] }} - {{ number_format($k['pinjaman'],2) }} - {{ $k['nilaimarhun'] }} - {{ $k['berat'] }} - {{ $k['margin'] }} - + + {{ $k['norujukan'] }} + {{ $k['cawangan'] }} + {{ $k['namateller'] }} + {{ $k['komen'] }} + {{ number_format($k['pinjaman'],2) }} + {{ $k['nilaimarhun'] }} + {{ $k['berat'] }} + {{ $k['margin'] }} + + - @endforeach @@ -68,10 +150,152 @@ "scrollX": true }); - function updatelulus(e) + let api = "{{ config('api.url') }}"; + + const formatter = new Intl.NumberFormat('en-US', { + minimumFractionDigits: 2 + }); + + $('#kelulusanmodal').on('show.bs.modal', function(event) { + let button = $(event.relatedTarget); + let norujukan = $(button).data('norujukan'); + let kodcaw = $(button).data('kodcawangan'); + + $.ajax({ + method:'GET', + url: api + '/api/gadai/norujukan/' + norujukan, + dataType: 'json', + success:function(datagadaiwithnorujukan){ + + let nokp = datagadaiwithnorujukan[0][0].nokp; + + $.ajax({ + method:'GET', + url: api + '/api/customers/' + nokp, + dataType: 'json', + success:function(datagadaiwithnokp){ + + let nama = datagadaiwithnokp[0].nama; + + $('#namalanjut').text(nama); + $('#nokplanjut').text(nokp); + + $.ajax({ + method:'GET', + url: api + '/api/gadai/customers/' + nokp + '/outstandingsemasa/' + kodcaw, + dataType: 'json', + success:function(outstandingsemasa){ + + $('#pinjterkumpul').text('RM' + formatter.format(outstandingsemasa)); + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + + } + }); + + $.ajax({ + method:'GET', + url: api + '/api/customers/' + nokp + '/gadai/belum_tebus', + dataType: 'json', + success:function(data){ + let bilanganaktif = 0; + if(data == null) + { + bilanganaktif = 0; + }else{ + bilanganaktif = data[0].length; + } + + $('#bilaktif').text(bilanganaktif); + + + } + }); + + + $.ajax({ + method:'GET', + url: api + '/api/customers/' + nokp + '/gadai/lelong', + dataType: 'json', + success:function(data){ + + let bilanganlelong = 0; + + if(data == null) + { + bilanganlelong = 0; + }else{ + bilanganlelong = data.length; + } + + + $('#billelong').text(bilanganlelong); + } + }); + + + } + }); + + }); + + + async function updatelulus(e) { + + const { value: katalaluan } = await Swal.fire({ + title: 'Masukkan Katalaluan Semula', + input: 'password', + inputPlaceholder: 'Katalaluan', + confirmButtonText: 'Hantar', + showCancelButton:true, + cancelButtonText:'Batal', + allowOutsideClick: true + }) + + let dataminta = ''; + + $.ajax({ + method:'get', + url: "{{ route('operasi.getmintasemulakelulusan') }}", + async:false, + data:{ passsemula : katalaluan }, + success:function(data) + { + if(data == "False") + { + dataminta = data; + } + } + }); + + if(dataminta == 'False') + { + Swal.fire({ + icon: 'error', + title: 'Pengesahan Katalaluan Tidak Berjaya' + }) + event.preventDefault(); + return false; + } + + const { value: komenkelulusan } = await Swal.fire({ + title: 'Masukkan Komen!', + input: 'text', + inputPlaceholder: 'Komen', + confirmButtonText: 'Hantar', + showCancelButton:false, + allowOutsideClick: false + }) + let norujukan = $(e).data('norujukan'); let cawangankod = $(e).data('kodcaw'); + let siri = $(e).data('siri'); $.ajax({ method:'put', @@ -79,7 +303,9 @@ data: { "_token": "{{ csrf_token() }}", "norujukan" : norujukan, - "kodcaw" : cawangankod + "kodcaw" : cawangankod, + "komenkelulusan" : komenkelulusan, + "siri" : siri }, success:function(data){ console.log(data); @@ -95,6 +321,87 @@ alert(xhr.responseText); } }); + + } + + async function updatebatal(e) + { + const { value: katalaluan } = await Swal.fire({ + title: 'Masukkan Katalaluan Semula', + input: 'password', + inputPlaceholder: 'Katalaluan', + confirmButtonText: 'Hantar', + showCancelButton:true, + cancelButtonText:'Batal', + allowOutsideClick: true + }) + + let dataminta = ''; + + $.ajax({ + method:'get', + url: "{{ route('operasi.getmintasemulakelulusan') }}", + async:false, + data:{ passsemula : katalaluan }, + success:function(data) + { + if(data == "False") + { + dataminta = data; + } + } + }); + + if(dataminta == 'False') + { + Swal.fire({ + icon: 'error', + title: 'Pengesahan Katalaluan Tidak Berjaya' + }) + event.preventDefault(); + return false; + } + + const { value: komenkelulusan } = await Swal.fire({ + title: 'Masukkan Komen Daripada Khazanah', + input: 'text', + inputPlaceholder: 'Komen', + confirmButtonText: 'Hantar', + showCancelButton:false, + allowOutsideClick: false + }) + + let norujukan = $(e).data('norujukan'); + let siri = $(e).data('siri'); + let cawangankod = $(e).data('kodcaw'); + + $.ajax({ + method:'put', + url: "{{ route('operasi.updatekelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan, + "siri" : siri, + "kodcaw" : cawangankod, + "komenkelulusan" : komenkelulusan, + "pembatalan" : "batal" + }, + success:function(data){ + + console.log(data); + Swal.fire({ + icon: 'success', + title: 'Pengesahan Berjaya' + }).then(function(){ + location.reload(); + + }); + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 4afe0ce..f80449b 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -836,10 +836,8 @@ if(tarikhgadai >= tarikhtawarruq) { var bayar = $('#bayaran').val(); - var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran; + var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran; - - if(bayar > bakipinjam) { Swal.fire( @@ -850,7 +848,6 @@ return false; } - $.ajax({ method:'get', url: "{{ route('bayaran.ansuranstawarruq') }}", @@ -862,8 +859,6 @@ }, success:function(success_data){ - console.log(success_data); - var urlroute = '{{ route("resit.ansurans", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); @@ -922,7 +917,7 @@ var marhun = "{{ $gadai['marhun'] }}"; var noic = "{{ $gadai['nokp'] }}"; var total_berat = parseFloat("{{ $gadai['berat'] }}"); - var kuantiti_marhun = Number("{{sizeof($marhun)}}"); + var kuantiti_marhun = Number("{{ sizeof($marhun) }}"); var kadarupahbaru = 0; @@ -1276,7 +1271,7 @@ event.preventDefault(); return false; - }else if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80) || pinjamanbaru >= 10000){ + }else if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80) || pinjamanbaru >= 10000){ const swalWithBootstrapButtons = Swal.mixin({ customClass: { @@ -1388,8 +1383,6 @@ tambahpinjamanfunc(); } - } - function tambahpinjamanfunc() { let jenisbayarantebus = ''; diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php index ef23ab6..ae85cec 100644 --- a/resources/views/print/resitansuran.blade.php +++ b/resources/views/print/resitansuran.blade.php @@ -108,7 +108,7 @@ hr.new5 { } #inside td, #inside th { - border: 1px solid #ddd; + border: none; padding: 2px; } @@ -131,11 +131,12 @@ hr.new5 { font-family: Arial, Helvetica, sans-serif; border-collapse:collapse; width:100%; + margin-top:40px; font-size:10px; } #semakan td, #semakan th { - border: 1px solid #ddd; + border: none; padding: 2px; text-align: center; } @@ -396,18 +397,18 @@ hr.new5 { - + - + - + - + @@ -420,16 +421,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $transaction['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $transaction['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphpNama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
Nama Wakil : @endphp Nama Wakil :
- + - + - + - + @@ -489,14 +490,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp
Harga Jualan RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} Harga Jualan : RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }}
(-) Bayaran Pelanggan RM {{ number_format($transaction['duit_masuk'],2) }} (-) Bayaran Pelanggan : RM {{ number_format($transaction['duit_masuk'],2) }}
Baki Harga Jualan RM {{ number_format($transaction['bakiharga'],2) }} Baki Harga Jualan : RM {{ number_format($transaction['bakiharga'],2) }}
- + - + - + @@ -513,16 +514,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $transaction['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $transaction['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
- + - + - + - + diff --git a/resources/views/print/resitansuransebelum.blade.php b/resources/views/print/resitansuransebelum.blade.php index a52b855..2681be5 100644 --- a/resources/views/print/resitansuransebelum.blade.php +++ b/resources/views/print/resitansuransebelum.blade.php @@ -108,7 +108,7 @@ hr.new5 { } #inside td, #inside th { - border: 1px solid #ddd; + border: none; padding: 2px; } @@ -131,11 +131,12 @@ hr.new5 { font-family: Arial, Helvetica, sans-serif; border-collapse:collapse; width:100%; + margin-top:40px; font-size:10px; } #semakan td, #semakan th { - border: 1px solid #ddd; + border: none; padding: 2px; text-align: center; } @@ -396,14 +397,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp
Harga Jualan RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} Harga Jualan : RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }}
(-) Bayaran Pelanggan RM {{ number_format($transaction['duit_masuk'],2) }} (-) Bayaran Pelanggan : RM {{ number_format($transaction['duit_masuk'],2) }}
Baki Harga Jualan RM {{ number_format($transaction['bakiharga'],2) }}Baki Harga Jualan : RM {{ number_format($transaction['bakiharga'],2) }}
- + - + - + @@ -420,16 +421,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $penebusan['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $penebusan['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphpNama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
- + - + - + - + @@ -489,14 +490,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
Pembiayaan RM {{ number_format($gadai['pinjaman'],2) }} Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }}
(-) Bayaran Pelanggan RM {{ number_format($penebusan['ansuran'],2) }} (-) Bayaran Pelanggan : RM {{ number_format($penebusan['ansuran'],2) }}
Baki Pembiayaan RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }} Baki Pembiayaan : RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }}
- + - + - + @@ -513,16 +514,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $penebusan['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $penebusan['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
- + - + - + - + diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php index 63e3356..e55acbd 100644 --- a/resources/views/print/resittambahpinjam.blade.php +++ b/resources/views/print/resittambahpinjam.blade.php @@ -108,7 +108,7 @@ hr.new5 { } #inside td, #inside th { - border: 1px solid #ddd; + border: none; padding: 2px; } @@ -131,11 +131,12 @@ hr.new5 { font-family: Arial, Helvetica, sans-serif; border-collapse:collapse; width:100%; + margin-top:40px; font-size:10px; } #semakan td, #semakan th { - border: 1px solid #ddd; + border: none; padding: 2px; text-align: center; } @@ -396,14 +397,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp
Pembiayaan RM {{ number_format($gadai['pinjaman'],2) }} Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }}
(-) Bayaran Pelanggan RM {{ number_format($penebusan['ansuran'],2) }} (-) Bayaran Pelanggan : RM {{ number_format($penebusan['ansuran'],2) }}
Baki Pembiayaan RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }}Baki Pembiayaan : RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }}
- + - + - + @@ -420,16 +421,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }} Marhun : {{ $gadai['marhun'] }} : No SAG {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphpNama : {{ $customers_info['nama'] }} : Tarikh Bayar@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} : Tempoh Simpan {{ $gadai['jbg'] }}
- + - + - + - + @@ -489,14 +490,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
Pembiayaan RM {{ number_format($gadai['pinjaman'],2) }} Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }}
(+) Tambah Pembiayaan RM {{ number_format($penebusan['addpinjaman'],2) }} (+) Tambah Pembiayaan : RM {{ number_format($penebusan['addpinjaman'],2) }}
Pembiayaan Baru RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} Pembiayaan Baru : RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }}
- + - + - + @@ -512,16 +513,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }} Marhun : {{ $gadai['marhun'] }} : No SAG {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Nama : {{ $customers_info['nama'] }} : Tarikh Bayar @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} : Tempoh Simpan {{ $gadai['jbg'] }}
Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
- + - + - + - + diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php index 4ccc5cb..5cc8c85 100644 --- a/resources/views/print/resittebus.blade.php +++ b/resources/views/print/resittebus.blade.php @@ -108,7 +108,7 @@ hr.new5 { } #inside td, #inside th { - border: 1px solid #ddd; + border: none; padding: 2px; } @@ -131,11 +131,12 @@ hr.new5 { font-family: Arial, Helvetica, sans-serif; border-collapse:collapse; width:100%; + margin-top:40px; font-size:10px; } #semakan td, #semakan th { - border: 1px solid #ddd; + border: none; padding: 2px; text-align: center; } @@ -397,14 +398,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
Pembiayaan RM {{ number_format($gadai['pinjaman'],2) }} Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }}
(+) Tambah Pembiayaan RM {{ number_format($penebusan['addpinjaman'],2) }} (+) Tambah Pembiayaan : RM {{ number_format($penebusan['addpinjaman'],2) }}
Pembiayaan Baru RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} Pembiayaan Baru : RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }}
- + - + - + @@ -421,22 +422,22 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphpNama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
- + - + - + - + - + - + @@ -496,14 +497,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
Harga Jualan RM {{ number_format(($gadai['hargajualan']),2) }} Harga Jualan : RM {{ number_format(($gadai['hargajualan']),2) }}
(-) Bayaran Pelanggan RM {{ number_format($totaltransaction,2) }}(-) Bayaran Pelanggan : RM {{ number_format($totaltransaction,2) }}
Baki Harga Jualan RM {{ number_format($gadai['bakihargajualan'],2) }} Baki Harga Jualan : RM {{ number_format($gadai['bakihargajualan'],2) }}
(-) Rebate RM {{ number_format($penebusan['rebate'],2) }} (-) Rebate : RM {{ number_format($penebusan['rebate'],2) }}
Tebus Keseluruhan RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}Tebus Keseluruhan : RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}
- + - + - + @@ -523,22 +524,22 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
- + - + - + - + - + - +
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
Harga Jualan RM {{ number_format(($gadai['hargajualan']),2) }} Harga Jualan : RM {{ number_format(($gadai['hargajualan']),2) }}
(-) Bayaran Pelanggan RM {{ number_format($totaltransaction,2) }} (-) Bayaran Pelanggan : RM {{ number_format($totaltransaction,2) }}
Baki Harga Jualan RM {{ number_format($gadai['bakihargajualan'],2) }}Baki Harga Jualan : RM {{ number_format($gadai['bakihargajualan'],2) }}
(-) Rebate RM {{ number_format($penebusan['rebate'],2) }} (-) Rebate : RM {{ number_format($penebusan['rebate'],2) }}
Tebus Keseluruhan RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}Tebus Keseluruhan : RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php index 1ab3407..c566ee6 100644 --- a/resources/views/print/resittebussebelum.blade.php +++ b/resources/views/print/resittebussebelum.blade.php @@ -108,7 +108,7 @@ hr.new5 { } #inside td, #inside th { - border: 1px solid #ddd; + border: none; padding: 2px; } @@ -131,11 +131,12 @@ hr.new5 { font-family: Arial, Helvetica, sans-serif; border-collapse:collapse; width:100%; + margin-top:40px; font-size:10px; } #semakan td, #semakan th { - border: 1px solid #ddd; + border: none; padding: 2px; text-align: center; } @@ -397,14 +398,14 @@ hr.new5 { - + - + - + @@ -421,16 +422,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphpNama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
- + - + - + - + @@ -490,14 +491,14 @@ hr.new5 {
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
Pembiayaan RM {{ number_format(($gadai['pinjaman']),2) }} Pembiayaan : RM {{ number_format(($gadai['pinjaman']),2) }}
Jumlah Upah RM {{ number_format($penebusan['bakiupah'],2) }} Jumlah Upah : RM {{ number_format($penebusan['bakiupah'],2) }}
Tebus Keseluruhan RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}Tebus Keseluruhan : RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}
- + - + - + @@ -517,16 +518,16 @@ hr.new5 {
Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg`'] }}
- + - + - + - +
Tarikh Bayaran @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
Pembiayaan RM {{ number_format(($gadai['pinjaman']),2) }} Pembiayaan : RM {{ number_format(($gadai['pinjaman']),2) }}
Jumlah Upah RM {{ number_format($penebusan['bakiupah'],2) }} Jumlah Upah : RM {{ number_format($penebusan['bakiupah'],2) }}
Tebus Keseluruhan RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}Tebus Keseluruhan : RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}
diff --git a/routes/web.php b/routes/web.php index 394ca3d..d227b5c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -132,6 +132,7 @@ Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahContr Route::post('/createkelulusan',['as'=>'khazanah.createkelulusan','uses'=>'KhazanahController@createkelulusan'])->middleware('auth','teller'); Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'KhazanahController@updatekelulusan'])->middleware('auth','khazanah'); Route::get('/mintasemulakelulusan',['as'=>'khazanah.getmintasemulakelulusan','uses'=>'KhazanahController@mintakatalaluansemula'])->middleware('auth','khazanah'); +Route::get('/mintasemulakelulusan/operasi',['as'=>'operasi.getmintasemulakelulusan','uses'=>'OperasiController@mintakatalaluansemula'])->middleware('auth','operasi'); Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createpanjar'])->middleware('auth','khazanah'); Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianController@edit'])->middleware('auth','teller'); Route::post('/gadai/edit/store',['as'=>'gadai.editstore','uses'=>'GadaianController@editstore'])->middleware('auth','teller');