From fc335d12cc97779319af2d6ddf77dfbb06830e93 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 7 Apr 2019 18:31:38 +0800 Subject: [PATCH] Change monthNumber helper name to month_number --- app/Helpers/date_time.php | 12 ++++++------ resources/views/reports/sales/daily.blade.php | 2 +- resources/views/reports/sales/yearly.blade.php | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Helpers/date_time.php b/app/Helpers/date_time.php index 5c0afce..8cf0b02 100644 --- a/app/Helpers/date_time.php +++ b/app/Helpers/date_time.php @@ -34,21 +34,21 @@ function date_id($date) throw new App\Exceptions\InvalidDateException('Invalid date format.'); } -function monthNumber($number) +function month_number($number) { return str_pad($number, 2, '0', STR_PAD_LEFT); } -function monthId($monthNumber) +function monthId($month_number) { - if (is_null($monthNumber)) { - return $monthNumber; + if (is_null($month_number)) { + return $month_number; } $months = get_months(); - $monthNumber = monthNumber($monthNumber); + $month_number = month_number($month_number); - return $months[$monthNumber]; + return $months[$month_number]; } function get_months() diff --git a/resources/views/reports/sales/daily.blade.php b/resources/views/reports/sales/daily.blade.php index 88da42c..1f1f335 100755 --- a/resources/views/reports/sales/daily.blade.php +++ b/resources/views/reports/sales/daily.blade.php @@ -14,7 +14,7 @@ {{ link_to_route( 'reports.sales.monthly', __('report.view_monthly'), - ['month' => monthNumber($dt->month), 'year' => $dt->year], + ['month' => month_number($dt->month), 'year' => $dt->year], ['class' => 'btn btn-default btn-sm'] ) }} {{ Form::close() }} diff --git a/resources/views/reports/sales/yearly.blade.php b/resources/views/reports/sales/yearly.blade.php index aaa0d16..40eaba7 100755 --- a/resources/views/reports/sales/yearly.blade.php +++ b/resources/views/reports/sales/yearly.blade.php @@ -32,30 +32,30 @@ @php $chartData = []; @endphp - @foreach(get_months() as $monthNumber => $monthName) + @foreach(get_months() as $month_number => $monthName) @php - $any = isset($reports[$monthNumber]); - $omzet = $any ? $reports[$monthNumber]->omzet : 0 + $any = isset($reports[$month_number]); + $omzet = $any ? $reports[$month_number]->omzet : 0 @endphp - {{ monthId($monthNumber) }} - {{ $any ? $reports[$monthNumber]->count : 0 }} + {{ monthId($month_number) }} + {{ $any ? $reports[$month_number]->count : 0 }} {{ format_rp($omzet) }} {{ link_to_route( 'reports.sales.monthly', __('report.view_monthly'), - ['month' => $monthNumber, 'year' => $year], + ['month' => $month_number, 'year' => $year], [ 'class' => 'btn btn-info btn-xs', - 'title' => __('report.monthly', ['year_month' => monthId($monthNumber)]), - 'title' => __('report.monthly', ['year_month' => monthId($monthNumber).' '.$year]), + 'title' => __('report.monthly', ['year_month' => monthId($month_number)]), + 'title' => __('report.monthly', ['year_month' => monthId($month_number).' '.$year]), ] ) }} @php - $chartData[] = ['month' => monthId($monthNumber), 'value' => $omzet]; + $chartData[] = ['month' => monthId($month_number), 'value' => $omzet]; @endphp @endforeach