Browse Source

Change getMonths() to get_months()

pull/32/head
Nafies Luthfi 7 years ago
parent
commit
590790bf3c
  1. 2
      app/Http/Controllers/ReportsController.php
  2. 6
      app/helpers.php
  3. 2
      resources/views/reports/payments/daily.blade.php
  4. 2
      resources/views/reports/payments/yearly.blade.php

2
app/Http/Controllers/ReportsController.php

@ -45,7 +45,7 @@ class ReportsController extends Controller
$month = $req->get('month'); $month = $req->get('month');
} }
$reports = $this->repo->getMonthlyReports($year, $month); $reports = $this->repo->getMonthlyReports($year, $month);
$months = \getMonths();
$months = \get_months();
$years = \getYears(); $years = \getYears();
return view('reports.payments.monthly', compact('reports', 'months', 'years', 'month', 'year')); return view('reports.payments.monthly', compact('reports', 'months', 'years', 'month', 'year'));

6
app/helpers.php

@ -80,7 +80,7 @@ function dateId($date)
$explodedDate = explode('-', $date); $explodedDate = explode('-', $date);
if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) { if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) {
$months = getMonths();
$months = get_months();
return $explodedDate[2].' '.$months[$explodedDate[1]].' '.$explodedDate[0]; return $explodedDate[2].' '.$months[$explodedDate[1]].' '.$explodedDate[0];
} }
@ -111,7 +111,7 @@ function monthId($monthNumber)
return $monthNumber; return $monthNumber;
} }
$months = getMonths();
$months = get_months();
$monthNumber = monthNumber($monthNumber); $monthNumber = monthNumber($monthNumber);
return $months[$monthNumber]; return $months[$monthNumber];
@ -122,7 +122,7 @@ function monthId($monthNumber)
* *
* @return array * @return array
*/ */
function getMonths()
function get_months()
{ {
return [ return [
'01' => __('time.months.01'), '01' => __('time.months.01'),

2
resources/views/reports/payments/daily.blade.php

@ -8,7 +8,7 @@
<ul class="breadcrumb hidden-print"> <ul class="breadcrumb hidden-print">
<li>{{ link_to_route('reports.payments.yearly', __('report.yearly', ['year' => $dt->year]), ['year' => $dt->year]) }}</li> <li>{{ link_to_route('reports.payments.yearly', __('report.yearly', ['year' => $dt->year]), ['year' => $dt->year]) }}</li>
<li>{{ link_to_route('reports.payments.monthly', getMonths()[monthNumber($dt->month)], ['year' => $dt->year,'month' => monthNumber($dt->month)]) }}</li>
<li>{{ link_to_route('reports.payments.monthly', get_months()[monthNumber($dt->month)], ['year' => $dt->year,'month' => monthNumber($dt->month)]) }}</li>
<li class="active">{{ $dt->format('d') }}</li> <li class="active">{{ $dt->format('d') }}</li>
</ul> </ul>

2
resources/views/reports/payments/yearly.blade.php

@ -37,7 +37,7 @@
</thead> </thead>
<tbody> <tbody>
@php $chartData = []; @endphp @php $chartData = []; @endphp
@foreach(getMonths() as $monthNumber => $monthName)
@foreach(get_months() as $monthNumber => $monthName)
@php @php
$any = isset($reports[$monthNumber]); $any = isset($reports[$monthNumber]);
@endphp @endphp

Loading…
Cancel
Save