added admin controller and moved BulkSMS to marketing tab

Author: matthiez

.gitignore

@@ -24,6 +24,5 @@ Available message placeholders:
 
 #### TODO:
 - Add tests
-- Add more translations
 - Add more events
 - Add more placeholders to message contents

LICENSE

@@ -31,23 +31,9 @@ abstract class Constants
     const SIGNATURE = 'SMS77_SIGNATURE';
     const SIGNATURE_POSITION = 'SMS77_SIGNATURE_POSITION';
 
-    static function persistedKeys() {
-        $keys = [];
-
-        foreach (self::CONFIGURATION as $k => $v) {
-            if (!in_array($k, self::NON_PERSISTED_KEYS)) {
-                $keys[] = $k;
-            }
-        }
-
-        return $keys;
-    }
-
     const CONFIGURATION = [
         self::API_KEY => '',
         self::BULK => '',
-        self::BULK_COUNTRIES => [],
-        self::BULK_GROUPS => [],
         self::FROM => '',
         self::MSG_ON_DELIVERY => false,
         self::MSG_ON_INVOICE => false,
@@ -65,6 +51,4 @@ static function persistedKeys() {
     ];
 
     const SIGNATURE_POSITIONS = ['append', 'prepend',];
-
-    const NON_PERSISTED_KEYS = [Constants::BULK_COUNTRIES, Constants::BULK_GROUPS,];
 }

README.md

@@ -13,17 +13,19 @@
  * @license   LICENSE
  */
 
+require_once __DIR__ . "/../controllers/admin/Sms77AdminController.php";
+require_once __DIR__ . "./Constants.php";
+
 class Form extends HelperForm
 {
-    public function __construct($name)
-    {
+    public function __construct($name) {
         parent::__construct();
         $defaultLang = (int)Configuration::get('PS_LANG_DEFAULT');
         $this->allow_employee_form_lang = $defaultLang;
-        $this->currentIndex = AdminController::$currentIndex . "&configure=$name";
+        $this->currentIndex = Sms77AdminController::$currentIndex . "&configure=$name";
         $this->default_form_language = $defaultLang;
 
-        $setFieldsValue = function($k, $v) {
+        $setFieldsValue = function ($k, $v) {
             $name = "config[$k]";
 
             if (is_array($v)) {
@@ -33,15 +35,11 @@ public function __construct($name)
             $this->fields_value[$name] = $v;
         };
 
-        foreach (Configuration::getMultiple(Constants::persistedKeys()) as $k => $v) {
+        foreach (Configuration::getMultiple(array_keys(Constants::CONFIGURATION)) as $k => $v) {
             $setFieldsValue($k, $v);
         }
 
-        foreach (Constants::NON_PERSISTED_KEYS as $k) {
-            $setFieldsValue($k, Constants::CONFIGURATION[$k]);
-        }
-
-        $toName = function($key) {
+        $toName = function ($key) {
             return "config[$key]";
         };
 
@@ -130,35 +128,6 @@ public function __construct($name)
                                 ];
                             }, Constants::SIGNATURE_POSITIONS),
                         ],
-                        [
-                            'label' => $this->l('Countries'),
-                            'multiple' => true,
-                            'name' => $toName(Constants::BULK_COUNTRIES),
-                            'options' => [
-                                'query' => Country::getCountries($this->context->language->id),
-                                'id' => 'id_country',
-                                'name' => 'name'
-                            ],
-                            'tab' => 'bulk',
-                            'type' => 'select',
-                        ],
-                        [
-                            'label' => $this->l('Groups'),
-                            'multiple' => true,
-                            'name' => $toName(Constants::BULK_GROUPS),
-                            'options' => [
-                                'query' => Group::getGroups($this->context->language->id),
-                                'id' => 'id_group',
-                                'name' => 'name'
-                            ],
-                            'tab' => 'bulk',
-                            'type' => 'select',
-                        ],
-                        $this->makeTextarea(
-                            'BULK',
-                            'Send out any message to all of your customers.',
-                            'bulk'
-                        ),
                     ],
                     'submit' => [
                         'title' => $this->l('Save'),
@@ -179,19 +148,18 @@ public function __construct($name)
             'save' =>
                 [
                     'desc' => $this->l('Save'),
-                    'href' => AdminController::$currentIndex . "&configure=$name&save$name&token="
+                    'href' => Sms77AdminController::$currentIndex . "&configure=$name&save$name&token="
                         . Tools::getAdminTokenLite('AdminModules'),
                 ],
             'back' => [
-                'href' => AdminController::$currentIndex . '&token=' . Tools::getAdminTokenLite('AdminModules'),
+                'href' => Sms77AdminController::$currentIndex . '&token=' . Tools::getAdminTokenLite('AdminModules'),
                 'desc' => $this->l('Back to list'),
             ],
         ];
         $this->toolbar_scroll = true;
     }
 
-    private function makeTextarea($action, $trans, $tab = 'settings')
-    {
+    private function makeTextarea($action, $trans, $tab = 'settings') {
         $trans = $this->l($trans);
 
         return [
@@ -204,8 +172,7 @@ private function makeTextarea($action, $trans, $tab = 'settings')
         ];
     }
 
-    private function makeSwitch($action, $label, $desc, $values, $isBool)
-    {
+    private function makeSwitch($action, $label, $desc, $values, $isBool) {
         $descHit = $this->l($desc);
 
         return [
@@ -220,18 +187,17 @@ private function makeSwitch($action, $label, $desc, $values, $isBool)
         ];
     }
 
-    private function makeBool($action, $label, $desc)
-    {
+    private function makeBool($action, $label, $desc) {
         $sAction = Tools::strtolower($action);
 
         return $this->makeSwitch("MSG_ON_$action", $label, $desc, [
             [
                 'id' => 'on_' . $sAction . '_on',
-                'value' => 1
+                'value' => 1,
             ],
             [
                 'id' => 'on_' . $sAction . '_off',
-                'value' => 0
+                'value' => 0,
             ],
         ], true);
     }

TableWrapper.php

@@ -19,12 +19,10 @@
  * @property bool $hasFirstName
  * @property bool $hasLastName
  * @property bool $hasOrderId
- *
  */
 class Personalizer
 {
-    public function __construct($msg, $address)
-    {
+    public function __construct($msg, $address) {
         $this->msg = $msg;
         $this->address = $address;
 
@@ -33,8 +31,7 @@ public function __construct($msg, $address)
         $this->hasOrderId = false !== strpos($this->msg, '{2}');
     }
 
-    function toString($orderId = null)
-    {
+    function toString($orderId = null) {
         $msg = $this->msg;
 
         if ($this->hasFirstName) {