new function importdata from live to master

2022-04-27 10:25:02 +08:00
parent 8f903b337c
commit be64ed3a93
13 changed files with 542 additions and 12 deletions
@@ -0,0 +1,165 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+use App\Models\User;
+use App\Models\Gadai;
+use App\Models\GadaiMarhun;
+use App\Models\Cawangan;
+use App\Models\TransaksiKeuntungan;
+
+use DateTime;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Input;
+
+
+
+
+class ImportDataController extends Controller
+{
+    //PC
+    public function importdata(Request $request) 
+    {
+        //return view('importdata.importdatacawangan');
+        $caw = Cawangan::all();
+        return view('importdata.listcawangan',compact('caw'));
+        
+    }
+
+    public function listcawangan()
+    {
+        $caw = Cawangan::all();
+        return view('importdata.listcawangan',compact('caw'));
+    }
+
+    public function showsenarai($kodcaw)
+    {
+        $caw = Cawangan::where('caw_code','=',$kodcaw)->first();
+        
+        return view('importdata.showsenarai',compact('caw'));
+    }
+
+    public function importdatagadai($kodcaw)
+    {
+        // dd($kodcaw);
+        $caw = Cawangan::all();
+        if (Gadai::where('kodcaw', '=', $kodcaw)->count() == null) 
+        {
+                $results = DB::select("SELECT * FROM cawangan where caw_code  = '$kodcaw' ");
+                        //dd($results);	
+                foreach($results as $row)
+                {
+                    $caw_ip = $row->caw_ip;
+                    $caw_dbuser = $row->caw_dbuser;
+                    $caw_dbpass = $row->caw_dbpass;
+                    $caw_dbname = $row->caw_dbname;
+                    $caw_name = $row->caw_name;
+                    $caw_id = $row->id;
+
+                // dd($caw_ip);
+                                
+                $db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass); 
+                if (!$db)
+                    {   
+                    echo "<p style='color:#F00'>Server Down: $caw_name</p>";
+                    continue;
+                    die('Could not connect: ' . mysqli_error());
+                    } 
+                    mysqli_select_db($db,$caw_dbname);
+                        
+                        $count = 0;
+                        $result=mysqli_query($db,"SELECT * FROM gadai where sttebus = '' and upah12 is NOT NULL");
+                        while($row_gadai = mysqli_fetch_array($result))
+                        {	
+                        
+                                $count++;
+                                $kodcaw = $row_gadai['kodcaw'];
+                                $norujukan = $row_gadai['norujukan'];
+                                $nopelanggan = $row_gadai['nopelanggan'];
+                                $nokp = $row_gadai['nokp'];
+                                $t_gadai = $row_gadai['t_gadai'];
+                                $masa = $row_gadai['masa'];
+                                $sirig = $row_gadai['sirig'];
+                                $nilaimarhun = $row_gadai['nilaimarhun'];
+                                $berat = $row_gadai['berat'];
+                                $pinjaman = $row_gadai['pinjaman'];
+                                $kadarupah = $row_gadai['kadarupah'];
+                                $tempoh = $row_gadai['tempoh'];
+                                $t_matang = $row_gadai['t_matang'];
+                                $t_matang1 = $row_gadai['t_matang1'];
+                                $teller = $row_gadai['teller'];
+                                $bakipjm = $row_gadai['bakipjm'];
+                                $bakiupah = $row_gadai['bakiupah'];
+                                $marhun = $row_gadai['marhun'];
+                                $taglel = $row_gadai['taglel'];
+                                $ansakhir = $row_gadai['ansakhir'];
+                                $t_update = $row_gadai['t_update'];
+                                $tagtbaki = $row_gadai['tagtbaki'];
+                                $penilai = $row_gadai['penilai'];
+                                $percentpinj = $row_gadai['percentpinj'];
+                                $tagpalsu = $row_gadai['tagpalsu'];
+                                $semakbarcode = $row_gadai['semakbarcode'];
+                                $historygadaian = $row_gadai['historygadaian'];
+                                $upah12 = $row_gadai['upah12'];
+                                $hargajualan = $row_gadai['hargajualan'];
+                                $bakihargajualan = $row_gadai['bakihargajualan'];
+                                $tempohbayar = $row_gadai['tempohbayar'];
+                            
+                                DB::insert("INSERT INTO elelong.gadai (kodcaw,norujukan,nopelanggan,nokp,t_gadai,masa,sirig,nilaimarhun,berat,pinjaman,sttebus,tagcetak,kadarupah,tempoh,t_matang,t_matang1,teller,bakipjm,bakiupah,marhun,taglel,ansakhir,t_update,tagtbaki,penilai,percentpinj,tagpalsu,semakbarcode,historygadaian,upah12,hargajualan,bakihargajualan,tempohbayar)  
+                                VALUES ('$kodcaw','$norujukan','$nopelanggan','$nokp','$t_gadai','$masa','$sirig','$nilaimarhun','$berat','$pinjaman', '','','$kadarupah','$tempoh','$t_matang','$t_matang1','$teller','$bakipjm','$bakiupah','$marhun','$taglel','$ansakhir','$t_update','$tagtbaki','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar')");     
+                            
+                                //untuk gadaimarhun
+                                $result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'");
+                                while($row_tender1 = mysqli_fetch_array($result1))
+                                {	
+                                
+                                        $kodcaw1 = $row_tender1['kodcaw'];
+                                        $norujukan1 = $row_tender1['norujukan'];
+                                        $bil1 = $row_tender1['bil'];
+                                        $t_gadai1 = $row_tender1['t_gadai'];
+                                        $marhun1 = $row_tender1['marhun'];
+                                        $nota1 = $row_tender1['nota'];
+                                        $karat1 = $row_tender1['karat'];
+                                        $berat1 = $row_tender1['berat'];
+                                        $harga1 = $row_tender1['harga'];
+                                        $n_marhun1 = $row_tender1['n_marhun'];
+                                        //$hargaasas1 = $row_tender1['hargaasas'];
+                                        //$batch_no1 = $row_tender1['batch_no'];
+                                    
+                                        DB::insert("INSERT INTO elelong.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun)  
+                                        VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota1','$karat1','$berat1','$harga1','$n_marhun1')");  
+                                        
+                                }
+                                
+                    }
+                    return redirect()->route('importdata.listcawangan')
+                                    ->with('success','Data '.$caw_name.' berjaya import');
+
+                }
+            }else{
+                return redirect()->route('importdata.listcawangan')
+                                 ->with('success','Data '.$kodcaw.' Ini Telah Wujud Sila Hapus Data Dahulu');
+            }
+        
+
+    }
+    public function hapusdatacawangan($kodcaw)
+    {
+        $caw = Gadai::where('kodcaw','=',$kodcaw);
+        $caw->delete();
+
+        $cawmarhun = GadaiMarhun::where('kodcaw','=',$kodcaw);
+        $cawmarhun->delete();
+       // dd($cawmarhun);
+        return redirect()->route('importdata.listcawangan')
+                         ->with('success','Data '.$kodcaw.' Berjaya Dihapuskan');
+    }
+
+
+
+    
+}
@@ -63,18 +63,19 @@ class PenggunaController extends Controller
        $currentdate = $currentdate->toDateTimeString();
        //dd($request->all());
        $validator = Validator::make($request->all(), [
-            'email' => 'required|string|unique:users|email'
+            'email' => 'required|string|unique:users|email',
+            'username' => 'required|string|unique:users'
        ]);
        
        if ($validator->fails()) {
            $errors = [
                'success' => "error",
-                //'message' => $validator->errors()
+                'message' => $validator->errors()
                
            ];

        return redirect()->route('pengguna.index')
-            ->with('success', 'Sila Masukkan Email Yang Sah');  }
+            ->with('message', 'Sila Masukkan Email Yang Sah');  }

        $user = new User;
        $user->name = $request->name;
