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

Amendment meant to resolve merge conflict in development branch from branch dillon/63.6-company-with-multiple-employees

Browse Source
This commit is contained in:
Dillon Ngo
2024-08-21 22:04:09 +08:00
parent 6093ce896e
commit 2905edef5e
9 changed files with 76 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/VoucherResource.php
+2 -2
View File
@@ -17,8 +17,8 @@ class VoucherResource extends JsonResource
public function toArray($request)
{
$filteredRedemptions = new ArrayObject([]);
if ($request->has('filters') && (str_contains($request->input('filters'), "has_active_reward_with_user") )) {
//|| str_contains($request->input('filters'), "has_active_reward_with_company")
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{