fix skit2

2022-04-17 11:24:37 +08:00
parent d2ab9e9e05
commit c09332063a
13 changed files with 589 additions and 88 deletions
@@ -35,6 +35,8 @@ class BayaranController extends Controller
    public function SenaraiPembayaran()
    {

+		$api_url = config('api.url');
+
 		$arraysag = [];

        $auth_user = Auth::user();
@@ -58,7 +60,7 @@ class BayaranController extends Controller
 		$belum_tebus = $arraysag;

        // return view('pembayaran.senaraibayaran', compact('belum_tebus'));
-        return view('includes.bayaran.senaraibayaransag', compact('belum_tebus'));
+        return view('includes.bayaran.senaraibayaransag', compact('belum_tebus','api_url'));
    }

    public function PembayaranAction(Request $request)
@@ -172,8 +174,6 @@ class BayaranController extends Controller

 		$billcode = $response->toArray();

-		dd($bill);
-
        foreach($array_payment as $index1=>$arraypay)
        {
            $previous_siri = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/online/transaction')->json();
@@ -2,6 +2,7 @@

 namespace App\Http\Controllers;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Auth;

 class HomeController extends Controller
 {
@@ -22,6 +23,7 @@ class HomeController extends Controller
     */
    public function index()
    {
+        $auth_user = Auth::user();
        $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();

        $hargaemasterdahulu = array();
@@ -36,6 +38,29 @@ class HomeController extends Controller

        }

-        return view('includes.home',compact('hargaemasterdahulu'));
+      
+        $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
+
+        $total = 0.00;
+        $sixmonths = 0;
+        $bilangan = 0;
+        foreach($CustomerInfo['gadai'] as $index=>$gadai)
+        {
+            $bilangan++;
+            $total += $gadai['pinjaman'];
+
+            if($gadai['tempoh'] >= 6)
+            {
+                $sixmonths++;
+            }
+        }
+
+        $bilanganlelong = 0;
+        foreach($CustomerInfo['lelong'] as $index1=>$lelong)
+        {
+            $bilanganlelong += 1;
+        }
+
+        return view('includes.home',compact('hargaemasterdahulu','bilangan','sixmonths','total','bilanganlelong'));
    }
 }
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Http;
+
+class InformationController extends Controller
+{
+    public function pembiayaansemasa()
+    {
+        $auth_user = Auth::User();
+
+        $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
+
+        $pembiayaansemasa = [];
+        if(isset($CustomerInfo['gadai']))
+        {
+            $pembiayaansemasa = $CustomerInfo['gadai'];
+        }
+
+        return view('includes.information.pembiayaansemasa',compact('pembiayaansemasa'));
+    }
+
+    public function pembiayaanaktif()
+    {
+        $auth_user = Auth::User();
+
+        $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
+
+        $pembiayaansemasa = [];
+        if(isset($CustomerInfo['gadai']))
+        {
+            $pembiayaansemasa = $CustomerInfo['gadai'];
+        }
+
+        return view('includes.information.pembiayaanaktif',compact('pembiayaansemasa'));
+    }
+
+    public function pembiayaanmelebihi6bulan()
+    {
+        $auth_user = Auth::User();
+
+        $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
+
+        $melebihi6bulan = [];
+        if(isset($CustomerInfo['gadai']))
+        {
+            foreach($CustomerInfo['gadai'] as $index=>$gadai)
+            {
+                if($gadai['jbg'] >= 6)
+                {
+                    array_push($melebihi6bulan,$gadai);
+                }
+            }
+        }
+
+        return view('includes.information.melebihi6bulan',compact('melebihi6bulan'));
+    }
+
+    public function pembiayaanakandilelong()
+    {
+        $auth_user = Auth::User();
+
+        $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
+
+        $lelong = [];
+        if(isset($CustomerInfo['lelong']))
+        {
+            $lelong += $CustomerInfo['lelong'];
+        }
+
+        return view('includes.information.lelongan',compact('lelong'));
+    }
+}
@@ -90,7 +90,7 @@
                    <div class="card-body">
                        <div class="row">
                            <div class="col">
-                                <h6 class="card-title text-uppercase text-muted mb-0">Bilangan Pembiayaan Aktif</h6>
+                                <h6 class="card-title text-uppercase text-muted mb-0">Pembiayaan Aktif</h6>
                                <span class="h4 font-weight-bold mb-0">{{ number_format($bilangan_belum_tebus) }}</span>
                            </div>
                            <div class="col-auto">
