Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/kaunter into finadev

app/Http/Controllers/GadaianController.php

@@ -347,13 +347,18 @@ class GadaianController extends Controller
 
         $pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera";
 
-        // return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
+        $komoditi = Http::withOptions(['verify' => config('app.api_verify')])
-        
+        ->get($api_url . '/api/komuditi/check')
-        if($gadai_detail['tagbaru'] == 1)
+        ->json();
-        {
+        $product = Http::withOptions(['verify' => config('app.api_verify')])
-            return view('print.sag_ujrah_2',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu', 'kadar_ujrah'));
+        ->get($api_url . '/api/komuditi/description', ['kodproduk' => $komoditi['kodproduct']])
-        }else{
+        ->json();
-            return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
+        $kuantiti = $gadai_detail['pinjaman'] / $komoditi['nilai'];
+
+        if ($gadai_detail['tagbaru'] == 1) {
+            return view('print.sag_ujrah_3', compact('komoditi', 'product', 'kuantiti', 'gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu', 'kadar_ujrah'));
+        } else {
+            return view('print.sag', compact('gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu'));
         }
     }
 
@@ -580,15 +585,18 @@ class GadaianController extends Controller
         $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json();
 
         // dd($wakil);
-        if(sizeof($wakil) != 0)
+        $surat_wakil = [];
+        if(sizeof($wakil) != 0) {
             $wakil = $wakil[0];
+            $surat_wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getsuratwakil/' . $auth_user['cawangan'] . '/' . $id)->json();
+        }
 
         $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
 
         if($gadai['tagbaru'] == 1) {
-            return view('print.resittebus_ujrah',compact('totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
+            return view('print.resittebus_ujrah',compact('surat_wakil','totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
         } else {
-            return view('print.resittebus',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
+            return view('print.resittebus',compact('surat_wakil', 'transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
         }
     }
 

resources/views/print/resittebus.blade.php

@@ -449,10 +449,10 @@ hr.new5 {
             <td style="width:7px">Alamat</td>
             <td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
         </tr>
-        {{-- <tr>
+        <tr>
             <td style="width:7px">No Siri Wakil</td>
-            <td style="width:10px">: S9090232-001</td>
+            <td style="width:10px">: {{ sizeof($surat_wakil) == 0 ? '-' : $surat_wakil['no_surat'] }}</td>
-        </tr> --}}
+        </tr>
     </table>
 @endif
 
@@ -586,10 +586,10 @@ hr.new5 {
               <td style="width:7px">Alamat</td>
               <td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
           </tr>
-          {{-- <tr>
+          <tr>
               <td style="width:7px">No Siri Wakil</td>
-              <td style="width:10px">: S9090232-001</td>
+              <td style="width:10px">: {{ sizeof($surat_wakil) == 0 ? '-' : $surat_wakil['no_surat'] }}</td>
-          </tr> --}}
+          </tr>
       </table>
   @endif
 

resources/views/print/resittebus_ujrah.blade.php

@@ -513,10 +513,10 @@
                     <td style="width:7px">Alamat</td>
                     <td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
                 </tr>
-                {{-- <tr>
+                <tr>
                     <td style="width:7px">No Siri Wakil</td>
-                    <td style="width:10px">: S9090232-001</td>
+                    <td style="width:10px">: {{ sizeof($surat_wakil) == 0 ? '-' : $surat_wakil['no_surat'] }}</td>
-                </tr> --}}
+                </tr>
             </table>
         @endif
         <table id="payment">
@@ -677,10 +677,10 @@
                     <td style="width:7px">Alamat</td>
                     <td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
                 </tr>
-                {{-- <tr>
+                <tr>
                     <td style="width:7px">No Siri Wakil</td>
-                    <td style="width:10px">: S9090232-001</td>
+                    <td style="width:10px">: {{ sizeof($surat_wakil) == 0 ? '-' : $surat_wakil['no_surat'] }}</td>
-                </tr> --}}
+                </tr>
             </table>
         @endif
         <table id="payment">