boonkerz/printshopcreator
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Fixes
All checks were successful
Gitea Actions / Run-Tests-On-Arm64 (push) Successful in 30m21s
Details
Gitea Actions / Run-Tests-On-Amd64 (push) Successful in 49m13s
Details
Gitea Actions / Merge (push) Successful in 2m12s
Details

Browse Source
This commit is contained in:
Thomas 2025-06-25 11:46:26 +02:00
parent a5ef283d39
commit 55e0594eb4
8 changed files with 555 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.docker/images/nginx/conf.d/default.conf
View File

@ -64,10 +64,10 @@ server {
try_files $uri @sfFront; try_files $uri @sfFront;
} }
location /w2p/ { #location /w2p/ {
proxy_pass http://tp:8080/w2p/; # proxy_pass http://tp:8080/w2p/;
proxy_temp_path /tmp/proxy; # proxy_temp_path /tmp/proxy;
} #}
location @sfFront { # Symfony location @sfFront { # Symfony
if ($request_method = 'OPTIONS') { if ($request_method = 'OPTIONS') {

4
src/new/var/plugins/Custom/PSC/CollectLayouter/Api/Preview.php
View File

@ -69,7 +69,9 @@ class Preview extends AbstractController
$this->requestStack->getSession()->set('collectLayouterData', $this->serializer->serialize($data, 'json')); $this->requestStack->getSession()->set('collectLayouterData', $this->serializer->serialize($data, 'json'));
$formData = []; $formData = [];
/** @var Element $element */ /**
* @var Element $element
*/
foreach ($setting->getCustomerForm() as $element) { foreach ($setting->getCustomerForm() as $element) {
$value = match($element->getBinding()) { $value = match($element->getBinding()) {
ElementBinding::none => $element->getDefaultForTypePreview(), ElementBinding::none => $element->getDefaultForTypePreview(),

15
src/new/var/plugins/Custom/PSC/CollectLayouter/Helper/MPDF.php
View File

@ -27,12 +27,15 @@ class MPDF
private function init(): void private function init(): void
{ {
$config = array_merge([ $config = array_merge(
[
'mode' => 'utf-8', 'mode' => 'utf-8',
'format' => [$this->setting->getSheetWidth(), $this->setting->getSheetHeight()], 'format' => [$this->setting->getSheetWidth(), $this->setting->getSheetHeight()],
'img_dpi' => 300, 'img_dpi' => 300,
'tempDir' => sys_get_temp_dir() 'tempDir' => sys_get_temp_dir()
], $this->buildFontArray()); ],
$this->buildFontArray()
);
$this->mpdf = new \Mpdf\Mpdf($config); $this->mpdf = new \Mpdf\Mpdf($config);
$this->mpdf->PDFX = $this->setting->isPdfx(); $this->mpdf->PDFX = $this->setting->isPdfx();
@ -47,9 +50,12 @@ class MPDF
public function clearTempFiles(): void public function clearTempFiles(): void
{ {
unlink($this->pdfFile); unlink($this->pdfFile);
array_walk($this->previewFiles, function ($file) { array_walk(
$this->previewFiles,
function ($file) {
unlink($file); unlink($file);
}); }
);
$this->previewFiles = []; $this->previewFiles = [];
$this->pdfFile = ""; $this->pdfFile = "";
} }
@ -133,7 +139,6 @@ EOD;
$this->mpdf->WriteHTML($this->buildPageCss($this->setting), \Mpdf\HTMLParserMode::HEADER_CSS); $this->mpdf->WriteHTML($this->buildPageCss($this->setting), \Mpdf\HTMLParserMode::HEADER_CSS);
$twig = $this->twig->createTemplate($this->setting->getHtml()); $twig = $this->twig->createTemplate($this->setting->getHtml());
$html = $twig->render(['form' => $this->data, 'print' => $print]); $html = $twig->render(['form' => $this->data, 'print' => $print]);
$this->mpdf->WriteHTML($html, \Mpdf\HTMLParserMode::HTML_BODY); $this->mpdf->WriteHTML($html, \Mpdf\HTMLParserMode::HTML_BODY);
$this->mpdf->Output($this->pdfFile); $this->mpdf->Output($this->pdfFile);

71
src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/backend/index/index.html.twig
View File

@ -459,6 +459,22 @@
var $obj = []; var $obj = [];
if(!element.phone.displayAreaCode) { if(!element.phone.displayAreaCode) {
if(element.phone.fixAreaCode) {
$obj = $.merge($obj, $.merge($('<input>', {
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]'
}), $('<input>', {
type: 'hidden',
value: element.default1,
id: element.id,
name: 'data[' + element.id + '][value][areacode]'
})));
}else{
$obj = $.merge($obj, $('<input>', { $obj = $.merge($obj, $('<input>', {
type: 'text', type: 'text',
class: 'form-control form-control-sm', class: 'form-control form-control-sm',
@ -469,8 +485,25 @@
name: 'data[' + element.id + '][value][areacode]' name: 'data[' + element.id + '][value][areacode]'
})); }));
} }
}
if(!element.phone.displayPrefix) { if(!element.phone.displayPrefix) {
if(element.phone.fixPrefix) {
$obj = $.merge($obj, $.merge($('<input>', {
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]'
}), $('<input>', {
type: 'hidden',
value: element.default2,
id: element.id,
name: 'data[' + element.id + '][value][prefix]'
})));
}else{
$obj = $.merge($obj, $('<input>', { $obj = $.merge($obj, $('<input>', {
type: 'text', type: 'text',
class: 'form-control form-control-sm', class: 'form-control form-control-sm',
@ -479,10 +512,28 @@
required: element.required, required: element.required,
disabled: element.phone.fixPrefix, disabled: element.phone.fixPrefix,
name: 'data[' + element.id + '][value][prefix]' name: 'data[' + element.id + '][value][prefix]'
})); }))
}
} }
if(!element.phone.displayNumber) { if(!element.phone.displayNumber) {
if(element.phone.fixNumber) {
$obj = $.merge($obj, $.merge($('<input>', {
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]'
}), $('<input>', {
type: 'hidden',
value: element.default3,
id: element.id,
name: 'data[' + element.id + '][value][number]'
})));
}else{
$obj = $.merge($obj, $('<input>', { $obj = $.merge($obj, $('<input>', {
type: 'text', type: 'text',
class: 'form-control form-control-sm', class: 'form-control form-control-sm',
@ -493,8 +544,25 @@
name: 'data[' + element.id + '][value][number]' name: 'data[' + element.id + '][value][number]'
})); }));
} }
}
if(!element.phone.displayAppendix) { if(!element.phone.displayAppendix) {
if(element.phone.fixAppendix) {
$obj = $.merge($obj, $.merge($('<input>', {
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]'
}), $('<input>', {
type: 'hidden',
value: element.default4,
id: element.id,
name: 'data[' + element.id + '][value][appendix]'
})));
}else{
$obj = $.merge($obj, $('<input>', { $obj = $.merge($obj, $('<input>', {
type: 'text', type: 'text',
class: 'form-control form-control-sm', class: 'form-control form-control-sm',
@ -506,6 +574,7 @@
})); }));
} }
} }
}
if(element.type == 4) { if(element.type == 4) {

72
src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/collect.html.twig
View File

@ -276,6 +276,23 @@
} }
if(!element.phone.displayAreaCode) { if(!element.phone.displayAreaCode) {
if(element.phone.fixAreaCode) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default1,
id: element.id,
name: 'data[' + element.id + '][value][areacode]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -286,8 +303,26 @@
name: 'data[' + element.id + '][value][areacode]' name: 'data[' + element.id + '][value][areacode]'
})); }));
} }
}
if(!element.phone.displayPrefix) { if(!element.phone.displayPrefix) {
if(element.phone.fixPrefix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default2,
id: element.id,
name: 'data[' + element.id + '][value][prefix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -298,8 +333,26 @@
name: 'data[' + element.id + '][value][prefix]' name: 'data[' + element.id + '][value][prefix]'
})); }));
} }
}
if(!element.phone.displayNumber) { if(!element.phone.displayNumber) {
if(element.phone.fixNumber) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default3,
id: element.id,
name: 'data[' + element.id + '][value][number]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -310,8 +363,26 @@
name: 'data[' + element.id + '][value][number]' name: 'data[' + element.id + '][value][number]'
})); }));
} }
}
if(!element.phone.displayAppendix) { if(!element.phone.displayAppendix) {
if(element.phone.fixAppendix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default4,
id: element.id,
name: 'data[' + element.id + '][value][appendix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -323,6 +394,7 @@
})); }));
} }
} }
}
if(element.type == 4) { if(element.type == 4) {
var $uploadFieldData = $('<input>', { var $uploadFieldData = $('<input>', {

72
src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load.html.twig
View File

@ -225,6 +225,23 @@
} }
if(!element.phone.displayAreaCode) { if(!element.phone.displayAreaCode) {
if(element.phone.fixAreaCode) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default1,
id: element.id,
name: 'data[' + element.id + '][value][areacode]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -235,8 +252,26 @@
name: 'data[' + element.id + '][value][areacode]' name: 'data[' + element.id + '][value][areacode]'
})); }));
} }
}
if(!element.phone.displayPrefix) { if(!element.phone.displayPrefix) {
if(element.phone.fixPrefix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default2,
id: element.id,
name: 'data[' + element.id + '][value][prefix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -247,8 +282,26 @@
name: 'data[' + element.id + '][value][prefix]' name: 'data[' + element.id + '][value][prefix]'
})); }));
} }
}
if(!element.phone.displayNumber) { if(!element.phone.displayNumber) {
if(element.phone.fixNumber) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default3,
id: element.id,
name: 'data[' + element.id + '][value][number]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -259,8 +312,26 @@
name: 'data[' + element.id + '][value][number]' name: 'data[' + element.id + '][value][number]'
})); }));
} }
}
if(!element.phone.displayAppendix) { if(!element.phone.displayAppendix) {
if(element.phone.fixAppendix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default4,
id: element.id,
name: 'data[' + element.id + '][value][appendix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -272,6 +343,7 @@
})); }));
} }
} }
}
if(element.type == 4) { if(element.type == 4) {
var $uploadFieldData = $('<input>', { var $uploadFieldData = $('<input>', {

72
src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load_collect.html.twig
View File

@ -226,6 +226,23 @@
} }
if(!element.phone.displayAreaCode) { if(!element.phone.displayAreaCode) {
if(element.phone.fixAreaCode) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default1,
id: element.id,
name: 'data[' + element.id + '][value][areacode]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -236,8 +253,26 @@
name: 'data[' + element.id + '][value][areacode]' name: 'data[' + element.id + '][value][areacode]'
})); }));
} }
}
if(!element.phone.displayPrefix) { if(!element.phone.displayPrefix) {
if(element.phone.fixPrefix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default2,
id: element.id,
name: 'data[' + element.id + '][value][prefix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -248,8 +283,26 @@
name: 'data[' + element.id + '][value][prefix]' name: 'data[' + element.id + '][value][prefix]'
})); }));
} }
}
if(!element.phone.displayNumber) { if(!element.phone.displayNumber) {
if(element.phone.fixNumber) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default3,
id: element.id,
name: 'data[' + element.id + '][value][number]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -260,8 +313,26 @@
name: 'data[' + element.id + '][value][number]' name: 'data[' + element.id + '][value][number]'
})); }));
} }
}
if(!element.phone.displayAppendix) { if(!element.phone.displayAppendix) {
if(element.phone.fixAppendix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default4,
id: element.id,
name: 'data[' + element.id + '][value][appendix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -273,6 +344,7 @@
})); }));
} }
} }
}
if(element.type == 4) { if(element.type == 4) {
var $uploadFieldData = $('<input>', { var $uploadFieldData = $('<input>', {

72
src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/start.html.twig
View File

@ -229,6 +229,23 @@
} }
if(!element.phone.displayAreaCode) { if(!element.phone.displayAreaCode) {
if(element.phone.fixAreaCode) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default1,
id: element.id,
name: 'data[' + element.id + '][value][areacode]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -239,8 +256,26 @@
name: 'data[' + element.id + '][value][areacode]' name: 'data[' + element.id + '][value][areacode]'
})); }));
} }
}
if(!element.phone.displayPrefix) { if(!element.phone.displayPrefix) {
if(element.phone.fixPrefix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default2,
id: element.id,
name: 'data[' + element.id + '][value][prefix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -251,8 +286,26 @@
name: 'data[' + element.id + '][value][prefix]' name: 'data[' + element.id + '][value][prefix]'
})); }));
} }
}
if(!element.phone.displayNumber) { if(!element.phone.displayNumber) {
if(element.phone.fixNumber) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default3,
id: element.id,
name: 'data[' + element.id + '][value][number]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -263,8 +316,26 @@
name: 'data[' + element.id + '][value][number]' name: 'data[' + element.id + '][value][number]'
})); }));
} }
}
if(!element.phone.displayAppendix) { if(!element.phone.displayAppendix) {
if(element.phone.fixAppendix) {
$obj.append($('<input>', {
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($('<input>', {
type: 'hidden',
value: element.default4,
id: element.id,
name: 'data[' + element.id + '][value][appendix]'
}));
}else{
$obj.append($('<input>', { $obj.append($('<input>', {
type: 'text', type: 'text',
class: 'bg-gray-100 p-1 border w-full', class: 'bg-gray-100 p-1 border w-full',
@ -276,6 +347,7 @@
})); }));
} }
} }
}
if(element.type == 4) { if(element.type == 4) {
var $uploadFieldData = $('<input>', { var $uploadFieldData = $('<input>', {