From 9b83f78f372bc9ebc0bd7f2393cbc34752c4deb1 Mon Sep 17 00:00:00 2001
From: BTMS2 <btms2@BTMS2s-MacBook-Pro.local>
Date: Wed, 4 Sep 2024 10:21:33 +0800
Subject: [PATCH] update tagbaru dalam blade notis peringatan arcc

---
 resources/views/callcenter/bycawdetailnotisjbg2.blade.php | 8 +++++++-
 .../views/callcenter/bycawdetailnotisperingatan.blade.php | 4 ++++
 .../callcenter/bycawdetailnotisperingatankedua.blade.php  | 4 ++++
 resources/views/callcenter/callnotisjbg2.blade.php        | 8 +++++++-
 .../views/callcenter/pdfbycawdetailnotisjbg2.blade.php    | 8 +++++++-
 .../callcenter/pdfbycawdetailnotisperingatan.blade.php    | 4 ++++
 .../pdfbycawdetailnotisperingatankedua.blade.php          | 4 ++++
 .../callcenter/suratnotisperingatankeduafasa1.blade.php   | 4 ++++
 .../callcenter/suratnotisperingatankeduafasa2.blade.php   | 4 ++++
 9 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/resources/views/callcenter/bycawdetailnotisjbg2.blade.php b/resources/views/callcenter/bycawdetailnotisjbg2.blade.php
index a274784..16f19e1 100644
--- a/resources/views/callcenter/bycawdetailnotisjbg2.blade.php
+++ b/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)
 
diff --git a/resources/views/callcenter/bycawdetailnotisperingatan.blade.php b/resources/views/callcenter/bycawdetailnotisperingatan.blade.php
index 41ecc90..59ddbc9 100644
--- a/resources/views/callcenter/bycawdetailnotisperingatan.blade.php
+++ b/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
diff --git a/resources/views/callcenter/bycawdetailnotisperingatankedua.blade.php b/resources/views/callcenter/bycawdetailnotisperingatankedua.blade.php
index ebea1ef..9e0dcda 100644
--- a/resources/views/callcenter/bycawdetailnotisperingatankedua.blade.php
+++ b/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
diff --git a/resources/views/callcenter/callnotisjbg2.blade.php b/resources/views/callcenter/callnotisjbg2.blade.php
index 4ff3478..1445688 100644
--- a/resources/views/callcenter/callnotisjbg2.blade.php
+++ b/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)
 
diff --git a/resources/views/callcenter/pdfbycawdetailnotisjbg2.blade.php b/resources/views/callcenter/pdfbycawdetailnotisjbg2.blade.php
index 339e74f..1ecb3e8 100644
--- a/resources/views/callcenter/pdfbycawdetailnotisjbg2.blade.php
+++ b/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)
 
diff --git a/resources/views/callcenter/pdfbycawdetailnotisperingatan.blade.php b/resources/views/callcenter/pdfbycawdetailnotisperingatan.blade.php
index 473db6e..03d9588 100644
--- a/resources/views/callcenter/pdfbycawdetailnotisperingatan.blade.php
+++ b/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
diff --git a/resources/views/callcenter/pdfbycawdetailnotisperingatankedua.blade.php b/resources/views/callcenter/pdfbycawdetailnotisperingatankedua.blade.php
index 770f65e..e9e6f1f 100644
--- a/resources/views/callcenter/pdfbycawdetailnotisperingatankedua.blade.php
+++ b/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
diff --git a/resources/views/callcenter/suratnotisperingatankeduafasa1.blade.php b/resources/views/callcenter/suratnotisperingatankeduafasa1.blade.php
index 352c20b..ce0343d 100644
--- a/resources/views/callcenter/suratnotisperingatankeduafasa1.blade.php
+++ b/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>
diff --git a/resources/views/callcenter/suratnotisperingatankeduafasa2.blade.php b/resources/views/callcenter/suratnotisperingatankeduafasa2.blade.php
index cdf9d42..6a90753 100644
--- a/resources/views/callcenter/suratnotisperingatankeduafasa2.blade.php
+++ b/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>