cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-19 04:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix payment due date days filter

Browse Source
This commit is contained in:
Omair Saleh
2022-10-30 18:56:19 +08:00
parent 1abc99fe10
commit 524da42526
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/PackingListOrderedByInvoiceDate.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace App\Classes\General\Eloquent\Filters;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\SegmentConstants;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\PackingList;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\DB;
class PackingListOrderedByInvoiceDate implements Filter
{
/**
* @param Builder $builder
* @param $value
* @return Builder|mixed
*/
public static function apply(Builder $builder, $value)
{
return $builder->join('transactions', function($join){
$join->on('transactions.owner_id', '=', 'packing_lists.id');
$join->on('transactions.owner_type', '=', PackingList::class);
$join->on('transactions.status', '=', ApprovalStatus::APPROVED);
})->orderBy('transactions.updated_at');
}
}
resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue
+1 -1
View File
@@ -121,7 +121,7 @@
<div class="row tabsContainer tabContent hide" tab-name="pendingPayment">
<div class="col">
<payment-filter-component :endpoint="route('api.packing_list.list')" :data="data"></payment-filter-component>
<list-component section="pendingPaymentSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [2], order_by: {column: 'updated_at', DESC: true}}">
<list-component section="pendingPaymentSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [2], packing_list_ordered_by_invoice_date: true}">
<template slot="list" slot-scope="{data}">
<admin-payments-billing-component :data="data" invoice_status="Pending Payment" section="pendingPaymentSection" ></admin-payments-billing-component>
</template>