fix: fix reminders (#154)

monicahq · Jul 22, 2022 · 132c106 · 132c106
1 parent 7cc1cc1
commit 132c106
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php b/domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php
@@ -63,6 +63,10 @@ public static function data(Vault $vault, User $user): Collection
                 $reminder = ContactReminder::where('id', $contactReminderScheduled->contact_reminder_id)->with('contact')->first();
                 $contact = $reminder->contact;
 
+                if ($contact->vault_id !== $vault->id) {
+                    continue;
+                }
+
                 $remindersCollection->push([
                     'id' => $reminder->id,
                     'label' => $reminder->label,

diff --git a/domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php b/domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php
@@ -65,6 +65,10 @@ public static function upcomingReminders(Vault $vault, User $user): array
             $reminder = ContactReminder::where('id', $contactReminderScheduled->contact_reminder_id)->with('contact')->first();
             $contact = $reminder->contact;
 
+            if ($contact->vault_id !== $vault->id) {
+                continue;
+            }
+
             $scheduledAtDate = Carbon::createFromFormat('Y-m-d H:i:s', $contactReminderScheduled->scheduled_at);
 
             $remindersCollection->push([

diff --git a/resources/js/Pages/Vault/Dashboard/Partials/UpcomingReminders.vue b/resources/js/Pages/Vault/Dashboard/Partials/UpcomingReminders.vue
@@ -46,7 +46,7 @@
     <div v-if="data.reminders.length > 0">
       <ul class="mb-4 rounded-lg border border-gray-200 bg-white">
         <li
-          v-for="reminder in data"
+          v-for="reminder in data.reminders"
           :key="reminder.id"
           class="item-list border-b border-gray-200 px-3 py-2 hover:bg-slate-50">
           <div class="flex items-center">