diff --git a/app/Classes/General/Eloquent/Filters/HasActiveRewardWithUser.php b/app/Classes/General/Eloquent/Filters/HasActiveReward.php similarity index 93% rename from app/Classes/General/Eloquent/Filters/HasActiveRewardWithUser.php rename to app/Classes/General/Eloquent/Filters/HasActiveReward.php index 054e5afc..26385b96 100644 --- a/app/Classes/General/Eloquent/Filters/HasActiveRewardWithUser.php +++ b/app/Classes/General/Eloquent/Filters/HasActiveReward.php @@ -5,7 +5,7 @@ namespace App\Classes\General\Eloquent\Filters; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Auth; -class HasActiveRewardWithUser implements Filter +class HasActiveReward implements Filter { /** diff --git a/app/Classes/General/Eloquent/Filters/HasActiveRewardWithCompany.php b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithCompany.php similarity index 97% rename from app/Classes/General/Eloquent/Filters/HasActiveRewardWithCompany.php rename to app/Classes/General/Eloquent/Filters/HasVouchersAllWithCompany.php index c9ff1f53..be4d335b 100644 --- a/app/Classes/General/Eloquent/Filters/HasActiveRewardWithCompany.php +++ b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithCompany.php @@ -7,7 +7,7 @@ use App\Models\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Auth; -class HasActiveRewardWithCompany implements Filter +class HasVouchersAllWithCompany implements Filter { /** diff --git a/app/Http/Resources/VoucherResource.php b/app/Http/Resources/VoucherResource.php index 96d139b9..55cc2b56 100644 --- a/app/Http/Resources/VoucherResource.php +++ b/app/Http/Resources/VoucherResource.php @@ -17,7 +17,8 @@ class VoucherResource extends JsonResource public function toArray($request) { $filteredRedemptions = new ArrayObject([]); - if ($request->has('filters') && str_contains($request->input('filters'), "has_vouchers_all_with_user")) { + if ($request->has('filters') && (str_contains($request->input('filters'), "has_vouchers_all_with_user") )) { + //|| str_contains($request->input('filters'), "has_vouchers_all_with_company") $filteredRedemptions = new ArrayObject([]); } else{ diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue index a4ba5912..5ec89fec 100644 --- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue +++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue @@ -98,7 +98,7 @@ fetchVouchers(){ this.isLoading = true; if(this.employee){ - this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user': this.employee.id} ), 'get', this.section, false, false); + this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_company': this.employee.id} ), 'get', this.section, false, false); } }, successHandler(response){ diff --git a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue index b869cf73..1fd47eb5 100644 --- a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue +++ b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue @@ -79,7 +79,7 @@ fetchVouchers(){ this.isLoading = true; if(this.employee){ - this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user': this.employee.id} ), 'get', this.section, false, false); + this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_company': this.employee.id} ), 'get', this.section, false, false); } }, successHandler(response){