update tagbaru dalam blade notis peringatan arcc

resources/views/callcenter/bycawdetailnotisjbg2.blade.php

@@ -181,7 +181,13 @@
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['bakipjm'], 2, '.', ',')}}<br>@endforeach</td>
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['bakiupah'], 2, '.', ',')}}<br>@endforeach</td>
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['hargajualan']-$item1['bakihargajualan'], 2, '.', ',')}}<br>@endforeach</td>
-                                    <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['keuntungan'], 2, '.', ',')}}<br>@endforeach<br></td>
+                                    <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1)
+                                    @if($item1['tagbaru'] == '0')
+                                    {{number_format($item1['keuntungan'], 2, '.', ',')}}
+                                    @elseif($item1['tagbaru'] == '1')
+                                    {{number_format($item1['keuntungan']['ujrah']+$item1['keuntungan']['onepercent'], 2, '.', ',')}}
+                                    @endif
+                                    <br>@endforeach<br></td>
                                     <td align='right' style="white-space: nowrap;"><b> @foreach($item['listsag'] as $item1)
                                             @if($item1['t_matang'] == null)
 

resources/views/callcenter/bycawdetailnotisperingatan.blade.php

@@ -160,7 +160,11 @@
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakipjm'], 2, '.', ',')}}</td>
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakiupah'], 2, '.', ',')}}</td>
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['hargajualan']-$item['datagadai']['bakihargajualan'], 2, '.', ',')}}</td>
+                                    @if($item['datagadai']['tagbaru'] == '0')
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan'], 2, '.', ',')}}</td>
+                                    @elseif($item['datagadai']['tagbaru'] == '1')
+                                    <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan']['ujrah']+$item['keuntungan']['onepercent'], 2, '.', ',')}}</td>
+                                    @endif
                                     <td align = 'right' style="white-space: nowrap;"><b> 
                                         @if($item['tmatang'] == null)
                                         @else

resources/views/callcenter/bycawdetailnotisperingatankedua.blade.php

@@ -175,7 +175,11 @@
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakipjm'], 2, '.', ',')}}</td>
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakiupah'], 2, '.', ',')}}</td>
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['hargajualan']-$item['datagadai']['bakihargajualan'], 2, '.', ',')}}</td>
+                                    @if($item['datagadai']['tagbaru'] == '0')
                                     <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan'], 2, '.', ',')}}</td>
+                                    @elseif($item['datagadai']['tagbaru'] == '1')
+                                    <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan']['ujrah']+$item['keuntungan']['onepercent'], 2, '.', ',')}}</td>
+                                    @endif
                                     <td align = 'right' style="white-space: nowrap;"><b> 
                                         @if($item['tmatang'] == null)
                                         @else

resources/views/callcenter/callnotisjbg2.blade.php

@@ -159,7 +159,13 @@
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['bakipjm'], 2, '.', ',')}}<br>@endforeach</td>
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['bakiupah'], 2, '.', ',')}}<br>@endforeach</td>
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['hargajualan']-$item1['bakihargajualan'], 2, '.', ',')}}<br>@endforeach</td>
-                                    <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['keuntungan'], 2, '.', ',')}}<br>@endforeach<br></td>
+                                    <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1)
+                                    @if($item1['tagbaru'] == '0')
+                                    {{number_format($item1['keuntungan'], 2, '.', ',')}}
+                                    @elseif($item1['tagbaru'] == '1')
+                                    {{number_format($item1['keuntungan']['ujrah']+$item1['keuntungan']['onepercent'], 2, '.', ',')}}
+                                    @endif
+                                    <br>@endforeach<br></td>
                                     <td align='right' style="white-space: nowrap;"><b> @foreach($item['listsag'] as $item1)
                                             @if($item1['t_matang'] == null)
 

resources/views/callcenter/pdfbycawdetailnotisjbg2.blade.php