@@ -111,7 +112,7 @@ class PenggunaController extends Controller
                array_push($arraytaraf,$taraf);
            }
        }
-        // dd($arraytaraf);
+       //dd($arraytaraf);
        $user->syncRoles($arraytaraf);

        if($request->status == true)
@@ -206,14 +206,18 @@ class TamatKontController extends Controller
                         ->first(); 

        $tarikh_lelong = Carbon::parse($t_lelong);
-        $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
+        // $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
+        $t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
+        $t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
+        $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
+

        foreach($getsurat as $index1=>$surats)
        {
            $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
            ->where('norujukan', $surats['norujukan'])
            ->get();   
-            dd($senarai);
+            //dd($senarai);
            $getsurat[$index1]['list_norujukan'] = $senarai;
        }

@@ -226,7 +230,9 @@ class TamatKontController extends Controller
                                           't_lelong',
                                           't_gadais',
                                           't_anggaran',
-                                           'tarikh_lelong'
+                                           'tarikh_lelong',
+                                           't_daftarlelong',
+                                           't_lelongdisplay'
                                           ));
    }

@@ -231,6 +231,7 @@ return [
        'Validator' => Illuminate\Support\Facades\Validator::class,
        'View' => Illuminate\Support\Facades\View::class,
        'PDF' => Barryvdh\DomPDF\Facade::class,
+        'Input' => Illuminate\Support\Facades\Input::class,

    ],

