BulkSMS: replace isValidNumberForRegion with isValidNumber

Author: matthiez

composer.json

@@ -11,25 +11,25 @@
     "prepend-autoloader": false
   },
   "description": "Sms77.io API module for PrestaShop applications.",
-  "homepage": "https://github.com/sms77io/prestashop-api",
+  "homepage": "https://github.com/sms77io/prestashop-module",
   "keywords": [
     "prestashop",
     "sms"
   ],
   "license": "MIT",
   "minimum-stability": "dev",
-  "name": "sms77/prestashop-api",
+  "name": "sms77/prestashop-module",
   "prefer-stable": true,
   "require": {
     "php": ">=5.6.0",
-    "sms77/api": "^1.0",
+    "sms77/api": "dev-master",
     "giggsey/libphonenumber-for-php": "^8.11"
-  }
+  },
   "support": {
     "email": "[email protected]",
     "rss": "https://www.sms77.io/de/feed/",
-    "source": "https://github.com/sms77io/prestashop-api",
-    "docs": "https://github.com/sms77io/prestashop-api"
+    "source": "https://github.com/sms77io/prestashop-module",
+    "docs": "https://github.com/sms77io/prestashop-module"
   },
   "type": "prestashop-module"
 }

composer.lock

@@ -179,13 +179,12 @@ public function getContent()
         if (Tools::isSubmit('submit' . $this->name)) {
             foreach (Tools::getValue('config') as $k => $v) {
                 if ('SMS77_API_KEY' === $k && 0 === Tools::strlen($v)) {
-                    $this->errors[] =
-                        Tools::displayError($this->l(
-                            'An API key is required in order to send SMS. Get yours at sms77.io.'
-                        ));
+                    $this->errors[] = Tools::displayError($this->l(
+                        'An API key is required in order to send SMS. Get yours at http://sms77.io.'
+                    ));
                 }
 
-                if ('SMS77_ON_GENERIC' === $k) {
+                if ('SMS77_ON_GENERIC' === $k && Tools::strlen($v)) {
                     $addresses = self::dbQuery(
                         'id_country, id_customer, phone, phone_mobile',
                         'address',
@@ -208,7 +207,6 @@ public function getContent()
                             $numbers[] = $d['phone_mobile'];
                         }
 
-
                         $numbers = array_filter($numbers, function ($number) use ($d) {
                             try {
                                 $isoCode = self::dbQuery(
@@ -217,7 +215,7 @@ public function getContent()
                                     'q.id_country = ' . $d['id_country']);
                                 $isoCode = array_shift($isoCode)['iso_code'];
                                 $numberProto = $this->phoneNumberUtil->parse($number, $isoCode);
-                                return $this->phoneNumberUtil->isValidNumberForRegion($numberProto, $isoCode);
+                                return $this->phoneNumberUtil->isValidNumber($numberProto);
                             } catch (NumberParseException $e) {
                                 return false;
                             }
@@ -241,9 +239,9 @@ public function getContent()
                         }, $valids);
                         $this->validateAndSend($k, implode(',', array_unique($phoneNumbers)));
                     }
+                } else {
+                    Configuration::updateValue($k, $v);
                 }
-
-                Configuration::updateValue($k, $v);
             }
         }
 

sms77.php

@@ -120,6 +120,50 @@
         ],
         "description": "Locale functions required by libphonenumber-for-php"
     },
+    {
+        "name": "mervick/emojionearea",
+        "version": "v3.4.1",
+        "version_normalized": "3.4.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/mervick/emojionearea.git",
+            "reference": "dc73dc556fdc6e82c5d26847533b893ece255ce1"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/mervick/emojionearea/zipball/dc73dc556fdc6e82c5d26847533b893ece255ce1",
+            "reference": "dc73dc556fdc6e82c5d26847533b893ece255ce1",
+            "shasum": ""
+        },
+        "time": "2018-02-09T22:44:43+00:00",
+        "type": "plugin",
+        "extra": {
+            "asset-installer-paths": {
+                "npm-asset-library": "vendor/npm",
+                "bower-asset-library": "vendor/bower"
+            }
+        },
+        "installation-source": "dist",
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Andrey Izman",
+                "email": "[email protected]"
+            },
+            {
+                "name": "Klas Lundberg",
+                "email": "[email protected]"
+            },
+            {
+                "name": "Merlin Mason",
+                "email": "[email protected]"
+            }
+        ],
+        "description": "WYSIWYG-like EmojiOne Converter / Picker Plugin for jQuery"
+    },
     {
         "name": "sms77/api",
         "version": "dev-master",