add internationalization choice

Author: leanormandon

Config/TheliaMain.sql

@@ -27,6 +27,7 @@ CREATE TABLE `custom_field`
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `code` VARCHAR(100) NOT NULL,
     `title` VARCHAR(255) NOT NULL,
+    `is_international` TINYINT(1) DEFAULT 1 NOT NULL,
     `type` TINYINT DEFAULT 0 NOT NULL,
     `custom_field_parent_id` INTEGER,
     PRIMARY KEY (`id`),

Config/module.xml

@@ -21,7 +21,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <authors>
         <author>
             <name>Openstudio</name>

Config/schema.xml

@@ -38,6 +38,7 @@
         <column name="id"    type="INTEGER" required="true" primaryKey="true" autoIncrement="true"/>
         <column name="code"  type="VARCHAR" size="100"  required="true"/>
         <column name="title" type="VARCHAR" size="255"  required="true"/>
+        <column name="is_international" type="BOOLEAN" required="true" default="true"/>
         <column name="type"  type="ENUM"    valueSet="text,textarea, wysiwyg, content, category, folder, product, image" required="true" default="text"/>
         <column name="custom_field_parent_id" type="INTEGER" required="false"/>
 

Config/update/1.0.4.sql

@@ -0,0 +1,7 @@
+# This is a fix for InnoDB in MySQL >= 4.1.x
+# It "suspends judgement" for fkey relationships until are tables are set.
+SET FOREIGN_KEY_CHECKS = 0;
+
+ALTER TABLE custom_field ADD COLUMN `is_international` TINYINT(1) DEFAULT 1 NOT NULL;
+
+SET FOREIGN_KEY_CHECKS = 1;

Controller/Admin/CustomFieldController.php

@@ -75,7 +75,11 @@ public function listCustomFields(): Response
                 ->filterBySource('general')
                 ->findOne();
 
-            if ($value && in_array($customField->getType(), CustomFieldValueController::CUSTOM_FIELD_SIMPLE_VALUES)) {
+            if (
+                $value &&
+                (in_array($customField->getType(), CustomFieldValueController::CUSTOM_FIELD_SIMPLE_VALUES)
+                || !$customField->getIsInternational())
+            ) {
                 $generalValues[$customField->getId()] = $value->getSimpleValue() ?? '';
                 $generalValueIds[$customField->getId()] = $value->getId();
             } elseif ($value) {
@@ -112,7 +116,9 @@ public function createCustomField(): Response
         // Get all parents for the dropdown
         $parents = CustomFieldParentQuery::create()->find();
 
-        $form = $this->createForm(CustomFieldForm::getName());
+        $form = $this->createForm(CustomFieldForm::getName(), FormType::class, [
+            'is_international' => true,
+        ]);
         $this->getParserContext()->addForm($form);
         $error = null;
 
@@ -176,6 +182,7 @@ public function updateCustomField(int $id): Response
             'title' => $customField->getTitle(),
             'code' => $customField->getCode(),
             'type' => $customField->getType(),
+            'is_international' => $customField->getIsInternational(),
             'sources' => $sourcesArray,
             'custom_field_parent_id' => $customField->getCustomFieldParentId(),
         ]);
@@ -228,6 +235,7 @@ private function handleSave(Form $validatedForm, ?CustomField $customField = nul
             ->setTitle($validatedForm->get('title')->getData())
             ->setCode($validatedForm->get('code')->getData())
             ->setType($validatedForm->get('type')->getData())
+            ->setIsInternational($validatedForm->get('is_international')->getData())
             ->setCustomFieldParentId($parentId ?: null)
             ->save();
 

Controller/Admin/CustomFieldValueController.php

@@ -131,7 +131,10 @@ public function saveCustomFieldValues(): Response
                             ->filterBySourceId($sourceId)
                             ->findOneOrCreate();
 
-                        if (in_array($customField->getType(), self::CUSTOM_FIELD_SIMPLE_VALUES)) {
+                        if (
+                            in_array($customField->getType(), self::CUSTOM_FIELD_SIMPLE_VALUES) ||
+                            !$customField->isInternational()
+                        ) {
                             $customFieldValue
                                 ->setSimpleValue($value)
                                 ->save();

Form/CustomFieldForm.php

@@ -10,6 +10,7 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Thelia\Core\Translation\Translator;
 use Thelia\Form\BaseForm;
 
@@ -84,6 +85,15 @@ protected function buildForm(): void
                     'required' => true,
                 ]
             )
+            ->add(
+                'is_international',
+                CheckboxType::class,
+                [
+                    'label' => Translator::getInstance()->trans('International', [], 'customfields'),
+                    'label_attr' => ['for' => 'custom_field_is_international'],
+                    'required' => false,
+                ]
+            )
             ->add(
                 'sources',
                 ChoiceType::class,

I18n/en_US.php

@@ -83,4 +83,6 @@
     'Select a parent group to organize this field' => 'Select a parent group to organize this field',
     'Or create new parent' => 'Or create new parent',
     'Enter a new parent group name' => 'Enter a new parent group name',
+    'International' => 'International',
+    'Check to allow translation of the field' => 'Check to allow translation of the field'
 ];

I18n/fr_FR.php

@@ -84,4 +84,6 @@
     'Select a parent group to organize this field' => 'Sélectionnez un groupe parent pour organiser ce champ',
     'Or create new parent' => 'Ou créer un nouveau parent',
     'Enter a new parent group name' => 'Entrez un nom de groupe parent',
+    'International' => 'International',
+    'Check to allow translation of the field' => 'Cochez pour permettre la traduction du champ'
 ];

Service/CustomFieldService.php

@@ -60,7 +60,10 @@ public function getCustomFieldValue(string $code, ?string $source = 'general', ?
             return null;
         }
 
-        if (in_array($customField->getType(), CustomFieldValueController::CUSTOM_FIELD_SIMPLE_VALUES)) {
+        if (
+            in_array($customField->getType(), CustomFieldValueController::CUSTOM_FIELD_SIMPLE_VALUES)
+            || !$customField->isInternational()
+        ) {
             return $customFieldValue->getSimpleValue();
         }
         if ($customField->getType() === CustomFieldTableMap::COL_TYPE_IMAGE) {