@@ -124,12 +124,12 @@
                    <div class="card-body">
                        <div class="row">
                            <div class="col">
-                                <h6 class="card-title text-uppercase text-muted mb-0">Bilangan Pembiayaan Akan Dilelong</h6>
+                                <h6 class="card-title text-uppercase text-muted mb-0">Pembiayaan Akan Dilelong</h6>
                                <span class="h4 font-weight-bold mb-0">{{ number_format($bilakandilelong) }}</span>
                            </div>
                            <div class="col-auto">
                                <div class="icon icon-shape bg-info text-white rounded-circle shadow">
-                                    <i class="fas fa-percent" style="margin-left: 2px;"></i>
+                                    <i class="fas fa-gavel" style="margin-left: 2px;"></i>
                                </div>
                            </div>
                        </div>
@@ -67,7 +67,7 @@
                            <thead class="thead-light bg-dark text-white text-center">
                                <tr>
                                    <th>#</th>
-                                    <th>Ar-Rahn</th>
+                                    <th>Cawangan</th>
                                    <th>No Rujukan</th>
                                    <th>Keuntungan Semasa</th>
                                </tr>
@@ -118,7 +118,7 @@
                                                    @php
                                                    $marhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json();
                                                    @endphp
-                                                    <a href="#" class="linktarget" data-toggle="modal" data-pjmnum="{{ number_format($bt['pinjaman'],2) }}" data-bakipjm="{{ number_format($bt['bakipjm'],2) }}" data-lelong="{{ $bt['taglel'] }}" data-marhun="{{ json_encode($marhun) }}" data-pinjaman="{{$bt['pinjaman']}}" data-norujukan="{{$bt['norujukan']}}" data-hargajualan="{{$bt['hargajualan']}}" data-kodcaw="{{ $bt['kodcaw'] }}" data-target="#marhunModal"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
+                                                    <a href="#" class="linktarget" data-toggle="modal" data-nm="{{ number_format($bt['nilaimarhun'],2) }}" data-berat="{{ number_format($bt['berat'],2) }}" data-upah12="{{ number_format($bt['upah12'],2) }}" data-pjmnum="{{ number_format($bt['pinjaman'],2) }}" data-bakipjm="{{ number_format($bt['bakipjm'],2) }}" data-lelong="{{ $bt['taglel'] }}" data-marhun="{{ json_encode($marhun) }}" data-pinjaman="{{$bt['pinjaman']}}" data-norujukan="{{$bt['norujukan']}}" data-hargajualan="{{$bt['hargajualan']}}" data-kodcaw="{{ $bt['kodcaw'] }}" data-target="#marhunModal"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
                                                </div>
                                            </div>
                                        </th>
@@ -150,6 +150,8 @@
 </div>

 <script>
+    var apiurl = "{{ $api_url }}";
+
    // var belumtawarruqtable = $('#belum_tawarruq').DataTable({
    //     "bLengthChange": false,
    //     "bFilter": true,
@@ -166,6 +168,10 @@

    // });

