[WIP] added descriptions for new tables fields. code refactoring

pixelant · Aug 20, 2018 · 186acab · 186acab
1 parent 529d16d
commit 186acab
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 10 deletions.
diff --git a/Classes/Backend/FormDataProvider/OrderEditFormInitialize.php b/Classes/Backend/FormDataProvider/OrderEditFormInitialize.php
@@ -4,6 +4,7 @@
 namespace Pixelant\PxaProductManager\Backend\FormDataProvider;
 
 use Pixelant\PxaProductManager\Domain\Model\Order;
+use Pixelant\PxaProductManager\Domain\Model\OrderFormField;
 use Pixelant\PxaProductManager\Utility\MainUtility;
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
 use TYPO3\CMS\Core\Utility\StringUtility;
@@ -40,7 +41,7 @@ public function addData(array $result): array
         foreach ($orderFields as $fieldName => $fieldConfiguration) {
             // Add TCA
             switch ($fieldConfiguration['type']) {
-                case Order::ORDERFIELD_TEXTAREA:
+                case OrderFormField::FIELD_TEXTAREA:
                     $result['processedTca']['columns'][$fieldName] = [
                         'label' => MainUtility::snakeCasePhraseToWords($fieldName),
                         'config' => [

diff --git a/Classes/Controller/ProductController.php b/Classes/Controller/ProductController.php
@@ -16,8 +16,6 @@
 use Pixelant\PxaProductManager\Validation\ValidatorResolver;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Extbase\Domain\Model\FrontendUser;
-use TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository;
 use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
@@ -594,7 +592,7 @@ protected function createAndSaveOrder(OrderConfiguration $orderConfiguration, ar
         /** @var OrderFormField $formField */
         foreach ($orderConfiguration->getFormFields() as $formField) {
             $orderFields[$formField->getUid()] = [
-                'value' => $formField->getValue(),
+                'value' => $formField->getValueAsText(),
                 'type' => $formField->getType()
             ];
         }

diff --git a/Classes/Domain/Model/Order.php b/Classes/Domain/Model/Order.php
@@ -36,10 +36,6 @@
  */
 class Order extends AbstractDomainObject
 {
-
-    const ORDERFIELD_INPUT = 'input';
-    const ORDERFIELD_TEXTAREA = 'textarea';
-
     /**
      * @var bool
      */

diff --git a/Classes/Domain/Model/OrderFormField.php b/Classes/Domain/Model/OrderFormField.php
@@ -158,6 +158,28 @@ public function getValue(): string
         return $this->value;
     }
 
+    /**
+     * @return string
+     */
+    public function getValueAsText(): string
+    {
+        switch ($this->value) {
+            case self::FIELD_SELECTBOX:
+                $optionUid = (int)$this->value;
+                /** @var Option $option */
+                foreach ($this->getOptions() as $option) {
+                    if ($option->getUid() === $optionUid) {
+                        return $option->getValue();
+                    }
+                }
+                break;
+            default:
+                return $this->value;
+        }
+
+        return '';
+    }
+
     /**
      * @param string $value
      */

diff --git a/Configuration/TCA/tx_pxaproductmanager_domain_model_orderformfield.php b/Configuration/TCA/tx_pxaproductmanager_domain_model_orderformfield.php
@@ -22,7 +22,7 @@
         ],
         'type' => 'type',
         'sortby' => 'sorting',
-        'hideTable' => 1,
+        'hideTable' => true,
         'searchFields' => 'name',
         'iconfile' => 'EXT:pxa_product_manager/Resources/Public/Icons/Svg/form-field.svg'
     ],

diff --git a/...s/Private/Language/locallang_csh_tx_pxaproductmanager_domain_model_orderconfiguration.xlf b/...s/Private/Language/locallang_csh_tx_pxaproductmanager_domain_model_orderconfiguration.xlf
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2018-08-20T15:29:57Z"
+		  product-name="pxa_product_manager">
+		<header/>
+		<body>
+			<trans-unit id="name.description">
+				<source>Name of configuration.</source>
+			</trans-unit>
+			<trans-unit id="enabled_email_to_user.description">
+				<source>Send email to user. One of the inputs must be marked as user email.</source>
+			</trans-unit>
+			<trans-unit id="enabled_replace_with_fe_user_fields.description">
+				<source>Autofill form fields with Frontend user fields values. Name of form field must much FE user DB field name as camel case.</source>
+			</trans-unit>
+			<trans-unit id="admin_emails.description">
+			    <source>List of admin emails</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/...urces/Private/Language/locallang_csh_tx_pxaproductmanager_domain_model_orderformfield.xlf b/...urces/Private/Language/locallang_csh_tx_pxaproductmanager_domain_model_orderformfield.xlf
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2018-08-20T15:29:57Z"
+		  product-name="pxa_product_manager">
+		<header/>
+		<body>
+			<trans-unit id="name.description">
+				<source>Name of field. Should be same as FE user field in order to replace it automatically.</source>
+			</trans-unit>
+			<trans-unit id="user_email_field.description">
+			    <source>Use this field as user email address.</source>
+			</trans-unit>
+			<trans-unit id="label.description">
+				<source>Field label.</source>
+			</trans-unit>
+			<trans-unit id="placeholder.description">
+				<source>Field placeholder.</source>
+			</trans-unit>
+			<trans-unit id="validation_rules.description">
+				<source>Select validations for field.</source>
+			</trans-unit>
+			<trans-unit id="type.description">
+			    <source>Type of form field.</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/ext_tables.php b/ext_tables.php
@@ -18,7 +18,9 @@ function ($_EXTKEY) {
             'tx_pxaproductmanager_domain_model_option',
             'tx_pxaproductmanager_domain_model_link',
             'tx_pxaproductmanager_domain_model_filter',
-            'tx_pxaproductmanager_domain_model_order'
+            'tx_pxaproductmanager_domain_model_order',
+            'tx_pxaproductmanager_domain_model_orderconfiguration',
+            'tx_pxaproductmanager_domain_model_orderformfield'
         ];
 
         // @codingStandardsIgnoreStart