From 91e9a727819a83534bcbfdcadc3a51ec7cd854f5 Mon Sep 17 00:00:00 2001
From: fifi97 <46933637+fifi97@users.noreply.github.com>
Date: Thu, 3 Mar 2022 02:45:49 +0800
Subject: [PATCH] fix skit2

---
 app/Http/Controllers/ResitController.php      | 292 +++++++++---------
 public/img/pkb.png                            | Bin 0 -> 5066 bytes
 .../js/components/util/RekodBayaranModal.vue  |  52 ++--
 resources/js/pages/Detailspelanggan.vue       |  13 +-
 routes/web.php                                |  18 +-
 5 files changed, 198 insertions(+), 177 deletions(-)
 create mode 100644 public/img/pkb.png

diff --git a/app/Http/Controllers/ResitController.php b/app/Http/Controllers/ResitController.php
index 24f3338..a792ba0 100644
--- a/app/Http/Controllers/ResitController.php
+++ b/app/Http/Controllers/ResitController.php
@@ -15,120 +15,6 @@ class ResitController extends Controller
         return view('bajet.home');
     }
 
-    public function resittebus($id)
-    {  
-
-        $auth_user = Auth::user();
-
-        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-
-        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
-        
-        $totaltransaction = 0;
-
-        $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
-
-        foreach($transaction as $trans)
-        {
-                $totaltransaction += $trans['duit_masuk'];
-        }
-
-
-        if(sizeof($gadai) != 0)
-            $gadai = $gadai[0][0];
-
-        $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
-
-        // if(sizeof($customers_info) != 0)
-        //     $customers_info = $customers_info[0];
-
-           
-        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
-       
-        if(sizeof($penebusan) != 0)
-            $penebusan = $penebusan[0];
-
-        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();    
-
-        // dd($wakil);
-        if(sizeof($wakil) != 0)
-            $wakil = $wakil[0]; 
-
-        return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction'));
-    }
-
-    public function resitadvansur($id)
-    {  
-
-        $auth_user = Auth::user();
-
-        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
-        
-
-        if(sizeof($gadai) != 0)
-            $gadai = $gadai[0][0];
-
-        $customers_info = Http::get(config('api.url') . '/api/customers/'.  $gadai['nokp'])->json();
-
-        // if(sizeof($customers_info) != 0)
-        //     $customers_info = $customers_info[0];
-
-        $advansur = Http::get(config('api.url') . '/api/advansur/'. $auth_user['cawangan'] . '/'. $id)->json();
-
-        if($advansur['nowakil'] != 0){    
-            $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan']  . '/code/' . $advansur['nowakil'])->json();    
-
-            if(sizeof($wakil) != 0){
-                $wakil = $wakil[0]; 
-            }
-        }
-        else
-        {
-            $wakil = [];
-        }
-        
-        return view('print.resitadvansur',compact('gadai','customers_info','advansur','wakil'));
-    }
-
-    public function resittambahpinjam($id)
-    {  
-
-        $auth_user = Auth::user();
-
-        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
-        
-
-        if(sizeof($gadai) != 0)
-            $gadai = $gadai[0][0];
-
-        $customers_info = Http::get(config('api.url') . '/api/customers/'.  $gadai['nokp'])->json();
-
-        // if(sizeof($customers_info) != 0)
-        //     $customers_info = $customers_info[0];
-
-           
-        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'] ,[ "norujukan" => $id])->json();
-       
-        if(sizeof($penebusan) != 0)
-            $penebusan = $penebusan[0];
-
-        // dd($penebusan['nowakil']);
-
-        if($penebusan['nowakil'] != 0)
-        {    
-        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan']  . '/code/' . $penebusan['nowakil'])->json();    
-
-        if(sizeof($wakil) != 0)
-            $wakil = $wakil[0]; 
-        }
-        else
-        {
-            $wakil = [];
-        }
-        
-        return view('print.resittambahpinjam',compact('gadai','customers_info','penebusan','wakil'));
-    }
-
     public function resit($id)
     {  
 
@@ -146,10 +32,7 @@ class ResitController extends Controller
 
         $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
 
-        // if(sizeof($customers_info) != 0)
-        // $customers_info = $customers_info[0];
-
-        return view('print.resitansuran',compact('transaction','gadai','customers_info'));
+        return view('resit.resitansuran',compact('transaction','gadai','customers_info'));
     }
 
     public function resittebusseparuh($id)
@@ -159,6 +42,9 @@ class ResitController extends Controller
 
         $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
         