+    var historybayarandatatable = $('#tablehistorybayaran').DataTable({
+        "ordering": false
+    });
+
    var selepastawarruqtable = $('#selepas_tawarruq').DataTable({
        "bFilter": true,
        language: {
@@ -178,6 +184,55 @@
        "scrollX": true
    });

+    function bayaranfunc(e,api){
+        
+        let norujukan = $(e).data('norujukan');
+
+        let pinjaman = $(e).data('pinjaman');
+        let upah12 = $(e).data('upah12');
+        let bakipjm = $(e).data('bakipjm');
+        let berat = $(e).data('berat');
+        let nm = $(e).data('nm');
+
+        console.log(pinjaman,upah12,bakipjm,berat,nm);
+
+        $('#pembiayaan').text('RM ' + pinjaman);
+        $('#bpembiayaan').text('RM ' + bakipjm);
+        $('#nm').text('RM ' + nm);
+        $('#berat').text(berat + 'g');
+        $('#koskeun').text('RM ' + upah12);
+
+
+
+        $.ajax({
+            method: 'get',
+            url: api + '/api/transaction/' + norujukan,
+            success: function(data){
+                historybayarantable(data);
+            }
+        });
+    }
+
+    function historybayarantable(data){
+        var counter = 1;
+        
+        historybayarandatatable.clear().draw();
+        $.each(data,function(index,bayaran){
+
+            var urlroute = '{{ route("resit.ansuran", ":id") }}';
+            urlroute = urlroute.replace(':id', bayaran['id']);
+
+            var date = new Date(bayaran['created_at']);
+            historybayarandatatable.row.add([
+                    counter,
+                    // date.toLocaleDateString(), 
+                    '<a target="_blank" href='+ urlroute + '>'+date.toLocaleDateString()+'</a>',
+                    "RM " + bayaran['duit_masuk'],
+                ]).draw();
+                counter = counter + 1;
+        });
+    }
+
    $("input[type='checkbox'][name='chkboxsag[]']").click(function() {
        var count = parseInt($('#totalsag').text());
        if ($(this).is(':checked')) {
@@ -212,6 +267,8 @@
        var lelong = $(this).data('lelong');
        var pjmnum = $(this).data('pjmnum');

+        bayaranfunc(this,apiurl);
+
        $('#pemb').text('RM ' + pjmnum);
        $('#bpemb').text('RM ' + bakipjm);

@@ -21,11 +21,87 @@

 <title>Home | Portal Pelanggan</title>

-<!-- <div class="loader">
-    <img src="{{ asset('assets/img/material-kit/grid.svg') }}">
-</div> -->
+<div class="row mt-n9 top-0">
+    <div class="col-xl-3 col-lg-6">
+        <div class="card card-stats mb-4 mb-xl-0">
+            <div class="card-body">
+                <div class="row">
+                    <div class="col">
+                        <h6 class="card-title text-uppercase text-muted mb-0"> Jumlah Pemb. Semasa</h6>
+                        <span class="h4 font-weight-bold mb-0">RM{{ number_format($total,2) }}</span>
+                    </div>
+                    <div class="col-auto text-center">
+                        <div class="icon icon-shape bg-danger text-white rounded-circle shadow text-center">
+                            <i class="fas fa-chart-bar"></i>
+                        </div>
+                        <br>
+                        <a href="{{ route('info.pembsemasa') }}" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Masuk</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>

-<div class="col-lg-4 col-md-6">
+    <div class="col-xl-3 col-lg-6">
+        <div class="card card-stats mb-4 mb-xl-0">
+            <div class="card-body">
+                <div class="row">
+                    <div class="col">
+                        <h6 class="card-title text-uppercase text-muted mb-0">Pembiayaan<br>Aktif</h6>
+                        <span class="h4 font-weight-bold mb-0">{{ $bilangan }}</span>
+                    </div>
+                    <div class="col-auto text-center">
+                        <div class="icon icon-shape bg-warning text-white rounded-circle shadow text-center">
+                            <i class="fas fa-chart-pie text-center"></i>
+                        </div>
+                        <br>
+                        <a href="{{ route('info.pembaktif') }}" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Masuk</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-xl-3 col-lg-6">
+        <div class="card card-stats mb-4 mb-xl-0">
+            <div class="card-body">
+                <div class="row">
+                    <div class="col">
+                        <h6 class="card-title text-uppercase text-muted mb-0">Pembiayaan Melebihi 6 Bulan</h6>
+                        <span class="h4 font-weight-bold mb-0">{{ $sixmonths }}</span>
+                    </div>
+                    <div class="col-auto text-center">
+                        <div class="icon icon-shape bg-success text-white rounded-circle shadow text-center">
+                            <i class="fas fa-users"></i>
+                        </div>
+                        <br>
+                        <a href="{{ route('info.pemb6bulan') }}" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Masuk</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-xl-3 col-lg-6">
+        <div class="card card-stats mb-4 mb-xl-0">
+            <div class="card-body">
+                <div class="row">
+                    <div class="col">
+                        <h6 class="card-title text-uppercase text-muted mb-0">Pembiayaan Akan Dilelong</h6>
+                        <span class="h4 font-weight-bold mb-0">{{ $bilanganlelong }}</span>
+                    </div>
+                    <div class="col-auto text-center">
+                        <div class="icon icon-shape bg-info text-white rounded-circle shadow text-center">
+                            <i class="fas fa-gavel" style="margin-left: 2px;"></i>
+                        </div>
+                        <br>
+                        <a href="{{ route('info.pemblelongan') }}" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Masuk</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{{-- <div class="col-lg-4 col-md-6">
    <div class="card mt-5">
        <div class="card-header p-0 position-relative mt-n4 mx-3 z-index-2">
            <a class="d-block blur-shadow-image"> 
@@ -41,7 +117,7 @@
            <a type="button" href="{{ route('semaksag') }}" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Masuk</a>
        </div>
    </div>
-</div>
+</div> --}}
 <div class="col-lg-4 col-md-6">
    <div class="card mt-5">
        <div class="card-header p-0 position-relative mt-n4 mx-3 z-index-2">
@@ -75,7 +151,7 @@
        </div>
    </div>
 </div>
-<div class="col-lg-4 col-md-6">
+{{-- <div class="col-lg-4 col-md-6">
    <div class="card mt-5">
        <div class="card-header p-0 position-relative mt-n4 mx-3 z-index-2">
            <a class="d-block blur-shadow-image">
@@ -89,7 +165,7 @@
            <a type="button" href="{{ route('analisa.index') }}" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Masuk</a>
        </div>
    </div>
-</div>
+</div> --}}
 <div class="col-lg-4 col-md-6">
    <div class="card mt-5">
        <div class="card-header p-0 position-relative mt-n4 mx-3 z-index-2">
@@ -101,14 +177,14 @@
        </div>
        <div class="card-body text-center">
            <h5 class="font-weight-normal">
-                <a>PitihEmas</a>
+                <a>Pitih Emas</a>
            </h5>
            <button type="button" class="btn bg-gradient-primary btn-sm mb-0 mt-3" disabled>Masuk</button>
        </div>
    </div>
 </div>

-<div class="col-lg-4 col-md-6">
+<div class="col-lg-6 col-md-8">
    <div class="card mt-3 card-bg shadow p-4">
        {{-- <div class="card-header border-0">
            <div class="row align-items-center">
@@ -124,7 +200,7 @@
                    <tr>
                        <th>Karat</th>
                        <th>Harga (RM)</th>
-                        <th>Perubahan (%)</th>
+                        {{-- <th>Perubahan (%)</th> --}}
                    </tr>
                </thead>
                <tbody>
@@ -132,33 +208,8 @@
                    <tr>
                        <td>{{ $hm['karat'] }}</td>
                        <td>{{ $hm['hargasemasa'] }}</td>
-                        @if($hm['percent'] > 0)
-                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">({{ number_format($hm['percent'],2) }})</span></td>
-                        @else
-                        <td><i class="fas fa-arrow-down text-warning mr-3"></i><span class="text-warning">({{ number_format($hm['percent']*-1,2) }})</span></td>
-                        @endif
                    </tr>
                    @endforeach
-                    <!-- <tr>
-                        <td>14.0k</td>
-                        <td>157.30</td>
-                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                    </tr>
-                    <tr>
-                        <td>14.0k</td>
-                        <td>157.30</td>
-                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                    </tr>
-                    <tr>
-                        <td>14.0k</td>
-                        <td>157.30</td>
-                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                    </tr>
-                    <tr>
-                        <td>14.0k</td>
-                        <td>157.30</td>
-                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                    </tr> -->
                </tbody>
            </table>
        </div>
@@ -0,0 +1,46 @@
+@extends('layouts.indexthird')
+@section('content')
+
+<title>Pembiayaan Akan Dilelong | Portal Pelanggan</title>
+
+<div class="container">
+    <div class="row">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb">
+                <li class="breadcrumb-item text-dark opacity-5"><a href="/">Home</a></li>
+                <li class="breadcrumb-item text-dark active" aria-current="page">Pembiayaan Akan Dilelong</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+
+<div class="container col-11 shadow-lg p-3 mb-5 bg-white rounded">
+    <div class="table-responsive table-bordered">
+        <table class="table align-items-center table-flush table-hover border" id="selepas_tawarruq" style="width: 100%;">
+            <thead class="thead-light bg-dark text-white text-center">
+                <tr>
+                    <th scope="col" class="sort" data-sort="name">No Rujukan</th>
+                    <th scope="col" class="sort" data-sort="budget">Keuntungan</th>
+                    <th scope="col" class="sort" data-sort="budget">JBG</th>
+                </tr>
+            </thead>
+            <tbody class="list">
+                @foreach($lelong as $index=>$lel)
+                <tr style="text-align: center;">
+                    <td>
+                        a
+                    </td>
+                    <td>
+                        a
+                    </td>
+                    <td>
+                        a
+                    </td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </div>
+</div>
+
+@endsection
@@ -0,0 +1,47 @@
+@extends('layouts.indexthird')
+@section('content')
+@include('modal.historybayaran')
+
+<title>Pembiayaan Melebihi 6 Bulan | Portal Pelanggan</title>
+
+<div class="container">
+    <div class="row">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb">
+                <li class="breadcrumb-item text-dark opacity-5"><a href="/">Home</a></li>
+                <li class="breadcrumb-item text-dark active" aria-current="page">Pembiayaan Melebihi 6 Bulan</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+
+<div class="container col-11 shadow-lg p-3 mb-5 bg-white rounded">
+    <div class="table-responsive table-bordered">
+        <table class="table align-items-center table-flush table-hover border" id="selepas_tawarruq" style="width: 100%;">
+            <thead class="thead-light bg-dark text-white text-center">
+                <tr>
+                    <th scope="col" class="sort" data-sort="name">No Rujukan</th>
+                    <th scope="col" class="sort" data-sort="budget">Keuntungan</th>
+                    <th scope="col" class="sort" data-sort="budget">JBG</th>
+                </tr>
+            </thead>
+            <tbody class="list">
+                @foreach($melebihi6bulan as $index=>$sixmonths)
+                <tr style="text-align: center;">
+                    <td>
+                        {{ $sixmonths['norujukan'] }}
+                    </td>
+                    <td>
+                        a
+                    </td>
+                    <td>
+                        a
+                    </td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </div>
+</div>
+
+@endsection
@@ -0,0 +1,47 @@
+@extends('layouts.indexthird')
+@section('content')
+@include('modal.historybayaran')
+
+<title>Pembiayaan Aktif | Portal Pelanggan</title>
+
+<div class="container">
+    <div class="row">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb">
+                <li class="breadcrumb-item text-dark opacity-5"><a href="/">Home</a></li>
+                <li class="breadcrumb-item text-dark active" aria-current="page">Pembiayaan Aktif</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+
+<div class="container col-11 shadow-lg p-3 mb-5 bg-white rounded">
+    <div class="table-responsive table-bordered">
+        <table class="table align-items-center table-flush table-hover border" id="selepas_tawarruq" style="width: 100%;">
+            <thead class="thead-light bg-dark text-white text-center">
+                <tr>
+                    <th scope="col" class="sort" data-sort="name">No Rujukan</th>
+                    <th scope="col" class="sort" data-sort="budget">Keuntungan</th>
+                    <th scope="col" class="sort" data-sort="budget">JBG</th>
+                </tr>
+            </thead>
+            <tbody class="list">
+                @foreach($pembiayaansemasa as $index=>$aktif)
+                <tr style="text-align: center;">
+                    <td>
+                        {{ $aktif['norujukan'] }}
+                    </td>
+                    <td>
+                        {{ number_format($aktif['bakiupah'],2) }}
+                    </td>
+                    <td>
+                        {{ $aktif['tempoh'] }}
+                    </td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </div>
+</div>
+
+@endsection
@@ -0,0 +1,47 @@
+@extends('layouts.indexthird')
+@section('content')
+@include('modal.historybayaran')
+
+<title>Pembiayaan Semasa | Portal Pelanggan</title>
+
+<div class="container">
+    <div class="row">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb">
+                <li class="breadcrumb-item text-dark opacity-5"><a href="/">Home</a></li>
+                <li class="breadcrumb-item text-dark active" aria-current="page">Pembiayaan Semasa</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+
+<div class="container col-11 shadow-lg p-3 mb-5 bg-white rounded">
+    <div class="table-responsive table-bordered">
+        <table class="table align-items-center table-flush table-hover border" id="selepas_tawarruq" style="width: 100%;">
+            <thead class="thead-light bg-dark text-white text-center">
+                <tr>
+                    <th scope="col" class="sort" data-sort="name">No Rujukan</th>
+                    <th scope="col" class="sort" data-sort="budget">Keuntungan (RM)</th>
+                    <th scope="col" class="sort" data-sort="budget">Tempoh</th>
+                </tr>
+            </thead>
+            <tbody class="list">
+                @foreach($pembiayaansemasa as $index=>$semasa)
+                <tr style="text-align: center;">
+                    <td>
+                        {{ $semasa['norujukan'] }}
+                    </td>
+                    <td>
+                        {{ number_format($semasa['bakiupah'],2) }}
+                    </td>
+                    <td>
+                        {{ $semasa['tempoh'] }}
+                    </td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </div>
+</div>
+
+@endsection
@@ -104,7 +104,7 @@
                            </li>
                            <li class="nav-item my-auto ms-3 ms-lg-0">
                                <a href="{{ route('logout') }}" class="btn btn-sm bg-white border mb-0 me-1 mt-2 mt-md-0" onclick="event.preventDefault();document.getElementById('logout-form').submit();">
-                                    <span>{{ __('Logout') }}</span>
+                                    <span>{{ __('LOG KELUAR') }}</span>
                                </a>
                    </div>
                    </li>
@@ -4,55 +4,109 @@

            <!-- Modal Header -->
            <div class="modal-header">
-                <h5 class="modal-title">Senarai Marhun</h5>
+                {{-- <h5 class="modal-title">Senarai Marhun</h5> --}}
+                <ul class="nav nav-tabs nav-fill">
+                    <li class="nav-item">
+                      <a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-marhun" aria-selected="true">Marhun</a>
+                    </li>
+                    <li class="nav-item">
+                      <a class="nav-link" data-toggle="pill" href="#rekod" role="tab" aria-controls="pills-rekod" aria-selected="false">Rekod</a>
+                    </li>
+                  </ul>
                <!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
            </div>

            <!-- Modal body -->
            <div class="modal-body">

-                <div class="row">
-                    <div class="col-4">
-                      <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Pembiayaan: <span id="pemb"></span></b></div></div>
+                <div class="tab-content">
+                    <div class="tab-pane active" id="home" role="tabpanel" aria-labelledby="marhun-tab">
+                        <div class="row">
+                            <div class="col-4">
+                            <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Pembiayaan: <span id="pemb"></span></b></div></div>
+                            </div>
+                
+                            <div class="col-4">
+                            <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>B. Pembiayaan: <span id="bpemb"></span></b></div></div>
+                            </div>
+                
+                            <div class="col-4">
+                            <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Status: <span id="statuslelong"></span></b></div></div>
+                            </div>
+                        </div>
+
+                        <div class="table-responsive table-bordered">
+                            <table id="biasa" class="table table-hover text-center" style="width:100%">
+                                <thead class="bg-dark text-white">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>Jenis Marhun</th>
+                                        <th>Berat</th>
+                                        <th>Karat</th>
+                                        <th>Nilai Marhun</th>
+                                        <th>Nota</th>
+                                    </tr>
+                                </thead>
+                                <tbody id="tablemarhun">
+                                    <tr>
+                                        <td>dassad</td>
+                                        <td>dassad</td>
+
+                                        <td>dassad</td>
+
+                                        <td>dassad</td>
+
+                                        <td>dassad</td>
+
+                                        <td>dassad</td>
+
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
                    </div>
-        
-                    <div class="col-4">
-                      <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>B. Pembiayaan: <span id="bpemb"></span></b></div></div>
+
+                    <div class="tab-pane fade" id="rekod" role="tabpanel" aria-labelledby="rekod-tab">
+
+                        <div class="row">
+                            <div class="col-4">
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Pembiayaan: <span id="pembiayaan"></span></b></div></div>
+                            </div>
+                
+                            <div class="col-4">
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>B. Pembiayaan: <span id="bpembiayaan"></span></b></div></div>
+                            </div>
+                
+                            <div class="col-4">
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>N. Marhun: <span id="nm"></span></b></div></div>
+                            </div>
+                
+                            <div class="col-4">
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Berat: <span id="berat"></span></b></div></div>
+                            </div>
+                
+                            <div class="col-6">
+                              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Kos Keuntungan (12 Bulan): <span id="koskeun"></span></b></div></div>
+                            </div>
+                          </div>
+                
+                          <div style="overflow-x: auto;">
+                            <table id="tablehistorybayaran" class="table table-striped table-bordered text-center">
+                              <thead class="bg-dark text-white">
+                                <tr>
+                                  <th>Bil</th>
+                                  <th>Tarikh Bayaran</th>
+                                  <th>Bayaran</th>
+                                  <!-- <th>Action</th> -->
+                                </tr>
+                              </thead>
+                              <tbody>
+                              </tbody>
+                            </table>
+                          </div>
+                          <p><i>*Sila klik di atas tarikh bayaran untuk mencetak resit bayaran.</i></p>
+
                    </div>
-        
-                    <div class="col-4">
-                      <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Status: <span id="statuslelong"></span></b></div></div>
-                    </div>
-                  </div>
-
-                <div class="table-responsive table-bordered">
-                    <table id="biasa" class="table table-hover text-center" style="width:100%">
-                        <thead class="bg-dark text-white">
-                            <tr>
-                                <th>Bil</th>
-                                <th>Jenis Marhun</th>
-                                <th>Berat</th>
-                                <th>Karat</th>
-                                <th>Nilai Marhun</th>
-                                <th>Nota</th>
-                            </tr>
-                        </thead>
-                        <tbody id="tablemarhun">
-                            <tr>
-                                <td>dassad</td>
-                                <td>dassad</td>
-
-                                <td>dassad</td>
-
-                                <td>dassad</td>
-
-                                <td>dassad</td>
-
-                                <td>dassad</td>
-
-                            </tr>
-                        </tbody>
-                    </table>
                </div>
            </div>

@@ -33,6 +33,7 @@ Route::get('/firsttime', function () {
    return view('/includes/login/firsttime');
 });
 Route::get('/portalhome', function () {
+	$auth_user = Auth::user();

 	$harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();

@@ -48,7 +49,29 @@ Route::get('/portalhome', function () {

 	}

-	return view('includes.home',compact('hargaemasterdahulu'));
+	$CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
+
+	$total = 0.00;
+	$sixmonths = 0;
+	$bilangan = 0;
+	foreach($CustomerInfo['gadai'] as $index=>$gadai)
+	{
+		$bilangan++;
+		$total += $gadai['pinjaman'];
+
+		if($gadai['tempoh'] >= 6)
+		{
+			$sixmonths++;
+		}
+	}
+
+	$bilanganlelong = 0;
+	foreach($CustomerInfo['lelong'] as $index1=>$lelong)
+	{
+		$bilanganlelong += 1;
+	}
+
+	return view('includes.home',compact('hargaemasterdahulu','bilangan','sixmonths','total','bilanganlelong'));
 });
 Route::get('/portalprofile', function () {
    return view('/includes/profile');
@@ -72,6 +95,7 @@ Route::get('/bayarsag', function () {

 Route::get('/', function () {
 	// return view('dashboard');
+	$auth_user = Auth::user();

 	$harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();

@@ -87,7 +111,29 @@ Route::get('/', function () {

 	}

-	return view('includes.home',compact('hargaemasterdahulu'));
+	$CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
+
+	$total = 0.00;
+	$sixmonths = 0;
+	$bilangan = 0;
+	foreach($CustomerInfo['gadai'] as $index=>$gadai)
+	{
+		$bilangan++;
+		$total += $gadai['pinjaman'];
+
+		if($gadai['tempoh'] >= 6)
+		{
+			$sixmonths++;
+		}
+	}
+
+	$bilanganlelong = 0;
+	foreach($CustomerInfo['lelong'] as $index1=>$lelong)
+	{
+		$bilanganlelong += 1;
+	}
+
+	return view('includes.home',compact('hargaemasterdahulu','bilangan','sixmonths','total','bilanganlelong'));
 })->middleware(['auth','verified']);

 // Route::get('/home', 'HomeController@index');
@@ -107,6 +153,11 @@ Route::group(['middleware' => 'auth'], function () {
 	Route::get('icons', function () {return view('pages.icons');})->name('icons');
 	Route::get('table-list', function () {return view('pages.tables');})->name('table');
 	Route::put('profile/password', ['as' => 'profile.password', 'uses' => 'App\Http\Controllers\ProfileController@password']);
+
+	Route::get('pembiayaansemasa', ['as' => 'info.pembsemasa', 'uses' => 'App\Http\Controllers\InformationController@pembiayaansemasa']);
+	Route::get('pembiayaanaktif', ['as' => 'info.pembaktif', 'uses' => 'App\Http\Controllers\InformationController@pembiayaanaktif']);
+	Route::get('melebihi6bulan', ['as' => 'info.pemb6bulan', 'uses' => 'App\Http\Controllers\InformationController@pembiayaanmelebihi6bulan']);
+	Route::get('pemblelongan', ['as' => 'info.pemblelongan', 'uses' => 'App\Http\Controllers\InformationController@pembiayaanakandilelong']);
 });