diff --git a/app/Models/Payment.php b/app/Models/Payment.php index 65c773c89b87..36e315d61918 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -12,8 +12,10 @@ namespace App\Models; use App\Models\BaseModel; +use App\Models\DateFormat; use App\Models\Filterable; use App\Utils\Number; +use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; @@ -21,6 +23,7 @@ class Payment extends BaseModel { use MakesHash; use Filterable; + use MakesDates; const STATUS_PENDING = 1; const STATUS_VOIDED = 2; @@ -99,6 +102,13 @@ class Payment extends BaseModel return Number::formatMoney($this->amount, $this->client); } + public function clientPaymentDate() + { + $date_format = DateFormat::find($this->client->getSetting('date_format_id')); + + return $this->createClientDate($this->payment_date, $this->client->timezone()->name)->format($date_format->format); + } + public static function badgeForStatus(int $status) { switch ($status) { diff --git a/resources/views/portal/default/payments/show.blade.php b/resources/views/portal/default/payments/show.blade.php index 34a2a4fea677..ee0f531bc782 100644 --- a/resources/views/portal/default/payments/show.blade.php +++ b/resources/views/portal/default/payments/show.blade.php @@ -13,7 +13,7 @@
- +
{{ctrans('texts.payment_date')}}{{$payment->payment_date}}
{{ctrans('texts.payment_date')}}{!! $payment->clientPaymentDate() !!}
{{ctrans('texts.transaction_reference')}}{{$payment->transaction_reference}}
{{ctrans('texts.method')}}{{$payment->type->name}}
{{ctrans('texts.amount')}}{{$payment->formattedAmount()}}