+        if(sizeof($gadai) != 0)
+            $gadai = $gadai[0][0];
+
         $totaltransaction = 0;
 
         $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
@@ -168,8 +54,7 @@ class ResitController extends Controller
                 $totaltransaction += $trans['duit_masuk'];
         }
 
-        if(sizeof($gadai) != 0)
-            $gadai = $gadai[0][0];
+       
 
         $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
 
@@ -177,57 +62,182 @@ class ResitController extends Controller
         //     $customers_info = $customers_info[0];
 
            
-        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
+        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'],[ "norujukan" => $id])->json();
        
         if(sizeof($penebusan) != 0)
             $penebusan = $penebusan[0];
 
-        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();    
+        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();    
 
         // dd($wakil);
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0]; 
 
-        return view('print.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
+        return view('resit.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
     }
 
     public function resitautotawarruq($id)
+    {  
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
+        
+        
+        if(sizeof($gadai) != 0)
+            $gadai = $gadai[0][0];
+
+        $totaltransaction = 0;
+
+        $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
+
+        foreach($transaction as $trans)
+        {
+                $totaltransaction += $trans['duit_masuk'];
+        }
+
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
+
+        $transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json();
+           
+        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'],[ "norujukan" => $id])->json();
+       
+        if(sizeof($penebusan) != 0)
+            $penebusan = $penebusan[0];
+
+        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();    
+
+        if(sizeof($wakil) != 0)
+            $wakil = $wakil[0]; 
+
+        return view('resit.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
+    }
+
+
+    public function resittebus($id)
+    {  
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
+        
+        if(sizeof($gadai) != 0)
+            $gadai = $gadai[0][0];
+
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $gadai['kodcaw'])->json();
+
+        $totaltransaction = 0;
+
+        $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
+
+        foreach($transaction as $trans)
+        {
+                $totaltransaction += $trans['duit_masuk'];
+        }
+
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
+    
+        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'],[ "norujukan" => $id])->json();
+       
+        if(sizeof($penebusan) != 0)
+            $penebusan = $penebusan[0];
+
+        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();    
+
+        $totalBayaranAnsuran = Http::get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
+
+        if(sizeof($wakil) != 0)
+            $wakil = $wakil[0]; 
+
+        return view('resit.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+    }
+
+    public function resitbelumtebus($id)
+    {  
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
+        
+        if(sizeof($gadai) != 0)
+            $gadai = $gadai[0][0];
+
+        $customers_info = Http::get(config('api.url') . '/api/customers/'.  $gadai['nokp'])->json();
+           
+        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'] ,[ "norujukan" => $id])->json();
+       
+        if(sizeof($penebusan) != 0)
+            $penebusan = $penebusan[0];
+
+        if($penebusan['nowakil'] != 0)
+        {    
+        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw']  . '/code/' . $penebusan['nowakil'])->json();    
+
+        if(sizeof($wakil) != 0)
+            $wakil = $wakil[0]; 
+        }
+        else
+        {
+            $wakil = [];
+        }
+        
+        return view('resit.resittebussebelum',compact('gadai','customers_info','penebusan','wakil'));
+    }
+
+    public function resitadvansur($id)
     {  
 
         $auth_user = Auth::user();
 
         $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
         
-        $totaltransaction = 0;
-
-        $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
-
-        foreach($transaction as $trans)
-        {
-                $totaltransaction += $trans['duit_masuk'];
-        }
 
         if(sizeof($gadai) != 0)
             $gadai = $gadai[0][0];
 
-        $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
+        $customers_info = Http::get(config('api.url') . '/api/customers/'.  $gadai['nokp'])->json();
 
-        $transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json();
-        // if(sizeof($customers_info) != 0)
-        //     $customers_info = $customers_info[0];
+        $advansur = Http::get(config('api.url') . '/api/advansur/'. $gadai['kodcaw'] . '/'. $id)->json();
 
-           
-        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
+        if($advansur['nowakil'] != 0){    
+            $wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw']  . '/code/' . $advansur['nowakil'])->json();    
+
+            if(sizeof($wakil) != 0){
+                $wakil = $wakil[0]; 
+            }
+        }
+        else
+        {
+            $wakil = [];
+        }
+        
+        return view('resit.resitadvansur',compact('gadai','customers_info','advansur','wakil'));
+    }
+
+    public function resittambahpinjam($id)
+    {  
+
+        $auth_user = Auth::user();
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
+        
+
+        if(sizeof($gadai) != 0)
+            $gadai = $gadai[0][0];
+
+        $customers_info = Http::get(config('api.url') . '/api/customers/'.  $gadai['nokp'])->json();
+
+        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'] ,[ "norujukan" => $id])->json();
        
         if(sizeof($penebusan) != 0)
             $penebusan = $penebusan[0];
 
-        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();    
+        if($penebusan['nowakil'] != 0)
+        {    
+        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw']  . '/code/' . $penebusan['nowakil'])->json();    
 
-        // dd($wakil);
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0]; 
-
-        return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
+        }
+        else
+        {
+            $wakil = [];
+        }
+        
+        return view('resit.resittambahpinjam',compact('gadai','customers_info','penebusan','wakil'));
     }
 }
diff --git a/public/img/pkb.png b/public/img/pkb.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d03d4a6d12a9495e71b55a79db554e7c7808f6b
GIT binary patch
literal 5066
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

literal 0
HcmV?d00001

diff --git a/resources/js/components/util/RekodBayaranModal.vue b/resources/js/components/util/RekodBayaranModal.vue
index 2fd988b..d060351 100644
--- a/resources/js/components/util/RekodBayaranModal.vue
+++ b/resources/js/components/util/RekodBayaranModal.vue
@@ -11,9 +11,9 @@
           <div class="relative p-6 flex-auto">
 
           <div class="grid grid-cols-3">
-            <div class="h-auto w-auto text-center p-6 mt-8 rounded-lg bg-yellow-300 border border-yellow-300">Hargajualan : RM {{ this.hargajualan }}</div>
-            <div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Pembiayaan : RM {{ this.pinjaman }}</div>
-            <div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Nilai Marhun : RM {{ this.nilaimarhun }}</div>
+            <div class="h-auto w-auto text-center p-6 mt-8 rounded-lg bg-yellow-300 border border-yellow-300">Hargajualan : RM {{ formatexchange(this.hargajualan) }}</div>
+            <div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Pembiayaan : RM {{ formatexchange(this.pinjaman) }}</div>
+            <div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Nilai Marhun : RM {{ formatexchange(this.nilaimarhun) }}</div>
           </div>
 
           <div class="flex justify-center mt-10 mb-10">
@@ -83,7 +83,7 @@
                     <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                       <div class="flex items-center">
                         <div class="ml-3">
-                          <p class="text-gray-900 whitespace-no-wrap" v-text="bayaran.duit_masuk">
+                          <p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(bayaran.duit_masuk)">
                           </p>
                         </div>
                       </div>
@@ -154,7 +154,7 @@
                     <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                       <div class="flex items-center">
                         <div class="ml-3">
-                          <p class="text-gray-900 whitespace-no-wrap" v-text="upah.upahDibayar">
+                          <p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(upah.upahDibayar)">
                           </p>
                         </div>
                       </div>
@@ -242,7 +242,7 @@
                     <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                       <div class="flex items-center">
                         <div class="ml-3">
-                          <p class="text-gray-900 whitespace-no-wrap" v-text="rekod.pinjaman">
+                          <p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(rekod.pinjaman)">
                           </p>
                         </div>
                       </div>
@@ -304,6 +304,10 @@
 <script>
 import { createPopper } from "@popperjs/core";
 
+const formatter = new Intl.NumberFormat('en-US', {
+  minimumFractionDigits: 2
+});
+
 export default {
 
     props: {
@@ -329,6 +333,9 @@ export default {
     }
   },
   methods: {
+    formatexchange: function(value){
+        return formatter.format(value)
+    },
     toggleModal: function(){
       this.showModal = false;
     },
@@ -348,43 +355,40 @@ export default {
       });
     },
     bayaranfunc: function(id){
-            // var urlroute = '{{ route("resit.ansuran", ":id") }}';
-            console.log(route().has('resit.ansuran'))
-            return window.route('resit.ansuran', id)
+      let urlroute = window.route('resit.ansuran', id)
+      window.open(urlroute, '_blank');
     },
     upahfunc: function(norujukan){
-      // var urlroute = '{{ route("resit.advansur", ":id") }}';
-      console.log(norujukan)
+      let urlroute = window.route('resit.advansur', id)
+      window.open(urlroute, '_blank');
     },
     rekodfunc: function(norujukan,sttebus,hargajualan){
+      let urlroute = '';
       switch(sttebus) {
         case 'P':
-            var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
-            urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+            urlroute = window.route('resit.tambahpinjam', norujukan)
+            window.open(urlroute, '_blank');
             break;
         case 'T':
 
             if(hargajualan === '')
             {
-                var urlroute = '{{ route("resit.belumtebus", ":id") }}';
-                urlroute = urlroute.replace(':id', tebusaz['norujukan']);
-
+              urlroute = window.route('resit.belumtebus', norujukan)
+              window.open(urlroute, '_blank');
             }else{
-                var urlroute = '{{ route("resit.tebus", ":id") }}';
-                urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+              urlroute = window.route('resit.tebus', norujukan)
+              window.open(urlroute, '_blank');
             }
-          
             break;
         case 'A':
-            var urlroute = '{{ route("resit.belumansurans", ":id") }}';
-            urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+             urlroute = window.route('resit.belumansurans', norujukan);
+            window.open(urlroute, '_blank');
             break;
         case 'S':
-        var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
-        urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+             urlroute = window.route('resit.tebusseparuh', norujukan)
+            window.open(urlroute, '_blank');
         break;
       }
-      console.log(norujukan)
     },
   }
 }
