cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 05:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/63.7-company-with-multiple-employees' into development

Browse Source
This commit is contained in:
Dillon Ngo
2024-08-21 22:16:22 +08:00
parent be063d985a 2905edef5e
commit 12e6386c04
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/HasActiveRewardWithUser.php → app/Classes/General/Eloquent/Filters/HasActiveReward.php
+1 -1
View File
@@ -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
{
/**
app/Classes/General/Eloquent/Filters/HasActiveRewardWithCompany.php → app/Classes/General/Eloquent/Filters/HasVouchersAllWithCompany.php
+1 -1
View File
@@ -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
{
/**
app/Http/Resources/VoucherResource.php
+2 -1
View File
@@ -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{
resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+1 -1
View File
@@ -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){
resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
+1 -1
View File
@@ -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){