From 01701909edad54eea3f7bf94f4079a94ecee2d7c Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sun, 10 Dec 2017 03:04:14 -0200
Subject: [PATCH 01/13] add translation

---
 Magento2/app/code/Werules/Chatbot/i18n/en_US.csv |   2 +-
 Magento2/app/code/Werules/Chatbot/i18n/es_ES.csv |   2 +-
 Magento2/app/code/Werules/Chatbot/i18n/pt_BR.csv |   2 +-
 .../app/code/Werules/Chatbot/i18n/zh_Hans_CN.csv |   2 +-
 .../app/code/Werules/Chatbot/i18n/zh_Hant_HK.csv |   2 +-
 .../app/code/Werules/Chatbot/i18n/zh_Hant_TW.csv |   2 +-
 .../view/frontend/layout/customer_account.xml    |   2 +-
 .../view/frontend/web/image/messenger-icon.png   | Bin 0 -> 6248 bytes
 8 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 Magento2/app/code/Werules/Chatbot/view/frontend/web/image/messenger-icon.png

diff --git a/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv b/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
index dcff767..b923d3b 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
@@ -1,3 +1,4 @@
+"Cancel","Cancel"
 "Sorry, no products found for this criteria.","Sorry, no products found for this criteria."
 "Sorry, no products found in this category.","Sorry, no products found in this category."
 "Please select a category.","Please select a category."
@@ -22,7 +23,6 @@
 "Track Order Status","Track Order Status"
 "Talk to Support","Talk to Support"
 "Send Email","Send Email"
-"Cancel","Cancel"
 "Help","Help"
 "About","About"
 "Logout","Logout"
diff --git a/Magento2/app/code/Werules/Chatbot/i18n/es_ES.csv b/Magento2/app/code/Werules/Chatbot/i18n/es_ES.csv
index 6410f0d..c30a7e0 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/es_ES.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/es_ES.csv
@@ -1 +1 @@
-"string","stringtranslated"
\ No newline at end of file
+"Cancel","Cancelar"
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/i18n/pt_BR.csv b/Magento2/app/code/Werules/Chatbot/i18n/pt_BR.csv
index 6410f0d..c30a7e0 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/pt_BR.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/pt_BR.csv
@@ -1 +1 @@
-"string","stringtranslated"
\ No newline at end of file
+"Cancel","Cancelar"
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/i18n/zh_Hans_CN.csv b/Magento2/app/code/Werules/Chatbot/i18n/zh_Hans_CN.csv
index 6410f0d..01039ab 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/zh_Hans_CN.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/zh_Hans_CN.csv
@@ -1 +1 @@
-"string","stringtranslated"
\ No newline at end of file
+"Cancel","取消。"
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_HK.csv b/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_HK.csv
index 6410f0d..01039ab 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_HK.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_HK.csv
@@ -1 +1 @@
-"string","stringtranslated"
\ No newline at end of file
+"Cancel","取消。"
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_TW.csv b/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_TW.csv
index 6410f0d..01039ab 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_TW.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/zh_Hant_TW.csv
@@ -1 +1 @@
-"string","stringtranslated"
\ No newline at end of file
+"Cancel","取消。"
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/view/frontend/layout/customer_account.xml b/Magento2/app/code/Werules/Chatbot/view/frontend/layout/customer_account.xml
index 9d9227c..5c676a2 100644
--- a/Magento2/app/code/Werules/Chatbot/view/frontend/layout/customer_account.xml
+++ b/Magento2/app/code/Werules/Chatbot/view/frontend/layout/customer_account.xml
@@ -5,7 +5,7 @@
             <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-chatbot">
                 <arguments>
                     <argument name="path" xsi:type="string">chatbot/customer</argument>
-                    <argument name="label" xsi:type="string">Chatbot</argument>
+                    <argument name="label" xsi:type="string">Chatbot Settings</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/Magento2/app/code/Werules/Chatbot/view/frontend/web/image/messenger-icon.png b/Magento2/app/code/Werules/Chatbot/view/frontend/web/image/messenger-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..611e6d4c85e649b7745b5c980085d5ad1c1b20b8
GIT binary patch
literal 6248
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
PaUl&AUFFY;sL=lblMGrF

literal 0
HcmV?d00001


From 1aabf2eaf398b66a5a7eac553eea1993e11ca573 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 17:12:28 -0200
Subject: [PATCH 02/13] add support command

---
 .../app/code/Werules/Chatbot/Helper/Data.php  | 24 +++++++++++++++++--
 .../code/Werules/Chatbot/Helper/Define.php    |  2 ++
 .../Werules/Chatbot/Setup/UpgradeData.php     |  2 +-
 .../Werules/Chatbot/etc/adminhtml/system.xml  |  6 ++---
 .../app/code/Werules/Chatbot/etc/module.xml   |  2 +-
 .../app/code/Werules/Chatbot/i18n/en_US.csv   |  1 +
 README.md                                     |  3 ++-
 7 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
index 909d031..8ad0ff4 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Data.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -317,6 +317,8 @@ public function processOutgoingMessage($outgoingMessage)
             $result = $chatbotAPI->sendReceiptList($outgoingMessage);
         else if ($outgoingMessage->getContentType() == $this->_define::TEXT_WITH_OPTIONS) // LIST_WITH_IMAGE
             $result = $chatbotAPI->sendMessageWithOptions($outgoingMessage);
+        else if ($outgoingMessage->getContentType() == $this->_define::NO_REPLY_MESSAGE)
+            $result = true;
 
         if ($result)
         {
@@ -350,7 +352,8 @@ public function processOutgoingMessage($outgoingMessage)
                 else
                     $lastCommandParameter = null;
 
-                $chatbotAPI->setChatbotAPILastCommandDetails($lastCommandText, $lastListedQuantity, $lastConversationState, $lastCommandParameter);
+                if ($currentCommandDetails)
+                    $chatbotAPI->setChatbotAPILastCommandDetails($lastCommandText, $lastListedQuantity, $lastConversationState, $lastCommandParameter);
             }
 
             if ($outgoingMessage->getStatus() != $this->_define::PROCESSED)
@@ -605,6 +608,10 @@ private function handleConversationState($content, $senderId, $keyword = false)
         {
             $result = $this->listOrderDetailsFromOrderId($messageContent, $senderId);
         }
