Merge branch 'pipi' into 'master'

fixing

See merge request online-sistem1/kaunter!61

app/Events/NotifikasiKelulusan.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+class NotifikasiKelulusan implements ShouldBroadcast
+{
+  use Dispatchable, InteractsWithSockets, SerializesModels;
+
+  public $norujukan,$kelulusan,$siri,$komen;
+
+  public function __construct($norujukan,$kelulusan,$siri,$komen)
+  {
+      $this->norujukan = $norujukan;
+      $this->kelulusan = $kelulusan;
+      $this->siri = $siri;
+      $this->komen = $komen;
+  }
+
+  public function broadcastOn()
+  {
+    return ['notice-kelulusan'];
+  }
+
+  public function broadcastAs()
+  {
+    return 'my-kelulusan';
+  }
+}

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();
+        $transaction = Http::get(config('api.url') . '/api/transaction/one/'. $id)->json();
-
-
-        if(sizeof($transaction) != 0)
-            $transaction = $transaction[0];
 
         $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();
 

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)
+        $listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get();
-            $tunai = $tunai[0];
 
-        $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)
+            array_push($arraytunaiharini,$tunai);
-        //    $addtunai = $addtunai[0];
+            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,[
+                $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $auth_user['cawangan'] . '/' . $norujukan,[
-                    "pengesahan" => "operasi"
+                    "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///

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()

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){
+            // if(+harini !== +tarikhgadai2){
-                Swal.fire({
+            //     Swal.fire({
-                    icon: 'error',
+            //         icon: 'error',
-                    title: 'Amaran',
+            //         title: 'Amaran',
-                    text: 'Hapus Gadai Tidak Dibenarkan'
+            //         text: 'Hapus Gadai Tidak Dibenarkan'
-                });
+            //     });
-                return false;
+            //     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){
+            // if(+harini !== +tarikhgadai1){
-                Swal.fire({
+            //     Swal.fire({
-                    icon: 'error',
+            //         icon: 'error',
-                    title: 'Amaran',
+            //         title: 'Amaran',
-                    text: 'Hapus Gadai Tidak Dibenarkan'
+            //         text: 'Hapus Gadai Tidak Dibenarkan'
-                });
+            //     });
-                return false;
+            //     return false;
-            }
+            // }
         }
 
         const swalWithBootstrapButtons = Swal.mixin({

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
+                                        var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
-                                            let timerInterval;
+                                        cluster: 'ap1',
-                                    
+                                        encrypted: true
-                                            timerInterval = setInterval(function(){
+                                        });
-                                                $.ajax({
+
-                                                    method:'get',
+                                        var channel = pusher.subscribe('notice-kelulusan');
-                                                    url: "{{ route('operasi.getkelulusan') }}",
+                                        channel.bind('my-kelulusan', function(data) {
-                                                    data: {
+                                        
-                                                        "norujukan" : norujukan
+
-                                                    
+                                            if(data.norujukan == norujukan && data.siri == siricreated)
-                                                    },
+                                            {
-                                                    success:function(data){
+                                                if(data.kelulusan == 'lulus')
-                                                        if(data != ''){
+                                                {
-                                                            clearInterval(timerInterval);
+                                                    Swal.fire({
-                                                            Swal.fire({
                                                                 icon: 'success',
-                                                                title: 'Telah Disahkan'
+                                                                title: 'Telah Disahkan',
-                                                            }).then(function(){
+                                                                text: `Komen : ${data.komen}`
-                                                                $(func).attr("onSubmit","return true;");
+                                                    }).then(function(){
-                                                                $(func).submit();
+                                                        $(func).attr("onSubmit","return true;");
-                                                                return true;
+                                                        $(func).submit();
-                                                            });
+                                                        return true;
-                                                        }
+                                                    });
-                                                    },
+
-                                                    error: function(xhr, status, error) {
+                                                }
-                                                        var err = eval("(" + xhr.responseText + ")");
+                                                else if(data.kelulusan == 'batal')
-                                                        alert(xhr.responseText);
+                                                {
-                                                    }
+                                                    Swal.fire({
-                                                });
+                                                        icon: 'warning',
-                                            }, 3000);
+                                                        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
+                                         //Try Pusher
-                                            let timerInterval;
-                                    
-                                            timerInterval = setInterval(function(){
-                                                $.ajax({
-                                                    method:'get',
-                                                    url: "{{ route('khazanah.getkelulusan') }}",
-                                                    data: {
-                                                        "norujukan" : norujukan
-                                                    },
-                                                    success:function(data){
-                                                        
-                                                        if(data != '')
-                                                        {
-                                                            clearInterval(timerInterval);
 
-                                                            if(data == 'batal')
+                                        var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
-                                                            {
+                                        cluster: 'ap1',
-                                                                Swal.fire({
+                                        encrypted: true
-                                                                icon: 'warning',
+                                        });
-                                                                title: 'Telah Dibatalkan'
-                                                                }).then(function(){
-                                                                    $("#terima_gadai").prop('disabled', false);
-                                                                    return false;
 
-                                                                });
+                                        var channel = pusher.subscribe('notice-kelulusan');
+                                        channel.bind('my-kelulusan', function(data) {
+                                        // let message = JSON.stringify(data);
 
-                                                            }else{
+                                            // console.log(message);
 
-                                                                Swal.fire({
+                                            if(data.norujukan == norujukan && data.siri == siricreated)
-                                                                icon: 'success',
+                                            {
-                                                                title: 'Telah Disahkan'
+                                                if(data.kelulusan == 'lulus')
-                                                                }).then(function(){
+                                                {
+                                                    Swal.fire({
+                                                        icon: 'success',
+                                                        title: 'Telah Disahkan'
+                                                    }).then(function(){
 
-                                                                    $(func).attr("onSubmit","return true;");
+                                                        $(func).attr("onSubmit","return true;");
-                                                                    $(func).submit();
+                                                        $(func).submit();
-                                                                    return true;
+                                                        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(

resources/views/homepage/teller/home.blade.php

@@ -34,6 +34,8 @@
             },
             success:function(data){
 
+                
+
                 if(jQuery.isEmptyObject(data))
                 {
                     console.log('empty');

resources/views/khazanah/alirantunai.blade.php

@@ -9,133 +9,314 @@
                 {{-- {{ dd($tunai) }} --}}
                 <div class="card-body text-center">
                     
-                 
                     <div class="row mb-4">
                         <div class="col-2 justify-content-start">
                         <a href="{{ url('/') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
                         </div>
                         <div class="col-8 mt-3 justify-content-center">
-                            <h3>Aliran Tunai</h3>
+                            <h3>Aliran Tunai - Peti Besi</h3>
                         </div>
                         <div class="col-2">
                         </div>
                     </div>
 
-                    <div class="col-12 row">
+                    <div class="container" id="exTab1">
-                        <div class="col-lg-6 col-xl-4 col-12">
-                            <!-- small box -->
-                            <div class="small-box bg-primary">
-                              <div class="inner">
-                                <h5>RM {{ number_format($tunai['bakiawal'],2) }}</h5>
-          
-                                <p>Baki Awal Tunai</p>
-                              </div>
-                              <div class="icon">
-                              </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
-                            </div>
-                          </div>
 
-                          <div class="col-lg-6 col-xl-4 col-12">
+                      {{-- {{ dd($arraytunai) }} --}}
-                            <!-- small box -->
-                            <div class="small-box bg-primary">
-                              <div class="inner">
-                                <h5>RM {{ number_format($tunai['tambah'],2) }}</h5>
-          
-                                <p>Tunai Diterima</p>
-                              </div>
-                              <div class="icon">
-                              </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
-                            </div>
-                          </div>
 
-                          <div class="col-lg-6 col-xl-4 col-12">
+                    <ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">  
-                            <!-- small box -->
+                    @foreach($listUser as $index1=>$ls)
-                            <div class="small-box bg-primary">
+                    
-                              <div class="inner">
+                      @if($index1 == 0)
-                                <h5>RM {{ number_format($tunai['kurang'],2) }}</h5>
+                        <li class="nav-item">
-          
+                          <a class="nav-link active" id="pills-home-tab" data-toggle="pill" href="#pills-home" role="tab" aria-controls="pills-home" aria-selected="true">{{ $ls->name }}</a>
-                                <p>Tunai Dikeluar</p>
+                        </li>
-                              </div>
+                      @else
-                              <div class="icon">
+                        <li class="nav-item">
-                              </div>
+                          <a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#pills-profile" role="tab" aria-controls="pills-profile" aria-selected="false">{{ $ls->name }}</a>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                        </li>
-                            </div>
+                        {{-- <li class="nav-item">
-                          </div>
+                          <a class="nav-link" id="pills-contact-tab" data-toggle="pill" href="#pills-contact" role="tab" aria-controls="pills-contact" aria-selected="false">Contact</a>
-                    </div>
+                        </li> --}}
+                      @endif
 
-                    <div class="col-12 row">
+                    @endforeach
-                        <div class="col-lg-6 col-xl-4 col-12">
+                    </ul>
-                            <!-- small box -->
+                       
-                            <div class="small-box bg-primary">
+                      
-                              <div class="inner">
-                                <h5>RM {{ number_format($tunai['baki'],2) }}</h5>
-          
-                                <p>Baki Akhir Tunai</p>
-                              </div>
-                              <div class="icon">
-                              </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
-                            </div>
-                          </div>
 
-                          <div class="col-lg-6 col-xl-4 col-12">
+                      <div class="tab-content" id="pills-tabContent">
-                            <!-- small box -->
-                            <div class="small-box bg-primary">
-                              <div class="inner">
-                                <h5>RM {{ number_format($tunai['keluar'],2) }}</h5>
-          
-                                <p>Gadaian</p>
-                              </div>
-                              <div class="icon">
-                              </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
-                            </div>
-                          </div>
 
-                          <div class="col-lg-6 col-xl-4 col-12">
+                        @foreach($listUser as $index1=>$ls)
-                            <!-- small box -->
+                    
-                            <div class="small-box bg-primary">
+                        {{-- {{ dd(empty($arraytunai[1])) }} --}}
-                              <div class="inner">
+                        @if($index1 == 0)
-                                <h5>RM {{ number_format($tunai['masuk'],2) }}</h5>
+                          <div class="tab-pane fade show active" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab">
-          
-                                <p>Tebusan</p>
-                              </div>
-                              <div class="icon">
-                              </div>
-                              {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
-                            </div>
-                          </div>
-                    </div>
 
-                    <div class="mt-3">
+                            <div class="col-12 row">
-                        
+                              <div class="col-lg-6 col-xl-4 col-12">
-                        <table class='table mt-4' id='table-capaian' style="width:100%;">
+                                  <!-- small box -->
-                            <thead>
+                                  <div class="small-box bg-primary">
-                                <tr>
+                                    <div class="inner">
-                                    <th>Bil</th>
+                                      <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}</h5>
-                                    <th>Tarikh</th>
-                                    <th>Debit</th>
-                                    <th>Kredit</th>
-                                    <th>Nota</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                @foreach ($addtunai as $tunai)
-                                <tr>
-                                <td>{{ $loop->iteration }}</td>
-                                <td>{{ $tunai['tarikh'] }}</td>
-                                <td>{{ $tunai['tambah'] }}</td>
-                                <td>{{ $tunai['kurang'] }}</td>
-                                <td>{{ $tunai['nota'] }}</td>
-                                </tr>
-                                @endforeach
-                            </tbody>
-                        </table>
-
-                    </div>
                 
+                                      <p>Baki Awal Tunai</p>
+                                    </div>
+                                    <div class="icon">
+                                    </div>
+                                    {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                  </div>
+                                </div>
+      
+                                <div class="col-lg-6 col-xl-4 col-12">
+                                  <!-- small box -->
+                                  <div class="small-box bg-primary">
+                                    <div class="inner">
+                                      <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
+                
+                                      <p>Tunai Diterima</p>
+                                    </div>
+                                    <div class="icon">
+                                    </div>
+                                    {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                  </div>
+                                </div>
+      
+                                <div class="col-lg-6 col-xl-4 col-12">
+                                  <!-- small box -->
+                                  <div class="small-box bg-primary">
+                                    <div class="inner">
+                                      <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
+                
+                                      <p>Tunai Dikeluar</p>
+                                    </div>
+                                    <div class="icon">
+                                    </div>
+                                    {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                  </div>
+                                </div>
+                            </div>
+      
+                            <div class="col-12 row">
+                                <div class="col-lg-6 col-xl-4 col-12">
+                                    <!-- small box -->
+                                    <div class="small-box bg-primary">
+                                      <div class="inner">
+                                        <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}</h5>
+                  
+                                        <p>Baki Akhir Tunai</p>
+                                      </div>
+                                      <div class="icon">
+                                      </div>
+                                      {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                    </div>
+                                  </div>
+        
+                                  <div class="col-lg-6 col-xl-4 col-12">
+                                    <!-- small box -->
+                                    <div class="small-box bg-primary">
+                                      <div class="inner">
+                                        <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}</h5>
+                  
+                                        <p>Gadaian</p>
+                                      </div>
+                                      <div class="icon">
+                                      </div>
+                                      {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                    </div>
+                                  </div>
+        
+                                  <div class="col-lg-6 col-xl-4 col-12">
+                                    <!-- small box -->
+                                    <div class="small-box bg-primary">
+                                      <div class="inner">
+                                        <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
+                  
+                                        <p>Tebusan</p>
+                                      </div>
+                                      <div class="icon">
+                                      </div>
+                                      {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                    </div>
+                                  </div>
+                            </div>
+
+                              <div class="mt-3">
+                          
+                                <table class='table mt-4' id='table-tunai' style="width:100%;">
+                                    <thead>
+                                        <tr>
+                                            <th>bil</th>
+                                            <th>Tarikh</th>
+                                            <th>Baki Awal Tunai</th>
+                                            <th>Tunai Diterima</th>
+                                            <th>Tunai Dikeluar</th>
+                                            <th>Gadaian</th>
+                                            <th>Tebusan</th>
+                                            <th>Baki Akhir Tunai</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($arraytunai[$index1] as $tunai)
+                                          <tr>
+                                          <td>{{ $loop->iteration }}</td>
+                                          <td>{{ $tunai['tarikh'] }}</td>
+                                          <td>{{ $tunai['bakiawal'] }}</td>
+                                          <td>{{ $tunai['tambah'] }}</td>
+                                          <td>{{ $tunai['kurang'] }}</td>
+                                          <td>{{ $tunai['keluar'] }}</td>
+                                          <td>{{ $tunai['masuk'] }}</td>
+                                          <td>{{ $tunai['baki'] }}</td>
+                                          </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
+        
+                            </div>
+
+                          </div>
+                        @else
+                          <div class="tab-pane fade" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab">
+
+                            <div class="tab-pane fade show active" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab">
+
+                              <div class="col-12 row">
+                                <div class="col-lg-6 col-xl-4 col-12">
+                                    <!-- small box -->
+                                    <div class="small-box bg-primary">
+                                      <div class="inner">
+                                        <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}</h5>
+                  
+                                        <p>Baki Awal Tunai</p>
+                                      </div>
+                                      <div class="icon">
+                                      </div>
+                                      {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                    </div>
+                                  </div>
+        
+                                  <div class="col-lg-6 col-xl-4 col-12">
+                                    <!-- small box -->
+                                    <div class="small-box bg-primary">
+                                      <div class="inner">
+                                        <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
+                  
+                                        <p>Tunai Diterima</p>
+                                      </div>
+                                      <div class="icon">
+                                      </div>
+                                      {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                    </div>
+                                  </div>
+        
+                                  <div class="col-lg-6 col-xl-4 col-12">
+                                    <!-- small box -->
+                                    <div class="small-box bg-primary">
+                                      <div class="inner">
+                                        <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
+                  
+                                        <p>Tunai Dikeluar</p>
+                                      </div>
+                                      <div class="icon">
+                                      </div>
+                                      {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                    </div>
+                                  </div>
+                              </div>
+        
+                              <div class="col-12 row">
+                                  <div class="col-lg-6 col-xl-4 col-12">
+                                      <!-- small box -->
+                                      <div class="small-box bg-primary">
+                                        <div class="inner">
+                                          <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}</h5>
+                    
+                                          <p>Baki Akhir Tunai</p>
+                                        </div>
+                                        <div class="icon">
+                                        </div>
+                                        {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                      </div>
+                                    </div>
+          
+                                    <div class="col-lg-6 col-xl-4 col-12">
+                                      <!-- small box -->
+                                      <div class="small-box bg-primary">
+                                        <div class="inner">
+                                          <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}</h5>
+                    
+                                          <p>Gadaian</p>
+                                        </div>
+                                        <div class="icon">
+                                        </div>
+                                        {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                      </div>
+                                    </div>
+          
+                                    <div class="col-lg-6 col-xl-4 col-12">
+                                      <!-- small box -->
+                                      <div class="small-box bg-primary">
+                                        <div class="inner">
+                                          <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
+                    
+                                          <p>Tebusan</p>
+                                        </div>
+                                        <div class="icon">
+                                        </div>
+                                        {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
+                                      </div>
+                                    </div>
+                              </div>
+
+
+                              <div class="mt-3">
+                          
+                                <table class='table mt-4' id='table-tunai2'>
+                                    <thead>
+                                        <tr>
+                                            <th>bil</th>
+                                            <th>Tarikh</th>
+                                            <th>Baki Awal Tunai</th>
+                                            <th>Tunai Diterima</th>
+                                            <th>Tunai Dikeluar</th>
+                                            <th>Gadaian</th>
+                                            <th>Tebusan</th>
+                                            <th>Baki Akhir Tunai</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($arraytunai[$index1] as $tunai)
+                                          <tr>
+                                          <td>{{ $loop->iteration }}</td>
+                                          <td>{{ $tunai['tarikh'] }}</td>
+                                          <td>{{ $tunai['bakiawal'] }}</td>
+                                          <td>{{ $tunai['tambah'] }}</td>
+                                          <td>{{ $tunai['kurang'] }}</td>
+                                          <td>{{ $tunai['keluar'] }}</td>
+                                          <td>{{ $tunai['masuk'] }}</td>
+                                          <td>{{ $tunai['baki'] }}</td>
+                                          </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
+        
+                            </div>
+
+  
+                            </div>
+
+                          </div>
+                        @endif
+
+                        @endforeach
+
+                        
+                        {{-- <div class="tab-pane fade" id="pills-contact" role="tabpanel" aria-labelledby="pills-contact-tab">...</div> --}}
+                      </div>
+
+
+                  </div>
+
                 </div>
             </div>
         </div>
@@ -143,9 +324,11 @@
 </div>
 <script>
 
-    var tablecapaian = $('#table-capaian').DataTable({
+    var tablecapaian = $('#table-tunai').DataTable({
           "scrollX": true
         });
+
+        
     
     </script>
 

resources/views/khazanah/kelulusan.blade.php

@@ -1,6 +1,86 @@
 @extends('layouts.app')
 
 @section('content')
+
+<div class="modal fade" id="kelulusanmodal">
+    <div class="modal-dialog modal-lg modal-dialog-centered">
+      <div class="modal-content">
+        <!-- Modal Header -->
+        <div class="modal-header">
+            <h4 class="text-center">Maklumat Lanjut</h4>
+            <button type="button" class="close" data-dismiss="modal">&times;</button>
+        </div>
+        <!-- Modal body -->
+        <div class="modal-body">
+          
+        <div class="row col-12 text-center">
+            <div class="row col-7">   
+                <label>Nama : </label>
+                <span id="namalanjut"> </span>
+             </div>
+
+            <div class="row col-5">   
+                <label>Kad Pengenalan : </label>
+                <span id="nokplanjut"> </span>
+            </div>
+        </div>
+
+        <div class="row mt-3">
+
+          <div class="col-lg-6 col-xl-4 col-12">
+            <!-- small box -->
+            <div class="small-box bg-info">
+              <div class="inner">
+                <h4 id="pinjterkumpul"></h4>
+                <p>Pembiayaan Terkumpul</p>
+              </div>
+              <div class="icon">
+                <i class="fas fa-money-bill-wave"></i>
+              </div>
+            </div>
+          </div>
+
+          <div class="col-lg-6 col-xl-4 col-12">
+            <!-- small box -->
+            <div class="small-box bg-success">
+              <div class="inner">
+                <h4 id="bilaktif"></h4>
+                <p>Belum Tebus</p>
+              </div>
+              <div class="icon">
+                <i class="fas fa-thumbs-up"></i>
+              </div>
+            </div>
+          </div>
+
+
+          <div class="col-lg-6 col-xl-4 col-12">
+            <!-- small box -->
+            <div class="small-box bg-danger">
+              <div class="inner">
+                <h4 id="billelong"></h4>
+                <p>Bilangan Lelong</p>
+              </div>
+              <div class="icon">
+                <i class="fas fa-gavel"></i>
+              </div>
+            </div>
+          </div>
+
+
+        </div>
+
+
+        </div>
+        <!-- Modal footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12">
@@ -26,8 +106,8 @@
                                 <th>No Rujukan</th>
                                 <th>Teller</th>
                                 <th>Komen</th>
-                                <th>Nilai Pembiayaan</th>
+                                <th>Nilai Pembiayaan (RM)</th>
-                                <th>Nilai Marhun</th>
+                                <th>Nilai Marhun (RM)</th>
                                 <th>Berat</th>
                                 <th>Margin</th>
                                 <th>Tindakan</th>
@@ -36,15 +116,15 @@
                         <tbody>
                             @foreach($arraykelulusan as $index=>$k)
                             <tr>
-                                <td>{{ $k['norujukan'] }}</td>
+                                <td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
                                 <td>{{ $k['namateller'] }}</td>
                                 <td>{{ $k['komen'] }}</td>
                                 <td>{{ number_format($k['pinjaman'],2) }}</td>
                                 <td>{{ $k['nilaimarhun'] }}</td>
                                 <td>{{ $k['berat'] }}</td>
                                 <td>{{ $k['margin'] }}</td>
-                                <td><button class="btn btn-primary mr-2" data-pelulus="{{ $k['pelulus'] }}" onclick="updatelulus(this)" data-norujukan="{{ $k['norujukan'] }}"><i class="fas fa-thumbs-up"></i></button>
+                                <td><button class="btn btn-primary mr-2"  data-pelulus="{{ $k['pelulus'] }}" onclick="updatelulus(this)" data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ $k['siri'] }}"><i class="fas fa-thumbs-up"></i></button>
-                                    <button class="btn btn-danger" data-norujukan="{{ $k['norujukan'] }}" data-pelulus="{{ $k['pelulus'] }}" onclick="updatebatal(this)"><i class="fas fa-thumbs-down"></i></button></td>
+                                    <button class="btn btn-danger" data-norujukan="{{ $k['norujukan'] }}" data-pelulus="{{ $k['pelulus'] }}" data-siri="{{ $k['siri'] }}" onclick="updatebatal(this)"><i class="fas fa-thumbs-down"></i></button></td>
                             </tr>
                             @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');
+        const { value: komenkelulusan } = await Swal.fire({
-        let pelulus = $(e).data('pelulus');
+            title: 'Masukkan Komen Daripada Khazanah',
-
+            input: 'text',
-        $.ajax({
+            inputPlaceholder: 'Komen',
-            method:'put',
+            confirmButtonText: 'Hantar',
-            url: "{{ route('khazanah.updatekelulusan') }}",
+            showCancelButton:false,
-            data: {
+            allowOutsideClick: false
-                "_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)
-    {
         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',

resources/views/operasi/kelulusan.blade.php

@@ -1,6 +1,86 @@
 @extends('layouts.app_operasi')
 
 @section('content')
+
+<div class="modal fade" id="kelulusanmodal">
+    <div class="modal-dialog modal-lg modal-dialog-centered">
+      <div class="modal-content">
+        <!-- Modal Header -->
+        <div class="modal-header">
+            <h4 class="text-center">Maklumat Lanjut</h4>
+            <button type="button" class="close" data-dismiss="modal">&times;</button>
+        </div>
+        <!-- Modal body -->
+        <div class="modal-body">
+          
+        <div class="row col-12 text-center">
+            <div class="row col-7">   
+                <label>Nama : </label>
+                <span id="namalanjut"> </span>
+             </div>
+
+            <div class="row col-5">   
+                <label>Kad Pengenalan : </label>
+                <span id="nokplanjut"> </span>
+            </div>
+        </div>
+
+        <div class="row mt-3">
+
+          <div class="col-lg-6 col-xl-4 col-12">
+            <!-- small box -->
+            <div class="small-box bg-info">
+              <div class="inner">
+                <h4 id="pinjterkumpul"></h4>
+                <p>Pembiayaan Terkumpul</p>
+              </div>
+              <div class="icon">
+                <i class="fas fa-money-bill-wave"></i>
+              </div>
+            </div>
+          </div>
+
+          <div class="col-lg-6 col-xl-4 col-12">
+            <!-- small box -->
+            <div class="small-box bg-success">
+              <div class="inner">
+                <h4 id="bilaktif"></h4>
+                <p>Belum Tebus</p>
+              </div>
+              <div class="icon">
+                <i class="fas fa-thumbs-up"></i>
+              </div>
+            </div>
+          </div>
+
+
+          <div class="col-lg-6 col-xl-4 col-12">
+            <!-- small box -->
+            <div class="small-box bg-danger">
+              <div class="inner">
+                <h4 id="billelong"></h4>
+                <p>Bilangan Lelong</p>
+              </div>
+              <div class="icon">
+                <i class="fas fa-gavel"></i>
+              </div>
+            </div>
+          </div>
+
+
+        </div>
+
+
+        </div>
+        <!-- Modal footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12">
@@ -25,6 +105,7 @@
                             <tr>
                                 <th>No Rujukan</th>
                                 <th>Cawangan</th>
+                                <th>Teller</th>
                                 <th>Komen</th>
                                 <th>Nilai Pembiayaan</th>
                                 <th>Nilai Marhun</th>
@@ -35,17 +116,18 @@
                         </thead>
                         <tbody>
                             @foreach($arraykelulusan as $index=>$k)
-                            <tr>
+                            <tr>    
-                            <td>{{ $k['norujukan'] }}</td>
+                                <td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-kodcawangan="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
-                            <td>{{ $k['cawangan'] }}</td>
+                                <td>{{ $k['cawangan'] }}</td>
-                            <td>{{ $k['komen'] }}</td>
+                                <td>{{ $k['namateller'] }}</td>
-                            <td>{{ number_format($k['pinjaman'],2) }}</td>
+                                <td>{{ $k['komen'] }}</td>
-                            <td>{{ $k['nilaimarhun'] }}</td>
+                                <td>{{ number_format($k['pinjaman'],2) }}</td>
-                            <td>{{ $k['berat'] }}</td>
+                                <td>{{ $k['nilaimarhun'] }}</td>
-                            <td>{{ $k['margin'] }}</td>
+                                <td>{{ $k['berat'] }}</td>
-                            <td><button class="btn btn-primary mr-2" onclick="updatelulus(this)" data-kodcaw="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}"><i class="fas fa-thumbs-up"></i></button><button class="btn btn-danger"><i class="fas fa-thumbs-down"></i></button></td>
+                                <td>{{ $k['margin'] }}</td>
+                                <td><button class="btn btn-primary mr-2" onclick="updatelulus(this)" data-kodcaw="{{ $k['cawangankod'] }}" data-pelulus="{{ $k['pelulus'] }}"  data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ $k['siri'] }}"><i class="fas fa-thumbs-up"></i></button>
+                                    <button class="btn btn-danger" onclick="updatebatal(this)" data-kodcaw="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}" data-pelulus="{{ $k['pelulus'] }}" data-siri="{{ $k['siri'] }}" ><i class="fas fa-thumbs-down"></i></button></td>
                             </tr>
-
                             @endforeach
                         </tbody>
                     </table>
@@ -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);
+            }
+        });  
     }
 
 </script>

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 = '';

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 {
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $transaction['norujukan'] }} </td>
  </tr>
  <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
  </tr>
  
  <tr>
-  <td colspan="3">Nama Wakil </td> <td>: @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
+  <td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
    </tr>
   
    <tr>
@@ -420,16 +421,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
+<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($transaction['duit_masuk'],2) }} </td>
+<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($transaction['bakiharga'],2) }} </td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }} </td>
 </tr>
 
 
@@ -489,14 +490,14 @@ hr.new5 {
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $transaction['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td> @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
 </tr>
 
 <tr>
@@ -513,16 +514,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
+<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($transaction['duit_masuk'],2) }} </td>
+<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($transaction['bakiharga'],2) }}</td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
 </tr>
 
 

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 {
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $penebusan['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $penebusan['norujukan'] }} </td>
  </tr>
  <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
  </tr>
  
  <tr>
@@ -420,16 +421,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['pinjaman'],2) }} </td>
+<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['ansuran'],2) }} </td>
+<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['ansuran'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Pembiayaan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }} </td>
+<td style="width:10px"><b>Baki Pembiayaan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }} </td>
 </tr>
 
 
@@ -489,14 +490,14 @@ hr.new5 {
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $penebusan['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $penebusan['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td> @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
 </tr>
 
 <tr>
@@ -513,16 +514,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['pinjaman'],2) }} </td>
+<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['ansuran'],2) }} </td>
+<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['ansuran'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Pembiayaan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }}</td>
+<td style="width:10px"><b>Baki Pembiayaan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] - $penebusan['ansuran']),2) }}</td>
 </tr>
 
 

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 {
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: No SAG</td><td> {{ $gadai['norujukan'] }} </td>
  </tr>
  <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tarikh Bayar</td><td>@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td>
  </tr>
  
  <tr>
@@ -420,16 +421,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['pinjaman'],2) }} </td>
+<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(+) Tambah Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['addpinjaman'],2) }} </td>
+<td style="width:10px">(+) Tambah Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['addpinjaman'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} </td>
+<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} </td>
 </tr>
 
 
