Merge branch 'hotfix/0.2.2' into main

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog] and this project adheres to [Semantic Versioning].
 
+## [0.2.2] - 2021-01-25
+
+### Added
+
+- Added option to suppress URL shortner
+
+### Fixed
+
+- Changed translation for nl to nl_NL
+
 ## [0.2.1] - 2020-12-14
 
 ### Added
@@ -32,6 +42,7 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic
 
 Inial release 🎉
 
+[0.2.2]: https://github.com/bastolen/mautic-message-extension/releases/tag/0.2.2
 [0.2.1]: https://github.com/bastolen/mautic-message-extension/releases/tag/0.2.1
 [0.2.0]: https://github.com/bastolen/mautic-message-extension/releases/tag/0.2.0
 [0.1.1]: https://github.com/bastolen/mautic-message-extension/releases/tag/0.1.1

Config/config.php

@@ -3,7 +3,7 @@
 namespace MauticPlugin\MauticMessageExtensionBundle;
 
 return [
-  'version'     => '0.2.1',
+  'version'     => '0.2.2',
   'author'      => 'Bas Tolen',
   'services'    => [
     'integrations' => [

EventListener/BasicSMSSubscriber.php

@@ -36,10 +36,12 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
       $config = $event->getConfig();
       $message = $config['message'];
       $change_lang_code = $config['change_lang_code'];
+      $shorten_url = $config['shorten_url'];
       $default_lang_code = isset($config['default_lang_code']) ? $config['default_lang_code'] : '';
       $contact_number_field = $config['contact_number_field'];
+
       try {
-        $this->messageService->sendMessage($contact_number_field, $message, $change_lang_code, $default_lang_code, $event->getLead());
+        $this->messageService->sendMessage($contact_number_field, $message, $change_lang_code, $default_lang_code, $shorten_url, $event->getLead());
         $event->setResult(true);
       } catch (\Exception $e) {
         $event->setFailed($e->getMessage());

Form/Type/MessageExtensionSMSFormBasic.php

@@ -72,6 +72,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         'required'    => true,
       ]
     );
+
+    $builder->add(
+      'shorten_url',
+      'yesno_button_group',
+      [
+        'label_attr' => ['class' => 'control-label'],
+        'label'      => 'message-extension.forms.sms.shorten_url',
+        'attr'       => [
+          'class' => 'form-control',
+        ],
+        'required'    => true,
+      ]
+    );
   }
 
   public function getName()

Services/MessageService.php

@@ -34,9 +34,9 @@ public function __construct(Http $connector, MessageHelper $helper, LoggerInterf
     $this->logger = $logger;
   }
 
-  public function sendMessage(string $contact_number_field, string $originalText, bool $change_lang_code, string $default_lang_code = '', Lead $lead)
+  public function sendMessage(string $contact_number_field, string $originalText, bool $change_lang_code, string $default_lang_code = '', bool $shorten_url = false, Lead $lead)
   {
-    $message = $this->helper->getMessageText($lead, $originalText, true);
+    $message = $this->helper->getMessageText($lead, $originalText, $shorten_url);
     $number = $lead->$contact_number_field;
     $number = isset($number) ? $number : '';
     $number = preg_replace('/[^0-9+]+/', '', $number);

Translations/en_US/messages.ini

@@ -9,5 +9,6 @@ message-extension.forms.sms.message="The SMS content message"
 message-extension.forms.sms.number_field="Phone number field"
 message-extension.forms.sms.change_lang_code="Change the land code if no land code is provided?"
 message-extension.forms.sms.default_lang_code="Default value to change the land code to"
+message-extension.forms.sms.shorten_url="Shorten the URLs using CM"
 
 mautic.campaign.message_extension.action.send_sms="Send a SMS with the CM.com Messaging API"

Translations/nl_NL/messages.ini → Translations/nl/messages.ini

@@ -9,5 +9,6 @@ message-extension.forms.sms.message="SMS bericht"
 message-extension.forms.sms.number_field="Telefoon nummer veld"
 message-extension.forms.sms.change_lang_code="Verander de landcode van het nummer als er geen landcode bekend is?"
 message-extension.forms.sms.default_lang_code="Vervanging van landcode (Voor Nederland gebruik '+31')"
+message-extension.forms.sms.shorten_url="Verkort t"
 
 mautic.campaign.message_extension.action.send_sms="Stuur een SMS met behulp van de Messages API"

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bastolen/mautic-message-extension-bundle",
   "description": "Mautic plugin to send messages to contacts/leads",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "mautic-plugin",
   "authors": [
     {