From c544deb3d102d1e96dc513e083dcbf36b4bba9a0 Mon Sep 17 00:00:00 2001
From: Markus Dick <47363631+MarkusDick@users.noreply.github.com>
Date: Tue, 14 Sep 2021 00:24:55 +0200
Subject: [PATCH] feat: add next reminder date to stayintouch (#5491)

---
 app/Http/Controllers/ContactsController.php    |  7 +++++--
 resources/js/components/people/StayInTouch.vue | 16 +++++++++++++++-
 resources/lang/en/people.php                   |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index f521d54fc64..98c54aa55f8 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -607,7 +607,7 @@ public function vCard(Contact $contact)
      *
      * @param  Request  $request
      * @param  Contact  $contact
-     * @return int|RedirectResponse
+     * @return array
      */
     public function stayInTouch(Request $request, Contact $contact)
     {
@@ -632,7 +632,10 @@ public function stayInTouch(Request $request, Contact $contact)
 
         $contact->setStayInTouchTriggerDate($frequency);
 
-        return $frequency;
+        return [
+            'frequency' => $frequency,
+            'trigger_date' => $contact->stay_in_touch_trigger_date,
+        ];
     }
 
     /**
diff --git a/resources/js/components/people/StayInTouch.vue b/resources/js/components/people/StayInTouch.vue
index 8f9ed6db201..a474e7de120 100644
--- a/resources/js/components/people/StayInTouch.vue
+++ b/resources/js/components/people/StayInTouch.vue
@@ -10,6 +10,10 @@
     display: block;
     color:#f57f6c;
   }
+
+  .dashed {
+    border-bottom-style: dashed;
+  }
 </style>
 
 <template>
@@ -23,7 +27,7 @@
 
     <!-- Contact has a frequency set -->
     <div v-else class="di">
-      <span>
+      <span v-tooltip.bottom="$t('people.stay_in_touch_next_date', { date: formatDate(next_trigger_date) })" class="bb dashed dib pointer nowrap-link">
         {{ $tc('people.stay_in_touch_frequency', frequency, { count: frequency }) }}
       </span>
       <a class="pointer" href="" @click.prevent="showUpdate">
@@ -227,6 +231,7 @@ export default {
         this.frequency = 0;
       } else {
         this.frequency = parseInt(this.contact.stay_in_touch_frequency);
+        this.next_trigger_date = this.contact.stay_in_touch_trigger_date;
       }
       this.isActive = (this.frequency > 0);
 
@@ -236,6 +241,14 @@ export default {
       this.stateInput = this.isActive;
       this.frequencyInput = this.frequency;
     },
+    
+    formatDate(dateAsString) {
+      const moment = require('moment-timezone');
+      moment.locale(this._i18n.locale);
+      moment.tz.setDefault('UTC');
+      var date = moment.tz(moment(dateAsString), this.$root.timezone);
+      return date.format('LL');
+    },
 
     showUpdate() {
       this.errorMessage = '';
@@ -266,6 +279,7 @@ export default {
           this.$refs.updateModal.close();
           this.isActive = this.stateInput;
           this.frequency = this.frequencyInput;
+          this.next_trigger_date = response.data.trigger_date;
 
           this.$notify({
             group: 'main',
diff --git a/resources/lang/en/people.php b/resources/lang/en/people.php
index 20c10b24e6c..68f700bb58e 100644
--- a/resources/lang/en/people.php
+++ b/resources/lang/en/people.php
@@ -90,6 +90,7 @@
     // Stay in touch
     'stay_in_touch' => 'Stay in touch',
     'stay_in_touch_frequency' => 'Stay in touch every day|Stay in touch every {count} days',
+    'stay_in_touch_next_date' => 'Next due: {date}',
     'stay_in_touch_invalid' => 'The frequency must be a number greater than 0.',
     'stay_in_touch_premium' => 'You need to upgrade your account to make use of this feature',
     'stay_in_touch_modal_title' => 'Stay in touch',