@@ -489,14 +490,14 @@ hr.new5 {
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: No SAG</td><td> {{ $gadai['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td> @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tarikh Bayar</td><td> @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td>
 </tr>
 <tr>
   <td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
@@ -512,16 +513,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['pinjaman'],2) }} </td>
+<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(+) Tambah Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['addpinjaman'],2) }} </td>
+<td style="width:10px">(+) Tambah Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['addpinjaman'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} </td>
+<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} </td>
 </tr>
 
 

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 {
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
  </tr>
  <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
  </tr>
 
  <tr>
@@ -421,22 +422,22 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['hargajualan']),2) }} </td>
+<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($totaltransaction,2) }}</td>
+<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($totaltransaction,2) }}</td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['bakihargajualan'],2) }} </td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['rebate'],2) }} </td>
+  <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
   </tr>
 
 
@@ -496,14 +497,14 @@ hr.new5 {
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td> @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
 </tr>
 
 
@@ -523,22 +524,22 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['hargajualan']),2) }} </td>
+<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($totaltransaction,2) }} </td>
+<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($totaltransaction,2) }} </td>
 </tr>
 <tr>
-<td style="width:10px">Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['bakihargajualan'],2) }}</td>
+<td style="width:10px">Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }}</td>
 </tr>
 <tr>
-  <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['rebate'],2) }} </td>
+  <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
   </tr>
 
 </table>

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 {
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
  </tr>
  <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
  </tr>
 
  <tr>
@@ -421,16 +422,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['pinjaman']),2) }} </td>
+<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
   </tr>
 
 
@@ -490,14 +491,14 @@ hr.new5 {
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td> @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg`'] }} </td>
 </tr>
 
 
@@ -517,16 +518,16 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
 </tr>
 <tr>
-<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['pinjaman']),2) }} </td>
+<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
   </tr>
 
 </table>

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');