Added sent filter to contact activity

putyourlightson · Jul 5, 2021 · 6c6942d · 6c6942d
1 parent 56581e2
commit 6c6942d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/src/models/ContactCampaignModel.php b/src/models/ContactCampaignModel.php
@@ -34,7 +34,8 @@ class ContactCampaignModel extends BaseModel
     // Constants
     // =========================================================================
 
-    const INTERACTIONS = ['opened', 'clicked', 'unsubscribed', 'complained', 'bounced'];
+    const INTERACTIONS = ['opened', 'clicked', 'unsubscribed', 'complained', 'bounced', 'sent'];
+    const DEFAULT_INTERACTIONS = ['opened', 'clicked', 'unsubscribed', 'complained', 'bounced'];
 
     // Properties
     // =========================================================================

diff --git a/src/models/ContactMailingListModel.php b/src/models/ContactMailingListModel.php
@@ -29,6 +29,7 @@ class ContactMailingListModel extends BaseModel
     // =========================================================================
 
     const INTERACTIONS = ['subscribed', 'unsubscribed', 'complained', 'bounced'];
+    const DEFAULT_INTERACTIONS = ['subscribed', 'unsubscribed', 'complained', 'bounced'];
 
     // Properties
     // =========================================================================

diff --git a/src/services/ReportsService.php b/src/services/ReportsService.php
@@ -659,7 +659,7 @@ private function _getActivity(array $models, string $interaction = null, int $li
 
         foreach ($models as $model) {
             /** @var ContactCampaignModel|ContactMailingListModel $model */
-            $interactionTypes = ($interaction !== null && in_array($interaction, $model::INTERACTIONS)) ? [$interaction] : $model::INTERACTIONS;
+            $interactionTypes = ($interaction !== null && in_array($interaction, $model::INTERACTIONS)) ? [$interaction] : $model::DEFAULT_INTERACTIONS;
 
             foreach ($interactionTypes as $key => $interactionType) {
                 if ($model->{$interactionType} !== null) {

diff --git a/src/templates/reports/campaigns/_includes/contact-activity.html b/src/templates/reports/campaigns/_includes/contact-activity.html
@@ -6,12 +6,17 @@
     {{ "Filter by interaction"|t('campaign') }}:
     <div class="select">
         <select class="interaction-filter">
-            <option value="">{{ "All"|t('campaign') }}</option>
-            <option value="opened" {{ interaction == 'opened' ? 'selected' }}>{{ "Opened"|t('campaign') }}</option>
-            <option value="clicked" {{ interaction == 'clicked' ? 'selected' }}>{{ "Clicked"|t('campaign') }}</option>
-            <option value="unsubscribed" {{ interaction == 'unsubscribed' ? 'selected' }}>{{ "Unsubscribed"|t('campaign') }}</option>
-            <option value="complained" {{ interaction == 'complained' ? 'selected' }}>{{ "Complained"|t('campaign') }}</option>
-            <option value="bounced" {{ interaction == 'bounced' ? 'selected' }}>{{ "Bounced"|t('campaign') }}</option>
+            <optgroup label="{{ "Interactions"|t('campaign') }}">
+                <option value="">{{ "All"|t('campaign') }}</option>
+                <option value="opened" {{ interaction == 'opened' ? 'selected' }}>{{ "Opened"|t('campaign') }}</option>
+                <option value="clicked" {{ interaction == 'clicked' ? 'selected' }}>{{ "Clicked"|t('campaign') }}</option>
+                <option value="unsubscribed" {{ interaction == 'unsubscribed' ? 'selected' }}>{{ "Unsubscribed"|t('campaign') }}</option>
+                <option value="complained" {{ interaction == 'complained' ? 'selected' }}>{{ "Complained"|t('campaign') }}</option>
+                <option value="bounced" {{ interaction == 'bounced' ? 'selected' }}>{{ "Bounced"|t('campaign') }}</option>
+            </optgroup>
+            <optgroup label="{{ "Other"|t('campaign') }}">
+                <option value="sent" {{ interaction == 'sent' ? 'selected' }}>{{ "Sent"|t('campaign') }}</option>
+            </optgroup>
         </select>
     </div>
     <br/><br/>