+        else if ($chatbotAPI->getConversationState() == $this->_define::CONVERSATION_SUPPORT)
+        {
+            $result = $this->getNoMessage();
+        }
 
 //        if ($result)
 //        {
@@ -1301,6 +1308,18 @@ private function setCurrentCommand($messageContent)
     }
 
     // GETS
+    private function getNoMessage()
+    {
+        $result = array();
+        $responseMessage = array(
+            'content_type' => $this->_define::NO_REPLY_MESSAGE,
+            'content' => '',
+            'current_command_details' => json_encode(array())
+        );
+        array_push($result, $responseMessage);
+        return $result;
+    }
+
     private function getWelcomeMessage($message)
     {
 //        $this->setHelperMessageAttributes($message);
@@ -2356,8 +2375,9 @@ private function processSupportCommand()
         $result = array();
         $responseMessage = array(
             'content_type' => $this->_define::CONTENT_TEXT,
-            'content' => 'The SUPPORT command is still under development', // TODO
+            'content' => __("You're on support mode. In a few words, please explain what would you like help with. To cancel send '%1'.", $this->getCommandText($this->_define::CANCEL_COMMAND_ID)),
             'current_command_details' => json_encode(array(
+                'conversation_state' => $this->_define::CONVERSATION_SUPPORT,
                 'command_text' => $this->getCommandText($this->_define::SUPPORT_COMMAND_ID)
             ))
         );
diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Define.php b/Magento2/app/code/Werules/Chatbot/Helper/Define.php
index 91ac394..1011de5 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Define.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Define.php
@@ -80,6 +80,7 @@ class Define
     const RECEIPT_LAYOUT = 4;
     const LIST_WITH_IMAGE = 5;
     const TEXT_WITH_OPTIONS = 6;
+    const NO_REPLY_MESSAGE = 7;
 
     // conversation states
     const CONVERSATION_STARTED = 0;
@@ -87,6 +88,7 @@ class Define
     const CONVERSATION_SEARCH = 2;
     const CONVERSATION_EMAIL = 3;
     const CONVERSATION_TRACK_ORDER = 4;
+    const CONVERSATION_SUPPORT = 5;
 
     // API
     const MAX_MESSAGE_ELEMENTS = 7;
diff --git a/Magento2/app/code/Werules/Chatbot/Setup/UpgradeData.php b/Magento2/app/code/Werules/Chatbot/Setup/UpgradeData.php
index f376e72..0dd61e3 100644
--- a/Magento2/app/code/Werules/Chatbot/Setup/UpgradeData.php
+++ b/Magento2/app/code/Werules/Chatbot/Setup/UpgradeData.php
@@ -36,7 +36,7 @@ public function upgrade(
         ModuleContextInterface $context
     ) {
         $setup->startSetup();
-        if (version_compare($context->getVersion(), "1.0.3", "<")) {
+        if (version_compare($context->getVersion(), "1.0.4", "<")) {
         //Your upgrade script
         }
         $setup->endSetup();
diff --git a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
index 0c6955d..ae71ada 100644
--- a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
+++ b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
@@ -11,7 +11,7 @@
 			<group id="general" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label comment tooltip">
 				<label>General Settings</label>
 				<comment><![CDATA[
-				<h3>Magento Chatbot v1.0.3</h3>
+				<h3>Magento Chatbot v1.0.4</h3>
 				<p>To use this module you'll have to use SSL in your store.</p>
 				]]></comment>
 				<field id="enable" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="1" translate="label comment tooltip" type="select">
@@ -67,7 +67,7 @@
 			<group id="general" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label comment tooltip">
 				<label>Messenger Settings</label>
 				<comment><![CDATA[
-				<h3>Magento Chatbot v1.0.3</h3>
+				<h3>Magento Chatbot v1.0.4</h3>
 				<p>To use this module you'll have to use SSL in your store.</p>
 				]]></comment>
 				<field id="enable" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="1" translate="label comment tooltip" type="select">
@@ -227,7 +227,7 @@
 			<group id="general" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label comment tooltip">
 				<label>Danger Zone</label>
 				<comment><![CDATA[
-				<h3>Magento Chatbot v1.0.3</h3>
+				<h3>Magento Chatbot v1.0.4</h3>
 				<p>To use this module you'll have to use SSL in your store.</p>
 				<p style='color: red;'><b>You should only change settings here if you know what you're doing.</b></p>
 				<div class='message-system-inner' id='werules_scheduled_clearing' style='display: none; border-width: 0.1rem; padding: 0 1.5rem 0 3rem;'>
diff --git a/Magento2/app/code/Werules/Chatbot/etc/module.xml b/Magento2/app/code/Werules/Chatbot/etc/module.xml
index 6786491..7a8d737 100644
--- a/Magento2/app/code/Werules/Chatbot/etc/module.xml
+++ b/Magento2/app/code/Werules/Chatbot/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Werules_Chatbot" setup_version="1.0.3" schema_version="1.0.3"/>
+	<module name="Werules_Chatbot" setup_version="1.0.4" schema_version="1.0.4"/>
 </config>
diff --git a/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv b/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
index b923d3b..58a1976 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
@@ -81,3 +81,4 @@
 "To list more send '%1'.","To list more send '%1'."
 "No more items to list.","No more items to list."
 "This category doesn't seems to exist. Please try again.","This category doesn't seems to exist. Please try again."
+"You're on support mode. In a few words, please explain what would you like help with. To cancel send '%1'.","You're on support mode. In a few words, please explain what would you like help with. To cancel send '%1'."
diff --git a/README.md b/README.md
index b1932e7..7d57663 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,8 @@ Go to **System > General Settings  > Chatbot Settings**
 
 ## Release Notes
 ### Magento2
+- **v1.0.4:**
+    - Add Support command
 - **v1.0.3:**
     - Add Messages Queue Modes
     - Add option to Clear Message Queue
@@ -265,7 +267,6 @@ A: Thank you! You can help by codding more features, creating pull requests, or
     - Add compatibility with products with custom options
     - Add "abandoned cart" messages
     - Add `CDATA` and `<tooltip>` to configuration descriptions
-    - Add Support
     - Add Promotional Messages
     - Add Enable Facebook Messenger Box
     - Add Welcome Message Options

From ef740314362214eb242bf798408698eb76aa7d3d Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 18:20:41 -0200
Subject: [PATCH 03/13] Add option to list commands on Help Command

---
 .../app/code/Werules/Chatbot/Helper/Data.php  | 38 +++++++++++++++++--
 .../Werules/Chatbot/etc/adminhtml/system.xml  | 12 +++---
 README.md                                     |  2 +-
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
index 8ad0ff4..36eae84 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Data.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -861,7 +861,7 @@ private function listProductsFromCategory($messageContent, $messagePayload, $sen
 
     private function prepareCommandsList()
     {
-        if (isset($this->_commandsList) || isset($this->_completeCommandsList))
+        if (isset($this->_commandsList) && isset($this->_completeCommandsList))
             return true;
 
         $serializedCommands = $this->getConfigValue($this->_configPrefix . '/general/commands_list');
@@ -2425,9 +2425,41 @@ private function processHelpCommand()
         $text = $this->getConfigValue($this->_configPrefix . '/general/help_message');
         if ($text)
         {
+            $listCommands = $this->getConfigValue($this->_configPrefix . '/general/enable_help_command_list');
+            if ($listCommands == $this->_define::ENABLED)
+            {
+                $quickReplies = array();
+                $enabledCommands = $this->getCommandsList();
+                foreach ($enabledCommands as $commandId => $command)
+                {
+                    if (count($quickReplies) >= $this->_define::MAX_MESSAGE_ELEMENTS)
+                        break;
+
+                    $payload = array(
+                        'command' => $commandId
+                    );
+                    $quickReply = array(
+                        'content_type' => 'text', // TODO messenger pattern
+                        'title' => $command['command_code'],
+                        'payload' => json_encode($payload)
+                    );
+                    array_push($quickReplies, $quickReply);
+                }
+
+                $contentObject = new \stdClass();
+                $contentObject->message = $text;
+                $contentObject->quick_replies = $quickReplies;
+                $content = json_encode($contentObject);
+                $contentType = $this->_define::QUICK_REPLY;
+            }
+            else
+            {
+                $contentType = $this->_define::CONTENT_TEXT;
+                $content = $text;
+            }
             $responseMessage = array(
-                'content_type' => $this->_define::CONTENT_TEXT,
-                'content' => $text,
+                'content_type' => $contentType,
+                'content' => $content,
                 'current_command_details' => json_encode(array(
                     'command_text' => $this->getCommandText($this->_define::HELP_COMMAND_ID)
                 ))
diff --git a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
index ae71ada..0cfb234 100644
--- a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
+++ b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
@@ -149,14 +149,14 @@
 					<label>Help Message</label>
 					<comment>Message will be sent when customer asks for help. Please check the maximum size for messages on Facebook API, otherwise your message might not be sent.</comment>
 				</field>
-				<!--<field id="enable_help_command_list" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="16" translate="label comment tooltip" type="select">-->
-					<!--<label>Enable Command Listing on Help Command</label>-->
-					<!--<comment>Enable command listing when customer ask for help.</comment>-->
-					<!--<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>-->
-				<!--</field>-->
+				<field id="enable_help_command_list" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="16" translate="label comment tooltip" type="select">
+					<label>Enable Command Listing on Help Command</label>
+					<comment>Enable command listing when customer ask for help.</comment>
+					<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+				</field>
 				<field id="commands_list" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="17" translate="label comment tooltip" type="text">
 					<label>Commands List</label>
-					<comment>Code of the commands and it's alias. Alias must be split by comma. eg.: &quot;support,chat,talk,sac&quot;.</comment>
+					<comment>Code of the commands and it's alias. Alias must be split by comma. eg.: "support,chat,talk,sac".</comment>
 					<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
 					<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\Commands</frontend_model>
 				</field>
diff --git a/README.md b/README.md
index 7d57663..566b1e1 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,7 @@ Go to **System > General Settings  > Chatbot Settings**
 ### Magento2
 - **v1.0.4:**
     - Add Support command
+    - Add option to list commands on Help Command
 - **v1.0.3:**
     - Add Messages Queue Modes
     - Add option to Clear Message Queue
@@ -270,7 +271,6 @@ A: Thank you! You can help by codding more features, creating pull requests, or
     - Add Promotional Messages
     - Add Enable Facebook Messenger Box
     - Add Welcome Message Options
-    - Add Command Listing on Help Command
     - Add Enable Default Replies
     - Add more options to filter clearing message queue
     - Add handler for other posts from Messenger

From 91c14240e65e389824da4bdc60a7ce54c68b8dd2 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 18:36:08 -0200
Subject: [PATCH 04/13] add default replies config to backend

---
 .../Werules/Chatbot/etc/adminhtml/system.xml  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
index 0cfb234..8d4777a 100644
--- a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
+++ b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
@@ -160,20 +160,20 @@
 					<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
 					<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\Commands</frontend_model>
 				</field>
-				<!--<field id="enable_default_replies" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="18" translate="label comment tooltip" type="select">-->
-					<!--<label>Enable Default Replies</label>-->
-					<!--<comment>Enable default replies.</comment>-->
-					<!--<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>-->
-				<!--</field>-->
-				<!--<field id="default_replies" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="19" translate="label comment tooltip" type="text">-->
-					<!--<depends>-->
-						<!--<field id="werules_chatbot_messenger/general/enable_default_replies">1</field>-->
-					<!--</depends>-->
-					<!--<label>Default Replies</label>-->
-					<!--<comment>Replies to be send to the customer whenever matches one of the requirements.</comment>-->
-					<!--<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>-->
-					<!--<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\Commands</frontend_model>-->
-				<!--</field>-->
+				<field id="enable_default_replies" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="18" translate="label comment tooltip" type="select">
+					<label>Enable Default Replies</label>
+					<comment>Enable default replies.</comment>
+					<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+				</field>
+				<field id="default_replies" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="19" translate="label comment tooltip" type="text">
+					<depends>
+						<field id="werules_chatbot_messenger/general/enable_default_replies">1</field>
+					</depends>
+					<label>Default Replies</label>
+					<comment>Replies to be send to the customer whenever matches one of the requirements.</comment>
+					<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
+					<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\Commands</frontend_model>
+				</field>
 				<field id="enable_nlp_replies" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment tooltip" type="select">
 					<label>Enable Natural Language Processor Replies (wit.ai)</label>
 					<comment>Enable Natural Language Processor replies.</comment>

From a952ad67e9480c3f9605dc8ab1b601916ba34434 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 20:21:43 -0200
Subject: [PATCH 05/13] add default replies

---
 .../Config/Form/Field/DefaultReplies.php      | 135 ++++++++++++++++++
 .../Config/Form/Field/MatchModeList.php       |  41 ++++++
 .../Config/Form/Field/MatchModeSelect.php     |  53 +++++++
 .../app/code/Werules/Chatbot/Helper/Data.php  | 110 +++++++++++++-
 .../code/Werules/Chatbot/Helper/Define.php    |   7 +
 .../Werules/Chatbot/etc/adminhtml/system.xml  |   2 +-
 6 files changed, 346 insertions(+), 2 deletions(-)
 create mode 100644 Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/DefaultReplies.php
 create mode 100644 Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeList.php
 create mode 100644 Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeSelect.php

diff --git a/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/DefaultReplies.php b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/DefaultReplies.php
new file mode 100644
index 0000000..0c58c49
--- /dev/null
+++ b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/DefaultReplies.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Magento Chatbot Integration
+ * Copyright (C) 2017
+ *
+ * This file is part of Werules/Chatbot.
+ *
+ * Werules/Chatbot is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field;
+
+class DefaultReplies extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
+{
+    /**
+     * @var \Magento\Framework\Data\Form\Element\Factory
+     */
+    protected $_elementFactory;
+    protected $_itemRendererMatchCase;
+    protected $_itemRendererMatchMode;
+    protected $_itemRendererEnable;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Data\Form\Element\Factory $elementFactory,
+        array $data = array()
+    )
+    {
+        $this->_elementFactory  = $elementFactory;
+        parent::__construct($context,$data);
+    }
+    protected function _construct()
+    {
+        $this->addColumn('enable_reply', array(
+            'label' => __("Enable"),
+            'renderer' => $this->_getRendererEnable()
+        ));
+//        $this->addColumn('stop_processing', array(
+//            'label' => __("Stop Processing"),
+//            'renderer' => $this->_getRendererEnable()
+//        ));
+        $this->addColumn('match_mode', array(
+            'label' => __("Match Mode"),
+            'renderer' => $this->_getRendererMatchMode()
+        ));
+        $this->addColumn('match_sintax', array(
+            'label' => __("Match Text or Regex"),
+            //'style' => 'width: 100%',
+            'class' => 'validate-no-html-tags'
+        ));
+        $this->addColumn('match_case', array(
+            'label' => __("Match Case"),
+            'renderer' => $this->_getRendererMatchCase()
+        ));
+        $this->addColumn('reply_text', array(
+            'label' => __("Reply Text"),
+            //'style' => 'width: 100%',
+            'class' => 'validate-no-html-tags'
+        ));
+
+        $this->_addAfter = false;
+        $this->_addButtonLabel = __("Add");
+        parent::_construct();
+    }
+
+    protected function _getRendererYesNo()
+    {
+        return $this->getLayout()->createBlock(
+            'Werules\Chatbot\Block\Adminhtml\System\Config\Options\YesNo',
+            '',
+            array('data' => array('is_render_to_js_template' => true))
+//                array('is_render_to_js_template' => true)
+        ); // ->setExtraParams('style="width: 100%;"');
+    }
+
+    protected function _getRendererEnable()
+    {
+        if (!$this->_itemRendererEnable)
+        {
+            $this->_itemRendererEnable = $this->_getRendererYesNo();
+        }
+        return $this->_itemRendererEnable;
+    }
+
+    protected function _getRendererMatchCase()
+    {
+        if (!$this->_itemRendererMatchCase)
+        {
+            $this->_itemRendererMatchCase = $this->_getRendererYesNo();
+        }
+        return $this->_itemRendererMatchCase;
+    }
+
+    protected function _getRendererMatchMode()
+    {
+        if (!$this->_itemRendererMatchMode)
+        {
+            $this->_itemRendererMatchMode = $this->getLayout()->createBlock(
+                'Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\MatchModeSelect',
+                '',
+                array('data' => array('is_render_to_js_template' => true))
+//                  array('is_render_to_js_template' => true)
+            ); // ->setExtraParams('style="width: 100%;"');
+        }
+        return $this->_itemRendererMatchMode;
+    }
+
+    protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
+    {
+        $optionExtraAttr = array();
+        $optionExtraAttr['option_' . $this->_getRendererEnable()->calcOptionHash($row->getData('enable_reply'))] = 'selected="selected"';
+        $optionExtraAttr['option_' . $this->_getRendererMatchMode()->calcOptionHash($row->getData('match_mode'))] = 'selected="selected"';
+        $optionExtraAttr['option_' . $this->_getRendererMatchCase()->calcOptionHash($row->getData('match_case'))] = 'selected="selected"';
+
+        $row->setData(
+            'option_extra_attrs', $optionExtraAttr
+        );
+    }
+}
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeList.php b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeList.php
new file mode 100644
index 0000000..670dcda
--- /dev/null
+++ b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeList.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento Chatbot Integration
+ * Copyright (C) 2017
+ *
+ * This file is part of Werules/Chatbot.
+ *
+ * Werules/Chatbot is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field;
+
+class MatchModeList implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Provide available options as a value/label array
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return array(
+            array('value' => 0, 'label' => __("Equals to")),
+            array('value' => 1, 'label' => __("Starts With")),
+            array('value' => 2, 'label' => __("Ends With")),
+            array('value' => 3, 'label' => __("Contains")),
+            array('value' => 4, 'label' => __("Match RegEx"))
+        );
+    }
+}
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeSelect.php b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeSelect.php
new file mode 100644
index 0000000..85aa524
--- /dev/null
+++ b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/MatchModeSelect.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento Chatbot Integration
+ * Copyright (C) 2017
+ *
+ * This file is part of Werules/Chatbot.
+ *
+ * Werules/Chatbot is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field;
+
+class MatchModeSelect extends \Magento\Framework\View\Element\Html\Select
+{
+    /**
+     * @var \Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\MatchModeList
+     */
+    protected $_matchModeList;
+
+    public function __construct(
+        \Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\MatchModeList $MatchModeList,
+        \Magento\Backend\Block\Template\Context $context, array $data = array())
+    {
+        parent::__construct($context, $data);
+        $this->_matchModeList = $MatchModeList;
+    }
+
+    public function _toHtml()
+    {
+        if (!$this->getOptions()) {
+            foreach ($this->_matchModeList->toOptionArray() as $option) {
+                $this->addOption($option['value'], $option['label']);
+            }
+        }
+        return parent::_toHtml();
+    }
+
+    public function getName()
+    {
+        return $this->getInputName();
+    }
+}
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
index 36eae84..62b47bf 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Data.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -121,6 +121,24 @@ public function logger($text, $file = 'werules_chatbot.log') // TODO find a bett
         $logger->info(var_export($text, true));
     }
 
+    public function startsWith($haystack, $needle)
+    {
+        $length = strlen($needle);
+        if ($length == 0)
+            return true;
+
+        return substr($haystack, 0, $length) === $needle;
+    }
+
+    public function endsWith($haystack, $needle)
+    {
+        $length = strlen($needle);
+        if ($length == 0)
+            return true;
+
+        return (substr($haystack, -$length) === $needle);
+    }
+
     public function excerpt($text, $size)
     {
         if (strlen($text) > $size)
@@ -376,6 +394,7 @@ private function processMessageRequest($message)
         $errorMessages = array();
         $conversationStateResponses = array();
         $payloadCommandResponses = array();
+        $defaultRepliesResponses = array();
         $NLPResponses = array();
         $this->setHelperMessageAttributes($message);
 
@@ -414,6 +433,20 @@ private function processMessageRequest($message)
             }
         }
 
+        $enableDefaultReplies = $this->getConfigValue($this->_configPrefix . '/general/enable_default_replies');
+        if ($enableDefaultReplies == $this->_define::ENABLED)
+        {
+            if (count($responseContent) <= 0)
+                $defaultRepliesResponses = $this->handleDefaultReplies($message);
+            if ($defaultRepliesResponses)
+            {
+                foreach ($defaultRepliesResponses as $defaultReplyResponse)
+                {
+                    array_push($responseContent, $defaultReplyResponse);
+                }
+            }
+        }
+
         if (count($responseContent) <= 0)
             $commandResponses = $this->handleCommands($message);
         if ($commandResponses)
@@ -515,7 +548,7 @@ private function handleNaturalLanguageProcessor($message)
             {
                 if (isset($intent['confidence']))
                 {
-                    $entityData = $this->getCommandNLPEntityData($commandCode);
+                    $entityData = $this->getCommandNLPEntityData($commandCode); // get all NPL configs from backend
                     if (isset($entityData['confidence']))
                     {
                         $confidence = $entityData['confidence'];
@@ -1057,6 +1090,73 @@ private function handleCommandsWithParameters($message, $keyword, $commandCode)
         return $result;
     }
 
+    private function handleDefaultReplies($message)
+    {
+        $result = array();
+        $defaultReplies = $this->getDefaultRepliesData();
+        $text = $message->getContent();
+
+        foreach ($defaultReplies as $defaultReply)
+        {
+            if (isset($defaultReply['enable_reply']))
+            {
+                if ($defaultReply['enable_reply'] == $this->_define::ENABLED)
+                {
+                    // MODES:
+//                    EQUALS_TO
+//                    STARTS_WITH
+//                    ENDS_WITH
+//                    CONTAINS
+//                    MATCH_REGEX
+
+                    $matched = false;
+                    $match = $defaultReply["match_sintax"];
+                    if ($defaultReply["match_case"] != $this->_define::ENABLED)
+                    {
+                        $match = strtolower($match);
+                        $text = strtolower($text);
+                    }
+
+                    if ($defaultReply['match_mode'] == $this->_define::EQUALS_TO)
+                    {
+                        if ($text == $match)
+                            $matched = true;
+                    }
+                    else if ($defaultReply['match_mode'] == $this->_define::STARTS_WITH)
+                    {
+                        if ($this->startsWith($text, $match))
+                            $matched = true;
+                    }
+                    else if ($defaultReply['match_mode'] == $this->_define::ENDS_WITH)
+                    {
+
+                        if ($this->endsWith($text, $match))
+                            $matched = true;
+                    }
+                    else if ($defaultReply['match_mode'] == $this->_define::CONTAINS)
+                    {
+                        if (strpos($text, $match) !== false)
+                            $matched = true;
+                    }
+                    else if ($defaultReply['match_mode'] == $this->_define::MATCH_REGEX)
+                    {
+                        if (preg_match($match, $text))
+                            $matched = true;
+                    }
+
+                    if ($matched)
+                    {
+                        $replyText = $defaultReply['reply_text'];
+                        $result = $this->getTextMessageArray($replyText);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+
     private function handlePayloadCommands($message)
     {
         return $this->processPayloadCommands($message);
@@ -1927,6 +2027,14 @@ private function getCommandNLPEntityData($commandCode)
         return $result;
     }
 
+    private function getDefaultRepliesData()
+    {
+        $serializedDefaultReplies = $this->getConfigValue($this->_configPrefix . '/general/default_replies');
+        $defaultReplies = $this->_serializer->unserialize($serializedDefaultReplies);
+
+        return $defaultReplies;
+    }
+
     private function getChatbotAPIModelBySenderId($senderId)
     {
         if (isset($this->_chatbotAPIModel))
diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Define.php b/Magento2/app/code/Werules/Chatbot/Helper/Define.php
index 1011de5..f605b8c 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Define.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Define.php
@@ -101,4 +101,11 @@ class Define
 
     const DONT_CLEAR_MESSAGE_QUEUE = 0;
     const CLEAR_MESSAGE_QUEUE = 1;
+
+    // DEFAULT REPLIES MODES
+    const EQUALS_TO = 0;
+    const STARTS_WITH = 1;
+    const ENDS_WITH = 2;
+    const CONTAINS = 3;
+    const MATCH_REGEX = 4;
 }
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
index 8d4777a..36ff88a 100644
--- a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
+++ b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
@@ -172,7 +172,7 @@
 					<label>Default Replies</label>
 					<comment>Replies to be send to the customer whenever matches one of the requirements.</comment>
 					<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
-					<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\Commands</frontend_model>
+					<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\DefaultReplies</frontend_model>
 				</field>
 				<field id="enable_nlp_replies" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment tooltip" type="select">
 					<label>Enable Natural Language Processor Replies (wit.ai)</label>

From 9531024c6b22a5ad552e4afd15a4c0ed6e71e58b Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 20:46:04 -0200
Subject: [PATCH 06/13] fix javascript glitch

---
 .../adminhtml/layout/adminhtml_system_config_edit.xml |  3 +++
 .../adminhtml/templates/system/config/custom_css.css  |  1 +
 .../adminhtml/templates/system/config/custom_js.phtml | 11 +++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css

diff --git a/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml b/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml
index df9e032..c751865 100644
--- a/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml
+++ b/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" ?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="styles"/>
+    <head>
+        <css src="Werules_Chatbot::system/config/custom_css.css"/>
+    </head>
     <body>
         <referenceContainer name="js">
             <block class="Magento\Backend\Block\Template" template="Werules_Chatbot::system/config/custom_js.phtml"/>
diff --git a/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css b/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css
new file mode 100644
index 0000000..be8d361
--- /dev/null
+++ b/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css
@@ -0,0 +1 @@
+/*backend css*/
diff --git a/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_js.phtml b/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_js.phtml
index 15537e8..8bfc566 100644
--- a/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_js.phtml
+++ b/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_js.phtml
@@ -29,11 +29,14 @@
         updateCustomKeyUrl(custom_key.value);
 
     var scheduled_clear = document.getElementById('werules_chatbot_danger_general_clear_message_pending');
-    if (scheduled_clear.value === '1')
+    if (scheduled_clear)
     {
-        var schedule_message = document.getElementById('werules_scheduled_clearing');
-        if (schedule_message)
-            document.getElementById('werules_scheduled_clearing').style.display = 'block';
+        if (scheduled_clear.value === '1')
+        {
+            var schedule_message = document.getElementById('werules_scheduled_clearing');
+            if (schedule_message)
+                document.getElementById('werules_scheduled_clearing').style.display = 'block';
+        }
     }
 
     function updateCustomKeyUrl(custom_key)

From f4d5aa56f12ba8df5c8c02c7803cb5e195cae872 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 21:11:15 -0200
Subject: [PATCH 07/13] add css file

---
 .../view/adminhtml/layout/adminhtml_system_config_edit.xml   | 2 +-
 .../view/adminhtml/templates/system/config/custom_css.css    | 1 -
 .../Werules/Chatbot/view/adminhtml/web/css/custom_css.css    | 5 +++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css
 create mode 100644 Magento2/app/code/Werules/Chatbot/view/adminhtml/web/css/custom_css.css

diff --git a/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml b/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml
index c751865..2cc33ee 100644
--- a/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml
+++ b/Magento2/app/code/Werules/Chatbot/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -2,7 +2,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="styles"/>
     <head>
-        <css src="Werules_Chatbot::system/config/custom_css.css"/>
+        <css src="Werules_Chatbot::css/custom_css.css"/>
     </head>
     <body>
         <referenceContainer name="js">
diff --git a/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css b/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css
deleted file mode 100644
index be8d361..0000000
--- a/Magento2/app/code/Werules/Chatbot/view/adminhtml/templates/system/config/custom_css.css
+++ /dev/null
@@ -1 +0,0 @@
-/*backend css*/
diff --git a/Magento2/app/code/Werules/Chatbot/view/adminhtml/web/css/custom_css.css b/Magento2/app/code/Werules/Chatbot/view/adminhtml/web/css/custom_css.css
new file mode 100644
index 0000000..149bc29
--- /dev/null
+++ b/Magento2/app/code/Werules/Chatbot/view/adminhtml/web/css/custom_css.css
@@ -0,0 +1,5 @@
+/*backend css*/
+
+.werules-placeholder:empty:before{
+	content: "Regex or text";
+}
\ No newline at end of file

From e5c48aa09b98d541d05975bb3d668bdfb9b13bd9 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 21:11:54 -0200
Subject: [PATCH 08/13] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 566b1e1..203dc97 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,7 @@ Go to **System > General Settings  > Chatbot Settings**
 - **v1.0.4:**
     - Add Support command
     - Add option to list commands on Help Command
+    - Add Default Replies
 - **v1.0.3:**
     - Add Messages Queue Modes
     - Add option to Clear Message Queue
@@ -271,7 +272,6 @@ A: Thank you! You can help by codding more features, creating pull requests, or
     - Add Promotional Messages
     - Add Enable Facebook Messenger Box
     - Add Welcome Message Options
-    - Add Enable Default Replies
     - Add more options to filter clearing message queue
     - Add handler for other posts from Messenger
 

From cac07469f844fb31c34773bb4844cda4c4aaff59 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 21:15:25 -0200
Subject: [PATCH 09/13] add condition

---
 Magento2/app/code/Werules/Chatbot/Helper/Data.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
index 62b47bf..4666e0b 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Data.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -2029,8 +2029,10 @@ private function getCommandNLPEntityData($commandCode)
 
     private function getDefaultRepliesData()
     {
+        $defaultReplies = array();
         $serializedDefaultReplies = $this->getConfigValue($this->_configPrefix . '/general/default_replies');
-        $defaultReplies = $this->_serializer->unserialize($serializedDefaultReplies);
+        if ($serializedDefaultReplies)
+            $defaultReplies = $this->_serializer->unserialize($serializedDefaultReplies);
 
         return $defaultReplies;
     }

From 955c7874a79c4301466cc5044b30eabdcbbc30f5 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 21:17:29 -0200
Subject: [PATCH 10/13] error handler

---
 Magento2/app/code/Werules/Chatbot/Helper/Data.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
index 4666e0b..44758c0 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Data.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -1147,7 +1147,8 @@ private function handleDefaultReplies($message)
                     if ($matched)
                     {
                         $replyText = $defaultReply['reply_text'];
-                        $result = $this->getTextMessageArray($replyText);
+                        if ($replyText)
+                            $result = $this->getTextMessageArray($replyText);
                         break;
                     }
                 }

From c28fe2dea6aa787ac15d089f2e907d805a8cebd0 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 21:58:19 -0200
Subject: [PATCH 11/13] add welcome message options

---
 .../Config/Form/Field/WelcomeOptions.php      | 91 +++++++++++++++++++
 .../app/code/Werules/Chatbot/Helper/Data.php  | 56 +++++++++++-
 .../Werules/Chatbot/etc/adminhtml/system.xml  | 38 ++++----
 README.md                                     |  2 +-
 4 files changed, 164 insertions(+), 23 deletions(-)
 create mode 100644 Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php

diff --git a/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php
new file mode 100644
index 0000000..06eed07
--- /dev/null
+++ b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Magento Chatbot Integration
+ * Copyright (C) 2017
+ *
+ * This file is part of Werules/Chatbot.
+ *
+ * Werules/Chatbot is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field;
+
+class WelcomeOptions extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
+{
+    /**
+     * @var \Magento\Framework\Data\Form\Element\Factory
+     */
+    protected $_elementFactory;
+    protected $_itemRendererEnable;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Data\Form\Element\Factory $elementFactory,
+        array $data = array()
+    )
+    {
+        $this->_elementFactory  = $elementFactory;
+        parent::__construct($context,$data);
+    }
+    protected function _construct()
+    {
+        $this->addColumn('enable_option', array(
+            'label' => __("Enable"),
+            'renderer' => $this->_getRendererEnable()
+        ));
+        $this->addColumn('option_text', array(
+            'label' => __("Option Text"),
+            //'style' => 'width: 100%',
+            'class' => 'validate-no-html-tags'
+        ));
+
+        $this->_addAfter = false;
+        $this->_addButtonLabel = __("Add");
+        parent::_construct();
+    }
+
+    protected function _getRendererYesNo()
+    {
+        return $this->getLayout()->createBlock(
+            'Werules\Chatbot\Block\Adminhtml\System\Config\Options\YesNo',
+            '',
+            array('data' => array('is_render_to_js_template' => true))
+//                array('is_render_to_js_template' => true)
+        ); // ->setExtraParams('style="width: 100%;"');
+    }
+
+    protected function _getRendererEnable()
+    {
+        if (!$this->_itemRendererEnable)
+        {
+            $this->_itemRendererEnable = $this->_getRendererYesNo();
+        }
+        return $this->_itemRendererEnable;
+    }
+
+    protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
+    {
+        $optionExtraAttr = array();
+        $optionExtraAttr['option_' . $this->_getRendererEnable()->calcOptionHash($row->getData('enable_reply'))] = 'selected="selected"';
+
+        $row->setData(
+            'option_extra_attrs', $optionExtraAttr
+        );
+    }
+}
\ No newline at end of file
diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
index 44758c0..3e00693 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Data.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -252,7 +252,13 @@ public function processIncomingMessage($message)
             $chatbotAPI = $this->createChatbotAPI($chatbotAPI, $message);
             $welcomeMessage = $this->getWelcomeMessage($message);
             if ($welcomeMessage)
+            {
+                if ($message->getStatus() != $this->_define::PROCESSED)
+                    $message->updateIncomingMessageStatus($this->_define::PROCESSED);
+
                 array_push($result, $welcomeMessage);
+                return $result;
+            }
         }
 
         $enabled = $this->getConfigValue($this->_configPrefix . '/general/enable');
@@ -1428,8 +1434,41 @@ private function getWelcomeMessage($message)
         $text = $this->getConfigValue($this->_configPrefix . '/general/welcome_message');
         if ($text != '')
         {
-            $contentObj = $this->getTextMessageArray($text);
-            $outgoingMessage = $this->createOutgoingMessage($message, reset($contentObj)); // TODO reset -> gets first item of array
+            $enableMessageOptions = $this->getConfigValue($this->_configPrefix . '/general/enable_message_options');
+            if ($enableMessageOptions == $this->_define::ENABLED)
+            {
+                $quickReplies = array();
+                $welcomeMessageOptions = $this->getWelcomeMessageOptionsData();
+                foreach ($welcomeMessageOptions as $optionId => $messageOption)
+                {
+                    if (count($quickReplies) >= $this->_define::MAX_MESSAGE_ELEMENTS)
+                        break;
+
+                    $quickReply = array(
+                        'content_type' => 'text', // TODO messenger pattern
+                        'title' => $messageOption['option_text'],
+                        'payload' => json_encode(array())
+                    );
+                    array_push($quickReplies, $quickReply);
+                }
+
+                $contentObject = new \stdClass();
+                $contentObject->message = $text;
+                $contentObject->quick_replies = $quickReplies;
+                $content = json_encode($contentObject);
+                $contentType = $this->_define::QUICK_REPLY;
+            }
+            else
+            {
+                $contentType = $this->_define::CONTENT_TEXT;
+                $content = $text;
+            }
+            $responseMessage = array(
+                'content_type' => $contentType,
+                'content' => $content,
+                'current_command_details' => json_encode(array())
+            );
+            $outgoingMessage = $this->createOutgoingMessage($message, $responseMessage);
 //            $this->processOutgoingMessage($outgoingMessage);
         }
 
@@ -2038,6 +2077,16 @@ private function getDefaultRepliesData()
         return $defaultReplies;
     }
 
+    private function getWelcomeMessageOptionsData()
+    {
+        $welcomeMessageOptions = array();
+        $serializedWelcomeMessageOptions = $this->getConfigValue($this->_configPrefix . '/general/message_options');
+        if ($serializedWelcomeMessageOptions)
+            $welcomeMessageOptions = $this->_serializer->unserialize($serializedWelcomeMessageOptions);
+
+        return $welcomeMessageOptions;
+    }
+
     private function getChatbotAPIModelBySenderId($senderId)
     {
         if (isset($this->_chatbotAPIModel))
@@ -2547,7 +2596,8 @@ private function processHelpCommand()
                         break;
 
                     $payload = array(
-                        'command' => $commandId
+                        'command' => $commandId,
+//                        'parameter' => ''
                     );
                     $quickReply = array(
                         'content_type' => 'text', // TODO messenger pattern
diff --git a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
index 36ff88a..32be612 100644
--- a/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
+++ b/Magento2/app/code/Werules/Chatbot/etc/adminhtml/system.xml
@@ -126,25 +126,25 @@
 					<label>Welcome Message</label>
 					<comment>First message the bot will send to your client. please check the maximum size for messages on Facebook API, otherwise your message might not be sent. you can use "{customername}" to send the customer name.</comment>
 				</field>
-				<!--<field id="enable_message_options" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="12" translate="label comment tooltip" type="select">-->
-					<!--&lt;!&ndash;TODO&ndash;&gt;-->
-					<!--&lt;!&ndash;<depends>&ndash;&gt;-->
-						<!--&lt;!&ndash;<field id="werules_chatbot_messenger/general/welcome_message">1</field>&ndash;&gt;-->
-					<!--&lt;!&ndash;</depends>&ndash;&gt;-->
-					<!--<label>Enable Welcome Message Options</label>-->
-					<!--<comment>Enable welcome message options.</comment>-->
-					<!--<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>-->
-				<!--</field>-->
-				<!--<field id="message_options" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="13" translate="label comment tooltip" type="text">-->
-					<!--&lt;!&ndash;TODO&ndash;&gt;-->
-					<!--&lt;!&ndash;<depends>&ndash;&gt;-->
-						<!--&lt;!&ndash;<field id="werules_chatbot_messenger/general/welcome_message">1</field>&ndash;&gt;-->
-					<!--&lt;!&ndash;</depends>&ndash;&gt;-->
-					<!--<label>Welcome Message Options</label>-->
-					<!--<comment>Welcome message options.</comment>-->
-					<!--<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>-->
-					<!--<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\Commands</frontend_model>-->
-				<!--</field>-->
+				<field id="enable_message_options" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="12" translate="label comment tooltip" type="select">
+					<!--TODO-->
+					<!--<depends>-->
+						<!--<field id="werules_chatbot_messenger/general/welcome_message">1</field>-->
+					<!--</depends>-->
+					<label>Enable Welcome Message Options</label>
+					<comment>Enable welcome message options.</comment>
+					<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+				</field>
+				<field id="message_options" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="13" translate="label comment tooltip" type="text">
+					<depends>
+						<!--<field id="werules_chatbot_messenger/general/welcome_message">1</field>--> <!--TODO-->
+						<field id="werules_chatbot_messenger/general/enable_message_options">1</field>
+					</depends>
+					<label>Welcome Message Options</label>
+					<comment>Welcome message options.</comment>
+					<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
+					<frontend_model>Werules\Chatbot\Block\Adminhtml\System\Config\Form\Field\WelcomeOptions</frontend_model>
+				</field>
 				<field id="help_message" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="15" translate="label comment tooltip" type="text">
 					<label>Help Message</label>
 					<comment>Message will be sent when customer asks for help. Please check the maximum size for messages on Facebook API, otherwise your message might not be sent.</comment>
diff --git a/README.md b/README.md
index 203dc97..755150f 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ Go to **System > General Settings  > Chatbot Settings**
     - Add Support command
     - Add option to list commands on Help Command
     - Add Default Replies
+    - Add Welcome Message Options
 - **v1.0.3:**
     - Add Messages Queue Modes
     - Add option to Clear Message Queue
@@ -271,7 +272,6 @@ A: Thank you! You can help by codding more features, creating pull requests, or
     - Add `CDATA` and `<tooltip>` to configuration descriptions
     - Add Promotional Messages
     - Add Enable Facebook Messenger Box
-    - Add Welcome Message Options
     - Add more options to filter clearing message queue
     - Add handler for other posts from Messenger
 

From c1e0451a5d0a93d480f951826f381cd9a24b4092 Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 22:00:59 -0200
Subject: [PATCH 12/13] fix js option parser

---
 .../Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php | 2 +-
 Magento2/app/code/Werules/Chatbot/Helper/Data.php               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php
index 06eed07..f15b05b 100644
--- a/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php
+++ b/Magento2/app/code/Werules/Chatbot/Block/Adminhtml/System/Config/Form/Field/WelcomeOptions.php
@@ -82,7 +82,7 @@ protected function _getRendererEnable()
     protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
     {
         $optionExtraAttr = array();
-        $optionExtraAttr['option_' . $this->_getRendererEnable()->calcOptionHash($row->getData('enable_reply'))] = 'selected="selected"';
+        $optionExtraAttr['option_' . $this->_getRendererEnable()->calcOptionHash($row->getData('enable_option'))] = 'selected="selected"';
 
         $row->setData(
             'option_extra_attrs', $optionExtraAttr
diff --git a/Magento2/app/code/Werules/Chatbot/Helper/Data.php b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
index 3e00693..f1dfb53 100644
--- a/Magento2/app/code/Werules/Chatbot/Helper/Data.php
+++ b/Magento2/app/code/Werules/Chatbot/Helper/Data.php
@@ -1434,6 +1434,8 @@ private function getWelcomeMessage($message)
         $text = $this->getConfigValue($this->_configPrefix . '/general/welcome_message');
         if ($text != '')
         {
+//            $contentObj = $this->getTextMessageArray($text);
+//            $outgoingMessage = $this->createOutgoingMessage($message, reset($contentObj)); // TODO reset -> gets first item of array
             $enableMessageOptions = $this->getConfigValue($this->_configPrefix . '/general/enable_message_options');
             if ($enableMessageOptions == $this->_define::ENABLED)
             {

From a87fa132627109a386b343b7fa3b23d81059facb Mon Sep 17 00:00:00 2001
From: blopa <montenegro.pablo@outlook.com>
Date: Sat, 16 Dec 2017 22:05:37 -0200
Subject: [PATCH 13/13] add new translations

---
 Magento2/app/code/Werules/Chatbot/i18n/en_US.csv | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv b/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
index 58a1976..c49ae21 100644
--- a/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
+++ b/Magento2/app/code/Werules/Chatbot/i18n/en_US.csv
@@ -82,3 +82,12 @@
 "No more items to list.","No more items to list."
 "This category doesn't seems to exist. Please try again.","This category doesn't seems to exist. Please try again."
 "You're on support mode. In a few words, please explain what would you like help with. To cancel send '%1'.","You're on support mode. In a few words, please explain what would you like help with. To cancel send '%1'."
+"Match Mode","Match Mode"
+"Match Text or Regex","Match Text or Regex"
+"Match Case","Match Case"
+"Equals to","Equals to"
+"Starts With","Starts With"
+"Ends With","Ends With"
+"Contains","Contains"
+"Match RegEx","Match RegEx"
+"Option Text","Option Text"