From 2905edef5e2d3b831b22cf8f5037bd2d1d8ff3a8 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 21 Aug 2024 22:04:09 +0800
Subject: [PATCH] Amendment meant to resolve merge conflict in development
 branch from branch dillon/63.6-company-with-multiple-employees

---
 .../Eloquent/Filters/HasActiveReward.php      | 27 +++++++++++++++++++
 .../Filters/HasActiveRewardForAdmin.php       | 26 ++++++++++++++++++
 ...pany.php => HasVouchersAllWithCompany.php} |  2 +-
 ...ithUser.php => HasVouchersAllWithUser.php} |  2 +-
 app/Http/Resources/VoucherResource.php        |  4 +--
 .../elements/AvailableVouchersComponent.vue   |  2 +-
 .../elements/ListVouchersComponent.vue        |  2 +-
 .../CustomerRewardsAdminSectionComponent.vue  |  9 +++++--
 .../CustomerRewardsSectionComponent.vue       | 15 +++++++----
 9 files changed, 76 insertions(+), 13 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/HasActiveReward.php
 create mode 100644 app/Classes/General/Eloquent/Filters/HasActiveRewardForAdmin.php
 rename app/Classes/General/Eloquent/Filters/{HasActiveRewardWithCompany.php => HasVouchersAllWithCompany.php} (97%)
 rename app/Classes/General/Eloquent/Filters/{HasActiveRewardWithUser.php => HasVouchersAllWithUser.php} (96%)

diff --git a/app/Classes/General/Eloquent/Filters/HasActiveReward.php b/app/Classes/General/Eloquent/Filters/HasActiveReward.php
new file mode 100644
index 00000000..26385b96
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasActiveReward.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
+
+class HasActiveReward implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('user_id', Auth::user()->id) //cief todo: should not use Auth::user()->id
+        ->where(function ($query) {
+            $query->whereHas('reward', function ($subquery) {
+                $subquery->where('is_active', true);
+            });
+            // ->orWhereDoesntHave('reward');
+        });
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasActiveRewardForAdmin.php b/app/Classes/General/Eloquent/Filters/HasActiveRewardForAdmin.php
new file mode 100644
index 00000000..5d69aa4b
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasActiveRewardForAdmin.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class HasActiveRewardForAdmin implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('user_id', $value)
+        ->where(function ($query) {
+            $query->whereHas('reward', function ($subquery) {
+                $subquery->where('is_active', true);
+            });
+            // ->orWhereDoesntHave('reward');
+        });
+    }
+
+}
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/Classes/General/Eloquent/Filters/HasActiveRewardWithUser.php b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
similarity index 96%
rename from app/Classes/General/Eloquent/Filters/HasActiveRewardWithUser.php
rename to app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
index 72d0d6e2..79a02914 100644
--- a/app/Classes/General/Eloquent/Filters/HasActiveRewardWithUser.php
+++ b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
@@ -6,7 +6,7 @@ use App\Classes\ValueObjects\Constants\RoleTypes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 
-class HasActiveRewardWithUser implements Filter
+class HasVouchersAllWithUser implements Filter
 {
 
     /**
diff --git a/app/Http/Resources/VoucherResource.php b/app/Http/Resources/VoucherResource.php
index 7e372d5f..55cc2b56 100644
--- a/app/Http/Resources/VoucherResource.php
+++ b/app/Http/Resources/VoucherResource.php
@@ -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{
diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 3fff52e8..0d52ff13 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -95,7 +95,7 @@
             fetchVouchers(){
                 this.isLoading = true;
                 if(this.employee){
-                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_active_reward_with_company':  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 3b2eb5a0..cc8afbf2 100644
--- a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
@@ -76,7 +76,7 @@
             fetchVouchers(){
                 this.isLoading = true;
                 if(this.employee){
-                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_active_reward_with_company':  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/companies/sections/CustomerRewardsAdminSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
index 7300f3ba..d41c2b63 100644
--- a/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
@@ -57,7 +57,7 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_active_reward_with_user': id }">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all_with_user': id }">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-user-reward-item-component :data="data"></single-user-reward-item-component>
                                                                 </template>
@@ -74,10 +74,15 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details.admin', id)" :options="{'is_active': true, order_by:{ column:'order', DESC:false}}">
+                                                            <!-- <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details.admin', id)" :options="{'is_active': true, order_by:{ column:'order', DESC:false}}">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-reward-details-item-component :data="data"></single-reward-details-item-component>
                                                                 </template>
+                                                            </list-component> -->
+                                                            <list-component section="customerRewardsListSection" :endpoint="route('api.voucher.user.list')" :options="{'has_active_reward_for_admin': id}">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-user-reward-item-component :data="data"></single-user-reward-item-component>
+                                                                </template>
                                                             </list-component>
                                                         </div>
                                                     </div>
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
index 7a97f22f..f6143340 100644
--- a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
@@ -19,7 +19,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col m-r-5 d-none d-md-inline">
+                                        <!-- <div class="col m-r-5 d-none d-md-inline">
                                             <div class="row fs-12 text-center">
                                                 <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="rewards">
                                                     <div class="row">
@@ -29,7 +29,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
+                                        </div> -->
                                         <div class="col m-r-5 d-none d-md-inline">
                                             <div class="row fs-12 text-center">
                                                 <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="used">
@@ -52,7 +52,7 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_active_reward_with_user': true }">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all_with_user': true }">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-user-reward-item-component :data="data"></single-user-reward-item-component>
                                                                 </template>
@@ -69,11 +69,16 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details')" :options="{'random_name': true, order_by:{ column:'order', DESC:false}}">
+                                                            <!-- <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details')" :options="{'is_active': true, order_by:{ column:'order', DESC:false}}">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-reward-details-item-component :data="data"></single-reward-details-item-component>
                                                                 </template>
-                                                            </list-component>
+                                                            </list-component> -->
+                                                            <!-- <list-component section="customerRewardsListSection" :endpoint="route('api.voucher.user.list')" :options="{'has_active_reward': true}">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-user-reward-item-component :data="data"></single-user-reward-item-component>
+                                                                </template>
+                                                            </list-component> -->
                                                         </div>
                                                     </div>
                                                 </div>