Merge pull request #245 from lukasz-zaroda/master

Module's configuration form no longer generates notices.
PayU-EMEA · Sep 14, 2018 · bf4310c · bf4310c
2 parents 1af77b8 + d161807
commit bf4310c
Showing 1 changed file with 37 additions and 36 deletions.
diff --git a/payu/payu.php b/payu/payu.php
@@ -213,14 +213,13 @@ public function getContent()
      */
     public function displayForm()
     {
-
         $form['method'] = array(
             'form' => array(
                 'legend' => array(
                     'title' => $this->l('Integration method'),
                     'icon' => 'icon-th'
                 ),
-                'input' => array(
+                'input' => array_merge(array(
                     array(
                         'type' => 'switch',
                         'label' => $this->l('Promote credit payment methods'),
@@ -238,44 +237,46 @@ public function displayForm()
                                 'label' => $this->l('Disabled')
                             )
                         ),
-                    ),
+                    )),
                     !version_compare(_PS_VERSION_, '1.7', 'lt')? array(
-                        'type' => 'switch',
-                        'label' => $this->l('Show installment on cart'),
-                        'desc' => $this->l('Promotes credit payment method on cart'),
-                        'name' => 'PAYU_PROMOTE_CREDIT_CART',
-                        'values' => array(
-                            array(
-                                'id' => 'active_on',
-                                'value' => 1,
-                                'label' => $this->l('Enabled')
+                        array(
+                            'type' => 'switch',
+                            'label' => $this->l('Show installment on cart'),
+                            'desc' => $this->l('Promotes credit payment method on cart'),
+                            'name' => 'PAYU_PROMOTE_CREDIT_CART',
+                            'values' => array(
+                                array(
+                                    'id' => 'active_on',
+                                    'value' => 1,
+                                    'label' => $this->l('Enabled')
+                                ),
+                                array(
+                                    'id' => 'active_off',
+                                    'value' => 0,
+                                    'label' => $this->l('Disabled')
+                                )
                             ),
-                            array(
-                                'id' => 'active_off',
-                                'value' => 0,
-                                'label' => $this->l('Disabled')
-                            )
                         ),
-                    ):array(),
-                    !version_compare(_PS_VERSION_, '1.7', 'lt')? array(
-                        'type' => 'switch',
-                        'label' => $this->l('Show installment on summary'),
-                        'desc' => $this->l('Promotes credit payment method on summary'),
-                        'name' => 'PAYU_PROMOTE_CREDIT_SUMMARY',
-                        'values' => array(
-                            array(
-                                'id' => 'active_on',
-                                'value' => 1,
-                                'label' => $this->l('Enabled')
+                        array(
+                            'type' => 'switch',
+                            'label' => $this->l('Show installment on summary'),
+                            'desc' => $this->l('Promotes credit payment method on summary'),
+                            'name' => 'PAYU_PROMOTE_CREDIT_SUMMARY',
+                            'values' => array(
+                                array(
+                                    'id' => 'active_on',
+                                    'value' => 1,
+                                    'label' => $this->l('Enabled')
+                                ),
+                                array(
+                                    'id' => 'active_off',
+                                    'value' => 0,
+                                    'label' => $this->l('Disabled')
+                                )
                             ),
-                            array(
-                                'id' => 'active_off',
-                                'value' => 0,
-                                'label' => $this->l('Disabled')
-                            )
-                        ),
+                        )
                     ):array(),
-                    array(
+                    array(array(
                         'type' => 'switch',
                         'label' => $this->l('Show installments on product'),
                         'desc' => $this->l('Promotes credit payment method on product'),
@@ -335,7 +336,7 @@ public function displayForm()
                             )
                         ),
                     ),
-                ),
+                )),
                 'submit' => array(
                     'title' => $this->l('Save'),
                 )