Merged in afiqhamzah/fix/format-money-in-khazanah-kelulusan (pull request #24)

Format money in khazanah kelulusan
This commit is contained in:
Afiq Hamzah
2023-12-07 07:07:58 +00:00
3 changed files with 52 additions and 24 deletions
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App;
use DateTime;
class Helper
{
public static function formatNumber($amount)
{
$formattedAmount = number_format($amount, 2, '.', ',');
return $formattedAmount;
}
public static function formatDate($date_string)
{
return (new DateTime($date_string))->format("d-m-Y");
}
}
+1
View File
@@ -234,6 +234,7 @@ return [
'PDF' => Barryvdh\DomPDF\Facade::class, 'PDF' => Barryvdh\DomPDF\Facade::class,
'DNS1D' => Milon\Barcode\Facades\DNS1DFacade::class, 'DNS1D' => Milon\Barcode\Facades\DNS1DFacade::class,
'DNS2D' => Milon\Barcode\Facades\DNS2DFacade::class, 'DNS2D' => Milon\Barcode\Facades\DNS2DFacade::class,
'Helper' => App\Helper::class,
], ],
'reset_password' => env('RESET_PASSWORD', 'qwerty@12345'), 'reset_password' => env('RESET_PASSWORD', 'qwerty@12345'),
+11 -4
View File
@@ -120,13 +120,20 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@php
$formatNumber = function($number){
return number_format($number, 2, '.', ',');
}
@endphp
@foreach($kelulusan as $index=>$k) @foreach($kelulusan as $index=>$k)
<tr> <tr>
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td> <td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
<td>{{ $k['teller'] }}</td> <td>{{ $k['teller'] }}</td>
<td>{{ $k['status'] }}</td> <td>{{ $k['status'] }}</td>
<td>{{ number_format($k['jumpinj'],2) }}</td> <td>{{ Helper::formatNumber($k['jumpinj']) }}</td>
<td>{{ $k['nilaimarhun'] }}</td> <td>{{ Helper::formatNumber($k['nilaimarhun']) }}</td>
<td>{{ $k['berat'] }}</td> <td>{{ $k['berat'] }}</td>
<td>{{ $k['margin'] }}</td> <td>{{ $k['margin'] }}</td>
<td><button class="btn btn-primary mr-2" data-pelulus="{{ $k['pelulus'] }}" onclick="updatelulus(this)" data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ $k['siri'] }}"><i class="fas fa-thumbs-up"></i></button> <td><button class="btn btn-primary mr-2" data-pelulus="{{ $k['pelulus'] }}" onclick="updatelulus(this)" data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ $k['siri'] }}"><i class="fas fa-thumbs-up"></i></button>
@@ -138,8 +145,8 @@
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $km['norujukan'] }}">{{ $km['norujukan'] }} </a></td> <td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $km['norujukan'] }}">{{ $km['norujukan'] }} </a></td>
<td>{{ $km['teller'] }}</td> <td>{{ $km['teller'] }}</td>
<td>{{ $km['mohon'] }}</td> <td>{{ $km['mohon'] }}</td>
<td>{{ $km['pinjaman'] }}</td> <td>{{ Helper::formatNumber($km['pinjaman']) }}</td>
<td>{{ $km['nilaimarhun'] }}</td> <td>{{ Helper::formatNumber($km['nilaimarhun']) }}</td>
<td>{{ $km['berat'] }}</td> <td>{{ $km['berat'] }}</td>
<td>{{ $km['margin'] }}</td> <td>{{ $km['margin'] }}</td>
<td><button class="btn btn-primary mr-2" onclick="updatelulusmohon(this)" data-norujukan="{{ $km['norujukan'] }}"><i class="fas fa-thumbs-up"></i></button> <td><button class="btn btn-primary mr-2" onclick="updatelulusmohon(this)" data-norujukan="{{ $km['norujukan'] }}"><i class="fas fa-thumbs-up"></i></button>