Browse Source

Change monthNumber helper name to month_number

pull/20/head
Nafies Luthfi 7 years ago
parent
commit
fc335d12cc
  1. 12
      app/Helpers/date_time.php
  2. 2
      resources/views/reports/sales/daily.blade.php
  3. 18
      resources/views/reports/sales/yearly.blade.php

12
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()

2
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() }}

18
resources/views/reports/sales/yearly.blade.php

@ -32,30 +32,30 @@
</thead>
<tbody>
@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
<tr>
<td class="text-center">{{ monthId($monthNumber) }}</td>
<td class="text-center">{{ $any ? $reports[$monthNumber]->count : 0 }}</td>
<td class="text-center">{{ monthId($month_number) }}</td>
<td class="text-center">{{ $any ? $reports[$month_number]->count : 0 }}</td>
<td class="text-right">{{ format_rp($omzet) }}</td>
<td class="text-center">
{{ 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]),
]
) }}
</td>
</tr>
@php
$chartData[] = ['month' => monthId($monthNumber), 'value' => $omzet];
$chartData[] = ['month' => monthId($month_number), 'value' => $omzet];
@endphp
@endforeach
</tbody>

Loading…
Cancel
Save