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;
}
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') {

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'));
$formData = [];
/** @var Element $element */
/**
* @var Element $element
*/
foreach ($setting->getCustomerForm() as $element) {
$value = match($element->getBinding()) {
ElementBinding::none => $element->getDefaultForTypePreview(),

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

@ -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);

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

@ -459,51 +459,120 @@
var $obj = [];
if(!element.phone.displayAreaCode) {
$obj = $.merge($obj, $('<input>', {
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($('<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>', {
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, $('<input>', {
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($('<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>', {
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, $('<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]'
}));
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>', {
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, $('<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]'
}));
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>', {
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]'
}));
}
}
}

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

@ -276,51 +276,123 @@
}
if(!element.phone.displayAreaCode) {
$obj.append($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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) {

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

@ -225,51 +225,123 @@
}
if(!element.phone.displayAreaCode) {
$obj.append($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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) {

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

@ -226,51 +226,123 @@
}
if(!element.phone.displayAreaCode) {
$obj.append($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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) {

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

@ -229,51 +229,123 @@
}
if(!element.phone.displayAreaCode) {
$obj.append($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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($('<input>', {
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($('<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>', {
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) {