diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index c5d6d95..73cf23c 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -71,7 +71,7 @@ {{__("Need process orders")}}
- +

{{number_format(\App\Models\Invoice::where('status','PAID')->count())}} @@ -86,7 +86,7 @@ {{__("Pending tickets")}}

- +

{{number_format(\App\Models\Ticket::where('status','PENDING')->count())}} diff --git a/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php b/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php index ce35286..2aa08aa 100644 --- a/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php +++ b/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php @@ -199,7 +199,7 @@ - - @foreach(auth('customer')->user()->invoices as $inv) + @foreach(auth('customer')->user()->invoices()->orderByDesc('id')->get() as $inv) {{$inv->hash}} @@ -226,8 +226,8 @@ class="btn btn-outline-primary btn-sm "> - @if($inv->status != 'COMPLETED' && $inv->created_at->timestamp > (time() - 3600) ) - + @if( in_array($inv->status, ['PENDING', 'CANCELED', 'FAILED'] ) && $inv->created_at->timestamp > (time() - 3600) ) + {{__("Pay now")}} @@ -376,7 +376,8 @@ {{__($ticket->status)}} - + {{__("View")}} @@ -415,14 +416,16 @@ -

- +