Treat the form data in configurationForm class

Author: apacios

classes/Form/ConfigurationForm.php

@@ -35,11 +35,11 @@ public function __construct(\Ps_Googleanalytics $module) {
     }
 
     /**
-     * generateForm
+     * generate
      *
      * @return string
      */
-    public function generateForm()
+    public function generate()
     {
         // Check if multistore is active
         $is_multistore_active = \Shop::isFeatureActive();
@@ -158,6 +158,43 @@ public function generateForm()
         $helper->fields_value['GA_CROSSDOMAIN_ENABLED'] = \Configuration::get('GA_CROSSDOMAIN_ENABLED');
         $helper->fields_value['GA_ANONYMIZE_ENABLED'] = \Configuration::get('GA_ANONYMIZE_ENABLED');
 
-        return $helper->generateForm($fields_form);
+        return $helper->generate($fields_form);
+    }
+
+    /**
+     * treat the form datas if submited
+     *
+     * @return string
+     */
+    public function treat()
+    {
+        $treatmentResult = '';
+        $gaAccountId = \Tools::getValue('GA_ACCOUNT_ID');
+        $gaUserIdEnabled = \Tools::getValue('GA_USERID_ENABLED');
+        $gaCrossdomainEnabled = \Tools::getValue('GA_CROSSDOMAIN_ENABLED');
+        $gaAnonymizeEnabled = \Tools::getValue('GA_ANONYMIZE_ENABLED');
+
+        if (!empty($gaAccountId)) {
+            \Configuration::updateValue('GA_ACCOUNT_ID', $gaAccountId);
+            \Configuration::updateValue('GANALYTICS_CONFIGURATION_OK', true);
+            $treatmentResult .= $this->module->displayConfirmation($this->module->l('Account ID updated successfully'));
+        }
+
+        if (null !== $gaUserIdEnabled) {
+            \Configuration::updateValue('GA_USERID_ENABLED', (bool) $gaUserIdEnabled);
+            $treatmentResult .= $this->module->displayConfirmation($this->module->l('Settings for User ID updated successfully'));
+        }
+
+        if (null !== $gaCrossdomainEnabled) {
+            \Configuration::updateValue('GA_CROSSDOMAIN_ENABLED', (bool) $gaCrossdomainEnabled);
+            $treatmentResult .= $this->module->displayConfirmation($this->module->l('Settings for User ID updated successfully'));
+        }
+
+        if (null !== $gaAnonymizeEnabled) {
+            \Configuration::updateValue('GA_ANONYMIZE_ENABLED', (bool) $gaAnonymizeEnabled);
+            $treatmentResult .= $this->module->displayConfirmation($this->module->l('Settings for Anonymize IP updated successfully'));
+        }
+
+        return $treatmentResult;
     }
 }

classes/Wrapper/OrderWrapper.php

@@ -55,4 +55,4 @@ public function wrapOrder($id_order)
                 'customer' => $order->id_customer);
         }
     }
-}
+}

classes/Wrapper/ProductWrapper.php

@@ -131,4 +131,4 @@ public function wrapProduct($product, $extras, $index = 0, $full = false)
         }
         return $ga_product;
     }
-}
+}

ps_googleanalytics.php

@@ -62,47 +62,21 @@ public function __construct()
         $this->psVersionIs17 = (bool) version_compare(_PS_VERSION_, '1.7', '>=');
     }
 
-    public function displayForm()
-    {
-        $configurationForm = new PrestaShop\Module\Ps_Googleanalytics\Form\ConfigurationForm($this);
-        return $configurationForm->generateForm();
-    }
-
     /**
      * back office module configuration page content
      */
     public function getContent()
     {
-        $output = '';
+        $configurationForm = new PrestaShop\Module\Ps_Googleanalytics\Form\ConfigurationForm($this);
+        $formOutput = '';
+
         if (Tools::isSubmit('submit'.$this->name)) {
-            $ga_account_id = Tools::getValue('GA_ACCOUNT_ID');
-            if (!empty($ga_account_id)) {
-                Configuration::updateValue('GA_ACCOUNT_ID', $ga_account_id);
-                Configuration::updateValue('GANALYTICS_CONFIGURATION_OK', true);
-                $output .= $this->displayConfirmation($this->l('Account ID updated successfully'));
-            }
-            $ga_userid_enabled = Tools::getValue('GA_USERID_ENABLED');
-            if (null !== $ga_userid_enabled) {
-                Configuration::updateValue('GA_USERID_ENABLED', (bool)$ga_userid_enabled);
-                $output .= $this->displayConfirmation($this->l('Settings for User ID updated successfully'));
-            }
-
-            $ga_crossdomain_enabled = Tools::getValue('GA_CROSSDOMAIN_ENABLED');
-            if (null !== $ga_crossdomain_enabled) {
-                Configuration::updateValue('GA_CROSSDOMAIN_ENABLED', (bool)$ga_crossdomain_enabled);
-                $output .= $this->displayConfirmation($this->l('Settings for User ID updated successfully'));
-            }
-
-            $ga_anonymize_enabled = Tools::getValue('GA_ANONYMIZE_ENABLED');
-            if (null !== $ga_anonymize_enabled) {
-                Configuration::updateValue('GA_ANONYMIZE_ENABLED', (bool)$ga_anonymize_enabled);
-                $output .= $this->displayConfirmation($this->l('Settings for Anonymize IP updated successfully'));
-            }
+            $formOutput = $configurationForm->treat();
         }
 
-        $output .= $this->displayForm();
+        $formOutput .= $configurationForm->generate();
 
-        return $this->display(__FILE__, './views/templates/admin/configuration.tpl').$output;
+        return $this->display(__FILE__, './views/templates/admin/configuration.tpl') . $formOutput;
     }
 
     public function hookdisplayHeader($params, $back_office = false)