Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 05:34:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add partially unapplied payment status

Browse Source
This commit is contained in:
David Bomba 2024-01-26 10:04:50 +11:00
parent 50c7bb35ba
commit a329af2ddd
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Payment.php
View File

@ -314,9 +314,9 @@ class Payment extends BaseModel
return $this->createClientDate($this->date, $this->client->timezone()->name)->format($date_format->format); return $this->createClientDate($this->date, $this->client->timezone()->name)->format($date_format->format);
} }
public static function badgeForStatus(int $status): string public function badgeForStatus(): string
{ {
switch ($status) { switch ($this->status_id) {
case self::STATUS_PENDING: case self::STATUS_PENDING:
return '<h6><span class="badge badge-secondary">'.ctrans('texts.payment_status_1').'</span></h6>'; return '<h6><span class="badge badge-secondary">'.ctrans('texts.payment_status_1').'</span></h6>';
case self::STATUS_CANCELLED: case self::STATUS_CANCELLED:
@ -324,6 +324,10 @@ class Payment extends BaseModel
case self::STATUS_FAILED: case self::STATUS_FAILED:
return '<h6><span class="badge badge-danger">'.ctrans('texts.payment_status_3').'</span></h6>'; return '<h6><span class="badge badge-danger">'.ctrans('texts.payment_status_3').'</span></h6>';
case self::STATUS_COMPLETED: case self::STATUS_COMPLETED:
if($this->amount > $this->applied)
return '<h6><span class="badge badge-info">' . ctrans('texts.partially_unapplied') . '</span></h6>';
return '<h6><span class="badge badge-info">'.ctrans('texts.payment_status_4').'</span></h6>'; return '<h6><span class="badge badge-info">'.ctrans('texts.payment_status_4').'</span></h6>';
case self::STATUS_PARTIALLY_REFUNDED: case self::STATUS_PARTIALLY_REFUNDED:
return '<h6><span class="badge badge-success">'.ctrans('texts.payment_status_5').'</span></h6>'; return '<h6><span class="badge badge-success">'.ctrans('texts.payment_status_5').'</span></h6>';

2
resources/views/portal/ninja2020/components/livewire/payments-table.blade.php
View File

@ -66,7 +66,7 @@
{{ \Illuminate\Support\Str::limit($payment->transaction_reference, 35) }} {{ \Illuminate\Support\Str::limit($payment->transaction_reference, 35) }}
</td> </td>
<td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500"> <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
{!! \App\Models\Payment::badgeForStatus($payment->status_id) !!} {!! $payment->badgeForStatus() !!}
</td> </td>
<td class="px-6 py-4 whitespace-nowrap flex items-center justify-end text-sm leading-5 font-medium"> <td class="px-6 py-4 whitespace-nowrap flex items-center justify-end text-sm leading-5 font-medium">
<a href="{{ route('client.payments.show', $payment->hashed_id) }}" class="text-blue-600 hover:text-indigo-900 focus:outline-none focus:underline"> <a href="{{ route('client.payments.show', $payment->hashed_id) }}" class="text-blue-600 hover:text-indigo-900 focus:outline-none focus:underline">

2
resources/views/portal/ninja2020/payments/show.blade.php
View File

@ -21,7 +21,7 @@
{{ ctrans('texts.status') }} {{ ctrans('texts.status') }}
</dt> </dt>
<div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2"> <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
{!! \App\Models\Payment::badgeForStatus($payment->status_id) !!} {!! $payment->badgeForStatus() !!}
</div> </div>
</div> </div>
@endif @endif