Ver Fonte

new settings section

andre há 6 meses atrás
pai
commit
4e4ecc4f58

+ 3 - 3
app/Http/Client/Setting.php

@@ -7,7 +7,7 @@ use ThurData\Servers\KerioEmail\App\Enums\ProductParams;
 use ThurData\Servers\KerioEmail\App\Helpers\BuildUrlExtended;
 use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Pages\Description;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Pages\Settings;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Pages\Settings;
 use ThurData\Servers\KerioEmail\Core\Http\AbstractClientController;
 use ThurData\Servers\KerioEmail\Core\UI\Traits\WhmcsParams;
 use ThurData\Servers\KerioEmail\Core\Helper;
@@ -37,8 +37,8 @@ class Setting extends AbstractClientController
         }
 
         return Helper\view()
-            ->addElement(new Description('ressource'))
-            ->addElement(Ressources::class)
+            ->addElement(new Description('settings'))
+            ->addElement(Settings::class)
             ;
 
     }

+ 4 - 4
app/UI/Client/Setting/Buttons/ChangeStatusButton.php

@@ -4,14 +4,14 @@
  * User: ThurData
  * Date: 2019-10-11
  * Time: 11:29
- * @package ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons
+ * @package ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons
  */
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons;
 
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals\AddSettingsModal;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals\ChangeStatusModal;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals\AddSettingModal;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals\ChangeStatusModal;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonCreate;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonDataTableModalAction;

+ 8 - 8
app/UI/Client/Setting/Buttons/EditSettingsButton.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons;
 
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals\EditSettingsModal;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals\EditSettingModal;
 use \ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonDataTableModalAction;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals\AddSettingsModal;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals\AddSettingModal;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonCustomAction;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonModal;
@@ -17,16 +17,16 @@ use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\DropdawnButtonWrappers\Bu
  * User: ThurData
  * Date: 18.09.19
  * Time: 09:29
- * Class EditSettingsButton
+ * Class EditSettingButton
  */
-class EditSettingsButton extends ButtonDataTableModalAction implements ClientArea
+class EditSettingButton extends ButtonDataTableModalAction implements ClientArea
 {
-    protected $id    = 'editSettingsButton';
-    protected $title = 'editSettingsButton';
+    protected $id    = 'editSettingButton';
+    protected $title = 'editSettingButton';
 
     public function initContent()
     {
-        $this->initLoadModalAction(new EditSettingsModal());
+        $this->initLoadModalAction(new EditSettingModal());
     }
 
 }

+ 3 - 3
app/UI/Client/Setting/Buttons/MassChangeStatusButton.php

@@ -4,13 +4,13 @@
  * User: ThurData
  * Date: 2019-10-11
  * Time: 11:29
- * @package ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons
+ * @package ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons
  */
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons;
 
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals\MassChangeStatusModal;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals\MassChangeStatusModal;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonMassAction;
 

+ 1 - 1
app/UI/Client/Setting/Buttons/SpanDropdownButton.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons;
 
 
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\DropdawnButtonWrappers\ButtonDropdown;

