diff --git a/resources/views/pages/customer_support.blade.php b/resources/views/pages/customer_support.blade.php index 071c3f49..6b420e0f 100644 --- a/resources/views/pages/customer_support.blade.php +++ b/resources/views/pages/customer_support.blade.php @@ -64,6 +64,7 @@
Amount: {{$booking->fix_amount.' '.$booking->fixedCurrency->short_code}}
Status: {{$booking->status === 3 ? 'Complete' : 'In Progress'}}
Purchase Order Status: {{$purchaseOrder ? ($purchaseOrder->status === 3 ? 'Approved' : ($purchaseOrder->status === 1 ? 'Pending Approval' : 'Incomplete Submission')) : 'Pending Submission'}}
+ @if($payments)Payment History:
@endif @foreach($payments as $payment) @php $bill = $payment->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::BILL)->first(); @@ -94,14 +95,16 @@ } @endphp -Amount: {{$payment->original_amount.' '.$payment->original_currency->short_code}}
-Status: {{$status}}
-Payment Date: {{$payment->created_at->format('d-m-Y')}}
- @if($bill) -Supplier: {{$bill->issuerCompany->name}}
-Supplier Order Date: {{$bill->created_at->format('d-m-Y')}}
- @if($transferProof)Transfer Proof Upload Date: {{$transferProof->created_at->format('d-m-Y')}}
@endif - @endif +Amount: {{$payment->original_amount.' '.$payment->original_currency->short_code}}
+Status: {{$status}}
+Payment Date: {{$payment->created_at->format('d-m-Y')}}
+ @if($bill) +Supplier: {{$bill->issuerCompany->name}}
+Supplier Order Date: {{$bill->created_at->format('d-m-Y')}}
+ @if($transferProof)Transfer Proof Upload Date: {{$transferProof->created_at->format('d-m-Y')}}
@endif + @endif +Amount: {{$booking->fix_amount.' '.$booking->fixedCurrency->short_code}}
Status: {{$booking->status === 3 ? 'Complete' : 'In Progress'}}
Purchase Order Status: {{$purchaseOrder ? ($purchaseOrder->status === 3 ? 'Approved' : ($purchaseOrder->status === 1 ? 'Pending Approval' : 'Incomplete Submission')) : 'Pending Submission'}}
+ @if($payments)Payment History:
@endif @foreach($payments as $payment) @php $bill = $payment->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::BILL)->first(); @@ -149,14 +153,16 @@ } @endphp -Amount: {{$payment->original_amount.' '.$payment->original_currency->short_code}}
-Status: {{$status}}
-Payment Date: {{$payment->created_at->format('d-m-Y')}}
- @if($bill) -Supplier: {{$bill->issuerCompany->name}}
-Supplier Order Date: {{$bill->created_at->format('d-m-Y')}}
- @if($transferProof)Transfer Proof Upload Date: {{$transferProof->created_at->format('d-m-Y')}}
@endif - @endif +Amount: {{$payment->original_amount.' '.$payment->original_currency->short_code}}
+Status: {{$status}}
+Payment Date: {{$payment->created_at->format('d-m-Y')}}
+ @if($bill) +Supplier: {{$bill->issuerCompany->name}}
+Supplier Order Date: {{$bill->created_at->format('d-m-Y')}}
+ @if($transferProof)Transfer Proof Upload Date: {{$transferProof->created_at->format('d-m-Y')}}
@endif + @endif +