diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index 6c93ab1f..b6c80bde 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -875,6 +875,7 @@ class Pages extends Controller $clean = static fn (mixed $value, int $length = 80): string => mb_substr(trim((string) $value), 0, $length); $platform = $clean(request()->query('platform')); $withdrawalPath = $clean(request()->query('withdrawal_path')); + $storeEntity = $clean(request()->query('store_entity'), 191); $keyword = $clean(request()->query('keyword'), 191); $balanceStatus = $clean(request()->query('balance_status')); if (! in_array($balanceStatus, ['matched', 'unmatched', 'ambiguous', 'not_ready'], true)) { @@ -897,6 +898,15 @@ class Pages extends Controller ->filter() ->values() ->all(); + $storeEntities = StoreReceivingAccount::query() + ->whereNotNull('store_entity_name') + ->where('store_entity_name', '<>', '') + ->distinct() + ->orderBy('store_entity_name') + ->pluck('store_entity_name') + ->filter() + ->values() + ->all(); $query = StoreReceivingAccount::query(); @@ -908,6 +918,10 @@ class Pages extends Controller $query->where('receiving_method', $withdrawalPath); } + if ($storeEntity !== '') { + $query->where('store_entity_name', $storeEntity); + } + if ($keyword !== '') { $query->where('store_name', 'like', '%' . addcslashes($keyword, '%_\\') . '%'); } @@ -963,9 +977,10 @@ class Pages extends Controller return [ 'view' => 'business.pages.fund-management.withdrawal-management', 'withdrawalRows' => $withdrawalRows, - 'withdrawalFilters' => compact('platform', 'withdrawalPath', 'keyword', 'balanceStatus'), + 'withdrawalFilters' => compact('platform', 'withdrawalPath', 'storeEntity', 'keyword', 'balanceStatus'), 'withdrawalPlatforms' => $platforms, 'withdrawalPaths' => $withdrawalPaths, + 'withdrawalStoreEntities' => $storeEntities, 'withdrawalBalances' => $withdrawalBalances, 'withdrawalReserveStandards' => $withdrawalReserveStandards, 'withdrawalBalanceSummary' => [ diff --git a/resources/views/business/pages/fund-management/withdrawal-management.blade.php b/resources/views/business/pages/fund-management/withdrawal-management.blade.php index 773c9b7f..507fdfdb 100644 --- a/resources/views/business/pages/fund-management/withdrawal-management.blade.php +++ b/resources/views/business/pages/fund-management/withdrawal-management.blade.php @@ -32,6 +32,15 @@ @endforeach +