diff --git a/resources/js/pages/Detailspelanggan.vue b/resources/js/pages/Detailspelanggan.vue
index 25ac10a..573b342 100644
--- a/resources/js/pages/Detailspelanggan.vue
+++ b/resources/js/pages/Detailspelanggan.vue
@@ -252,7 +252,7 @@
                     <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                       <div class="flex items-center">
                         <div class="ml-3">
-                          <p class="text-gray-900 whitespace-no-wrap" v-text="belumtebus.pinjaman">
+                          <p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(belumtebus.pinjaman)">
                           </p>
                         </div>
                       </div>
@@ -371,7 +371,7 @@
                   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                     <div class="flex items-center">
                       <div class="ml-3">
-                        <p class="text-gray-900 whitespace-no-wrap" v-text="sudahtebus.bakipjm">
+                        <p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(sudahtebus.bakipjm)">
                         </p>
                       </div>
                     </div>
@@ -489,7 +489,7 @@
                   <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                     <div class="flex items-center">
                       <div class="ml-3">
-                        <p class="text-gray-900 whitespace-no-wrap" v-text="lelong.bakipjm">
+                        <p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(lelong.bakipjm)">
                         </p>
                       </div>
                     </div>
@@ -538,6 +538,10 @@ import { required, minLength, between } from 'vuelidate/lib/validators'
 import modal from '../components/util/RekodBayaranModal.vue'
 import pagination from '../components/pagination.vue'
 