@@ -218,7 +218,9 @@ class CreateCawangansTable extends Migration

        Schema::create('gadaimarhun', function (Blueprint $table) {
            $table->bigIncrements('id');
+            $table->string('kodcaw')->nullable(); 
            $table->string('norujukan');
+            $table->date('t_gadai')->nullable();;
            $table->decimal('bil', $precision = 3, $scale = 2);
            $table->string('marhun');
            $table->string('nota');
@@ -115,6 +115,10 @@ class RolesSeeder extends Seeder
            'name' => 'notistamatkontrak',
            'description' => 'Notis 30 Hari Sebelum Tamat Kontrak'
        ]);
+        Permission::create([
+            'name' => 'importdata',
+            'description' => 'Import Data Cawangan Dari LIVE to Master'
+        ]);
        

        //account
@@ -170,6 +174,7 @@ class RolesSeeder extends Seeder
        $role6->givePermissionTo('pengesahan');
        $role6->givePermissionTo('notistamatkontrak');
        $role6->givePermissionTo('kemaskinihargaasas');
+        $role6->givePermissionTo('importdata');

        $role7 = Role::create(['name' => 'account']);
        $role7->givePermissionTo('pengesahanbayaran');
@@ -0,0 +1,38 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-12 mx-auto card">
+          @if ($message = Session::get('failed'))
+              <div class="alert alert-danger" style="margin-top:1%;">
+                  <p>{{ $message }}</p>
+              </div>
+          @endif
+            <h3 class="pt-3" style="margin-left:2%;">Import Data Cawangan</h3>
+            
+            <form action="" method="POST" id="formsenarai">
+              @csrf
+                <div class="form-group row" style="margin-top:2%; margin-left:1%;">
+                  <label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Lelongan</label>
+                  <div>
+                    <input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
+                  </div>
+                  <label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Tempoh</label>
+                  <div>
+                    <input type="text" class="form-control" id="tempoh" name="tempoh" placeholder="12" disabled>
+                  </div>
+                </div>
+                
+                <div class="form-group row" style="margin-top:2%;">
+                  <div class="col-sm-10">
+                    <button type="button" class="btn btn-primary" onclick="carian()" style="margin-left:2%; width:9%;">Carian</button>                  
+                  </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+     
+@endsection
@@ -0,0 +1,163 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-md-11 mx-auto card p-4">
+            @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <h3 class="pt-3" style="margin-left:2%;">Import Data Cawangan</h3>
+            <form id="exportform" action="" method="POST"> 
+            <?php 
+							echo " <table class='table table-striped' id='cawangan'>";
+							echo "	<thead>";
+							echo "	  <tr>";
+							echo "		<th>#</th>";
+							echo "		<th>Cawangan</th>";
+							//echo "		<th>Tarikh Lelong</th>";
+							//echo "		<th>Batch Lelong</th>";
+							//echo "		<th>Tarikh Lelong</th>";
+							echo "		<th>Import Data</th>";
+              echo "		<th>Hapus Data</th>";
+							// echo "		<th>Senarai Lelongan</th>";
+							// echo "		<th>Export Data</th>";
+							echo "	  </tr>";
+							echo "	</thead>";
+							echo "<tbody>";
+						  
+						  $count = 0;
+						  // $result = mysql_query("SELECT * FROM cawangan_lelong"); 
+              $results = DB::select('select * from cawangan');
+              foreach($results as $row)
+                {
+                    $caw_ip = $row->caw_ip;
+                    $caw_dbuser = $row->caw_dbuser;
+                    $caw_dbpass = $row->caw_dbpass;
+                    $caw_dbname = $row->caw_dbname;
+                    $caw_name = $row->caw_name;
+                    $caw_id = $row->id;
+                    $kodcaw = $row->caw_code;
+
+                    //dd($caw_ip);
+								
+										$db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass); 
+										if (!$db)
+										{   
+										  echo "<p style='color:#F00'>Server Down: $con[caw_dbname]/$con[caw_name]</p>";
+										  continue;
+										  die('Could not connect: ' . mysqli_error());
+										} 
+										mysqli_select_db($db,$caw_dbname);
+										$count++;
+								
+										
+										echo "<tr>";
+										echo "<td>$count</td>";
+										echo "<td>$caw_name</td>";
+										//echo "<td>$tarikh</td>";
+									//	echo "<td>$batchno</td>";
+										//echo "<td>$tarikh</td>";
+										echo "<td><a class='btn btn-info' href='importdatagadai/$kodcaw'><i class='fa fa-delete'></i>Import Data From Live To Master</a></td>";
+                    echo "<td><a class='btn btn-danger' href='hapusdatacawangan/$kodcaw'><i class='fa fa-delete'></i>Hapus</a></td>";
+										// echo "<td><a class='btn btn-success' href='list_gadai_caw/$caw_id'><i class='fa fa-delete'></i>Lihat Senarai</a></td>";
+										// echo "<td><a class='btn btn-warning' href='exportdatalelong/$caw_id'><i class='fa fa-success'></i>Export Data</a></td>";
+										echo "</tr>";
+									
+								}
+								echo "</table>"?>
+            </form>
+        </div>
+        
+    </div>
+    
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    function newconnection() {
+        $("#formnewconnection").submit();
+    }
+    function confirm(id) {
+        // console.log(id);
+        $.confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-warning',
+                action: function () {
+                    $("#formdelconn-"+id).submit();
+                }
+            },  
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+    }
+   
+        var tablecawangan = $('#cawangan').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 8,
+                "orderable": false
+                }
+            ],
+            order: [[1, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            buttons: [
+                {
+                    className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+                    text: '<i class="fas fa-plus" id="test"></i>',
+                    titleAttr: 'Tambah Cawangan',
+                    action: function ( e, dt, node, config ) {
+                        // alert( 'Button activated' );
+                        // console.log('hye');
+                        
+                        $('#myModal').modal("show");
+                        $('#myModal').on('shown.bs.modal', function () {
+                            $('#rolename').trigger('focus')
+                        })
+                    }
+                },
+                {
+                    className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                    titleAttr: 'Export to CSV',
+                    text: '<i class="fas fa-download"></i>',
+                    action: function ( e, dt, node, config ) {
+                        $("#exportform").submit();
+                    }
+                }
+            ]
+        });
+
+        $('.addcaw').tooltip();
+        $('.export').tooltip();
+        // $( '.dt-buttons').addClass('btn-group');
+        $( '.addcaw').removeClass('dt-button');
+        $( '.export').removeClass('dt-button');
+    
+
+    function selectall(cb) {
+      tablecawangan.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
@@ -0,0 +1,108 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            @if ($message = Session::get('success'))
+                            <div class="alert alert-success">
+                                <p>{{ $message }}</p>
+                            </div>
+                        @endif
+            <?php 
+							echo " <table class='table table-striped' id='cawangan'>";
+							echo "	<thead>";
+							echo "	  <tr>";
+							echo "		<th>#</th>";
+							echo "		<th>Cawangan</th>";
+							//echo "		<th>Tarikh Lelong</th>";
+							echo "		<th>Batch Lelong</th>";
+							echo "		<th>Tarikh Lelong</th>";
+							echo "		<th>Import Data</th>";
+							echo "		<th>Senarai Lelongan</th>";
+							echo "		<th>Export Data</th>";
+							echo "	  </tr>";
+							echo "	</thead>";
+							echo "<tbody>";
+						  
+						  $count = 0;
+						  // $result = mysql_query("SELECT * FROM cawangan_lelong"); 
+              $results = DB::select('select * from cawangan');
+              foreach($results as $row)
+                {
+                    $caw_ip = $row->caw_ip;
+                    $caw_dbuser = $row->caw_dbuser;
+                    $caw_dbpass = $row->caw_dbpass;
+                    $caw_dbname = $row->caw_dbname;
+                    $caw_name = $row->caw_name;
+                    $caw_id = $row->id;
+
+                    //dd($caw_ip);
+								
+										$db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass); 
+										if (!$db)
+										{   
+										  echo "<p style='color:#F00'>Server Down: $con[caw_dbname]/$con[caw_name]</p>";
+										  continue;
+										  die('Could not connect: ' . mysqli_error());
+										} 
+										mysqli_select_db($db,$caw_dbname);
+										$count++;
+										
+										$result_tender = mysqli_query($db,"SELECT *, lelong.batchno as batch, DATE_FORMAT(tarikh, '%d/%m/%Y') AS tarikh FROM batchlel
+JOIN lelong ON (lelong.batchno = batchlel.batchno) 
+where norujukan NOT IN(select norujukan FROM gadai where sttebus = 'L' OR sttebus = 'H') and lelong.hargajual = '0.00' and lelong.nopembeli = '0' ORDER BY `batchlel`.`tarikh` ASC");
+										$row_tender = mysqli_fetch_array($result_tender); 
+										
+										$result_tender1 = mysqli_query($db,"SELECT MAX(batchno) as batchno
+																	  FROM batchlel");
+										$row_tender1 = mysqli_fetch_array($result_tender1); 
+										
+										$batchno = $row_tender['batch'];
+										$tarikh = $row_tender['tarikh'];
+										
+										echo "<tr>";
+										echo "<td>$count</td>";
+										echo "<td>$caw_name</td>";
+										//echo "<td>$tarikh</td>";
+										echo "<td>$batchno</td>";
+										echo "<td>$tarikh</td>";
+										echo "<td><a class='btn btn-info' href='export_tolelong/$caw_id/$batchno'><i class='fa fa-delete'></i>Import Data</a></td>";
+										echo "<td><a class='btn btn-success' href='list_lelongan_caw/$caw_id/$batchno'><i class='fa fa-delete'></i>Lihat Senarai</a></td>";
+										echo "<td><a class='btn btn-warning' href='export_tolelong_livecaw/$caw_id/$batchno'><i class='fa fa-success'></i>Export Data</a></td>";
+										echo "</tr>";
+									
+								}
+								echo "</table>"?>
+
+        </div>
+    </div>
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+          $('[data-toggle="tooltip"]').tooltip()
+      })
+    function confirm() {
+        $.confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Simpan: {
+                btnClass: 'btn-warning',
+                action: function () {
+                    $("#formeditconnection").submit();
+                }
+            },  
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+    }
+    
+</script>
+@endsection
@@ -98,6 +98,9 @@
      </li>
      @endhasrole
      @hasrole('operasi')
