Chang dateId() to date_id()

app/Entities/Subscriptions/Subscription.php

@@ -61,8 +61,8 @@ class Subscription extends Model
      */
     public function dueDateDescription()
     {
-        $dueDateDescription = __('subscription.start_date').' : '.dateId($this->start_date)."\n";
-        $dueDateDescription .= __('subscription.due_date').' : '.dateId($this->due_date);
+        $dueDateDescription = __('subscription.start_date').' : '.date_id($this->start_date)."\n";
+        $dueDateDescription .= __('subscription.due_date').' : '.date_id($this->due_date);
 
         return $dueDateDescription;
     }

app/helpers.php

@@ -71,7 +71,7 @@ function formatDate($date)
  * @param  string  $date
  * @return string
  */
-function dateId($date)
+function date_id($date)
 {
     if (is_null($date) || $date == '0000-00-00') {
         return '-';

resources/views/customers/subscriptions.blade.php

@@ -24,7 +24,7 @@
                 <td class="text-center">{!! $subscription->type_label !!}</td>
                 <td>{{ $subscription->customer->name }}</td>
                 <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
-                    {{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
+                    {{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
                 </td>
                 <td class="text-right">{{ formatRp($subscription->price) }}</td>
                 <td>{{ $subscription->vendor->name }}</td>

resources/views/invoices/pdf.blade.php

@@ -61,7 +61,7 @@
                 <td style="width:270px; text-align: center;">
                     <h3 style="margin: 3px 0; font-size: 24px">{{ __('invoice.invoice') }}</h3>
                     <div style="margin: 5px">{{ __('invoice.number') }} : INV-{{ $invoice->number }}</div>
-                    <div>{{ __('app.date') }} : {{ dateId($invoice->date) }}</div>
+                    <div>{{ __('app.date') }} : {{ date_id($invoice->date) }}</div>
                 </td>
             </tr>
             <tr>
@@ -87,7 +87,7 @@
                 <td class="text-center text-top">
                     @if ($invoice->due_date)
                         <h4 style="margin: 30px 3px 0;">{{ __('invoice.due_date') }}</h4>
-                        <p>{{ dateId($invoice->due_date) }}</p>
+                        <p>{{ date_id($invoice->due_date) }}</p>
                     @endif
                     @if ($taxId = Option::get('agency_tax_id'))
                         <h4 style="margin: 30px 3px 0;">{{ __('agency.tax_id') }}</h4>
@@ -176,7 +176,7 @@
             <tr>
                 <td colspan="3" class="text-center">
                     {{ Option::get('agency_city') ? Option::get('agency_city').', ' : '' }}
-                    {{ dateId($invoice->date) }} <br><br><br><br>
+                    {{ date_id($invoice->date) }} <br><br><br><br>
                     <div style="font-weight: bold;">{{ Option::get('agency_name') }}</div>
                 </td>
             </tr>

resources/views/payments/pdf.blade.php

@@ -63,7 +63,7 @@
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
                 <td style="text-align: center;">
-                    {{ Option::get('agency_city') ? Option::get('agency_city').', ' : '' }} {{ dateId($payment->date) }}
+                    {{ Option::get('agency_city') ? Option::get('agency_city').', ' : '' }} {{ date_id($payment->date) }}
                 </td>
             </tr>
             <tr>

resources/views/projects/partials/project-show.blade.php

@@ -5,14 +5,14 @@
             <tbody>
                 <tr><td class="col-xs-3">{{ trans('project.name') }}</td><td class="col-xs-9">{{ $project->name }}</td></tr>
                 <tr><td>{{ trans('project.description') }}</td><td>{!! nl2br($project->description) !!}</td></tr>
-                <tr><td>{{ trans('project.proposal_date') }}</td><td>{{ dateId($project->proposal_date) }}</td></tr>
+                <tr><td>{{ trans('project.proposal_date') }}</td><td>{{ date_id($project->proposal_date) }}</td></tr>
                 @can('see-pricings', $project)
                 <tr><td>{{ trans('project.proposal_value') }}</td><td class="text-right">{{ formatRp($project->proposal_value) }}</td></tr>
                 <tr><td>{{ trans('project.project_value') }}</td><td class="text-right">{{ formatRp($project->project_value) }}</td></tr>
                 @endcan
-                <tr><td>{{ trans('project.start_date') }}</td><td>{{ dateId($project->start_date) }}</td></tr>
-                <tr><td>{{ trans('project.end_date') }}</td><td>{{ dateId($project->end_date) }}</td></tr>
-                <tr><td>{{ trans('project.due_date') }}</td><td>{{ dateId($project->due_date) }}</td></tr>
+                <tr><td>{{ trans('project.start_date') }}</td><td>{{ date_id($project->start_date) }}</td></tr>
+                <tr><td>{{ trans('project.end_date') }}</td><td>{{ date_id($project->end_date) }}</td></tr>
+                <tr><td>{{ trans('project.due_date') }}</td><td>{{ date_id($project->due_date) }}</td></tr>
                 <tr><td>{{ trans('app.status') }}</td><td>{{ $project->present()->status }}</td></tr>
                 <tr>
                     <td>{{ trans('project.customer') }}</td>

resources/views/projects/subscriptions.blade.php

@@ -31,8 +31,8 @@
             <td>{{ 1 + $key }}</td>
             <td class="text-center">{{ $subscription->type }}</td>
             <td>{{ $subscription->nameLink() }}</td>
-            <td class="text-right">{{ dateId($subscription->start_date) }}</td>
-            <td class="text-right">{{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}</td>
+            <td class="text-right">{{ date_id($subscription->start_date) }}</td>
+            <td class="text-right">{{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}</td>
             <td class="text-right">{{ formatRp($subscription->price) }}</td>
             <td>
                 {!! link_to_route('subscriptions.show',trans('app.show'),[$subscription->id],['class'=>'btn btn-info btn-xs']) !!}

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

@@ -1,6 +1,6 @@
 @extends('layouts.app')
 
-@section('title', __('report.daily', ['date' => dateId($date)]))
+@section('title', __('report.daily', ['date' => date_id($date)]))
 
 @section('content')
 

resources/views/reports/payments/monthly.blade.php

@@ -48,7 +48,7 @@
                 @endphp
                 @if ($any)
                     <tr>
-                        <td class="text-center">{{ dateId($date = $year.'-'.$month.'-'.$dateNumber) }}</td>
+                        <td class="text-center">{{ date_id($date = $year.'-'.$month.'-'.$dateNumber) }}</td>
                         <td class="text-center">{{ $count }}</td>
                         <td class="text-right">{{ formatRp($any ? $reports[$dateNumber]->cashin : 0) }}</td>
                         <td class="text-right">{{ formatRp($any ? $reports[$dateNumber]->cashout : 0) }}</td>
@@ -60,7 +60,7 @@
                                 ['date' => $date],
                                 [
                                     'class' => 'btn btn-info btn-xs',
-                                    'title' => __('report.daily', ['date' => dateId($date)]),
+                                    'title' => __('report.daily', ['date' => date_id($date)]),
                                 ]
                             ) }}
                         </td>

resources/views/subscriptions/index.blade.php

@@ -34,7 +34,7 @@
             <td class="text-center">{!! $subscription->type_label !!}</td>
             <td>{{ $subscription->customer->name }}</td>
             <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
-                {{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
+                {{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
             </td>
             <td class="text-right">{{ formatRp($subscription->price) }}</td>
             <td>{{ $subscription->vendor->name }}</td>

resources/views/subscriptions/partials/subscription-show.blade.php

@@ -3,8 +3,8 @@
         <tr><td>{{ trans('subscription.name') }}</td><td>{{ $subscription->name }}</td></tr>
         <tr><td>{{ trans('subscription.price') }}</td><td>{{ formatRp($subscription->price) }}</td></tr>
         <tr><td>{{ trans('subscription.type') }}</td><td>{{ $subscription->type }}</td></tr>
-        <tr><td>{{ trans('subscription.start_date') }}</td><td>{{ dateId($subscription->start_date) }}</td></tr>
-        <tr><td>{{ trans('subscription.due_date') }}</td><td>{{ dateId($subscription->due_date) }}</td></tr>
+        <tr><td>{{ trans('subscription.start_date') }}</td><td>{{ date_id($subscription->start_date) }}</td></tr>
+        <tr><td>{{ trans('subscription.due_date') }}</td><td>{{ date_id($subscription->due_date) }}</td></tr>
         <tr><td>{{ trans('subscription.customer') }}</td><td>{{ $subscription->customer->nameLink() }}</td></tr>
         <tr>
             <td>{{ trans('subscription.project') }}</td>

tests/Feature/ManageSubscriptionsTest.php

@@ -112,7 +112,7 @@ class ManageSubscriptionsTest extends TestCase
 
         $this->see($subscription->name);
         $this->see(formatRp($subscription->price));
-        $this->see(dateId($subscription->start_date));
-        $this->see(dateId($subscription->due_date));
+        $this->see(date_id($subscription->start_date));
+        $this->see(date_id($subscription->due_date));
     }
 }

tests/Unit/Models/SubscriptionTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Unit\Models;
 
 use Carbon\Carbon;
-use Tests\TestCase as TestCase;
+use Tests\TestCase;
 use App\Entities\Partners\Vendor;
 use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
@@ -69,8 +69,8 @@ class SubscriptionTest extends TestCase
         $next3Months = Carbon::now()->addMonths(2)->format('Y-m-d');
         $subscription = factory(Subscription::class)->make(['due_date' => $next3Months]);
 
-        $dueDateDescription = trans('subscription.start_date').' : '.dateId($subscription->start_date)."\n";
-        $dueDateDescription .= trans('subscription.due_date').' : '.dateId($subscription->due_date);
+        $dueDateDescription = trans('subscription.start_date').' : '.date_id($subscription->start_date)."\n";
+        $dueDateDescription .= trans('subscription.due_date').' : '.date_id($subscription->due_date);
 
         $this->assertEquals($dueDateDescription, $subscription->dueDateDescription());
     }