+const formatter = new Intl.NumberFormat('en-US', {
+  minimumFractionDigits: 2
+});
+
 export default {
   components: {
     pagination,
@@ -615,6 +619,9 @@ export default {
     }
   },
   methods: {
+    formatexchange: function(value){
+        return formatter.format(value)
+    },
     koddaerahCall: function(negeri,daerah) {
       this.axios.get(this.$hostname + '/api/negeri/' + negeri).then(response => {
         this.kodnegeri = response.data.negeri
diff --git a/routes/web.php b/routes/web.php
index 80c8cb1..29a53a1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -82,12 +82,12 @@ Route::get('/akaunhome/cetakperbelanjaan',['as'=>'cetak.perbelanjaan','uses'=>'A
 
 
 //Resit
-Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'ResitController@resit']);
-Route::get('/resitansurans/{id}',['as'=>'resit.ansurans','uses'=>'ResitController@resitansurans']);
-Route::get('/resitbelumansurans/{id}',['as'=>'resit.belumansurans','uses'=>'ResitController@resitbelumansurans']);
-Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'ResitController@resittebus']);
-Route::get('/resit/advansur/{id}',['as'=>'resit.advansur','uses'=>'ResitController@resitadvansur']);
-Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'ResitController@resittebusseparuh']);
-Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'ResitController@resitbelumtebus']);
-Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'ResitController@resittambahpinjam']);
-Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'ResitController@resitautotawarruq']);
+Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'App\Http\Controllers\ResitController@resit']);
+Route::get('/resitansurans/{id}',['as'=>'resit.ansurans','uses'=>'App\Http\Controllers\ResitController@resitansurans']);
+Route::get('/resitbelumansurans/{id}',['as'=>'resit.belumansurans','uses'=>'App\Http\Controllers\ResitController@resitbelumansurans']);
+Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'App\Http\Controllers\ResitController@resittebus']);
+Route::get('/resit/advansur/{id}',['as'=>'resit.advansur','uses'=>'App\Http\Controllers\ResitController@resitadvansur']);
+Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'App\Http\Controllers\ResitController@resittebusseparuh']);
+Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'App\Http\Controllers\ResitController@resitbelumtebus']);
+Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'App\Http\Controllers\ResitController@resittambahpinjam']);
+Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'App\Http\Controllers\ResitController@resitautotawarruq']);