+ 3 - 3
app/UI/Client/Setting/Forms/ChangeStatusForm.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms;
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Providers\EditSettingsDataProvider;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Providers\EditSettingDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
@@ -30,7 +30,7 @@ class ChangeStatusForm extends BaseForm implements ClientArea
     public function initContent()
     {
         $this->setFormType('updateStatus');
-        $this->dataProvider = new EditSettingsDataProvider();
+        $this->dataProvider = new EditSettingDataProvider();
 
         $field = new Hidden('id');
         $this->addField($field);

+ 8 - 8
app/UI/Client/Setting/Forms/EditSettingsForm.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms;
 
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Providers\EditSettingsDataProvider;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Providers\EditSettingDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
@@ -19,20 +19,20 @@ use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
  * User: ThurData
  * Date: 18.09.19
  * Time: 09:29
- * Class EditSettingsForm
+ * Class EditSettingForm
  */
-class EditSettingsForm extends SortedFieldForm implements ClientArea
+class EditSettingForm extends SortedFieldForm implements ClientArea
 {
     use FormExtendedTrait;
 
-    protected $id    = 'editSettingsForm';
-    protected $name  = 'editSettingsForm';
-    protected $title = 'editSettingsForm';
+    protected $id    = 'editSettingForm';
+    protected $name  = 'editSettingForm';
+    protected $title = 'editSettingForm';
 
     public function initContent()
     {
         $this->setFormType(FormConstants::UPDATE);
-        $this->setProvider(new EditSettingsDataProvider());
+        $this->setProvider(new EditSettingDataProvider());
         $this->initFields();
         $this->loadDataToForm();
     }

+ 4 - 4
app/UI/Client/Setting/Forms/MassChangeStatusForm.php

@@ -4,12 +4,12 @@
  * User: ThurData
  * Date: 2019-10-11
  * Time: 12:26
- * @package ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms
+ * @package ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms
  */
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms;
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Providers\SettingsDataProvider;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Providers\SettingDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
@@ -24,7 +24,7 @@ class MassChangeStatusForm extends BaseForm implements ClientArea
     public function initContent()
     {
         $this->setFormType(FormConstants::UPDATE);
-        $this->dataProvider = new SettingsDataProvider();
+        $this->dataProvider = new SettingDataProvider();
 
         $field = new Select('status');
         $this->addField($field);

+ 3 - 3
app/UI/Client/Setting/Modals/ChangeStatusModal.php

@@ -4,12 +4,12 @@
  * User: ThurData
  * Date: 2019-10-11
  * Time: 11:29
- * @package ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals
+ * @package ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals
  */
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals;
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms\ChangeStatusForm;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms\ChangeStatusForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 

+ 8 - 8
app/UI/Client/Setting/Modals/EditSettingsModal.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals;
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms\EditSettingsForm;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms\EditSettingForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 
@@ -12,16 +12,16 @@ use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
  * User: ThurData
  * Date: 18.09.19
  * Time: 09:30
- * Class EditSettingsModal
+ * Class EditSettingModal
  */
-class EditSettingsModal extends BaseEditModal implements ClientArea
+class EditSettingModal extends BaseEditModal implements ClientArea
 {
-    protected $id    = 'editSettingsModal';
-    protected $name  = 'editSettingsModal';
-    protected $title = 'editSettingsModal';
+    protected $id    = 'editSettingModal';
+    protected $name  = 'editSettingModal';
+    protected $title = 'editSettingModal';
 
     public function initContent()
     {
-        $this->addForm(new EditSettingsForm());
+        $this->addForm(new EditSettingForm());
     }
 }

+ 3 - 3
app/UI/Client/Setting/Modals/MassChangeStatusModal.php

@@ -4,12 +4,12 @@
  * User: ThurData
  * Date: 2019-10-11
  * Time: 11:30
- * @package ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals
+ * @package ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals
  */
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals;
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms\MassChangeStatusForm;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms\MassChangeStatusForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 

+ 9 - 9
app/UI/Client/Setting/Modals/MassDeleteSettingsModal.php

@@ -1,30 +1,30 @@
 <?php
 /**
- * Class MassDeleteSettingsModal
+ * Class MassDeleteSettingModal
  * User: ThurData
  * Date: 2019-10-11
  * Time: 11:29
- * @package ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals
+ * @package ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals
  */
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Modals;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Modals;
 
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Forms\MassDeleteSettingsForm;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Forms\MassDeleteSettingForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;
 
-class MassDeleteSettingsModal extends BaseModal implements ClientArea
+class MassDeleteSettingModal extends BaseModal implements ClientArea
 {
 
-    protected $id    = 'massDeleteSettingsModal';
-    protected $name  = 'massDeleteSettingsModal';
-    protected $title = 'massDeleteSettingsModal';
+    protected $id    = 'massDeleteSettingModal';
+    protected $name  = 'massDeleteSettingModal';
+    protected $title = 'massDeleteSettingModal';
 
     public function initContent()
     {
         $this->setSubmitButtonClassesDanger();
         $this->setModalTitleTypeDanger();
-        $this->addForm(new MassDeleteSettingsForm());
+        $this->addForm(new MassDeleteSettingForm());
     }
 
 }

+ 17 - 17
app/UI/Client/Setting/Pages/Settings.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Pages;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Pages;
 
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Fields\EnabledField;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons\AddSettingsButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons\ChangeStatusButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons\DeleteSettingsButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons\EditSettingsButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons\MassChangeStatusButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons\MassDeleteSettingsButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Settings\Buttons\SpanDropdownButton;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons\AddSettingButton;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons\ChangeStatusButton;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons\DeleteSettingButton;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons\EditSettingButton;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons\MassChangeStatusButton;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons\MassDeleteSettingButton;
+use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Buttons\SpanDropdownButton;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\Column;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataProviders\DataProvider;
@@ -24,7 +24,7 @@ use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
  * User: ThurData
  * Date: 10.09.19
  * Time: 10:51
- * Class Settings
+ * Class Setting
  */
 class Settings extends DataTable implements ClientArea
 {
@@ -38,8 +38,8 @@ class Settings extends DataTable implements ClientArea
         'default'       => 'default'
     ];
 
-    protected $id    = 'settings';
-    protected $name  = 'settings';
+    protected $id    = 'Setting';
+    protected $name  = 'Setting';
     protected $title = null;
 
     /**
@@ -108,13 +108,13 @@ class Settings extends DataTable implements ClientArea
     public function initContent()
     {
         $this->addMassActionButton(new MassChangeStatusButton());
-        $this->addMassActionButton(new MassDeleteSettingsButton());
+        $this->addMassActionButton(new MassDeleteSettingButton());
 
-        $this->addButton(new AddSettingsButton());
+        $this->addButton(new AddSettingButton());
 
 
-        $this->addActionButton(new EditSettingsButton());
-        $this->addActionButton(new DeleteSettingsButton());
+        $this->addActionButton(new EditSettingButton());
+        $this->addActionButton(new DeleteSettingButton());
 
         $actions = new SpanDropdownButton('actions');
         $actions->addButton(new ChangeStatusButton());
@@ -150,7 +150,7 @@ class Settings extends DataTable implements ClientArea
             "isEnabled",
             "manager");
         try {
-            $settings = $api->getResources($fields, $domainID);
+            $Setting = $api->getResources($fields, $domainID);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -167,7 +167,7 @@ class Settings extends DataTable implements ClientArea
          * format model to array
          */
         $data = [];
-        foreach ($settings as $setting)
+        foreach ($Setting as $setting)
         {
             $settingArray = [
                 'id'           => $setting['id'],

+ 3 - 3
app/UI/Client/Setting/Providers/EditSettingsDataProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Providers;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Providers;
 
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
@@ -14,9 +14,9 @@ use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
  * User: ThurData
  * Date: 18.09.19
  * Time: 09:35
- * Class EditSettingsDataProvider
+ * Class EditSettingDataProvider
  */
-class EditSettingsDataProvider extends BaseDataProvider
+class EditSettingDataProvider extends BaseDataProvider
 {
 
     /**

+ 4 - 4
app/UI/Client/Setting/Providers/SettingsDataProvider.php

@@ -1,5 +1,5 @@
 <?php
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Providers;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Providers;
 
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
@@ -13,9 +13,9 @@ use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
  * User: ThurData
  * Date: 10.09.19
  * Time: 13:06
- * Class SettingsDataProvider
+ * Class SettingDataProvider
  */
-class SettingsDataProvider extends BaseDataProvider
+class SettingDataProvider extends BaseDataProvider
 {
 
     public function read()
@@ -166,6 +166,6 @@ class SettingsDataProvider extends BaseDataProvider
         /**
          * return success
          */
-        return (new HtmlDataJsonResponse())->setMessageAndTranslate('massSettingsStatusHasBeenUpdated')->setStatusSuccess();
+        return (new HtmlDataJsonResponse())->setMessageAndTranslate('massSettingStatusHasBeenUpdated')->setStatusSuccess();
     }
 }

+ 1 - 1
app/UI/Client/Setting/Sections/AdditionalSection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Sections;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Sections;
 
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;

+ 1 - 1
app/UI/Client/Setting/Sections/EditAdditionalSection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Sections;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Sections;
 
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;

+ 1 - 1
app/UI/Client/Setting/Sections/EditGeneralSection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Sections;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Sections;
 
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;

+ 1 - 1
app/UI/Client/Setting/Sections/GeneralSection.php

@@ -1,5 +1,5 @@
 <?php
-namespace ThurData\Servers\KerioEmail\App\UI\Client\Settings\Sections;
+namespace ThurData\Servers\KerioEmail\App\UI\Client\Setting\Sections;
 
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;