From 55e0594eb40917fd861e96e1de54fc2855d90cf4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 25 Jun 2025 11:46:26 +0200 Subject: [PATCH] Fixes --- .docker/images/nginx/conf.d/default.conf | 8 +- .../PSC/CollectLayouter/Api/Preview.php | 4 +- .../PSC/CollectLayouter/Helper/MPDF.php | 17 ++- .../views/backend/index/index.html.twig | 141 ++++++++++++----- .../views/frontend/designer/collect.html.twig | 144 +++++++++++++----- .../views/frontend/designer/load.html.twig | 144 +++++++++++++----- .../frontend/designer/load_collect.html.twig | 144 +++++++++++++----- .../views/frontend/designer/start.html.twig | 144 +++++++++++++----- 8 files changed, 555 insertions(+), 191 deletions(-) diff --git a/.docker/images/nginx/conf.d/default.conf b/.docker/images/nginx/conf.d/default.conf index 2d62736b1..18217f15f 100644 --- a/.docker/images/nginx/conf.d/default.conf +++ b/.docker/images/nginx/conf.d/default.conf @@ -64,10 +64,10 @@ server { try_files $uri @sfFront; } - location /w2p/ { - proxy_pass http://tp:8080/w2p/; - proxy_temp_path /tmp/proxy; - } + #location /w2p/ { + # proxy_pass http://tp:8080/w2p/; + # proxy_temp_path /tmp/proxy; + #} location @sfFront { # Symfony if ($request_method = 'OPTIONS') { diff --git a/src/new/var/plugins/Custom/PSC/CollectLayouter/Api/Preview.php b/src/new/var/plugins/Custom/PSC/CollectLayouter/Api/Preview.php index dc330d38b..dedb07ba6 100755 --- a/src/new/var/plugins/Custom/PSC/CollectLayouter/Api/Preview.php +++ b/src/new/var/plugins/Custom/PSC/CollectLayouter/Api/Preview.php @@ -69,7 +69,9 @@ class Preview extends AbstractController $this->requestStack->getSession()->set('collectLayouterData', $this->serializer->serialize($data, 'json')); $formData = []; - /** @var Element $element */ + /** + * @var Element $element +*/ foreach ($setting->getCustomerForm() as $element) { $value = match($element->getBinding()) { ElementBinding::none => $element->getDefaultForTypePreview(), diff --git a/src/new/var/plugins/Custom/PSC/CollectLayouter/Helper/MPDF.php b/src/new/var/plugins/Custom/PSC/CollectLayouter/Helper/MPDF.php index 0391f91f9..5298c7b8b 100755 --- a/src/new/var/plugins/Custom/PSC/CollectLayouter/Helper/MPDF.php +++ b/src/new/var/plugins/Custom/PSC/CollectLayouter/Helper/MPDF.php @@ -27,12 +27,15 @@ class MPDF private function init(): void { - $config = array_merge([ + $config = array_merge( + [ 'mode' => 'utf-8', 'format' => [$this->setting->getSheetWidth(), $this->setting->getSheetHeight()], 'img_dpi' => 300, 'tempDir' => sys_get_temp_dir() - ], $this->buildFontArray()); + ], + $this->buildFontArray() + ); $this->mpdf = new \Mpdf\Mpdf($config); $this->mpdf->PDFX = $this->setting->isPdfx(); @@ -47,9 +50,12 @@ class MPDF public function clearTempFiles(): void { unlink($this->pdfFile); - array_walk($this->previewFiles, function ($file) { - unlink($file); - }); + array_walk( + $this->previewFiles, + function ($file) { + unlink($file); + } + ); $this->previewFiles = []; $this->pdfFile = ""; } @@ -133,7 +139,6 @@ EOD; $this->mpdf->WriteHTML($this->buildPageCss($this->setting), \Mpdf\HTMLParserMode::HEADER_CSS); $twig = $this->twig->createTemplate($this->setting->getHtml()); - $html = $twig->render(['form' => $this->data, 'print' => $print]); $this->mpdf->WriteHTML($html, \Mpdf\HTMLParserMode::HTML_BODY); $this->mpdf->Output($this->pdfFile); diff --git a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/backend/index/index.html.twig b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/backend/index/index.html.twig index 352bdf85e..d470e788f 100755 --- a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/backend/index/index.html.twig +++ b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/backend/index/index.html.twig @@ -459,51 +459,120 @@ var $obj = []; if(!element.phone.displayAreaCode) { - $obj = $.merge($obj, $('', { - type: 'text', - class: 'form-control form-control-sm', - value: element.default1, - id: element.id, - required: element.required, - disabled: element.phone.fixAreaCode, - name: 'data[' + element.id + '][value][areacode]' - })); + if(element.phone.fixAreaCode) { + $obj = $.merge($obj, $.merge($('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default1, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode_display]' + }), $('', { + type: 'hidden', + value: element.default1, + id: element.id, + name: 'data[' + element.id + '][value][areacode]' + }))); + }else{ + $obj = $.merge($obj, $('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default1, + id: element.id, + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode]' + })); + } } if(!element.phone.displayPrefix) { - $obj = $.merge($obj, $('', { - type: 'text', - class: 'form-control form-control-sm', - value: element.default2, - id: element.id, - required: element.required, - disabled: element.phone.fixPrefix, - name: 'data[' + element.id + '][value][prefix]' - })); + if(element.phone.fixPrefix) { + $obj = $.merge($obj, $.merge($('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default2, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix_display]' + }), $('', { + type: 'hidden', + value: element.default2, + id: element.id, + name: 'data[' + element.id + '][value][prefix]' + }))); + }else{ + $obj = $.merge($obj, $('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default2, + id: element.id, + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix]' + })) + } } if(!element.phone.displayNumber) { - $obj = $.merge($obj, $('', { - type: 'text', - class: 'form-control form-control-sm', - value: element.default3, - id: element.id, - required: element.required, - disabled: element.phone.fixNumber, - name: 'data[' + element.id + '][value][number]' - })); + if(element.phone.fixNumber) { + $obj = $.merge($obj, $.merge($('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default3, + id: element.id, + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number]' + }), $('', { + type: 'hidden', + value: element.default3, + id: element.id, + name: 'data[' + element.id + '][value][number]' + }))); + + }else{ + $obj = $.merge($obj, $('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default3, + id: element.id, + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number]' + })); + } } if(!element.phone.displayAppendix) { - $obj = $.merge($obj, $('', { - type: 'text', - class: 'form-control form-control-sm', - value: element.default4, - id: element.id, - required: element.required, - disabled: element.phone.fixAppendix, - name: 'data[' + element.id + '][value][appendix]' - })); + if(element.phone.fixAppendix) { + $obj = $.merge($obj, $.merge($('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default4, + id: element.id, + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + }), $('', { + type: 'hidden', + value: element.default4, + id: element.id, + name: 'data[' + element.id + '][value][appendix]' + }))); + }else{ + $obj = $.merge($obj, $('', { + type: 'text', + class: 'form-control form-control-sm', + value: element.default4, + id: element.id, + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + } } } diff --git a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/collect.html.twig b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/collect.html.twig index be964e716..ac726270a 100755 --- a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/collect.html.twig +++ b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/collect.html.twig @@ -276,51 +276,123 @@ } if(!element.phone.displayAreaCode) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default1, - id: element.id, - required: element.required, - disabled: element.phone.fixAreaCode, - name: 'data[' + element.id + '][value][areacode]' - })); + if(element.phone.fixAreaCode) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default1, + id: element.id, + name: 'data[' + element.id + '][value][areacode]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id, + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode]' + })); + } } if(!element.phone.displayPrefix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default2, - id: element.id, - required: element.required, - disabled: element.phone.fixPrefix, - name: 'data[' + element.id + '][value][prefix]' - })); + if(element.phone.fixPrefix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default2, + id: element.id, + name: 'data[' + element.id + '][value][prefix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id, + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix]' + })); + } } if(!element.phone.displayNumber) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default3, - id: element.id, - required: element.required, - disabled: element.phone.fixNumber, - name: 'data[' + element.id + '][value][number]' - })); + if(element.phone.fixNumber) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default3, + id: element.id, + name: 'data[' + element.id + '][value][number]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id, + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number]' + })); + } } if(!element.phone.displayAppendix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default4, - id: element.id, - required: element.required, - disabled: element.phone.fixAppendix, - name: 'data[' + element.id + '][value][appendix]' - })); + if(element.phone.fixAppendix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default4, + id: element.id, + name: 'data[' + element.id + '][value][appendix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id, + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + } } } if(element.type == 4) { diff --git a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load.html.twig b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load.html.twig index a3235c15d..1bf5e3fd0 100755 --- a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load.html.twig +++ b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load.html.twig @@ -225,51 +225,123 @@ } if(!element.phone.displayAreaCode) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default1, - id: element.id, - required: element.required, - disabled: element.phone.fixAreaCode, - name: 'data[' + element.id + '][value][areacode]' - })); + if(element.phone.fixAreaCode) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default1, + id: element.id, + name: 'data[' + element.id + '][value][areacode]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id, + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode]' + })); + } } if(!element.phone.displayPrefix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default2, - id: element.id, - required: element.required, - disabled: element.phone.fixPrefix, - name: 'data[' + element.id + '][value][prefix]' - })); + if(element.phone.fixPrefix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default2, + id: element.id, + name: 'data[' + element.id + '][value][prefix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id, + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix]' + })); + } } if(!element.phone.displayNumber) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default3, - id: element.id, - required: element.required, - disabled: element.phone.fixNumber, - name: 'data[' + element.id + '][value][number]' - })); + if(element.phone.fixNumber) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default3, + id: element.id, + name: 'data[' + element.id + '][value][number]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id, + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number]' + })); + } } if(!element.phone.displayAppendix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default4, - id: element.id, - required: element.required, - disabled: element.phone.fixAppendix, - name: 'data[' + element.id + '][value][appendix]' - })); + if(element.phone.fixAppendix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default4, + id: element.id, + name: 'data[' + element.id + '][value][appendix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id, + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + } } } if(element.type == 4) { diff --git a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load_collect.html.twig b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load_collect.html.twig index 723be277a..afb598107 100644 --- a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load_collect.html.twig +++ b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load_collect.html.twig @@ -226,51 +226,123 @@ } if(!element.phone.displayAreaCode) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default1, - id: element.id, - required: element.required, - disabled: element.phone.fixAreaCode, - name: 'data[' + element.id + '][value][areacode]' - })); + if(element.phone.fixAreaCode) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default1, + id: element.id, + name: 'data[' + element.id + '][value][areacode]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id, + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode]' + })); + } } if(!element.phone.displayPrefix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default2, - id: element.id, - required: element.required, - disabled: element.phone.fixPrefix, - name: 'data[' + element.id + '][value][prefix]' - })); + if(element.phone.fixPrefix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default2, + id: element.id, + name: 'data[' + element.id + '][value][prefix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id, + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix]' + })); + } } if(!element.phone.displayNumber) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default3, - id: element.id, - required: element.required, - disabled: element.phone.fixNumber, - name: 'data[' + element.id + '][value][number]' - })); + if(element.phone.fixNumber) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default3, + id: element.id, + name: 'data[' + element.id + '][value][number]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id, + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number]' + })); + } } if(!element.phone.displayAppendix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default4, - id: element.id, - required: element.required, - disabled: element.phone.fixAppendix, - name: 'data[' + element.id + '][value][appendix]' - })); + if(element.phone.fixAppendix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default4, + id: element.id, + name: 'data[' + element.id + '][value][appendix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id, + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + } } } if(element.type == 4) { diff --git a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/start.html.twig b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/start.html.twig index f87d35b56..1faac1b1d 100755 --- a/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/start.html.twig +++ b/src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/start.html.twig @@ -229,51 +229,123 @@ } if(!element.phone.displayAreaCode) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default1, - id: element.id, - required: element.required, - disabled: element.phone.fixAreaCode, - name: 'data[' + element.id + '][value][areacode]' - })); + if(element.phone.fixAreaCode) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default1, + id: element.id, + name: 'data[' + element.id + '][value][areacode]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default1, + id: element.id, + required: element.required, + disabled: element.phone.fixAreaCode, + name: 'data[' + element.id + '][value][areacode]' + })); + } } if(!element.phone.displayPrefix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default2, - id: element.id, - required: element.required, - disabled: element.phone.fixPrefix, - name: 'data[' + element.id + '][value][prefix]' - })); + if(element.phone.fixPrefix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default2, + id: element.id, + name: 'data[' + element.id + '][value][prefix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default2, + id: element.id, + required: element.required, + disabled: element.phone.fixPrefix, + name: 'data[' + element.id + '][value][prefix]' + })); + } } if(!element.phone.displayNumber) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default3, - id: element.id, - required: element.required, - disabled: element.phone.fixNumber, - name: 'data[' + element.id + '][value][number]' - })); + if(element.phone.fixNumber) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number_display]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default3, + id: element.id, + name: 'data[' + element.id + '][value][number]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default3, + id: element.id, + required: element.required, + disabled: element.phone.fixNumber, + name: 'data[' + element.id + '][value][number]' + })); + } } if(!element.phone.displayAppendix) { - $obj.append($('', { - type: 'text', - class: 'bg-gray-100 p-1 border w-full', - value: element.default4, - id: element.id, - required: element.required, - disabled: element.phone.fixAppendix, - name: 'data[' + element.id + '][value][appendix]' - })); + if(element.phone.fixAppendix) { + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id + '_display', + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + $obj.append($('', { + type: 'hidden', + value: element.default4, + id: element.id, + name: 'data[' + element.id + '][value][appendix]' + })); + }else{ + $obj.append($('', { + type: 'text', + class: 'bg-gray-100 p-1 border w-full', + value: element.default4, + id: element.id, + required: element.required, + disabled: element.phone.fixAppendix, + name: 'data[' + element.id + '][value][appendix]' + })); + } } } if(element.type == 4) {