+      <li class="{{ (request()->is('importdata/*')) ? 'active' : '' }}">
+        <a href="{{url('importdata/importdatacawangan')}}">Import Data</a>
+      </li>
      <li class="{{ (request()->is('notistamatkontrak/*')) ? 'active' : '' }}">
        <a href="{{url('notistamatkontrak/sebelumtamatkont')}}">Notis Tamat Kontrak</a>
      </li>
@@ -17,9 +17,22 @@
                <div class="container">
                    <div class="row mb-2">
                        <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
-                            <p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
-                            <p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
-                            <p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
+                        <p> <b>Tarikh Lelong : </b> {{ $t_lelongdisplay }}</p>
+                        <p> <b>Tarikh Gadai Sehingga : </b> @php 
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai );
+                            $datez = $myDateTime->format('d-m-Y');
+                            echo($datez);
+                            @endphp</p>
+                        <p> <b>Tarikh Perlu Blast Notis SMS(30 Hari) : </b> @php 
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
+                            $datez1 = $myDateTime->modify('-1 month')->format('d-m-Y');
+                            echo($datez1);
+                            @endphp</p>
+                        <p> <b>Tarikh Perlu Daftar Batch Lelong(20 Hari) : </b>@php 
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
+                            $datez1 = $myDateTime->modify('-20 days')->format('d-m-Y');
+                            echo($datez1);
+                            @endphp</p>
                        </div>
                    </div>
                </div>
