diff --git a/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php b/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php
index 5f72a8ae0..ac52f936b 100755
--- a/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php
+++ b/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php
@@ -20,13 +20,13 @@ use PSC\System\SettingsBundle\Service\Language;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
@@ -39,6 +39,7 @@ class ShopSettingsType extends AbstractType
protected $fields;
protected $formFactory;
protected Language $localeService;
+
public function __construct(Language $localeService, Field $fields, FormFactoryInterface $formFactory)
{
$this->fields = $fields;
@@ -49,103 +50,140 @@ class ShopSettingsType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('title', TextType::class, array('required' => false, 'label' => 'Title'))
+ ->add('title', TextType::class, ['required' => false, 'label' => 'Title'])
->add('uid', HiddenType::class)
- ->add('subTitle', TextType::class, array('required' => false, 'label' => 'subtitle'))
- ->add('keywords', TextareaType::class, array('required' => false, 'label' => 'Keywords'))
- ->add('description', TextareaType::class, array('required' => false, 'label' => 'description'))
- ->add('author', TextareaType::class, array('required' => false, 'label' => 'Autor'))
- ->add('copyright', TextareaType::class, array('required' => false, 'label' => 'Copyright'))
- ->add('logo1', MediaType::class, array('label' => 'Logo (Topbanner)'))
- ->add('sitemap', MediaType::class, array('label' => 'Sitemap'))
- ->add('robots', MediaType::class, array('label' => 'robots'))
- ->add('logo2', MediaType::class, array('label' => 'Logo 2 (Background)'))
- ->add('browsericon', MediaType::class, array('label' => 'Logo 3 (Favicon)'))
- ->add('private', CheckboxType::class, array('required' => false, 'label' => 'Private'))
- ->add('guestEnable', CheckboxType::class, array('required' => false, 'label' => 'guestEnable'))
- ->add('registration', CheckboxType::class, array('required' => false, 'label' => 'Registrationpossible'))
- ->add('noVerify', CheckboxType::class, array('required' => false, 'label' => 'Withoutactivation'))
-
- ->add('betreiberCompany', TextType::class, array('required' => false, 'label' => 'company'))
- ->add('betreiberName', TextType::class, array('required' => false, 'label' => 'Name'))
- ->add('betreiberStreet', TextType::class, array('required' => false, 'label' => 'Streethousenumber'))
- ->add('betreiberAddress', TextType::class, array('required' => false, 'label' => 'ZipCity'))
- ->add('betreiberEmail', TextType::class, array('required' => false, 'label' => 'EMail'))
- ->add('betreiberTel', TextType::class, array('required' => false, 'label' => 'Phone'))
- ->add('betreiberFax', TextType::class, array('required' => false, 'label' => 'Fax'))
- ->add('betreiberUid', TextType::class, array('required' => false, 'label' => 'VATnumber'))
- ->add('betreiberHid', TextType::class, array('required' => false, 'label' => 'registrationnumber'))
- ->add('betreiberSid', TextType::class, array('required' => false, 'label' => 'taxnumber'))
- ->add('betreiberRegister', TextType::class, array('required' => false, 'label' => 'register'))
- ->add('betreiberVb', TextType::class, array('required' => false, 'label' => 'Authorizedrepresentative'))
- ->add('betreiberRechtsform', TextType::class, array('required' => false, 'label' => 'legalform'))
- ->add('betreiberWeb', TextType::class, array('required' => false, 'label' => 'Homepage'))
-
- ->add('senderCompany', TextType::class, array('required' => false, 'label' => 'company'))
- ->add('senderFirstname', TextType::class, array('required' => false, 'label' => 'firstname'))
- ->add('senderLastname', TextType::class, array('required' => false, 'label' => 'lastname'))
- ->add('senderStreet', TextType::class, array('required' => false, 'label' => 'Street'))
- ->add('senderHouseNumber', TextType::class, array('required' => false, 'label' => 'housenumber'))
- ->add('senderZip', TextType::class, array('required' => false, 'label' => 'Zip'))
- ->add('senderCity', TextType::class, array('required' => false, 'label' => 'City'))
- ->add('senderCountry', TextType::class, array('required' => false, 'label' => 'Country'))
- ->add('senderTel', TextType::class, array('required' => false, 'label' => 'Phone'))
- ->add('senderFax', TextType::class, array('required' => false, 'label' => 'Fax'))
- ->add('senderMobile', TextType::class, array('required' => false, 'label' => 'mobilephonenumber'))
- ->add('senderPhone', TextType::class, array('required' => false, 'label' => 'phonenumber'))
- ->add('senderEmail', TextType::class, array('required' => false, 'label' => 'EMail'))
- ->add('senderIban', TextType::class, array('required' => false, 'label' => 'Iban'))
- ->add('senderLId', TextType::class, array('required' => false, 'label' => 'Leitweg Id'))
- ->add('senderUstId', TextType::class, array('required' => false, 'label' => 'Umsatzsteuer Nr'))
- ->add('senderSteuerId', TextType::class, array('required' => false, 'label' => 'Steuer Nr'))
-
- ->add('priceFactor', NumberType::class, array('required' => false, 'label' => 'Factor', 'scale' => 5, 'html5' => true,
- 'attr' => array(
+ ->add('subTitle', TextType::class, ['required' => false, 'label' => 'subtitle'])
+ ->add('keywords', TextareaType::class, ['required' => false, 'label' => 'Keywords'])
+ ->add('description', TextareaType::class, ['required' => false, 'label' => 'description'])
+ ->add('author', TextareaType::class, ['required' => false, 'label' => 'Autor'])
+ ->add('copyright', TextareaType::class, ['required' => false, 'label' => 'Copyright'])
+ ->add('logo1', MediaType::class, ['label' => 'Logo (Topbanner)'])
+ ->add('sitemap', MediaType::class, ['label' => 'Sitemap'])
+ ->add('robots', MediaType::class, ['label' => 'robots'])
+ ->add('logo2', MediaType::class, ['label' => 'Logo 2 (Background)'])
+ ->add('browsericon', MediaType::class, ['label' => 'Logo 3 (Favicon)'])
+ ->add('private', CheckboxType::class, ['required' => false, 'label' => 'Private'])
+ ->add('guestEnable', CheckboxType::class, ['required' => false, 'label' => 'guestEnable'])
+ ->add('registration', CheckboxType::class, ['required' => false, 'label' => 'Registrationpossible'])
+ ->add('noVerify', CheckboxType::class, ['required' => false, 'label' => 'Withoutactivation'])
+ ->add('betreiberCompany', TextType::class, ['required' => false, 'label' => 'company'])
+ ->add('betreiberName', TextType::class, ['required' => false, 'label' => 'Name'])
+ ->add('betreiberStreet', TextType::class, ['required' => false, 'label' => 'Streethousenumber'])
+ ->add('betreiberAddress', TextType::class, ['required' => false, 'label' => 'ZipCity'])
+ ->add('betreiberEmail', TextType::class, ['required' => false, 'label' => 'EMail'])
+ ->add('betreiberTel', TextType::class, ['required' => false, 'label' => 'Phone'])
+ ->add('betreiberFax', TextType::class, ['required' => false, 'label' => 'Fax'])
+ ->add('betreiberUid', TextType::class, ['required' => false, 'label' => 'VATnumber'])
+ ->add('betreiberHid', TextType::class, ['required' => false, 'label' => 'registrationnumber'])
+ ->add('betreiberSid', TextType::class, ['required' => false, 'label' => 'taxnumber'])
+ ->add('betreiberRegister', TextType::class, ['required' => false, 'label' => 'register'])
+ ->add('betreiberVb', TextType::class, ['required' => false, 'label' => 'Authorizedrepresentative'])
+ ->add('betreiberRechtsform', TextType::class, ['required' => false, 'label' => 'legalform'])
+ ->add('betreiberWeb', TextType::class, ['required' => false, 'label' => 'Homepage'])
+ ->add('senderCompany', TextType::class, ['required' => false, 'label' => 'company'])
+ ->add('senderFirstname', TextType::class, ['required' => false, 'label' => 'firstname'])
+ ->add('senderLastname', TextType::class, ['required' => false, 'label' => 'lastname'])
+ ->add('senderStreet', TextType::class, ['required' => false, 'label' => 'Street'])
+ ->add('senderHouseNumber', TextType::class, ['required' => false, 'label' => 'housenumber'])
+ ->add('senderZip', TextType::class, ['required' => false, 'label' => 'Zip'])
+ ->add('senderCity', TextType::class, ['required' => false, 'label' => 'City'])
+ ->add('senderCountry', TextType::class, ['required' => false, 'label' => 'Country'])
+ ->add('senderTel', TextType::class, ['required' => false, 'label' => 'Phone'])
+ ->add('senderFax', TextType::class, ['required' => false, 'label' => 'Fax'])
+ ->add('senderMobile', TextType::class, ['required' => false, 'label' => 'mobilephonenumber'])
+ ->add('senderPhone', TextType::class, ['required' => false, 'label' => 'phonenumber'])
+ ->add('senderEmail', TextType::class, ['required' => false, 'label' => 'EMail'])
+ ->add('senderIban', TextType::class, ['required' => false, 'label' => 'Iban'])
+ ->add('senderLId', TextType::class, ['required' => false, 'label' => 'Leitweg Id'])
+ ->add('senderUstId', TextType::class, ['required' => false, 'label' => 'Umsatzsteuer Nr'])
+ ->add('senderSteuerId', TextType::class, ['required' => false, 'label' => 'Steuer Nr'])
+ ->add('priceFactor', NumberType::class, [
+ 'required' => false,
+ 'label' => 'Factor',
+ 'scale' => 5,
+ 'html5' => true,
+ 'attr' => [
'min' => -0.00001,
'max' => 2.00,
'step' => 0.00001,
- )))
-
- ->add('ownNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('numberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('numberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
-
- ->add('invoiceOwnNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('invoiceNumberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('invoiceNumberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
-
- ->add('creditOwnNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('creditNumberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('creditNumberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
-
- ->add('cancelationOwnNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('cancelationNumberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('cancelationNumberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
-
- ->add('parcelInvoiceOwnNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('parcelInvoiceNumberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('parcelInvoiceNumberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
-
- ->add('parcelCancelationOwnNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('parcelCancelationNumberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('parcelCancelationNumberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
-
- ->add('contactOwnNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('offerOwnNumber', CheckboxType::class, array('required' => false, 'label' => 'Useyourownnumberrange'))
- ->add('deleted', CheckboxType::class, array('required' => false, 'label' => 'Storedisabled'))
- ->add('contactNumberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('offerNumberStart', TextType::class, array('required' => false, 'label' => 'startnumber'))
- ->add('contactNumberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
- ->add('offerNumberPattern', TextType::class, array('required' => false, 'label' => 'Numberrangeformatexample'))
- ->add('redirectAfterBuy', TextType::class, array('required' => false, 'label' => 'Redirectafterorder'))
- ->add('redirectLogin', TextType::class, array('required' => false, 'label' => 'Redirectafterlogin'))
- ->add('redirectLogout', TextType::class, array('required' => false, 'label' => 'Redirectafterlogout'))
- ->add('redirectToSSL', CheckboxType::class, array('required' => false, 'label' => 'alwaysforwardtoSSL'))
- ->add('createPackageAfterBuy', CheckboxType::class, array('required' => false, 'label' => 'Generatepackagedirectly'))
- ->add('tpSaveUserData', CheckboxType::class, array('required' => false, 'label' => 'Restorecustomerdata'))
- ->add('apiKey', TextType::class, array('required' => false, 'disabled' => true, 'label' => 'APIKey'))
- ->add('docJobticketJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ ],
+ ])
+ ->add('ownNumber', CheckboxType::class, ['required' => false, 'label' => 'Useyourownnumberrange'])
+ ->add('numberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('numberPattern', TextType::class, ['required' => false, 'label' => 'Numberrangeformatexample'])
+ ->add('invoiceOwnNumber', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'Useyourownnumberrange',
+ ])
+ ->add('invoiceNumberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('invoiceNumberPattern', TextType::class, [
+ 'required' => false,
+ 'label' => 'Numberrangeformatexample',
+ ])
+ ->add('creditOwnNumber', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'Useyourownnumberrange',
+ ])
+ ->add('creditNumberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('creditNumberPattern', TextType::class, [
+ 'required' => false,
+ 'label' => 'Numberrangeformatexample',
+ ])
+ ->add('cancelationOwnNumber', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'Useyourownnumberrange',
+ ])
+ ->add('cancelationNumberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('cancelationNumberPattern', TextType::class, [
+ 'required' => false,
+ 'label' => 'Numberrangeformatexample',
+ ])
+ ->add('parcelInvoiceOwnNumber', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'Useyourownnumberrange',
+ ])
+ ->add('parcelInvoiceNumberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('parcelInvoiceNumberPattern', TextType::class, [
+ 'required' => false,
+ 'label' => 'Numberrangeformatexample',
+ ])
+ ->add('parcelCancelationOwnNumber', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'Useyourownnumberrange',
+ ])
+ ->add('parcelCancelationNumberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('parcelCancelationNumberPattern', TextType::class, [
+ 'required' => false,
+ 'label' => 'Numberrangeformatexample',
+ ])
+ ->add('contactOwnNumber', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'Useyourownnumberrange',
+ ])
+ ->add('offerOwnNumber', CheckboxType::class, ['required' => false, 'label' => 'Useyourownnumberrange'])
+ ->add('deleted', CheckboxType::class, ['required' => false, 'label' => 'Storedisabled'])
+ ->add('contactNumberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('offerNumberStart', TextType::class, ['required' => false, 'label' => 'startnumber'])
+ ->add('contactNumberPattern', TextType::class, [
+ 'required' => false,
+ 'label' => 'Numberrangeformatexample',
+ ])
+ ->add('offerNumberPattern', TextType::class, [
+ 'required' => false,
+ 'label' => 'Numberrangeformatexample',
+ ])
+ ->add('redirectAfterBuy', TextType::class, ['required' => false, 'label' => 'Redirectafterorder'])
+ ->add('redirectLogin', TextType::class, ['required' => false, 'label' => 'Redirectafterlogin'])
+ ->add('redirectLogout', TextType::class, ['required' => false, 'label' => 'Redirectafterlogout'])
+ ->add('redirectToSSL', CheckboxType::class, ['required' => false, 'label' => 'alwaysforwardtoSSL'])
+ ->add('createPackageAfterBuy', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'Generatepackagedirectly',
+ ])
+ ->add('tpSaveUserData', CheckboxType::class, ['required' => false, 'label' => 'Restorecustomerdata'])
+ ->add('apiKey', TextType::class, ['required' => false, 'disabled' => true, 'label' => 'APIKey'])
+ ->add('docJobticketJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -157,13 +195,13 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docJobticketBg', MediaType::class, array('label' => 'background'))
- ->add('docOfferProductBg', MediaType::class, array('label' => 'background'))
- ->add('docOfferProductFileName', TextType::class, array('label' => 'filename', 'required' => false))
- ->add('docOfferProductXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docJobticketBg', MediaType::class, ['label' => 'background'])
+ ->add('docOfferProductBg', MediaType::class, ['label' => 'background'])
+ ->add('docOfferProductFileName', TextType::class, ['label' => 'filename', 'required' => false])
+ ->add('docOfferProductXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -175,12 +213,12 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docJobticketPositionBg', MediaType::class, array('label' => 'background'))
- ->add('docJobticketFileName', TextType::class, array('label' => 'filenamej', 'required' => false))
- ->add('docJobticketPosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docJobticketPositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docJobticketFileName', TextType::class, ['label' => 'filenamej', 'required' => false])
+ ->add('docJobticketPosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -192,10 +230,10 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docJobticketPPJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docJobticketPPJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -207,13 +245,13 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docJobticketPPBg', MediaType::class, array('label' => 'background'))
- ->add('docJobticketPPFileName', TextType::class, array('label' => 'filename', 'required' => false))
- ->add('docJobticketPPPositionBg', MediaType::class, array('label' => 'background'))
- ->add('docJobticketPPPosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docJobticketPPBg', MediaType::class, ['label' => 'background'])
+ ->add('docJobticketPPFileName', TextType::class, ['label' => 'filename', 'required' => false])
+ ->add('docJobticketPPPositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docJobticketPPPosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -225,10 +263,10 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docOfferJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docOfferJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -240,13 +278,13 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docOfferBg', MediaType::class, array('label' => 'background'))
- ->add('docOfferFileName', TextType::class, array('label' => 'filenameo', 'required' => false))
- ->add('docOfferPositionBg', MediaType::class, array('label' => 'background'))
- ->add('docOfferPosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docOfferBg', MediaType::class, ['label' => 'background'])
+ ->add('docOfferFileName', TextType::class, ['label' => 'filenameo', 'required' => false])
+ ->add('docOfferPositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docOfferPosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -258,10 +296,10 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docOrderJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docOrderJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -273,13 +311,13 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docOrderBg', MediaType::class, array('label' => 'background'))
- ->add('docOrderFileName', TextType::class, array('label' => 'filenameor', 'required' => false))
- ->add('docOrderPositionBg', MediaType::class, array('label' => 'background'))
- ->add('docOrderPosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docOrderBg', MediaType::class, ['label' => 'background'])
+ ->add('docOrderFileName', TextType::class, ['label' => 'filenameor', 'required' => false])
+ ->add('docOrderPositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docOrderPosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -291,10 +329,10 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docInvoiceJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docInvoiceJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -306,19 +344,19 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docInvoiceBg', MediaType::class, array('label' => 'background'))
- ->add('docInvoiceFileName', TextType::class, array('label' => 'filenamei', 'required' => false))
- ->add('docInvoicePositionBg', MediaType::class, array('label' => 'background'))
- ->add('docInvoiceXML', CheckboxType::class, array('label' => 'embed XRechnung', 'required' => false))
- ->add('docJobticketXML', CheckboxType::class, array('label' => 'embed XRechnung', 'required' => false))
- ->add('docOfferXML', CheckboxType::class, array('label' => 'embed XRechnung', 'required' => false))
- ->add('docDeliveryXML', CheckboxType::class, array('label' => 'embed XRechnung', 'required' => false))
- ->add('docOrderXML', CheckboxType::class, array('label' => 'embed XRechnung', 'required' => false))
- ->add('docStornoXML', CheckboxType::class, array('label' => 'embed XRechnung', 'required' => false))
- ->add('docInvoicePosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docInvoiceBg', MediaType::class, ['label' => 'background'])
+ ->add('docInvoiceFileName', TextType::class, ['label' => 'filenamei', 'required' => false])
+ ->add('docInvoicePositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docInvoiceXML', CheckboxType::class, ['label' => 'embed XRechnung', 'required' => false])
+ ->add('docJobticketXML', CheckboxType::class, ['label' => 'embed XRechnung', 'required' => false])
+ ->add('docOfferXML', CheckboxType::class, ['label' => 'embed XRechnung', 'required' => false])
+ ->add('docDeliveryXML', CheckboxType::class, ['label' => 'embed XRechnung', 'required' => false])
+ ->add('docOrderXML', CheckboxType::class, ['label' => 'embed XRechnung', 'required' => false])
+ ->add('docStornoXML', CheckboxType::class, ['label' => 'embed XRechnung', 'required' => false])
+ ->add('docInvoicePosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -330,10 +368,10 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docLabelJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docLabelJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -345,13 +383,13 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docLabelBg', MediaType::class, array('label' => 'background'))
- ->add('docLabelFileName', TextType::class, array('label' => 'filenamel', 'required' => false))
- ->add('docLabelPositionBg', MediaType::class, array('label' => 'background'))
- ->add('docLabelPosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docLabelBg', MediaType::class, ['label' => 'background'])
+ ->add('docLabelFileName', TextType::class, ['label' => 'filenamel', 'required' => false])
+ ->add('docLabelPositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docLabelPosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -363,10 +401,10 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docDeliveryJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docDeliveryJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -378,13 +416,13 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docDeliveryBg', MediaType::class, array('label' => 'background'))
- ->add('docDeliveryFileName', TextType::class, array('label' => 'filenamed', 'required' => false))
- ->add('docDeliveryPositionBg', MediaType::class, array('label' => 'background'))
- ->add('docDeliveryPosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docDeliveryBg', MediaType::class, ['label' => 'background'])
+ ->add('docDeliveryFileName', TextType::class, ['label' => 'filenamed', 'required' => false])
+ ->add('docDeliveryPositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docDeliveryPosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -396,10 +434,10 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docStornoJasperXml', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docStornoJasperXml', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -411,13 +449,13 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('docStornoBg', MediaType::class, array('label' => 'background'))
- ->add('docStornoFileName', TextType::class, array('label' => 'filenames', 'required' => false))
- ->add('docStornoPositionBg', MediaType::class, array('label' => 'background'))
- ->add('docStornoPosition', AceEditorType::class, array(
- 'wrapper_attr' => array(), // aceeditor wrapper html attributes.
+ 'highlight_active_line' => null,
+ ])
+ ->add('docStornoBg', MediaType::class, ['label' => 'background'])
+ ->add('docStornoFileName', TextType::class, ['label' => 'filenames', 'required' => false])
+ ->add('docStornoPositionBg', MediaType::class, ['label' => 'background'])
+ ->add('docStornoPosition', AceEditorType::class, [
+ 'wrapper_attr' => [], // aceeditor wrapper html attributes.
'width' => '90%',
'height' => '500',
'font_size' => 14,
@@ -429,116 +467,267 @@ class ShopSettingsType extends AbstractType
'use_wrap_mode' => null,
'show_print_margin' => null,
'required' => false,
- 'highlight_active_line' => null
- ))
- ->add('productFieldName1', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field1Designation'))
- ->add('productFieldName2', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field2Designation'))
- ->add('productFieldName3', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field3Designation'))
- ->add('productFieldName4', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field4Designation'))
- ->add('productFieldName5', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field5Designation'))
- ->add('productFieldName6', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field6Designation'))
- ->add('productFieldName7', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field7Designation'))
- ->add('productFieldName8', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field8Designation'))
- ->add('productFieldName9', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field9Designation'))
- ->add('productFieldName10', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field10Designation'))
- ->add('productFieldName11', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field11Designation'))
- ->add('productFieldName12', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field12Designation'))
-
- ->add('customerFieldName1', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field1Designation'))
- ->add('customerFieldName2', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field2Designation'))
- ->add('customerFieldName3', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field3Designation'))
- ->add('customerFieldName4', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field4Designation'))
- ->add('customerFieldName5', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field5Designation'))
- ->add('customerFieldName6', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field6Designation'))
- ->add('customerFieldName7', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field7Designation'))
- ->add('customerFieldName8', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field8Designation'))
- ->add('customerFieldName9', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field9Designation'))
- ->add('customerFieldName10', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field10Designation'))
- ->add('customerFieldName11', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field11Designation'))
- ->add('customerFieldName12', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field12Designation'))
- ->add('customerFieldName13', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field13Designation'))
- ->add('customerFieldName14', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field14Designation'))
- ->add('customerFieldName15', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field15Designation'))
- ->add('customerFieldName16', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field16Designation'))
- ->add('customerFieldName17', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field17Designation'))
- ->add('customerFieldName18', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field18Designation'))
- ->add('customerFieldName19', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field19Designation'))
- ->add('customerFieldName20', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field20Designation'))
- ->add('customerFieldName21', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field21Designation'))
- ->add('customerFieldName22', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field22Designation'))
- ->add('customerFieldName23', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field23Designation'))
- ->add('customerFieldName24', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Field24Designation'))
-
- ->add('defaultLocale', ChoiceType::class, array('choices' => $this->localeService->getShopLocale(), 'required' => true, 'label' => 'defaultLanguage'))
- ->add('defaultCurrency', CurrencyType::class, array('required' => true, 'label' => 'defaultCurrency'))
- ->add('extraSettings', TextareaType::class, array('required' => false, 'label' => 'extrasettings'))
-
- ->add('mailOrderCustomerSubjectTemplate', TextType::class, array('required' => false, 'disabled' => false, 'label' => 'Ordermailtocustomersubject'))
- ->add('mailOrderCustomerTextTemplate', TextareaType::class, array(
+ 'highlight_active_line' => null,
+ ])
+ ->add('productFieldName1', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field1Designation',
+ ])
+ ->add('productFieldName2', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field2Designation',
+ ])
+ ->add('productFieldName3', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field3Designation',
+ ])
+ ->add('productFieldName4', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field4Designation',
+ ])
+ ->add('productFieldName5', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field5Designation',
+ ])
+ ->add('productFieldName6', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field6Designation',
+ ])
+ ->add('productFieldName7', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field7Designation',
+ ])
+ ->add('productFieldName8', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field8Designation',
+ ])
+ ->add('productFieldName9', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field9Designation',
+ ])
+ ->add('productFieldName10', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field10Designation',
+ ])
+ ->add('productFieldName11', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field11Designation',
+ ])
+ ->add('productFieldName12', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field12Designation',
+ ])
+ ->add('customerFieldName1', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field1Designation',
+ ])
+ ->add('customerFieldName2', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field2Designation',
+ ])
+ ->add('customerFieldName3', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field3Designation',
+ ])
+ ->add('customerFieldName4', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field4Designation',
+ ])
+ ->add('customerFieldName5', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field5Designation',
+ ])
+ ->add('customerFieldName6', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field6Designation',
+ ])
+ ->add('customerFieldName7', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field7Designation',
+ ])
+ ->add('customerFieldName8', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field8Designation',
+ ])
+ ->add('customerFieldName9', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field9Designation',
+ ])
+ ->add('customerFieldName10', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field10Designation',
+ ])
+ ->add('customerFieldName11', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field11Designation',
+ ])
+ ->add('customerFieldName12', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field12Designation',
+ ])
+ ->add('customerFieldName13', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field13Designation',
+ ])
+ ->add('customerFieldName14', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field14Designation',
+ ])
+ ->add('customerFieldName15', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field15Designation',
+ ])
+ ->add('customerFieldName16', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field16Designation',
+ ])
+ ->add('customerFieldName17', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field17Designation',
+ ])
+ ->add('customerFieldName18', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field18Designation',
+ ])
+ ->add('customerFieldName19', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field19Designation',
+ ])
+ ->add('customerFieldName20', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field20Designation',
+ ])
+ ->add('customerFieldName21', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field21Designation',
+ ])
+ ->add('customerFieldName22', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field22Designation',
+ ])
+ ->add('customerFieldName23', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field23Designation',
+ ])
+ ->add('customerFieldName24', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Field24Designation',
+ ])
+ ->add('defaultLocale', ChoiceType::class, [
+ 'choices' => $this->localeService->getShopLocale(),
+ 'required' => true,
+ 'label' => 'defaultLanguage',
+ ])
+ ->add('defaultCurrency', CurrencyType::class, ['required' => true, 'label' => 'defaultCurrency'])
+ ->add('extraSettings', TextareaType::class, ['required' => false, 'label' => 'extrasettings'])
+ ->add('mailOrderCustomerSubjectTemplate', TextType::class, [
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'Ordermailtocustomersubject',
+ ])
+ ->add('mailOrderCustomerTextTemplate', TextareaType::class, [
'required' => false,
'disabled' => false,
'label' => 'Ordermailtocustomer',
- 'attr' => ['rows' => 10]))
- ->add('imprintText', TextareaType::class, array(
+ 'attr' => ['rows' => 10],
+ ])
+ ->add('imprintText', TextareaType::class, [
'label' => 'Text',
'required' => false,
- ))
- ->add('templateCopyright', TextareaType::class, array(
+ ])
+ ->add('templateCopyright', TextareaType::class, [
'label' => 'Text',
'required' => false,
- ))
- ->add('conditionsText', TextareaType::class, array(
+ ])
+ ->add('conditionsText', TextareaType::class, [
'label' => 'Text',
'required' => false,
- ))
- ->add('cancellationTermsText', TextareaType::class, array(
+ ])
+ ->add('cancellationTermsText', TextareaType::class, [
'label' => 'Text',
'required' => false,
- ))
- ->add('privacyPolicyText', TextareaType::class, array(
+ ])
+ ->add('privacyPolicyText', TextareaType::class, [
'label' => 'Text',
'required' => false,
- ))
- ->add('productSort', ChoiceType::class, array(
+ ])
+ ->add('productSort', ChoiceType::class, [
'label' => 'productsorting',
'choices' => ['Position' => 'pos', 'Name' => 'name'],
'required' => false,
- ))
- ->add('productSortDir', ChoiceType::class, array(
+ ])
+ ->add('productSortDir', ChoiceType::class, [
'label' => 'productsorting',
'choices' => ['Ascending' => 'asc', 'Descending' => 'desc'],
'required' => false,
- ))
- ->add('disableOldCalc', CheckboxType::class, array('required' => false, 'label' => 'disableOldCalc'));
+ ])
+ ->add('disableOldCalc', CheckboxType::class, ['required' => false, 'label' => 'disableOldCalc']);
/** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */
foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Shop) as $field) {
- $builder->add($field->buildForm($this->formFactory->createNamedBuilder($field->getGroup(), FormType::class, null, ['mapped' => false]), $options));
+ $builder->add($field->buildForm($this->formFactory->createNamedBuilder(
+ $field->getGroup(),
+ FormType::class,
+ null,
+ ['mapped' => false],
+ ), $options));
}
- $builder->add('save', SubmitType::class, array('label' => 'save'));
+ $builder->add('save', SubmitType::class, ['label' => 'save']);
$builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
-
/** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */
foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Shop) as $field) {
$field->formPreSetData($event);
}
});
$builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
-
/** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */
foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Shop) as $field) {
$field->formPostSetData($event);
}
});
$builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
-
/** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */
foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Shop) as $field) {
$field->formPostSubmit($event);
}
});
$builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
-
/** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */
foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Shop) as $field) {
$field->formPreSubmit($event);
@@ -553,9 +742,9 @@ class ShopSettingsType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
- $resolver->setDefaults(array(
+ $resolver->setDefaults([
'data_class' => 'PSC\Shop\EntityBundle\Document\Shop',
- 'translation_domain' => 'core_settings_edit'
- ));
+ 'translation_domain' => 'core_settings_edit',
+ ]);
}
}
diff --git a/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig b/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig
index f73cfdebf..b193a0a2c 100755
--- a/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig
+++ b/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig
@@ -21,7 +21,7 @@
{{ form_errors(form) }}
diff --git a/src/new/tests/PSC/System/SettingsBundle/Api/PaperDBTest.php b/src/new/tests/PSC/System/SettingsBundle/Api/PaperDBTest.php
new file mode 100644
index 000000000..e78d8bef7
--- /dev/null
+++ b/src/new/tests/PSC/System/SettingsBundle/Api/PaperDBTest.php
@@ -0,0 +1,41 @@
+get(ContactRepository::class);
+ $testUser = $userRepository->loadUserByUsername('company@shop.de');
+
+ $client->loginUser($testUser, 'api');
+
+ $client->jsonRequest('GET', '/api/system/papercontainer', [], []);
+ $this->assertResponseIsSuccessful();
+
+ var_dump($client->getResponse()->getContent());
+ self::assertJson($client->getResponse()->getContent());
+ }
+
+ public function testPUT(): void
+ {
+ $client = static::createClient();
+ $userRepository = static::getContainer()->get(ContactRepository::class);
+ $testUser = $userRepository->loadUserByUsername('company@shop.de');
+
+ $client->loginUser($testUser, 'api');
+
+ $client->jsonRequest('GET', '/api/system/papercontainer', [], []);
+ $this->assertResponseIsSuccessful();
+
+ self::assertJson($client->getResponse()->getContent());
+ }
+}
diff --git a/src/new/tests/Plugins/System/PSC/XmlCalc/Api/DesignTest.php b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/DesignTest.php
index e914ee1a2..d2454cd9c 100644
--- a/src/new/tests/Plugins/System/PSC/XmlCalc/Api/DesignTest.php
+++ b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/DesignTest.php
@@ -19,7 +19,9 @@ class DesignTest extends WebTestCase
'/api/plugin/system/psc/xmlcalc/product/design',
[
'product' => '01938686-0e4d-7da9-bae3-b2e1b1681f9f',
- 'jsonProduct' => '[{"uuid":"df2df718-b28e-482d-bf0c-67d246f05d32","name":"Test Artikel","options":[{"id":"auflage","name":"Auflage","default":"100","dependencys":[],"placeHolder":"Placeholder","required":false,"type":2},{"id":"seiten_umschlag","name":"Seiten Umschlag","default":"2","dependencys":[],"placeHolder":"Placeholder","required":false,"type":2},{"id":"seiten_anzahl_inhalt","name":"Seiten Anzahl Inhalt","default":"10","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*0.12","price":0,"value":"1-10","dependencys":[{"relation":"seiten_umschlag","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.24","price":0,"value":"1-2","dependencys":[]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.23","price":0,"value":"3-","dependencys":[]}]}]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*0.11","price":0,"value":"11-","dependencys":[{"relation":"seiten_umschlag","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.21","price":0,"value":"1-2","dependencys":[]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.20","price":0,"value":"3-","dependencys":[]}]}]}]}],"placeHolder":"Placeholder","required":true,"type":2},{"id":"farbigkeit","name":"Farbigkeit","default":"10","dependencys":[],"type":3,"options":[{"id":"10","name":"1\/0 farbig","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"","price":0,"value":"1-101","dependencys":[]}]}]},{"id":"11","name":"1\/1 farbig","dependencys":[]},{"id":"20","name":"2\/0 farbig","dependencys":[]},{"id":"21","name":"2\/1 farbig","dependencys":[]},{"id":"22","name":"2\/2 farbig","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"","price":0,"value":"11-50","dependencys":[]}]}]}],"mode":"normal"},{"id":"calc","name":"calc","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*$Vseiten_anzahl_inhalt$V","price":0,"value":"1-","dependencys":[]}]}],"type":1}]}]',
+ 'jsonProduct' => json_decode(
+ '[{"uuid":"df2df718-b28e-482d-bf0c-67d246f05d32","name":"Test Artikel","options":[{"id":"auflage","name":"Auflage","default":"100","dependencys":[],"placeHolder":"Placeholder","required":false,"type":2},{"id":"seiten_umschlag","name":"Seiten Umschlag","default":"2","dependencys":[],"placeHolder":"Placeholder","required":false,"type":2},{"id":"seiten_anzahl_inhalt","name":"Seiten Anzahl Inhalt","default":"10","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*0.12","price":0,"value":"1-10","dependencys":[{"relation":"seiten_umschlag","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.24","price":0,"value":"1-2","dependencys":[]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.23","price":0,"value":"3-","dependencys":[]}]}]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*0.11","price":0,"value":"11-","dependencys":[{"relation":"seiten_umschlag","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.21","price":0,"value":"1-2","dependencys":[]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.20","price":0,"value":"3-","dependencys":[]}]}]}]}],"placeHolder":"Placeholder","required":true,"type":2},{"id":"farbigkeit","name":"Farbigkeit","default":"10","dependencys":[],"type":3,"options":[{"id":"10","name":"1\/0 farbig","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"","price":0,"value":"1-101","dependencys":[]}]}]},{"id":"11","name":"1\/1 farbig","dependencys":[]},{"id":"20","name":"2\/0 farbig","dependencys":[]},{"id":"21","name":"2\/1 farbig","dependencys":[]},{"id":"22","name":"2\/2 farbig","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"","price":0,"value":"11-50","dependencys":[]}]}]}],"mode":"normal"},{"id":"calc","name":"calc","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*$Vseiten_anzahl_inhalt$V","price":0,"value":"1-","dependencys":[]}]}],"type":1}]}]',
+ ),
],
[],
);
diff --git a/src/new/tests/Plugins/System/PSC/XmlCalc/Api/JsonTest.php b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/JsonTest.php
new file mode 100644
index 000000000..7aacc8409
--- /dev/null
+++ b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/JsonTest.php
@@ -0,0 +1,32 @@
+jsonRequest(
+ 'POST',
+ '/api/plugin/system/psc/xmlcalc/product/json',
+ [
+ 'product' => '01938686-0e4d-7da9-bae3-b2e1b1681f9f',
+ 'json' => json_decode(
+ '[{"uuid":"df2df718-b28e-482d-bf0c-67d246f05d32","name":"Test Artikel","options":[{"id":"auflage","name":"Auflage","default":"100","dependencys":[],"placeHolder":"Placeholder","required":false,"type":2},{"id":"seiten_umschlag","name":"Seiten Umschlag","default":"2","dependencys":[],"placeHolder":"Placeholder","required":false,"type":2},{"id":"seiten_anzahl_inhalt","name":"Seiten Anzahl Inhalt","default":"10","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*0.12","price":0,"value":"1-10","dependencys":[{"relation":"seiten_umschlag","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.24","price":0,"value":"1-2","dependencys":[]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.23","price":0,"value":"3-","dependencys":[]}]}]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*0.11","price":0,"value":"11-","dependencys":[{"relation":"seiten_umschlag","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.21","price":0,"value":"1-2","dependencys":[]},{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vseiten_umschlag$V*0.20","price":0,"value":"3-","dependencys":[]}]}]}]}],"placeHolder":"Placeholder","required":true,"type":2},{"id":"farbigkeit","name":"Farbigkeit","default":"10","dependencys":[],"type":3,"options":[{"id":"10","name":"1\/0 farbig","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"","price":0,"value":"1-101","dependencys":[]}]}]},{"id":"11","name":"1\/1 farbig","dependencys":[]},{"id":"20","name":"2\/0 farbig","dependencys":[]},{"id":"21","name":"2\/1 farbig","dependencys":[]},{"id":"22","name":"2\/2 farbig","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"","price":0,"value":"11-50","dependencys":[]}]}]}],"mode":"normal"},{"id":"calc","name":"calc","dependencys":[{"relation":"auflage","formula":"","borders":[{"calcValue":"","calcValue1":"","calcValue2":"","calcValue3":"","calcValue4":"","calcValue5":"","calcValue6":"","calcValue7":"","calcValue8":"","calcValue9":"","calcValue10":"","flatRate":"","formula":"$Vauflage$V*$Vseiten_anzahl_inhalt$V","price":0,"value":"1-","dependencys":[]}]}],"type":1}]}]',
+ ),
+ ],
+ [],
+ );
+ $this->assertResponseIsSuccessful();
+
+ self::assertJson($client->getResponse()->getContent());
+ }
+}
diff --git a/src/new/tests/Plugins/System/PSC/XmlCalc/Api/ShopTest.php b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/ShopTest.php
new file mode 100644
index 000000000..f6d2530d7
--- /dev/null
+++ b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/ShopTest.php
@@ -0,0 +1,55 @@
+get(ContactRepository::class);
+ $testUser = $userRepository->loadUserByUsername('company@shop.de');
+
+ $client->loginUser($testUser, 'api');
+
+ $client->jsonRequest('GET', '/api/plugin/system/psc/xmlcalc/shop/771a1176-d531-48ed-93b8-eec1fd4b917f', [], []);
+ $this->assertResponseIsSuccessful();
+
+ self::assertJson($client->getResponse()->getContent());
+ }
+
+ public function testUpdate(): void
+ {
+ $client = static::createClient();
+ $userRepository = static::getContainer()->get(ContactRepository::class);
+ $testUser = $userRepository->loadUserByUsername('company@shop.de');
+
+ $client->loginUser($testUser, 'api');
+
+ $str = '$test1 = 12;' . PHP_EOL . '$test2 => 13;' . PHP_EOL . '$test3 = 15;';
+
+ $client->jsonRequest(
+ 'PUT',
+ '/api/plugin/system/psc/xmlcalc/shop/771a1176-d531-48ed-93b8-eec1fd4b917f',
+ [
+ 'parameter' => $str,
+ ],
+ [],
+ );
+ $this->assertResponseIsSuccessful();
+
+ self::assertJson($client->getResponse()->getContent());
+
+ $client->jsonRequest('GET', '/api/plugin/system/psc/xmlcalc/shop/771a1176-d531-48ed-93b8-eec1fd4b917f', [], []);
+ $this->assertResponseIsSuccessful();
+
+ self::assertJson($client->getResponse()->getContent());
+ self::assertSame($str, json_decode($client->getResponse()->getContent(), true)['parameter']);
+ }
+}
diff --git a/src/new/tests/Plugins/System/PSC/XmlCalc/Api/SystemTest.php b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/SystemTest.php
new file mode 100644
index 000000000..be2bbf73c
--- /dev/null
+++ b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/SystemTest.php
@@ -0,0 +1,26 @@
+get(ContactRepository::class);
+ $testUser = $userRepository->loadUserByUsername('company@shop.de');
+
+ $client->loginUser($testUser, 'api');
+
+ $client->jsonRequest('GET', '/api/plugin/system/psc/xmlcalc/shop/771a1176-d531-48ed-93b8-eec1fd4b917f', [], []);
+ $this->assertResponseIsSuccessful();
+
+ self::assertJson($client->getResponse()->getContent());
+ }
+}
diff --git a/src/new/tests/Plugins/System/PSC/XmlCalc/Api/XMLTest.php b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/XMLTest.php
new file mode 100644
index 000000000..6d2214a99
--- /dev/null
+++ b/src/new/tests/Plugins/System/PSC/XmlCalc/Api/XMLTest.php
@@ -0,0 +1,66 @@
+jsonRequest(
+ 'POST',
+ '/api/plugin/system/psc/xmlcalc/product/xml',
+ [
+ 'product' => '01938686-0e4d-7da9-bae3-b2e1b1681f9f',
+ 'xml' => '
+
+
+ SD-Durchschreibesätze A4-Blocks
+ 210 mm x 297 mm
+
+
+
+
+
+
+
+
+
+
+
+
+ ',
+ ],
+ [],
+ );
+ $this->assertResponseIsSuccessful();
+
+ self::assertJson($client->getResponse()->getContent());
+ }
+}
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock
index 9fab97cc8..b05b1bbf1 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock
@@ -16,6 +16,7 @@
"reka-ui": "^2.3.2",
"tailwind-merge": "^3.3.1",
"tailwindcss": "^4.1.10",
+ "ts-debounce": "^4.0.0",
"tw-animate-css": "^1.3.4",
"uuid": "^11.1.0",
"vue": "^3.5.13",
@@ -23,6 +24,7 @@
"vue-draggable-plus": "^0.6.0",
"vue-i18n": "^11.1.9",
"xml-beautify": "^1.2.3",
+ "xml-formatter": "^3.6.6",
},
"devDependencies": {
"@types/node": "^24.0.1",
@@ -582,6 +584,8 @@
"totalist": ["totalist@3.0.1", "", {}, "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ=="],
+ "ts-debounce": ["ts-debounce@4.0.0", "", {}, "sha512-+1iDGY6NmOGidq7i7xZGA4cm8DAa6fqdYcvO5Z6yBevH++Bdo9Qt/mN0TzHUgcCcKv1gmh9+W5dHqz8pMWbCbg=="],
+
"tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
"tw-animate-css": ["tw-animate-css@1.3.4", "", {}, "sha512-dd1Ht6/YQHcNbq0znIT6dG8uhO7Ce+VIIhZUhjsryXsMPJQz3bZg7Q2eNzLwipb25bRZslGb2myio5mScd1TFg=="],
@@ -628,6 +632,10 @@
"xml-beautify": ["xml-beautify@1.2.3", "", {}, "sha512-VsYpkqoVawIP84pi00XukPsgQHqOhgrpwTHlXqqRMAgYZ1u+Yw3KHIUhO1Igf19d5CQ5h6ExJT1hFCJRLmzADg=="],
+ "xml-formatter": ["xml-formatter@3.6.6", "", { "dependencies": { "xml-parser-xo": "^4.1.4" } }, "sha512-yfofQht42x2sN1YThT6Er6GFXiQinfDAsMTNvMPi2uZw5/Vtc2PYHfvALR8U+b2oN2ekBxLd2tGWV06rAM8nQA=="],
+
+ "xml-parser-xo": ["xml-parser-xo@4.1.4", "", {}, "sha512-wo+yWDNeMwd1ctzH4CsiGXaAappDsxuR+VnmPewOzHk/zvefksT2ZlcWpAePl11THOWgnIZM4GjvumevurNWZw=="],
+
"yallist": ["yallist@5.0.0", "", {}, "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="],
"yoctocolors": ["yoctocolors@2.1.1", "", {}, "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ=="],
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json
index bb5b91f34..774dcccc5 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json
@@ -22,13 +22,14 @@
"reka-ui": "^2.3.2",
"tailwind-merge": "^3.3.1",
"tailwindcss": "^4.1.10",
+ "ts-debounce": "^4.0.0",
"tw-animate-css": "^1.3.4",
"uuid": "^11.1.0",
"vue": "^3.5.13",
"vue-codemirror": "^6.1.1",
"vue-draggable-plus": "^0.6.0",
"vue-i18n": "^11.1.9",
- "xml-beautify": "^1.2.3"
+ "xml-formatter": "^3.6.6"
},
"devDependencies": {
"@types/node": "^24.0.1",
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/App.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/App.vue
index 179e277c8..a34dec34e 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/App.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/App.vue
@@ -1,16 +1,25 @@
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue
index 316ec8199..6ca3c71ba 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue
@@ -5,6 +5,8 @@ import {
ResizablePanelGroup,
} from '../components/ui/resizable'
import { Tabs, TabsContent, TabsList, TabsTrigger } from '../components/ui/tabs'
+import TopBar from './app/TopBar.vue'
+import { useGlobalStore } from '../stores/Global'
import { Library } from '../components/app/library'
import { ElementProperties, SpecialElementProperties } from '../components/app/elementproperties'
@@ -13,59 +15,79 @@ import { Main } from '../components/app/main'
import FormulaVisualizer from './app/FormulaVisualizer.vue'
import JsonView from './app/JsonView.vue'
import XmlView from './app/XmlView.vue'
+import ParameterView from './app/ParameterView.vue'
+import PaperDBView from './app/PaperDBView.vue'
+import FormelView from './app/FormelView.vue'
+
+const globalStore = useGlobalStore()
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('designer') }}
-
-
- {{ $t('preview') }}
-
-
- {{ $t('xml_view') }}
-
-
- {{ $t('json_view') }}
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+ {{ $t('designer') }}
+
+
+ {{ $t('preview') }}
+
+
+ {{ $t('xml_view') }}
+
+
+ {{ $t('formel_view') }}
+
+
+ {{ $t('parameter_view') }}
+
+
+ {{ $t('paperdb_view') }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/FormelView.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/FormelView.vue
new file mode 100644
index 000000000..5c1e559e2
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/FormelView.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/FormulaVisualizer.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/FormulaVisualizer.vue
index 30548ad70..55d3290e0 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/FormulaVisualizer.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/FormulaVisualizer.vue
@@ -1,22 +1,14 @@
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/PaperDBView.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/PaperDBView.vue
new file mode 100644
index 000000000..c83a34756
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/PaperDBView.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/ParameterView.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/ParameterView.vue
new file mode 100644
index 000000000..13f64dd19
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/ParameterView.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/TopBar.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/TopBar.vue
new file mode 100644
index 000000000..e277c60cf
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/TopBar.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/XmlView.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/XmlView.vue
index bd714bbd5..7130318de 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/XmlView.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/XmlView.vue
@@ -1,28 +1,15 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementdependency/Dependency.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementdependency/Dependency.vue
index a33cfbdf6..3982d06a4 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementdependency/Dependency.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementdependency/Dependency.vue
@@ -1,5 +1,5 @@
@@ -52,50 +52,50 @@ watch(openModal, (newOpenModal) => {
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementproperties/SpecialProperties.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementproperties/SpecialProperties.vue
index 626a186a7..e232a88d8 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementproperties/SpecialProperties.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elementproperties/SpecialProperties.vue
@@ -1,18 +1,17 @@
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/HiddenElementForm.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/HiddenElementForm.vue
index 3e9b5b187..ee0abab08 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/HiddenElementForm.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/HiddenElementForm.vue
@@ -19,6 +19,6 @@ const theModel = computed({
-
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/InputElementForm.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/InputElementForm.vue
index edf231cc0..fcd0ddfa0 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/InputElementForm.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/InputElementForm.vue
@@ -20,6 +20,6 @@ const theModel = computed
({
-
+
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/RowElementForm.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/RowElementForm.vue
index 0022c29f2..53aefc736 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/RowElementForm.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/RowElementForm.vue
@@ -5,7 +5,8 @@ import BaseElement from '../../../model/BaseElement';
import { ref, computed } from 'vue';
import EmptyElementForm from './EmptyElementForm.vue'
import { RenderElements } from './../renderelements'
-import { useElementStore } from '../../../stores/Items'
+import { useItemStore } from '../../../stores/Items'
+import { useGlobalStore } from '../../../stores/Global'
import Parser from '../../../lib/parser'
import { CirclePlus } from 'lucide-vue-next';
@@ -19,7 +20,8 @@ let emit = defineEmits(['update:modelValue']);
const dragUuid = ref("");
let isPreview = ref(false)
-const store = useElementStore()
+const itemStore = useItemStore()
+const globalStore = useGlobalStore()
const theModel = computed({
get: () => props.modelValue,
@@ -29,19 +31,19 @@ const theModel = computed({
const onDrop = (event: DragEvent, targetUuid: string, column: Column) => {
dragUuid.value = ""
if(event.dataTransfer?.getData('mode') == "sort") {
- let item: BaseElement|null = store.cutItem(store.getSourceDragUuid)
+ let item: BaseElement|null = itemStore.cutItem(globalStore.getSourceDragUuid)
if(item !== null) {
column.items.push(item)
}
- store.setDragMode("")
+ globalStore.setDragMode("")
event.stopImmediatePropagation()
}
- if(store.getDragMode == "insert") {
+ if(globalStore.getDragMode == "insert") {
const itemId = Number(event.dataTransfer?.getData('itemId'));
column.items.push(Parser.getModelForType(itemId))
- store.setDragMode("")
+ globalStore.setDragMode("")
event.stopImmediatePropagation()
}
}
@@ -51,7 +53,7 @@ const dragLeaveEmpty = (event: DragEvent, uuid: string) => {
event.stopImmediatePropagation()
}
-store.$subscribe((mutation, state) => {
+globalStore.$subscribe((mutation, state) => {
if(state.showPreview) {
isPreview.value = true
}else{
@@ -62,7 +64,7 @@ store.$subscribe((mutation, state) => {
const dragEnterEmpty = (event: DragEvent, uuid: string) => {
dragUuid.value = uuid
event.stopImmediatePropagation()
- if(store.getDragMode == "sort" && uuid != store.getSourceDragUuid) {
+ if(globalStore.getDragMode == "sort" && uuid != globalStore.getSourceDragUuid) {
event.stopImmediatePropagation()
}
}
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/SelectElementForm.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/SelectElementForm.vue
index 62bb541c6..be5b171d9 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/SelectElementForm.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/elements/SelectElementForm.vue
@@ -28,7 +28,7 @@ const theModel = computed({
-