From 8d0fba2d2191782eccc23dc8bfce4e52ec206abc Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 20 Jun 2025 10:40:46 +0800 Subject: [PATCH] E-Invoice - Initial commit main feature integration --- .../General/Eloquent/Filters/TypeNotIn.php | 20 +++++++++++++++++++ .../ControllersLogic/ListAddressesLogic.php | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 app/Classes/General/Eloquent/Filters/TypeNotIn.php diff --git a/app/Classes/General/Eloquent/Filters/TypeNotIn.php b/app/Classes/General/Eloquent/Filters/TypeNotIn.php new file mode 100644 index 00000000..87670503 --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/TypeNotIn.php @@ -0,0 +1,20 @@ +whereNotIn('type', $value); + } + +} diff --git a/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php index 71e3b80d..148f7f67 100644 --- a/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php +++ b/app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php @@ -6,6 +6,7 @@ namespace App\Classes\Modules\Addresses\ControllersLogic; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Addresses\Services\ListsAddresses; use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses; +use App\Classes\ValueObjects\Constants\AddressType; use App\Http\Resources\AddressResource; use ErrorException; use Illuminate\Http\JsonResponse; @@ -51,13 +52,12 @@ class ListAddressesLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - $this->canListAddresses->passes(); - $query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters'))); + //$query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters'))); + $query = $this->listsAddresses->execute(array_merge($this->listsAddresses->deserializeFilters($request->input('filters')), ['type_not_in' => [AddressType::E_INVOICE]])); return $this->collectionResponse(AddressResource::collection($query)); - } -} \ No newline at end of file +}