@@ -36,6 +49,8 @@
                                <th>Baki Pembiayaan (RM)</th>
                                <th>Keuntungan 6 Bulan (RM)</th>
                                <th>Keuntungan Telah Bayar (RM)</th>
+                                <th>Nilai Marhun (RM)</th>
+                                <th>Tamat Kontrak</th>
                                
                            </tr>
                    </thead>
@@ -50,7 +65,9 @@
                                <td>{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
                                <td>{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
                                <td>{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
-                                <td></td>
+                                <td>{{ $surat['list_norujukan'][0]['ansakhir'] }}</td>
+                                <td>{{ $surat['list_norujukan'][0]['nilaimarhun'] }}</td>
+                                <td>{{ $surat['list_norujukan'][0]['t_matang1'] }}</td>
                            </tr>
                        @endforeach
                    </tbody>
@@ -73,7 +73,7 @@
        <div class="modal-dialog modal-lg">
          <div class="modal-content">
            <div class="modal-header">
-              <h5 class="modal-title">New Pengguna</h5>
+              <h5 class="modal-title">Tambah Pengguna</h5>
              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                <span aria-hidden="true">&times;</span>
              </button>
@@ -110,6 +110,19 @@
                        </div>
                      </div>

+                    <!-- <div class="form-row">
+                    <label for="name">Taraf Pengguna</label>
+                    <div class="form-group col-md-9">
+                        @foreach ($allroles as $namataraf)
+                            <div class="col-4 form-check form-check-inline">
+                                <input class="form-check-input" name="taraf{{$namataraf}}" type="checkbox" id="taraf{{$namataraf}}" value="{{$namataraf}}" >
+                                {{-- <input type="hidden" id="alltaraf" value=""> --}}
+                                <label class="form-check-label" for="taraf{{$namataraf}}">{{$namataraf}}</label>
+                            </div>
+                        @endforeach
+                    </div>
+                    </div> -->
+
                    <div class="form-row">
                    <div class="form-group col-md-9">
                      
@@ -202,6 +202,14 @@ Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notist
    Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']); 
    Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']); 
 });
+
+Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'], function () {
+    Route::get('/importdatacawangan',['as'=>'importdata.importdatacawangan','uses'=>'ImportDataController@importdata']); 
+    Route::get('/listcawangan',['as'=>'importdata.listcawangan','uses'=>'ImportDataController@listcawangan']);
+    Route::get('/showsenarai/{id}',['as'=>'importdata.showsenarai','uses'=>'ImportDataController@showsenarai']);
+    Route::get('/importdatagadai/{caw_id}',['as'=>'importdata.importdatagadai','uses'=>'ImportDataController@importdatagadai']);
+    Route::get('/hapusdatacawangan/{caw_id}',['as'=>'importdata.hapusdatacawangan','uses'=>'ImportDataController@hapusdatacawangan']);
+});
 //Operasi

 Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {