Merged in izzati-feat-format-notis-lelong-baru-30jun (pull request #41)

update notis lelong menngikut tagbaru ujrah

app/Http/Controllers/NotisController.php

@@ -386,6 +386,17 @@ class NotisController extends Controller
                     'tarikh' => $getdatalelongbid['t_lelong'],
                     'jeniskeuntungan' => 'asal'
                 ])->json();
+
+                $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
+                $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
+                $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['upahsemasa'];
+                $jumlah = $nilaipembiayaan + $nilaikeuntungan;
+
+                $marhuns[$index]['nilaitebus'] = $nilaitebus;
+                $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
+                $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
+                $marhuns[$index]['jumlah'] = $jumlah;
+
             }elseif($tagbaru == '1'){
                 $getkeuntunganhinggatarikhlelong = Http::get(config('app.api_ujrah_url'). 'get/upahtawarruqbytarikh',[
                     'kodcaw' => $user->kodcaw,
@@ -393,17 +404,24 @@ class NotisController extends Controller
                     'tarikh' => $getdatalelongbid['t_lelong'],
                     'jeniskeuntungan' => 'onepercent'
                 ])->json();
+
+                $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
+                $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
+                $nilaipendapatan = (float) $getkeuntunganhinggatarikhlelong['pendapatan'];
+                $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['keuntungan'];
+                $nilaiujrah = (float) $getkeuntunganhinggatarikhlelong['ujrah'];
+                $jumlah = $nilaipembiayaan + $nilaipendapatan ;
+
+                $marhuns[$index]['nilaitebus'] = $nilaitebus;
+                $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
+                $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
+                $marhuns[$index]['nilaiujrah'] = $nilaiujrah;
+                $marhuns[$index]['jumlah'] = $jumlah;
             }
             // dd($getkeuntunganhinggatarikhlelong);
-            $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
-            $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
-            $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['upahsemasa'];
-            $jumlah = $nilaipembiayaan + $nilaikeuntungan;
+            
 
-            $marhuns[$index]['nilaitebus'] = $nilaitebus;
-            $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
-            $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
-            $marhuns[$index]['jumlah'] = $jumlah;
+            
         }
         // return view('pdf.jananotis', compact('marhuns', 'lelongid', 'caw', 'tarikh_cetak'));
         $pdf = PDF::loadView('pdf.jananotis_new', compact('marhuns', 'lelongid', 'caw', 'tarikh_cetak'))
@@ -468,6 +486,16 @@ class NotisController extends Controller
                     'tarikh' => $getdatalelongbid['t_lelong'],
                     'jeniskeuntungan' => 'asal'
                 ])->json();
+
+                $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
+                $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
+                $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['upahsemasa'];
+                $jumlah = $nilaipembiayaan + $nilaikeuntungan;
+
+                $marhuns[$index]['nilaitebus'] = $nilaitebus;
+                $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
+                $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
+                $marhuns[$index]['jumlah'] = $jumlah;
             }elseif($tagbaru == '1'){
                 $getkeuntunganhinggatarikhlelong = Http::get(config('app.api_ujrah_url'). 'get/upahtawarruqbytarikh',[
                     'kodcaw' => $user->kodcaw,
@@ -475,17 +503,22 @@ class NotisController extends Controller
                     'tarikh' => $getdatalelongbid['t_lelong'],
                     'jeniskeuntungan' => 'onepercent'
                 ])->json();
+
+                $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
+                $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
+                $nilaipendapatan = (float) $getkeuntunganhinggatarikhlelong['pendapatan'];
+                $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['keuntungan'];
+                $nilaiujrah = (float) $getkeuntunganhinggatarikhlelong['ujrah'];
+                $jumlah = $nilaipembiayaan + $nilaipendapatan ;
+
+                $marhuns[$index]['nilaitebus'] = $nilaitebus;
+                $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
+                $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
+                $marhuns[$index]['nilaiujrah'] = $nilaiujrah;
+                $marhuns[$index]['jumlah'] = $jumlah;
             }
             // dd($getkeuntunganhinggatarikhlelong);
-            $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
-            $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
-            $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['upahsemasa'];
-            $jumlah = $nilaipembiayaan + $nilaikeuntungan;
-
-            $marhuns[$index]['nilaitebus'] = $nilaitebus;
-            $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
-            $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
-            $marhuns[$index]['jumlah'] = $jumlah;
+            
         }
         // return view('pdf.jananotis', compact('marhuns', 'lelongid', 'caw', 'tarikh_cetak'));
         $pdf = PDF::loadView('pdf.jananotisfasa2_new', compact('marhuns', 'lelongid', 'caw', 'tarikh_cetak'))

resources/views/pdf/jananotis_new.blade.php

@@ -319,6 +319,8 @@
           <td>RM</td>
           <td align="right">{{number_format($notis['nilaipembiayaan'], 2, '.', ',') }}</td>
         </tr>
+        
+        @if($notis['tagbaru'] == '1')
         <tr>
           <td></td>
           <td>Keuntungan</td>
@@ -326,6 +328,22 @@
           <td>RM</td>
           <td align="right">{{number_format($notis['nilaikeuntungan'], 2, '.', ',') }}</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>Lain-Lain Caj</td>
+          <td>:</td>
+          <td>RM</td>
+          <td align="right">{{number_format($notis['nilaiujrah'], 2, '.', ',') }}</td>
+        </tr>
+        @elseif($notis['tagbaru'] == '0')
+        <tr>
+          <td></td>
+          <td>Keuntungan</td>
+          <td>:</td>
+          <td>RM</td>
+          <td align="right">{{number_format($notis['nilaikeuntungan'], 2, '.', ',') }}</td>
+        </tr>
+        @endif
        
         <tr>
           <td></td>

resources/views/pdf/jananotisfasa2_new.blade.php

@@ -307,6 +307,7 @@
           <td>RM</td>
           <td align="right">{{number_format($notis['nilaipembiayaan'], 2, '.', ',') }}</td>
         </tr>
+        @if($notis['tagbaru'] == '1')
         <tr>
           <td></td>
           <td>Keuntungan</td>
@@ -314,6 +315,22 @@
           <td>RM</td>
           <td align="right">{{number_format($notis['nilaikeuntungan'], 2, '.', ',') }}</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>Lain-Lain Caj</td>
+          <td>:</td>
+          <td>RM</td>
+          <td align="right">{{number_format($notis['nilaiujrah'], 2, '.', ',') }}</td>
+        </tr>
+        @elseif($notis['tagbaru'] == '0')
+        <tr>
+          <td></td>
+          <td>Keuntungan</td>
+          <td>:</td>
+          <td>RM</td>
+          <td align="right">{{number_format($notis['nilaikeuntungan'], 2, '.', ',') }}</td>
+        </tr>
+        @endif
        
         <tr>
           <td></td>