@@ -329,7 +329,13 @@
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['bakipjm'], 2, '.', ',')}}<br>@endforeach</td>
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['bakiupah'], 2, '.', ',')}}<br>@endforeach</td>
                                     <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['hargajualan']-$item1['bakihargajualan'], 2, '.', ',')}}<br>@endforeach</td>
-                                    <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1){{number_format($item1['keuntungan'], 2, '.', ',')}}<br>@endforeach<br></td>
+                                    <td align='right' style="white-space: nowrap;">@foreach($item['listsag'] as $item1)
+                                    @if($item1['tagbaru'] == '0')
+                                    {{number_format($item1['keuntungan'], 2, '.', ',')}}
+                                    @elseif($item1['tagbaru'] == '1')
+                                    {{number_format($item1['keuntungan']['ujrah']+$item1['keuntungan']['onepercent'], 2, '.', ',')}}
+                                    @endif
+                                    <br>@endforeach<br></td>
                                     <td align='right' style="white-space: nowrap;"><b> @foreach($item['listsag'] as $item1)
                                             @if($item1['t_matang'] == null)
 

resources/views/callcenter/pdfbycawdetailnotisperingatan.blade.php

@@ -303,7 +303,11 @@
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakipjm'], 2, '.', ',')}}</td>
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakiupah'], 2, '.', ',')}}</td>
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['hargajualan']-$item['datagadai']['bakihargajualan'], 2, '.', ',')}}</td>
+                @if($item['datagadai']['tagbaru'] == '0')
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan'], 2, '.', ',')}}</td>
+                @elseif($item['datagadai']['tagbaru'] == '1')
+                <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan']['ujrah']+$item['keuntungan']['onepercent'], 2, '.', ',')}}</td>
+                @endif
                 <td align = 'right' style="white-space: nowrap;"><b> 
                     @if($item['tmatang'] == null)
                     @else

resources/views/callcenter/pdfbycawdetailnotisperingatankedua.blade.php

@@ -305,7 +305,11 @@
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakipjm'], 2, '.', ',')}}</td>
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['bakiupah'], 2, '.', ',')}}</td>
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['datagadai']['hargajualan']-$item['datagadai']['bakihargajualan'], 2, '.', ',')}}</td>
+                @if($item['datagadai']['tagbaru'] == '0')
                 <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan'], 2, '.', ',')}}</td>
+                @elseif($item['datagadai']['tagbaru'] == '1')
+                <td align = 'right' style="white-space: nowrap;">{{number_format($item['keuntungan']['ujrah']+$item['keuntungan']['onepercent'], 2, '.', ',')}}</td>
+                @endif
                 <td align = 'right' style="white-space: nowrap;"><b> 
                     @if($item['tmatang'] == null)
                     @else

resources/views/callcenter/suratnotisperingatankeduafasa1.blade.php

@@ -226,7 +226,11 @@
         <tr>
           <td>Jumlah Keuntungan</td>
           <td>:</td>
+          @if($lel['tagbaru'] == '0')
           <td>RM{{number_format($lel['keuntungan'], 2, '.', ',')}}</td>
+          @elseif($lel['tagbaru'] == '1')
+          <td>RM{{number_format($lel['keuntungan']['ujrah']+$lel['keuntungan']['onepercent'], 2, '.', ',')}}</td>
+          @endif
         </tr>
         <tr>
           <td>Tarikh Matang</td>

resources/views/callcenter/suratnotisperingatankeduafasa2.blade.php

@@ -226,7 +226,11 @@
         <tr>
           <td>Jumlah Keuntungan</td>
           <td>:</td>
+          @if($lel['tagbaru'] == '0')
           <td>RM{{number_format($lel['keuntungan'], 2, '.', ',')}}</td>
+          @elseif($lel['tagbaru'] == '1')
+          <td>RM{{number_format($lel['keuntungan']['ujrah']+$lel['keuntungan']['onepercent'], 2, '.', ',')}}</td>
+          @endif
         </tr>
         <tr>
           <td>Tarikh Tamat Kontrak</td>