check for enable promotional messages before sending it

blopa · Dec 24, 2017 · 0d97f2d · 0d97f2d
1 parent 7b4ef06
commit 0d97f2d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Magento2/app/code/Werules/Chatbot/Cron/PromotionalMessages.php b/Magento2/app/code/Werules/Chatbot/Cron/PromotionalMessages.php
@@ -69,6 +69,10 @@ public function execute()
                 $messageContent = $promotionalMessage->getContent();
                 foreach ($uniqueMessageCollection as $message)
                 {
+                    $chatbotUser = $this->_helper->getChatbotuserBySenderId($message->getSenderId());
+                    if ($chatbotUser->getEnablePromotionalMessages() == $this->_define::DISABLED)
+                        continue;
+
                     $content = array(
                         'content_type' => $this->_define::CONTENT_TEXT,
                         'content' => $messageContent,

diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -2110,7 +2110,7 @@ private function getChatbotAPIBySenderId($senderId)
         return $chatbotAPI;
     }
 
-    private function getChatbotuserBySenderId($senderId)
+    public function getChatbotuserBySenderId($senderId)
     {
         $chatbotAPI = $this->getChatbotAPIModelBySenderId($senderId);
         $chatbotUser = $this->_chatbotUserFactory->create();

diff --git a/Magento2/app/code/Werules/Chatbot/view/frontend/templates/customer/chatbot_settings.phtml b/Magento2/app/code/Werules/Chatbot/view/frontend/templates/customer/chatbot_settings.phtml
@@ -25,7 +25,7 @@
                 </p>
             </div>
         <?php endif; ?>
-        <div class="field choice" style="display: none;">
+        <div class="field choice"> <!-- style="display: none;"-->
             <input type="checkbox" name="enable_promotion" id="enable_promotion" value="1" title="<?php echo __("Receive Promotional Messages?") ?>" class="checkbox" <?php if (!$startedChatbot) echo 'disabled'; else if ($enablePromotion) echo 'checked'; ?>>
             <label for="enable_promotion" class="label">
                 <span><?php echo __("Receive Promotional Messages?") ?></span>