From 0e1ae9a1a7e4d3a10ae77eb96cd72ee9f7e9f079 Mon Sep 17 00:00:00 2001 From: Thomas Peterson Date: Thu, 11 Dec 2025 22:41:54 +0100 Subject: [PATCH] FIxes --- .../Shop/CmsBundle/Form/Backend/CmsType.php | 121 +++++++++++------- .../Form/Backend/General/ContactType.php | 82 ++++++------ .../Shop/NewsBundle/Form/Backend/NewsType.php | 40 +++--- .../Form/Backend/PaymentType.php | 78 ++++++----- .../Form/Backend/ShopSettingsType.php | 6 + .../ThemeBundle/Form/Backend/SettingsType.php | 52 +++++--- .../Form/Backend/VoucherType.php | 26 ++-- .../Form/Backend/SettingsType.php | 118 +++++++++++------ .../PaginaNetABSa/form/field/ShopSettings.php | 22 ++-- .../CreativeLayouter/Form/BackendFields.php | 18 +-- .../Form/Field/ShopSettings.php | 22 ++-- .../FormLayouter/Form/Field/EnableEditor.php | 20 +-- .../Form/ShopSettings.php | 16 ++- .../Pitchprint/Form/Field/ShopSettings.php | 16 ++- .../PSC/Printess/Form/BackendFields.php | 22 ++-- .../Custom/PSC/Printess/Form/ShopSettings.php | 32 ++--- .../R2_Pitchprint/Form/Field/ShopSettings.php | 16 ++- .../PSC/R2_Sendcloud/Form/ShopSettings.php | 36 +++--- .../Form/Field/ShopSettings.php | 58 +++++---- .../PSC/Sendcloud/Form/Field/ShopSettings.php | 28 ++-- .../Form/BackendFields.php | 20 +-- .../PSC/WMD_API/Form/ProductSettings.php | 10 +- .../Custom/PSC/WMD_API/Form/ShopSettings.php | 14 +- .../PSC/Zaikio/Form/ProductSettings.php | 16 ++- .../Custom/PSC/Zaikio/Form/ShopSettings.php | 16 ++- .../PSC/Bootstrap3/Form/Field/Design.php | 24 ++-- .../PSC/Bootstrap3/Form/Field/Formulare.php | 20 +-- .../PSC/Bootstrap3/Form/Field/General.php | 20 +-- .../PSC/Bootstrap3/Form/Field/Images.php | 20 +-- .../Form/Field/Product/PostUpload.php | 20 +-- .../PSC/Bootstrap3/Form/Field/Sites.php | 20 +-- .../PSC/Bootstrap3/Form/Field/Startseite.php | 50 ++++---- .../PSC/Bootstrap3/Form/Field/Style.php | 20 +-- .../PSC/Bootstrap3/Form/Field/Translator.php | 20 +-- .../PSC/Bootstrap4/Form/Field/Design.php | 20 +-- .../PSC/Bootstrap4/Form/Field/Formulare.php | 18 +-- .../PSC/Bootstrap4/Form/Field/General.php | 20 +-- .../PSC/Bootstrap4/Form/Field/Images.php | 18 +-- .../Form/Field/Product/PostUpload.php | 20 +-- .../PSC/Bootstrap4/Form/Field/Sites.php | 20 +-- .../PSC/Bootstrap4/Form/Field/Startseite.php | 50 ++++---- .../PSC/Bootstrap4/Form/Field/Style.php | 20 +-- .../CaptchaFox/Form/Field/ShopSettings.php | 28 ++-- .../Form/Field/ShopSettings.php | 28 ++-- .../Form/Field/ResellerProduct.php | 12 +- .../Form/Field/ShopSettings.php | 58 +++++---- 46 files changed, 816 insertions(+), 615 deletions(-) diff --git a/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php b/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php index 7895b0fbf..c55b1befc 100755 --- a/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php +++ b/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php @@ -15,7 +15,6 @@ namespace PSC\Shop\CmsBundle\Form\Backend; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; -use Spiriit\Bundle\FormFilterBundle\Filter\Query\QueryInterface; use PSC\Libraries\AceEditorBundle\Form\Extension\AceEditorType; use PSC\Shop\EntityBundle\Entity\Account; use PSC\Shop\EntityBundle\Entity\Cms; @@ -26,6 +25,7 @@ use PSC\Shop\ThemeBundle\Core\ThemeSourceInterface; use PSC\System\PluginBundle\Form\Chain\Field; use PSC\System\SettingsBundle\Service\Language; use PSC\System\SettingsBundle\Service\Shop; +use Spiriit\Bundle\FormFilterBundle\Filter\Query\QueryInterface; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader; @@ -55,8 +55,15 @@ class CmsType extends AbstractType protected $formFactory; /** @var Language */ public $language; - public function __construct(Field $fields, Shop $shop, ThemeSource $themeSource, FormFactoryInterface $formFactory, Language $language, EntityManagerInterface $entityManager) - { + + public function __construct( + Field $fields, + Shop $shop, + ThemeSource $themeSource, + FormFactoryInterface $formFactory, + Language $language, + EntityManagerInterface $entityManager, + ) { $this->shop = $shop; $this->fields = $fields; $this->themeSource = $themeSource; @@ -65,13 +72,16 @@ class CmsType extends AbstractType $this->entityManager = $entityManager; } - private function buildCmsTree(array $tmp = [], Cms $cms = null, $level = ''): array + private function buildCmsTree(array $tmp = [], null|Cms $cms = null, $level = ''): array { - if ($cms) { - $sites = $this->entityManager->getRepository(Cms::class)->findBy(['shop' => $this->shop->getSelectedShop()->getUid(), 'parent' => $cms]); + $sites = $this->entityManager + ->getRepository(Cms::class) + ->findBy(['shop' => $this->shop->getSelectedShop()->getUid(), 'parent' => $cms]); } else { - $sites = $this->entityManager->getRepository(Cms::class)->findBy(['shop' => $this->shop->getSelectedShop()->getUid(), 'parent' => [0,null]]); + $sites = $this->entityManager + ->getRepository(Cms::class) + ->findBy(['shop' => $this->shop->getSelectedShop()->getUid(), 'parent' => [0, null]]); } /** @var Cms $site */ @@ -88,15 +98,17 @@ class CmsType extends AbstractType $tmp = $this->buildCmsTree(['Oberste Ebene' => 0]); $builder ->add('title', TextType::class, ['label' => 'psc_shop_cms.Name', 'required' => false]) - ->add('parentRaw', ChoiceType::class, array( + ->add('parentRaw', ChoiceType::class, [ 'choices' => $tmp, 'required' => true, 'label' => 'psc_shop_cms.Parent', - - )) + ]) ->add('menu', TextType::class, ['label' => 'psc_shop_cms.MenuName', 'required' => true]) ->add('private', CheckboxType::class, ['label' => 'psc_shop_cms.Private', 'required' => false]) - ->add('displayOnlyWhenLoggedIn', CheckboxType::class, ['label' => 'psc_shop_cms.onlyLoggedIn', 'required' => false]) + ->add('displayOnlyWhenLoggedIn', CheckboxType::class, [ + 'label' => 'psc_shop_cms.onlyLoggedIn', + 'required' => false, + ]) ->add('enable', CheckboxType::class, ['label' => 'psc_shop_cms.Active', 'required' => false]) ->add('notInMenu', CheckboxType::class, ['label' => 'psc_shop_cms.NotInMenu', 'required' => false]) ->add('noIndex', CheckboxType::class, ['label' => 'psc_shop_cms.NoIndex', 'required' => false]) @@ -104,17 +116,21 @@ class CmsType extends AbstractType ->add('displayTitle', CheckboxType::class, ['label' => 'psc_shop_cms.DisplayTitle', 'required' => false]) ->add('sort', IntegerType::class, ['label' => 'psc_shop_cms.Sort', 'required' => false]) ->add('url', TextType::class, ['label' => 'psc_shop_cms.Url', 'required' => true]) - ->add('pos', ChoiceType::class, ['label' => 'psc_shop_cms.Region', + ->add('pos', ChoiceType::class, [ + 'label' => 'psc_shop_cms.Region', 'required' => true, 'choice_loader' => new CallbackChoiceLoader(function () { - - return $this->themeSource->getTheme($this->shop->getMongoSelectedShop()->getTheme())->getConfig()->getCms()->getPositionsAsArray(); - }) + return $this->themeSource + ->getTheme($this->shop->getMongoSelectedShop()->getTheme()) + ->getConfig() + ->getCms() + ->getPositionsAsArray(); + }), ]); if ($options['data']->isRawText()) { - $builder->add('text', AceEditorType::class, array( + $builder->add('text', AceEditorType::class, [ 'label' => 'psc_shop_cms.Text', - 'wrapper_attr' => array(), // aceeditor wrapper html attributes. + 'wrapper_attr' => [], // aceeditor wrapper html attributes. 'width' => '90%', 'height' => '500', 'font_size' => 14, @@ -126,63 +142,80 @@ class CmsType extends AbstractType 'use_wrap_mode' => null, 'show_print_margin' => null, 'required' => false, - 'highlight_active_line' => null - )); + 'highlight_active_line' => null, + ]); } else { - $builder->add('text', TextareaType::class, array( + $builder->add('text', TextareaType::class, [ 'label' => 'psc_shop_cms.Text', 'required' => false, - )); + ]); } - $builder->add('metaAuthor', TextType::class, ['label' => 'psc_shop_cms.MetaAuthor', 'required' => false]) - ->add('metaKeywords', TextAreaType::class, ['label' => 'psc_shop_cms.MetaKeywords', 'required' => false]) - ->add('metaDescription', TextareaType::class, ['label' => 'psc_shop_cms.MetaDescriptions', 'required' => false]) - ->add('metaCustomTitle', TextType::class, ['label' => 'psc_shop_cms.MetaCustomTitle', 'required' => false]) - ->add('metaOgTitle', TextType::class, ['label' => 'psc_shop_cms.OGTitle', 'required' => false]) - ->add('metaOgType', TextType::class, ['label' => 'psc_shop_cms.OGType', 'required' => false]) - ->add('metaOgUrl', TextType::class, ['label' => 'psc_shop_cms.OGType', 'required' => false]) - ->add('metaOgImage', TextType::class, ['label' => 'psc_shop_cms.OGImage', 'required' => false]) - ->add('extraSettings', TextareaType::class, array('required' => false, 'label' => 'psc_shop_cms.ExtendedSettings')) - ->add('language', ChoiceType::class, array( - 'label' => 'psc_shop_cms.Language', - 'choices' => $this->language->getLanguageArrayForContent(), - 'required' => true, - )) - ->add('metaOgDescription', TextAreaType::class, ['label' => 'psc_shop_cms.OGDescription', 'required' => false]); + $builder + ->add('metaAuthor', TextType::class, ['label' => 'psc_shop_cms.MetaAuthor', 'required' => false]) + ->add('metaKeywords', TextAreaType::class, ['label' => 'psc_shop_cms.MetaKeywords', 'required' => false]) + ->add('metaDescription', TextareaType::class, [ + 'label' => 'psc_shop_cms.MetaDescriptions', + 'required' => false, + ]) + ->add('metaCustomTitle', TextType::class, ['label' => 'psc_shop_cms.MetaCustomTitle', 'required' => false]) + ->add('metaOgTitle', TextType::class, ['label' => 'psc_shop_cms.OGTitle', 'required' => false]) + ->add('metaOgType', TextType::class, ['label' => 'psc_shop_cms.OGType', 'required' => false]) + ->add('metaOgUrl', TextType::class, ['label' => 'psc_shop_cms.OGType', 'required' => false]) + ->add('metaOgImage', TextType::class, ['label' => 'psc_shop_cms.OGImage', 'required' => false]) + ->add('extraSettings', TextareaType::class, [ + 'required' => false, + 'label' => 'psc_shop_cms.ExtendedSettings', + ]) + ->add('language', ChoiceType::class, [ + 'label' => 'psc_shop_cms.Language', + 'choices' => $this->language->getLanguageArrayForContent(), + 'required' => true, + ]) + ->add('metaOgDescription', TextAreaType::class, [ + 'label' => 'psc_shop_cms.OGDescription', + 'required' => false, + ]); /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Cms) 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' => 'psc_shop_cms.Save')); + $builder->add('save', SubmitType::class, ['label' => 'psc_shop_cms.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::Cms) 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::Cms) 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::Cms) 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::Cms) as $field) { $field->formPreSubmit($event); } }); + $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) { + /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ + foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Cms) as $field) { + $field->formSubmit($event); + } + }); } public function getName() @@ -192,8 +225,8 @@ class CmsType extends AbstractType public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'data_class' => 'PSC\Shop\EntityBundle\Entity\Cms', - )); + ]); } } diff --git a/src/new/src/PSC/Shop/ContactBundle/Form/Backend/General/ContactType.php b/src/new/src/PSC/Shop/ContactBundle/Form/Backend/General/ContactType.php index e37a04e89..7dde2af8e 100755 --- a/src/new/src/PSC/Shop/ContactBundle/Form/Backend/General/ContactType.php +++ b/src/new/src/PSC/Shop/ContactBundle/Form/Backend/General/ContactType.php @@ -127,7 +127,7 @@ class ContactType extends AbstractType 'data-bs-toggle' => 'tooltip', 'data-bs-html' => '{{ contact.username }}', ]]) - ->add('account', EntityType::class, array( + ->add('account', EntityType::class, [ 'label' => 'Company', 'class' => 'PSC\Shop\EntityBundle\Entity\Account', 'choice_label' => 'titleAppendix', @@ -139,8 +139,8 @@ class ContactType extends AbstractType ->where('s.uid = :shop') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) - ->add('payments', EntityType::class, array( + ]) + ->add('payments', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Payment', 'choice_label' => 'title', 'choice_value' => 'uid', @@ -153,7 +153,7 @@ class ContactType extends AbstractType ->andWhere('u.private = 1') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) + ]) ->add('defaultPayment', ChoiceType::class, [ 'required' => false, 'label' => 'defaultPayment', @@ -164,7 +164,7 @@ class ContactType extends AbstractType 'label' => 'defaultShipment', 'choices' => $defaultShipments, ]) - ->add('productGroups', EntityType::class, array( + ->add('productGroups', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Productgroup', 'choice_label' => function (Productgroup $choice, $key, $value) { if ($choice->isEnable()) { @@ -183,8 +183,8 @@ class ContactType extends AbstractType ->andWhere('u.private = 1') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) - ->add('shippings', EntityType::class, array( + ]) + ->add('shippings', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Shipping', 'choice_label' => 'title', 'choice_value' => 'uid', @@ -197,8 +197,8 @@ class ContactType extends AbstractType ->andWhere('u.private = 1') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) - ->add('productsOrg', EntityType::class, array( + ]) + ->add('productsOrg', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Product', 'choice_label' => 'title', 'choice_value' => 'uid', @@ -211,8 +211,8 @@ class ContactType extends AbstractType ->andWhere('u.private = 1 AND u.originalProduct = 0') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) - ->add('productsSub', EntityType::class, array( + ]) + ->add('productsSub', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Product', 'choice_label' => 'nrTitle', 'choice_value' => 'uid', @@ -225,8 +225,8 @@ class ContactType extends AbstractType ->andWhere('u.private = 1 AND u.originalProduct != 0') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) - ->add('cms', EntityType::class, array( + ]) + ->add('cms', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Cms', 'choice_label' => 'title', 'choice_value' => 'uid', @@ -239,8 +239,8 @@ class ContactType extends AbstractType ->andWhere('u.private = 1') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) - ->add('collectingOrdersAccounts', EntityType::class, array( + ]) + ->add('collectingOrdersAccounts', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Account', 'choice_label' => 'title', 'choice_value' => 'uid', @@ -253,21 +253,21 @@ class ContactType extends AbstractType ->where('s.uid = :shop') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) - ->add('shops', EntityType::class, array( + ]) + ->add('shops', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Shop', 'choice_label' => 'title', 'required' => false, 'choice_value' => 'uid', 'multiple' => true, - )) - ->add('rolesForm', EntityType::class, array( + ]) + ->add('rolesForm', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Role', 'choice_label' => 'title', 'required' => false, 'choice_value' => 'uid', 'multiple' => true, - )) + ]) ->add('accountType', EnumType::class, [ 'required' => true, 'class' => AccountType::class, @@ -330,21 +330,21 @@ class ContactType extends AbstractType ->add('information', TextareaType::class, ['required' => false, 'label' => 'information']) ->add('vonwo', TextType::class, ['required' => false, 'label' => 'Fromwhere']) ->add('newsletter', CheckboxType::class, ['required' => false, 'label' => 'newsletter']) - ->add('extraSettings', TextareaType::class, array('required' => false, 'label' => 'Extrasettings')) + ->add('extraSettings', TextareaType::class, ['required' => false, 'label' => 'Extrasettings']) ->add('isSek', CheckboxType::class, ['required' => false, 'label' => 'Candobulkorders']) ->add('collectingOrders', CheckboxType::class, ['required' => false, 'label' => 'Approvedforbulkorders']) ->add('language', LocaleType::class, ['required' => false, 'label' => 'language']) - ->add('priceFactor', NumberType::class, array( + ->add('priceFactor', NumberType::class, [ 'required' => false, 'label' => 'factor', 'scale' => 5, 'html5' => true, - 'attr' => array( + 'attr' => [ 'min' => -0.00001, 'max' => 2.00, 'step' => 0.00001, - ), - )) + ], + ]) ->add('enable', CheckboxType::class, ['required' => false, 'label' => 'active']) ->add('virtual', CheckboxType::class, ['required' => false, 'label' => 'virtual']) ->add('locked', CheckboxType::class, ['required' => false, 'label' => 'Locked']) @@ -669,15 +669,15 @@ class ContactType extends AbstractType ], ]) ->add('showOtherOrders', CheckboxType::class, ['required' => false, 'label' => 'Mayseeordersfromothers']) - ->add('showOtherOrdersAccountFilter', ChoiceType::class, array( - 'choices' => array( + ->add('showOtherOrdersAccountFilter', ChoiceType::class, [ + 'choices' => [ 'Allunblocked' => 1, 'Samecompany' => 2, 'Filterselectedcompany' => 3, - ), + ], 'label' => 'Companyfilter', - )) - ->add('showOtherOrdersAccount', EntityType::class, array( + ]) + ->add('showOtherOrdersAccount', EntityType::class, [ 'class' => 'PSC\Shop\EntityBundle\Entity\Account', 'choice_label' => 'title', 'choice_value' => 'uid', @@ -692,7 +692,7 @@ class ContactType extends AbstractType ->where('s.uid = :shop') ->setParameter('shop', $this->shop->getSelectedShop()->getId()); }, - )) + ]) ->add('custom1', TextType::class, [ 'required' => false, 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName1() ?? ' ', @@ -893,17 +893,17 @@ class ContactType extends AbstractType 'data-bs-html' => '{{ contact.kundenNr }}', ], ]) - ->add('password', PasswordType::class, array( + ->add('password', PasswordType::class, [ 'required' => false, 'disabled' => false, 'label' => 'password', - )) - ->add('productionStatus', ChoiceType::class, array( + ]) + ->add('productionStatus', ChoiceType::class, [ 'label' => 'Productionstatus', 'required' => false, 'choices' => $this->statusService->getOrderStatusAsArray(), 'translation_domain' => 'status', - )); + ]); /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Contact) as $field) { $builder->add($field->buildForm($this->formFactory->createNamedBuilder( @@ -914,7 +914,7 @@ class ContactType extends AbstractType ), $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::Contact) as $field) { @@ -939,6 +939,12 @@ class ContactType extends AbstractType $field->formPreSubmit($event); } }); + $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) { + /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ + foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Contact) as $field) { + $field->formSubmit($event); + } + }); } public function getName() @@ -948,7 +954,7 @@ class ContactType extends AbstractType public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'data_class' => 'PSC\Shop\EntityBundle\Entity\Contact', 'products' => [], 'productGroups' => [], @@ -956,6 +962,6 @@ class ContactType extends AbstractType 'payments' => [], 'shippings' => [], 'translation_domain' => 'core_contact_edit', - )); + ]); } } diff --git a/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php b/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php index e98ba71a3..64a727357 100755 --- a/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php +++ b/src/new/src/PSC/Shop/NewsBundle/Form/Backend/NewsType.php @@ -34,6 +34,7 @@ class NewsType extends AbstractType { /** @var Field */ protected $fields; + public function __construct(Field $fields) { $this->fields = $fields; @@ -44,13 +45,11 @@ class NewsType extends AbstractType $builder ->add('title', TextType::class, ['label' => 'Title', 'required' => false]) ->add('enable', CheckboxType::class, ['label' => 'active', 'required' => false]) - ->add('sortDate', DateType::class, ['label' => 'Sortdate', 'required' => false, - 'widget' => 'single_text', - ]) - ->add('toDate', DateTimeType::class, ['label' => 'toDate', 'required' => false, - 'widget' => 'single_text', - ]) - ->add('fromDate', DateTimeType::class, ['label' => 'fromDate', 'required' => false, + ->add('sortDate', DateType::class, ['label' => 'Sortdate', 'required' => false, 'widget' => 'single_text']) + ->add('toDate', DateTimeType::class, ['label' => 'toDate', 'required' => false, 'widget' => 'single_text']) + ->add('fromDate', DateTimeType::class, [ + 'label' => 'fromDate', + 'required' => false, 'widget' => 'single_text', ]) ->add('url', TextType::class, ['label' => 'Url', 'required' => false]) @@ -60,9 +59,10 @@ class NewsType extends AbstractType 'choices' => [ 'Alle' => 'all', 'Deutsch' => 'de_DE', - 'Englisch' => 'en_EN' + 'Englisch' => 'en_EN', ], - 'required' => true]) + 'required' => true, + ]) ->add('media', LiveCollectionType::class, [ 'entry_type' => MediaForm::class, 'entry_options' => ['label' => 'media'], @@ -71,23 +71,29 @@ class NewsType extends AbstractType 'allow_delete' => true, 'by_reference' => false, ]) - ->add('text', CKEditor5Type::class, array( + ->add('text', CKEditor5Type::class, [ 'label' => 'Text', - 'required' => false - )); + 'required' => false, + ]); foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::News) as $field) { $field->buildForm($builder, $options); } - $builder->add('save', SubmitType::class, array('label' => 'save')); + $builder->add('save', SubmitType::class, ['label' => 'save']); $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { - $data = $event->getData(); foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::News) as $field) { $field->formPreSubmit($data); } $event->setData($data); }); + $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) { + $data = $event->getData(); + foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::News) as $field) { + $field->formSubmit($data); + } + $event->setData($data); + }); } public function getName() @@ -97,9 +103,9 @@ class NewsType extends AbstractType public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'data_class' => 'PSC\Shop\NewsBundle\Entity\News', - 'translation_domain' => 'core_news_edit' - )); + 'translation_domain' => 'core_news_edit', + ]); } } diff --git a/src/new/src/PSC/Shop/PaymentBundle/Form/Backend/PaymentType.php b/src/new/src/PSC/Shop/PaymentBundle/Form/Backend/PaymentType.php index 277e8eccd..ad5155c05 100755 --- a/src/new/src/PSC/Shop/PaymentBundle/Form/Backend/PaymentType.php +++ b/src/new/src/PSC/Shop/PaymentBundle/Form/Backend/PaymentType.php @@ -45,8 +45,15 @@ class PaymentType extends AbstractType private Tax $taxService; private CountryRepository $countryRepository; - public function __construct(Field $fields, FormFactoryInterface $formFactory, CountryRepository $countryRepository, Shop $shop, EntityManagerInterface $entityManager, Registry $paymentRegistry, Tax $taxService) - { + public function __construct( + Field $fields, + FormFactoryInterface $formFactory, + CountryRepository $countryRepository, + Shop $shop, + EntityManagerInterface $entityManager, + Registry $paymentRegistry, + Tax $taxService, + ) { $this->fields = $fields; $this->formFactory = $formFactory; $this->shopService = $shop; @@ -62,7 +69,9 @@ class PaymentType extends AbstractType */ public function buildForm(FormBuilderInterface $builder, array $options) { - $shippings = $this->entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Shipping')->findBy(array("shop" => $this->shopService->getSelectedShop()->getUid(), "enable" => 1)); + $shippings = $this->entityManager + ->getRepository('PSC\Shop\EntityBundle\Entity\Shipping') + ->findBy(['shop' => $this->shopService->getSelectedShop()->getUid(), 'enable' => 1]); $tmpShipping = []; foreach ($shippings as $shipping) { $tmpShipping[$shipping->getTitle()] = $shipping->getUid(); @@ -74,80 +83,85 @@ class PaymentType extends AbstractType } $countryTemp = []; - $countrys = $this->countryRepository->findBy(['shop' => (string)$this->shopService->getSelectedShop()->getUid()]); + $countrys = $this->countryRepository->findBy([ + 'shop' => (string) $this->shopService->getSelectedShop()->getUid(), + ]); /** @var Country $country */ foreach ($countrys as $country) { $countryTemp[$country->getCode()] = $country->getCode(); } $builder - ->add('title', TextType::class, array('label' => 'Name', 'required' => true)) - ->add('price', MoneyType::class, array('label' => 'cost', 'required' => true)) - ->add('pos', IntegerType::class, array('label' => 'Position', 'required' => true)) - ->add('percent', CheckboxType::class, array('label' => 'Prozentual', 'required' => false)) - ->add('private', CheckboxType::class, array('label' => 'Private', 'required' => false)) - ->add('enable', CheckboxType::class, array('label' => 'Active', 'required' => false)) - ->add('priceFrom', IntegerType::class, array('label' => 'priceof', 'required' => true, 'empty_data' => 0)) - ->add('priceTo', IntegerType::class, array('label' => 'priceuntil', 'required' => true, 'empty_data' => 0)) - ->add('description', TextareaType::class, array('label' => 'description', 'required' => false)) - ->add('paymentTerms', TextareaType::class, array('label' => 'paymentTerms', 'required' => false)) - ->add('trustedShopName', TextType::class, array('label' => 'TrustedShopName', 'required' => false)) - ->add('paymentGateway', ChoiceType::class, array( + ->add('title', TextType::class, ['label' => 'Name', 'required' => true]) + ->add('price', MoneyType::class, ['label' => 'cost', 'required' => true]) + ->add('pos', IntegerType::class, ['label' => 'Position', 'required' => true]) + ->add('percent', CheckboxType::class, ['label' => 'Prozentual', 'required' => false]) + ->add('private', CheckboxType::class, ['label' => 'Private', 'required' => false]) + ->add('enable', CheckboxType::class, ['label' => 'Active', 'required' => false]) + ->add('priceFrom', IntegerType::class, ['label' => 'priceof', 'required' => true, 'empty_data' => 0]) + ->add('priceTo', IntegerType::class, ['label' => 'priceuntil', 'required' => true, 'empty_data' => 0]) + ->add('description', TextareaType::class, ['label' => 'description', 'required' => false]) + ->add('paymentTerms', TextareaType::class, ['label' => 'paymentTerms', 'required' => false]) + ->add('trustedShopName', TextType::class, ['label' => 'TrustedShopName', 'required' => false]) + ->add('paymentGateway', ChoiceType::class, [ 'label' => 'PaymentGateway', 'required' => false, 'empty_data' => '', - 'choices' => $tmpGateways - )) - ->add('taxClass', ChoiceType::class, array( + 'choices' => $tmpGateways, + ]) + ->add('taxClass', ChoiceType::class, [ 'choices' => $this->taxService->getTaxesForForm(), 'required' => false, - 'label' => 'taxclass')) - ->add('shippings', ChoiceType::class, array( + 'label' => 'taxclass', + ]) + ->add('shippings', ChoiceType::class, [ 'choices' => $tmpShipping, 'multiple' => true, 'required' => false, 'label' => 'shippingmethods', - )) - ->add('countrys', ChoiceType::class, array( + ]) + ->add('countrys', ChoiceType::class, [ 'choices' => $countryTemp, 'required' => false, 'multiple' => true, 'label' => 'countrys', - )); + ]); /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Payment) as $field) { $builder->add($field->buildForm($this->formFactory->createNamedBuilder($field->getGroup()), $options)); } $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::Payment) 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::Payment) 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::Payment) 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::Payment) as $field) { $field->formPreSubmit($event); } }); - $builder->add('save', SubmitType::class, array('label' => 'save')); + $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) { + /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ + foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Payment) as $field) { + $field->formSubmit($event); + } + }); + $builder->add('save', SubmitType::class, ['label' => 'save']); } public function getName() @@ -157,9 +171,9 @@ class PaymentType extends AbstractType public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'data_class' => 'PSC\Shop\EntityBundle\Entity\Payment', - 'translation_domain' => 'core_payment_edit' - )); + 'translation_domain' => 'core_payment_edit', + ]); } } 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 ac52f936b..439b59a58 100755 --- a/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php +++ b/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php @@ -733,6 +733,12 @@ class ShopSettingsType extends AbstractType $field->formPreSubmit($event); } }); + $builder->addEventListener(FormEvents::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->formSubmit($event); + } + }); } public function getName() diff --git a/src/new/src/PSC/Shop/ThemeBundle/Form/Backend/SettingsType.php b/src/new/src/PSC/Shop/ThemeBundle/Form/Backend/SettingsType.php index 157949057..1fdede3e9 100755 --- a/src/new/src/PSC/Shop/ThemeBundle/Form/Backend/SettingsType.php +++ b/src/new/src/PSC/Shop/ThemeBundle/Form/Backend/SettingsType.php @@ -31,12 +31,13 @@ class SettingsType extends AbstractType /** @var ThemeSource */ protected $themes; -/** @var Field */ + /** @var Field */ protected $fields; -/** + /** * @var FormFactory */ private $formFactory; + public function __construct(Field $fields, FormFactoryInterface $formFactory, ThemeSource $themes) { $this->themes = $themes; @@ -44,43 +45,62 @@ class SettingsType extends AbstractType $this->formFactory = $formFactory; } - public function buildForm(FormBuilderInterface $builder, array $options) { /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ - foreach ($this->fields->getThemeFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Theme, $options['themeType']) as $field) { + foreach ($this->fields->getThemeFields( + \PSC\System\PluginBundle\Form\Interfaces\Field::Theme, + $options['themeType'], + ) as $field) { $builder->add($field->buildForm($this->formFactory->createNamedBuilder($field->getGroup()), $options)); } - $builder->add('save', SubmitType::class, array('label' => 'Speichern')); + $builder->add('save', SubmitType::class, ['label' => 'Speichern']); $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($options) { - /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ - foreach ($this->fields->getThemeFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Theme, $options['themeType']) as $field) { + foreach ($this->fields->getThemeFields( + \PSC\System\PluginBundle\Form\Interfaces\Field::Theme, + $options['themeType'], + ) as $field) { $field->formPreSetData($event); } }); $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) use ($options) { - /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ - foreach ($this->fields->getThemeFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Theme, $options['themeType']) as $field) { + foreach ($this->fields->getThemeFields( + \PSC\System\PluginBundle\Form\Interfaces\Field::Theme, + $options['themeType'], + ) as $field) { $field->formPostSetData($event); } }); $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($options) { - /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ - foreach ($this->fields->getThemeFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Theme, $options['themeType']) as $field) { + foreach ($this->fields->getThemeFields( + \PSC\System\PluginBundle\Form\Interfaces\Field::Theme, + $options['themeType'], + ) as $field) { $field->formPostSubmit($event); } }); $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($options) { - /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ - foreach ($this->fields->getThemeFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Theme, $options['themeType']) as $field) { + foreach ($this->fields->getThemeFields( + \PSC\System\PluginBundle\Form\Interfaces\Field::Theme, + $options['themeType'], + ) as $field) { $field->formPreSubmit($event); } }); + $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) use ($options) { + /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ + foreach ($this->fields->getThemeFields( + \PSC\System\PluginBundle\Form\Interfaces\Field::Theme, + $options['themeType'], + ) as $field) { + $field->formSubmit($event); + } + }); } public function getName() @@ -90,10 +110,10 @@ class SettingsType extends AbstractType public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'shopEntity' => null, 'shopDoc' => null, - 'themeType' => "", - )); + 'themeType' => '', + ]); } } diff --git a/src/new/src/PSC/Shop/VoucherBundle/Form/Backend/VoucherType.php b/src/new/src/PSC/Shop/VoucherBundle/Form/Backend/VoucherType.php index 2fa63254d..da5d147e4 100755 --- a/src/new/src/PSC/Shop/VoucherBundle/Form/Backend/VoucherType.php +++ b/src/new/src/PSC/Shop/VoucherBundle/Form/Backend/VoucherType.php @@ -30,6 +30,7 @@ class VoucherType extends AbstractType { /** @var Field */ protected $fields; + public function __construct(Field $fields) { $this->fields = $fields; @@ -48,33 +49,38 @@ class VoucherType extends AbstractType ->add('count', NumberType::class, ['label' => 'Count', 'required' => false]) ->add('minBasketValue', NumberType::class, ['label' => 'min BasketValue', 'required' => false]) ->add('code', TextType::class, ['label' => 'Code', 'required' => false]) - ->add('mode', ChoiceType::class, array( + ->add('mode', ChoiceType::class, [ 'label' => 'Modus', 'choices' => [ 'Totalshoppingcart' => 1, - 'Calculationvalue' => 2 + 'Calculationvalue' => 2, ], 'required' => true, - )) + ]) ->add('payment', CheckboxType::class, ['label' => 'Payment', 'required' => false]) ->add('shipping', CheckboxType::class, ['label' => 'Shipping', 'required' => false]) ->add('zeroShipping', CheckboxType::class, ['label' => 'Zero Shipping', 'required' => false]) ->add('zeroPayment', CheckboxType::class, ['label' => 'Zero Payment', 'required' => false]) ->add('productIds', TextType::class, ['label' => 'ProductID', 'required' => false]) - ->add('productGroupIds', TextType::class, ['label' => 'ProductgroupID', 'required' => false]) - ; + ->add('productGroupIds', TextType::class, ['label' => 'ProductgroupID', 'required' => false]); foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Voucher) as $field) { $field->buildForm($builder, $options); } - $builder->add('save', SubmitType::class, array('label' => 'save')); + $builder->add('save', SubmitType::class, ['label' => 'save']); $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { - $data = $event->getData(); foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Voucher) as $field) { $field->formPreSubmit($data); } $event->setData($data); }); + $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) { + $data = $event->getData(); + foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Voucher) as $field) { + $field->formSubmit($data); + } + $event->setData($data); + }); } public function getName() @@ -84,9 +90,9 @@ class VoucherType extends AbstractType public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'data_class' => 'PSC\Shop\EntityBundle\Entity\Voucher', - 'translation_domain' => 'core_voucher_edit' - )); + 'translation_domain' => 'core_voucher_edit', + ]); } } diff --git a/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php b/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php index fdeb443d4..399956fa6 100755 --- a/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php +++ b/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php @@ -33,6 +33,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver; class SettingsType extends AbstractType { protected $shop = null; + public function __construct(Field $fields, FormFactoryInterface $formFactory) { $this->fields = $fields; @@ -42,72 +43,107 @@ class SettingsType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('numberStart', TextType::class, array('required' => false, 'label' => 'Startnummer')) - ->add('offerNumberStart', TextType::class, array('required' => false, 'label' => 'Startnummer')) - ->add('invoiceNumberStart', TextType::class, array('required' => false, 'label' => 'Startnummer')) - ->add('creditNumberStart', TextType::class, array('required' => false, 'label' => 'Startnummer')) - ->add('cancelationNumberStart', TextType::class, array('required' => false, 'label' => 'Startnummer')) - ->add('parcelInvoiceNumberStart', TextType::class, array('required' => false, 'label' => 'Startnummer')) - ->add('parcelCancelationNumberStart', TextType::class, array('required' => false, 'label' => 'Startnummer')) - ->add('numberPattern', TextType::class, array('required' => false, 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}')) - ->add('offerNumberPattern', TextType::class, array('required' => false, 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}')) - ->add('invoiceNumberPattern', TextType::class, array('required' => false, 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}')) - ->add('creditNumberPattern', TextType::class, array('required' => false, 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}')) - ->add('cancelationNumberPattern', TextType::class, array('required' => false, 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}')) - ->add('parcelInvoiceNumberPattern', TextType::class, array('required' => false, 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}')) - ->add('parcelCancelationNumberPattern', TextType::class, array('required' => false, 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}')) - - - - ->add('smtpOwn', CheckboxType::class, array('required' => false, 'label' => 'Eigene Einstellungen verwenden')) - ->add('smtpTls', CheckboxType::class, array('required' => false, 'label' => 'TLS')) - ->add('smtpPort', NumberType::class, array('required' => false, 'label' => 'Port')) - ->add('smtpHost', TextType::class, array('required' => false, 'label' => 'Host')) - ->add('smtpUsername', TextType::class, array('required' => false, 'label' => 'Username')) - ->add('smtpPassword', PasswordType::class, array('required' => false, 'label' => 'Password')) - ->add('extraSettings', TextareaType::class, array('required' => false, 'label' => 'Extra Einstellungen')) - ->add('maintenanceMode', CheckboxType::class, array('required' => false, 'label' => 'Wartungsmodus')) - ->add('maintenanceTitle', TextType::class, array('required' => false, 'label' => 'Wartung Titel')) - ->add('maintenanceText', TextareaType::class, array('required' => false, 'label' => 'Wartung Text')) - - ->add('supporturl', TextType::class, array('required' => false, 'label' => 'Support URL')) - ->add('supporttoken', TextType::class, array('required' => false, 'label' => 'API Token')) - ->add('supportprotokoll', CheckboxType::class, array('required' => false, 'attr' => array('checked' => 'checked', 'readonly' => true), 'label' => 'Fehlerprotokolle an PrintshopCreator übermitteln')) - ->add('supportlogin', CheckboxType::class, array('required' => false, 'attr' => array('checked' => 'checked', 'readonly' => true), 'label' => 'PSC Support Login erlauben')) - ->add('monitoringkey', TextType::class, array('required' => false, 'label' => 'Monitoring Key')); + ->add('numberStart', TextType::class, ['required' => false, 'label' => 'Startnummer']) + ->add('offerNumberStart', TextType::class, ['required' => false, 'label' => 'Startnummer']) + ->add('invoiceNumberStart', TextType::class, ['required' => false, 'label' => 'Startnummer']) + ->add('creditNumberStart', TextType::class, ['required' => false, 'label' => 'Startnummer']) + ->add('cancelationNumberStart', TextType::class, ['required' => false, 'label' => 'Startnummer']) + ->add('parcelInvoiceNumberStart', TextType::class, ['required' => false, 'label' => 'Startnummer']) + ->add('parcelCancelationNumberStart', TextType::class, ['required' => false, 'label' => 'Startnummer']) + ->add('numberPattern', TextType::class, [ + 'required' => false, + 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}', + ]) + ->add('offerNumberPattern', TextType::class, [ + 'required' => false, + 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}', + ]) + ->add('invoiceNumberPattern', TextType::class, [ + 'required' => false, + 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}', + ]) + ->add('creditNumberPattern', TextType::class, [ + 'required' => false, + 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}', + ]) + ->add('cancelationNumberPattern', TextType::class, [ + 'required' => false, + 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}', + ]) + ->add('parcelInvoiceNumberPattern', TextType::class, [ + 'required' => false, + 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}', + ]) + ->add('parcelCancelationNumberPattern', TextType::class, [ + 'required' => false, + 'label' => 'Nummernkreisformat Bsp: SP-{{ "now"|date("d.m.Y") }}-{{ number }}', + ]) + ->add('smtpOwn', CheckboxType::class, [ + 'required' => false, + 'label' => 'Eigene Einstellungen verwenden', + ]) + ->add('smtpTls', CheckboxType::class, ['required' => false, 'label' => 'TLS']) + ->add('smtpPort', NumberType::class, ['required' => false, 'label' => 'Port']) + ->add('smtpHost', TextType::class, ['required' => false, 'label' => 'Host']) + ->add('smtpUsername', TextType::class, ['required' => false, 'label' => 'Username']) + ->add('smtpPassword', PasswordType::class, ['required' => false, 'label' => 'Password']) + ->add('extraSettings', TextareaType::class, ['required' => false, 'label' => 'Extra Einstellungen']) + ->add('maintenanceMode', CheckboxType::class, ['required' => false, 'label' => 'Wartungsmodus']) + ->add('maintenanceTitle', TextType::class, ['required' => false, 'label' => 'Wartung Titel']) + ->add('maintenanceText', TextareaType::class, ['required' => false, 'label' => 'Wartung Text']) + ->add('supporturl', TextType::class, ['required' => false, 'label' => 'Support URL']) + ->add('supporttoken', TextType::class, ['required' => false, 'label' => 'API Token']) + ->add('supportprotokoll', CheckboxType::class, [ + 'required' => false, + 'attr' => ['checked' => 'checked', 'readonly' => true], + 'label' => 'Fehlerprotokolle an PrintshopCreator übermitteln', + ]) + ->add('supportlogin', CheckboxType::class, [ + 'required' => false, + 'attr' => ['checked' => 'checked', 'readonly' => true], + 'label' => 'PSC Support Login erlauben', + ]) + ->add('monitoringkey', TextType::class, ['required' => false, 'label' => 'Monitoring Key']); /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::System) 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' => 'Speichern')); + $builder->add('save', SubmitType::class, ['label' => 'Speichern']); $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::System) 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::System) 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::System) 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::System) as $field) { $field->formPreSubmit($event); } }); + $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) { + /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ + foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::System) as $field) { + $field->formSubmit($event); + } + }); } public function getName() @@ -117,8 +153,8 @@ class SettingsType extends AbstractType public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'data_class' => 'PSC\Shop\EntityBundle\Document\Instance', - )); + ]); } } diff --git a/src/new/var/plugins/Custom/Albertbauer/PaginaNetABSa/form/field/ShopSettings.php b/src/new/var/plugins/Custom/Albertbauer/PaginaNetABSa/form/field/ShopSettings.php index 19bdfe8de..0b99673d8 100755 --- a/src/new/var/plugins/Custom/Albertbauer/PaginaNetABSa/form/field/ShopSettings.php +++ b/src/new/var/plugins/Custom/Albertbauer/PaginaNetABSa/form/field/ShopSettings.php @@ -26,15 +26,9 @@ class ShopSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('paginanetABSa', 'server', $event->getForm()->get('paginanetABSa')->get('server')->getData()); - $data->setPluginSettingModule('paginanetABSa', 'serverUsername', $event->getForm()->get('paginanetABSa')->get('serverUsername')->getData()); - $data->setPluginSettingModule('paginanetABSa', 'serverPassword', $event->getForm()->get('paginanetABSa')->get('serverPassword')->getData()); - $data->setPluginSettingModule('paginanetABSa', 'contactGroup', $event->getForm()->get('paginanetABSa')->get('contactGroup')->getData()); - $event->setData($data); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -88,6 +82,14 @@ class ShopSettings implements Field } public function formSubmit(FormEvent $event) - { + { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('paginanetABSa', 'server', $event->getForm()->get('paginanetABSa')->get('server')->getData()); + $data->setPluginSettingModule('paginanetABSa', 'serverUsername', $event->getForm()->get('paginanetABSa')->get('serverUsername')->getData()); + $data->setPluginSettingModule('paginanetABSa', 'serverPassword', $event->getForm()->get('paginanetABSa')->get('serverPassword')->getData()); + $data->setPluginSettingModule('paginanetABSa', 'contactGroup', $event->getForm()->get('paginanetABSa')->get('contactGroup')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/CreativeLayouter/Form/BackendFields.php b/src/new/var/plugins/Custom/PSC/CreativeLayouter/Form/BackendFields.php index a78df6d51..275c91b33 100644 --- a/src/new/var/plugins/Custom/PSC/CreativeLayouter/Form/BackendFields.php +++ b/src/new/var/plugins/Custom/PSC/CreativeLayouter/Form/BackendFields.php @@ -78,14 +78,7 @@ class BackendFields extends \PSC\System\PluginBundle\Form\Field implements Field public function formPostSubmit(FormEvent $event) { - /** @var Product $product */ - $product = $event->getData(); - $product->setUploadSteplayouter2InitalStatus( - $event->getForm()->get('creativelayouter')->get('uploadSteplayouter2InitalStatus')->getData(), - ); - $product->setUploadSteplayouter2( - $event->getForm()->get('creativelayouter')->get('uploadSteplayouter2')->getData(), - ); + } public function formPreSetData(FormEvent $event) @@ -94,5 +87,14 @@ class BackendFields extends \PSC\System\PluginBundle\Form\Field implements Field public function formSubmit(FormEvent $event) { + /** @var Product $product */ + $product = $event->getData(); + $product->setUploadSteplayouter2InitalStatus( + $event->getForm()->get('creativelayouter')->get('uploadSteplayouter2InitalStatus')->getData(), + ); + $product->setUploadSteplayouter2( + $event->getForm()->get('creativelayouter')->get('uploadSteplayouter2')->getData(), + ); + } } diff --git a/src/new/var/plugins/Custom/PSC/FacebookProduktXMLExport/Form/Field/ShopSettings.php b/src/new/var/plugins/Custom/PSC/FacebookProduktXMLExport/Form/Field/ShopSettings.php index 91cc16fd3..476ca1198 100755 --- a/src/new/var/plugins/Custom/PSC/FacebookProduktXMLExport/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/FacebookProduktXMLExport/Form/Field/ShopSettings.php @@ -51,15 +51,9 @@ class ShopSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('facebookXML', 'country', $event->getForm()->get('facebookXML')->get('country')->getData()); - $data->setPluginSettingModule('facebookXML', 'service', $event->getForm()->get('facebookXML')->get('service')->getData()); - $data->setPluginSettingModule('facebookXML', 'shippingprice', $event->getForm()->get('facebookXML')->get('shippingprice')->getData()); - $data->setPluginSettingModule('facebookXML', 'productGroup', $event->getForm()->get('facebookXML')->get('productGroup')->getData()); - $event->setData($data); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -120,6 +114,14 @@ class ShopSettings implements Field } public function formSubmit(FormEvent $event) - { + { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('facebookXML', 'country', $event->getForm()->get('facebookXML')->get('country')->getData()); + $data->setPluginSettingModule('facebookXML', 'service', $event->getForm()->get('facebookXML')->get('service')->getData()); + $data->setPluginSettingModule('facebookXML', 'shippingprice', $event->getForm()->get('facebookXML')->get('shippingprice')->getData()); + $data->setPluginSettingModule('facebookXML', 'productGroup', $event->getForm()->get('facebookXML')->get('productGroup')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/FormLayouter/Form/Field/EnableEditor.php b/src/new/var/plugins/Custom/PSC/FormLayouter/Form/Field/EnableEditor.php index f26729f7f..49ccd7bd1 100644 --- a/src/new/var/plugins/Custom/PSC/FormLayouter/Form/Field/EnableEditor.php +++ b/src/new/var/plugins/Custom/PSC/FormLayouter/Form/Field/EnableEditor.php @@ -117,6 +117,16 @@ class EnableEditor implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + // TODO: Implement formPreSetData() method. + } + + public function formSubmit(FormEvent $event) { $filename = "/data/www/old/application/design/vorlagen/" . $_POST["settings"]["bootstrap3General"]["layout"] . "/step_layouter/header.html.twig"; $handle = fopen($filename, 'w'); @@ -128,14 +138,6 @@ class EnableEditor implements Field fputs($handle, $event->getForm()->get('formlayoutereditor')->get('footer')->getData()); fclose($handle); // TODO: Implement formPostSubmit() method. - } - - public function formPreSetData(FormEvent $event) - { - // TODO: Implement formPreSetData() method. - } - - public function formSubmit(FormEvent $event) - { + } } \ No newline at end of file diff --git a/src/new/var/plugins/Custom/PSC/GoogleProduktXMLExport/Form/ShopSettings.php b/src/new/var/plugins/Custom/PSC/GoogleProduktXMLExport/Form/ShopSettings.php index 6563034df..695329d4d 100755 --- a/src/new/var/plugins/Custom/PSC/GoogleProduktXMLExport/Form/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/GoogleProduktXMLExport/Form/ShopSettings.php @@ -39,13 +39,7 @@ class ShopSettings implements Field */ public function formPostSubmit(FormEvent $event) { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('googleXML', 'country', $event->getForm()->get('googleXML')->get('country')->getData()); - $data->setPluginSettingModule('googleXML', 'service', $event->getForm()->get('googleXML')->get('service')->getData()); - $data->setPluginSettingModule('googleXML', 'shippingprice', $event->getForm()->get('googleXML')->get('shippingprice')->getData()); - $data->setPluginSettingModule('googleXML', 'productGroup', $event->getForm()->get('googleXML')->get('productGroup')->getData()); - $event->setData($data); + } public function formPostSetData(FormEvent $event) @@ -108,5 +102,13 @@ class ShopSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('googleXML', 'country', $event->getForm()->get('googleXML')->get('country')->getData()); + $data->setPluginSettingModule('googleXML', 'service', $event->getForm()->get('googleXML')->get('service')->getData()); + $data->setPluginSettingModule('googleXML', 'shippingprice', $event->getForm()->get('googleXML')->get('shippingprice')->getData()); + $data->setPluginSettingModule('googleXML', 'productGroup', $event->getForm()->get('googleXML')->get('productGroup')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/Pitchprint/Form/Field/ShopSettings.php b/src/new/var/plugins/Custom/PSC/Pitchprint/Form/Field/ShopSettings.php index 5deba0497..4a816b4b9 100755 --- a/src/new/var/plugins/Custom/PSC/Pitchprint/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/Pitchprint/Form/Field/ShopSettings.php @@ -27,12 +27,9 @@ class ShopSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('pitchprint', 'publicKey', $event->getForm()->get('Pitchprint')->get('publicKey')->getData()); - $data->setPluginSettingModule('pitchprint', 'secretKey', $event->getForm()->get('Pitchprint')->get('secretKey')->getData()); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -74,6 +71,11 @@ class ShopSettings implements Field } public function formSubmit(FormEvent $event) - { + { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('pitchprint', 'publicKey', $event->getForm()->get('Pitchprint')->get('publicKey')->getData()); + $data->setPluginSettingModule('pitchprint', 'secretKey', $event->getForm()->get('Pitchprint')->get('secretKey')->getData()); + } } diff --git a/src/new/var/plugins/Custom/PSC/Printess/Form/BackendFields.php b/src/new/var/plugins/Custom/PSC/Printess/Form/BackendFields.php index 49a00189a..9ae22a737 100755 --- a/src/new/var/plugins/Custom/PSC/Printess/Form/BackendFields.php +++ b/src/new/var/plugins/Custom/PSC/Printess/Form/BackendFields.php @@ -147,7 +147,17 @@ class BackendFields extends \PSC\System\PluginBundle\Form\Field implements Field // TODO: Implement formPostSetData() method. } - public function formPostSubmit(FormEvent $event) + public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + // TODO: Implement formPreSetData() method. + } + + public function formSubmit(FormEvent $event) { /** @var Product $product */ $product = $event->getData(); @@ -175,15 +185,7 @@ class BackendFields extends \PSC\System\PluginBundle\Form\Field implements Field $product->setCollectingOrdersAccount( $event->getForm()->get('PrintessBulkorder')->get('collectingOrdersAccount')->getData(), ); - } - - public function formPreSetData(FormEvent $event) - { - // TODO: Implement formPreSetData() method. - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/Custom/PSC/Printess/Form/ShopSettings.php b/src/new/var/plugins/Custom/PSC/Printess/Form/ShopSettings.php index 8bedde3fb..fb6db2b9f 100755 --- a/src/new/var/plugins/Custom/PSC/Printess/Form/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/Printess/Form/ShopSettings.php @@ -27,20 +27,9 @@ class ShopSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule( - 'printess', - 'shopToken', - $event->getForm()->get('printess')->get('shopToken')->getData(), - ); - $data->setPluginSettingModule( - 'printess', - 'serviceToken', - $event->getForm()->get('printess')->get('serviceToken')->getData(), - ); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -84,8 +73,21 @@ class ShopSettings implements Field { } - public function formSubmit(FormEvent $event) + public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule( + 'printess', + 'shopToken', + $event->getForm()->get('printess')->get('shopToken')->getData(), + ); + $data->setPluginSettingModule( + 'printess', + 'serviceToken', + $event->getForm()->get('printess')->get('serviceToken')->getData(), + ); + } public function formPreSetData(FormEvent $event) diff --git a/src/new/var/plugins/Custom/PSC/R2_Pitchprint/Form/Field/ShopSettings.php b/src/new/var/plugins/Custom/PSC/R2_Pitchprint/Form/Field/ShopSettings.php index ab7c7dc66..b21156d59 100755 --- a/src/new/var/plugins/Custom/PSC/R2_Pitchprint/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/R2_Pitchprint/Form/Field/ShopSettings.php @@ -27,12 +27,9 @@ class ShopSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('pitchprint_r2', 'domainKey', $event->getForm()->get('Pitchprint_R2')->get('domainKey')->getData()); - $data->setPluginSettingModule('pitchprint_r2', 'authKey', $event->getForm()->get('Pitchprint_R2')->get('authKey')->getData()); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -74,6 +71,11 @@ class ShopSettings implements Field } public function formSubmit(FormEvent $event) - { + { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('pitchprint_r2', 'domainKey', $event->getForm()->get('Pitchprint_R2')->get('domainKey')->getData()); + $data->setPluginSettingModule('pitchprint_r2', 'authKey', $event->getForm()->get('Pitchprint_R2')->get('authKey')->getData()); + } } diff --git a/src/new/var/plugins/Custom/PSC/R2_Sendcloud/Form/ShopSettings.php b/src/new/var/plugins/Custom/PSC/R2_Sendcloud/Form/ShopSettings.php index 70405bca4..ebd0368b7 100755 --- a/src/new/var/plugins/Custom/PSC/R2_Sendcloud/Form/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/R2_Sendcloud/Form/ShopSettings.php @@ -33,24 +33,6 @@ class ShopSettings implements Field */ public function formPostSubmit(FormEvent $event): void { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule( - 'r2sendcloud', - 'publicKey', - $event->getForm()->get('r2sendcloud')->get('publicKey')->getData(), - ); - $data->setPluginSettingModule( - 'r2sendcloud', - 'secretKey', - $event->getForm()->get('r2sendcloud')->get('secretKey')->getData(), - ); - $data->setPluginSettingModule( - 'r2sendcloud', - 'status', - $event->getForm()->get('r2sendcloud')->get('status')->getData(), - ); - $event->setData($data); } public function formPostSetData(FormEvent $event): void @@ -115,5 +97,23 @@ class ShopSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule( + 'r2sendcloud', + 'publicKey', + $event->getForm()->get('r2sendcloud')->get('publicKey')->getData(), + ); + $data->setPluginSettingModule( + 'r2sendcloud', + 'secretKey', + $event->getForm()->get('r2sendcloud')->get('secretKey')->getData(), + ); + $data->setPluginSettingModule( + 'r2sendcloud', + 'status', + $event->getForm()->get('r2sendcloud')->get('status')->getData(), + ); + $event->setData($data); } } diff --git a/src/new/var/plugins/Custom/PSC/Saxoprint_API_R1/Form/Field/ShopSettings.php b/src/new/var/plugins/Custom/PSC/Saxoprint_API_R1/Form/Field/ShopSettings.php index 28cfba7b8..323a3394c 100755 --- a/src/new/var/plugins/Custom/PSC/Saxoprint_API_R1/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/Saxoprint_API_R1/Form/Field/ShopSettings.php @@ -33,34 +33,7 @@ class ShopSettings implements Field */ public function formPostSubmit(FormEvent $event) { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule( - 'saxoprint', - 'customerNumber', - $event->getForm()->get('saxoprint')->get('customerNumber')->getData(), - ); - $data->setPluginSettingModule( - 'saxoprint', - 'sriAPIKey', - $event->getForm()->get('saxoprint')->get('sriAPIKey')->getData(), - ); - $data->setPluginSettingModule( - 'saxoprint', - 'saxoprintaufschlag', - $event->getForm()->get('saxoprint')->get('saxoprintaufschlag')->getData(), - ); - $data->setPluginSettingModule( - 'saxoprint', - 'saxoprintaufschlagFix', - $event->getForm()->get('saxoprint')->get('saxoprintaufschlagFix')->getData(), - ); - $data->setPluginSettingModule( - 'saxoprint', - 'useTestSystem', - $event->getForm()->get('saxoprint')->get('useTestSystem')->getData(), - ); - $event->setData($data); + } public function formPostSetData(FormEvent $event) @@ -140,5 +113,34 @@ class ShopSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule( + 'saxoprint', + 'customerNumber', + $event->getForm()->get('saxoprint')->get('customerNumber')->getData(), + ); + $data->setPluginSettingModule( + 'saxoprint', + 'sriAPIKey', + $event->getForm()->get('saxoprint')->get('sriAPIKey')->getData(), + ); + $data->setPluginSettingModule( + 'saxoprint', + 'saxoprintaufschlag', + $event->getForm()->get('saxoprint')->get('saxoprintaufschlag')->getData(), + ); + $data->setPluginSettingModule( + 'saxoprint', + 'saxoprintaufschlagFix', + $event->getForm()->get('saxoprint')->get('saxoprintaufschlagFix')->getData(), + ); + $data->setPluginSettingModule( + 'saxoprint', + 'useTestSystem', + $event->getForm()->get('saxoprint')->get('useTestSystem')->getData(), + ); + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/Sendcloud/Form/Field/ShopSettings.php b/src/new/var/plugins/Custom/PSC/Sendcloud/Form/Field/ShopSettings.php index 39688b9ef..190ac862a 100755 --- a/src/new/var/plugins/Custom/PSC/Sendcloud/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/Sendcloud/Form/Field/ShopSettings.php @@ -27,18 +27,9 @@ class ShopSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('Sendcloud', 'publicKey', $event->getForm()->get('Sendcloud')->get('publicKey')->getData()); - $data->setPluginSettingModule('Sendcloud', 'secretKey', $event->getForm()->get('Sendcloud')->get('secretKey')->getData()); - $data->setPluginSettingModule('Sendcloud', 'versandartZoll', $event->getForm()->get('Sendcloud')->get('versandartZoll')->getData()); - $data->setPluginSettingModule('Sendcloud', 'versanddienstleister', $event->getForm()->get('Sendcloud')->get('versanddienstleister')->getData()); - $data->setPluginSettingModule('Sendcloud', 'labelerzeugen', $event->getForm()->get('Sendcloud')->get('labelerzeugen')->getData()); - $data->setPluginSettingModule('Sendcloud', 'empfaengerland', $event->getForm()->get('Sendcloud')->get('empfaengerland')->getData()); - $data->setPluginSettingModule('Sendcloud', 'actionsid', $event->getForm()->get('Sendcloud')->get('actionsid')->getData()); - $event->setData($data); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -120,6 +111,17 @@ class ShopSettings implements Field } public function formSubmit(FormEvent $event) - { + { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('Sendcloud', 'publicKey', $event->getForm()->get('Sendcloud')->get('publicKey')->getData()); + $data->setPluginSettingModule('Sendcloud', 'secretKey', $event->getForm()->get('Sendcloud')->get('secretKey')->getData()); + $data->setPluginSettingModule('Sendcloud', 'versandartZoll', $event->getForm()->get('Sendcloud')->get('versandartZoll')->getData()); + $data->setPluginSettingModule('Sendcloud', 'versanddienstleister', $event->getForm()->get('Sendcloud')->get('versanddienstleister')->getData()); + $data->setPluginSettingModule('Sendcloud', 'labelerzeugen', $event->getForm()->get('Sendcloud')->get('labelerzeugen')->getData()); + $data->setPluginSettingModule('Sendcloud', 'empfaengerland', $event->getForm()->get('Sendcloud')->get('empfaengerland')->getData()); + $data->setPluginSettingModule('Sendcloud', 'actionsid', $event->getForm()->get('Sendcloud')->get('actionsid')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/TemplateprintLayouter/Form/BackendFields.php b/src/new/var/plugins/Custom/PSC/TemplateprintLayouter/Form/BackendFields.php index ecd204500..064295d8c 100644 --- a/src/new/var/plugins/Custom/PSC/TemplateprintLayouter/Form/BackendFields.php +++ b/src/new/var/plugins/Custom/PSC/TemplateprintLayouter/Form/BackendFields.php @@ -148,6 +148,16 @@ class BackendFields extends \PSC\System\PluginBundle\Form\Field implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + // TODO: Implement formPreSetData() method. + } + + public function formSubmit(FormEvent $event) { /** @var Product $product */ $product = $event->getData(); @@ -181,14 +191,6 @@ class BackendFields extends \PSC\System\PluginBundle\Form\Field implements Field $product->setUploadTemplateprintInitalStatus( $event->getForm()->get('templateprintlayouter')->get('uploadTemplateprintInitalStatus')->getData(), ); - } - - public function formPreSetData(FormEvent $event) - { - // TODO: Implement formPreSetData() method. - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/Custom/PSC/WMD_API/Form/ProductSettings.php b/src/new/var/plugins/Custom/PSC/WMD_API/Form/ProductSettings.php index af477fb43..9429a1e76 100755 --- a/src/new/var/plugins/Custom/PSC/WMD_API/Form/ProductSettings.php +++ b/src/new/var/plugins/Custom/PSC/WMD_API/Form/ProductSettings.php @@ -95,10 +95,7 @@ class ProductSettings implements Field public function formPostSubmit(FormEvent $event) { - /** @var Product $data */ - $data = $event->getData(); - $data->setMwert($event->getForm()->get('wmd')->get('mwert')->getData()); - $event->setData($data); + } @@ -109,6 +106,11 @@ class ProductSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Product $data */ + $data = $event->getData(); + $data->setMwert($event->getForm()->get('wmd')->get('mwert')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/WMD_API/Form/ShopSettings.php b/src/new/var/plugins/Custom/PSC/WMD_API/Form/ShopSettings.php index 7f31af986..1ead9a1bf 100755 --- a/src/new/var/plugins/Custom/PSC/WMD_API/Form/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/WMD_API/Form/ShopSettings.php @@ -30,12 +30,7 @@ class ShopSettings implements Field */ public function formPostSubmit(FormEvent $event) { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('wmd', 'clientId', $event->getForm()->get('wmd')->get('clientId')->getData()); - $data->setPluginSettingModule('wmd', 'clientSecret', $event->getForm()->get('wmd')->get('clientSecret')->getData()); - $data->setPluginSettingModule('wmd', 'useTestSystem', $event->getForm()->get('wmd')->get('useTestSystem')->getData()); - $event->setData($data); + } public function formPostSetData(FormEvent $event) @@ -85,5 +80,12 @@ class ShopSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('wmd', 'clientId', $event->getForm()->get('wmd')->get('clientId')->getData()); + $data->setPluginSettingModule('wmd', 'clientSecret', $event->getForm()->get('wmd')->get('clientSecret')->getData()); + $data->setPluginSettingModule('wmd', 'useTestSystem', $event->getForm()->get('wmd')->get('useTestSystem')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/Zaikio/Form/ProductSettings.php b/src/new/var/plugins/Custom/PSC/Zaikio/Form/ProductSettings.php index e7fd3e38d..a67a2dc63 100755 --- a/src/new/var/plugins/Custom/PSC/Zaikio/Form/ProductSettings.php +++ b/src/new/var/plugins/Custom/PSC/Zaikio/Form/ProductSettings.php @@ -29,12 +29,9 @@ class ProductSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Product $data */ - $data = $event->getData(); - - $event->setData($data); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -105,6 +102,11 @@ class ProductSettings implements Field } public function formSubmit(FormEvent $event) - { + { + /** @var Product $data */ + $data = $event->getData(); + + $event->setData($data); + } } diff --git a/src/new/var/plugins/Custom/PSC/Zaikio/Form/ShopSettings.php b/src/new/var/plugins/Custom/PSC/Zaikio/Form/ShopSettings.php index 2f2866ccb..49caaf3cd 100755 --- a/src/new/var/plugins/Custom/PSC/Zaikio/Form/ShopSettings.php +++ b/src/new/var/plugins/Custom/PSC/Zaikio/Form/ShopSettings.php @@ -27,12 +27,9 @@ class ShopSettings implements Field /** * @param array $data */ - public function formPostSubmit(FormEvent $event) - { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('zaikio', 'useTestSystem', $event->getForm()->get('zaikio')->get('useTestSystem')->getData()); - $event->setData($data); + public function formPostSubmit(FormEvent $event) + { + } public function formPostSetData(FormEvent $event) @@ -69,6 +66,11 @@ class ShopSettings implements Field } public function formSubmit(FormEvent $event) - { + { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('zaikio', 'useTestSystem', $event->getForm()->get('zaikio')->get('useTestSystem')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Design.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Design.php index 896851951..6598ea0f0 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Design.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Design.php @@ -83,17 +83,7 @@ class Design implements Field public function formPostSubmit(FormEvent $event) { - /** @var Shop $shopEntity */ - $shopEntity = $this->options['shopEntity']; - - $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); - $layoutSettings[$shopEntity->getLayout()]['b2bshop'] = $event->getForm()->get('bootstrap3Design')->get('b2bshop')->getData(); - $layoutSettings[$shopEntity->getLayout()]['custom_css'] = $event->getForm()->get('bootstrap3Design')->get('custom_css')->getData(); - $layoutSettings[$shopEntity->getLayout()]['einbetten'] = $event->getForm()->get('bootstrap3Design')->get('einbetten')->getData(); - $layoutSettings[$shopEntity->getLayout()]['display_no_language'] = $event->getForm()->get('bootstrap3Design')->get('display_no_language')->getData(); - $layoutSettings[$shopEntity->getLayout()]['display_no_price'] = $event->getForm()->get('bootstrap3Design')->get('display_no_price')->getData(); - - $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } public function formPreSetData(FormEvent $event) @@ -110,5 +100,17 @@ class Design implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $shopEntity */ + $shopEntity = $this->options['shopEntity']; + + $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); + $layoutSettings[$shopEntity->getLayout()]['b2bshop'] = $event->getForm()->get('bootstrap3Design')->get('b2bshop')->getData(); + $layoutSettings[$shopEntity->getLayout()]['custom_css'] = $event->getForm()->get('bootstrap3Design')->get('custom_css')->getData(); + $layoutSettings[$shopEntity->getLayout()]['einbetten'] = $event->getForm()->get('bootstrap3Design')->get('einbetten')->getData(); + $layoutSettings[$shopEntity->getLayout()]['display_no_language'] = $event->getForm()->get('bootstrap3Design')->get('display_no_language')->getData(); + $layoutSettings[$shopEntity->getLayout()]['display_no_price'] = $event->getForm()->get('bootstrap3Design')->get('display_no_price')->getData(); + + $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } } \ No newline at end of file diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Formulare.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Formulare.php index 919553953..807a7db06 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Formulare.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Formulare.php @@ -161,6 +161,16 @@ class Formulare extends AbstractController implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -210,14 +220,6 @@ class Formulare extends AbstractController implements Field $shopEntity->setDefaultParam($event->getForm()->get('bootstrap3General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap3General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap3General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/General.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/General.php index b00dc5f3f..8db52a128 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/General.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/General.php @@ -133,6 +133,16 @@ class General implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -155,14 +165,6 @@ class General implements Field $shopEntity->setLayoutSettings(json_encode($layoutSettings)); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Images.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Images.php index de9aaf6d8..ecab8fa56 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Images.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Images.php @@ -113,6 +113,16 @@ class Images extends AbstractController implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -138,14 +148,6 @@ class Images extends AbstractController implements Field $shopEntity->setDefaultParam($event->getForm()->get('bootstrap3General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap3General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap3General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } \ No newline at end of file diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Product/PostUpload.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Product/PostUpload.php index 5f2e09f5d..52da17494 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Product/PostUpload.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Product/PostUpload.php @@ -80,15 +80,7 @@ class PostUpload implements Field public function formPostSubmit(FormEvent $event) { - /** @var Shop $shopEntity */ - $shopEntity = $this->options['shopEntity']; - - $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); - - $layoutSettings[$shopEntity->getLayout()]['textPost'] = $event->getForm()->get('bootstrap3Product')->get('textPost')->getData(); - $layoutSettings[$shopEntity->getLayout()]['textMail'] = $event->getForm()->get('bootstrap3Product')->get('textMail')->getData(); - - $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } public function formPreSetData(FormEvent $event) @@ -113,6 +105,16 @@ class PostUpload implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $shopEntity */ + $shopEntity = $this->options['shopEntity']; + + $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); + + $layoutSettings[$shopEntity->getLayout()]['textPost'] = $event->getForm()->get('bootstrap3Product')->get('textPost')->getData(); + $layoutSettings[$shopEntity->getLayout()]['textMail'] = $event->getForm()->get('bootstrap3Product')->get('textMail')->getData(); + + $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Sites.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Sites.php index 4896c21fb..bded0d6e0 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Sites.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Sites.php @@ -355,6 +355,16 @@ if(!file_exists($filenamecmsindex)) { } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -467,14 +477,6 @@ if(!file_exists($filenamecmsindex)) { $shopEntity->setDefaultParam($event->getForm()->get('bootstrap3General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap3General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap3General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Startseite.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Startseite.php index 8f3a48354..0b6277e13 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Startseite.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Startseite.php @@ -151,6 +151,31 @@ class Startseite implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + } + + /** + * @param mixed $entityManager + */ + public function setEntityManager($entityManager) + { + $this->_entityManager = $entityManager; + } + + /** + * @param \PSC\System\SettingsBundle\Service\Shop $shopService + */ + public function setShopService($shopService) + { + $this->_shopService = $shopService; + } + + public function formSubmit(FormEvent $event) { /** * @var Shop $shopEntity @@ -181,30 +206,7 @@ class Startseite implements Field $layoutSettings[$shopEntity->getLayout()]['index_slogan'] = $event->getForm()->get('bootstrap3Startseite')->get('index_slogan')->getData(); $shopEntity->setLayoutSettings(json_encode($layoutSettings)); - } - - public function formPreSetData(FormEvent $event) - { - } - - /** - * @param mixed $entityManager - */ - public function setEntityManager($entityManager) - { - $this->_entityManager = $entityManager; - } - - /** - * @param \PSC\System\SettingsBundle\Service\Shop $shopService - */ - public function setShopService($shopService) - { - $this->_shopService = $shopService; - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Style.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Style.php index 1cbefe0fa..5c040a3f6 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Style.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Style.php @@ -111,6 +111,16 @@ class Style extends AbstractController implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -136,14 +146,6 @@ class Style extends AbstractController implements Field $shopEntity->setDefaultParam($event->getForm()->get('bootstrap3General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap3General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap3General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } \ No newline at end of file diff --git a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Translator.php b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Translator.php index a4cfe997a..b7012635c 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Translator.php +++ b/src/new/var/plugins/System/PSC/Bootstrap3/Form/Field/Translator.php @@ -248,6 +248,16 @@ $builder->add($fieldname . 'edit', HiddenType::class, array('required' => false, public function formPostSubmit(FormEvent $event) { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) + { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; $myDirectory = "/data/www/old/application/design/vorlagen/" . $shopEntity->getLayout() . "/locale"; @@ -308,14 +318,6 @@ foreach($directorys as $key => $directorysout) { $shopEntity->setDefaultParam($event->getForm()->get('bootstrap3General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap3General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap3General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } \ No newline at end of file diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Design.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Design.php index ecb27a051..96364850d 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Design.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Design.php @@ -68,15 +68,7 @@ class Design implements Field public function formPostSubmit(FormEvent $event) { - /** @var Shop $shopEntity */ - $shopEntity = $this->options['shopEntity']; - - $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); - $layoutSettings[$shopEntity->getLayout()]['b2bshop'] = $event->getForm()->get('bootstrap4Design')->get('b2bshop')->getData(); - $layoutSettings[$shopEntity->getLayout()]['einbetten'] = $event->getForm()->get('bootstrap4Design')->get('einbetten')->getData(); - $layoutSettings[$shopEntity->getLayout()]['display_no_language'] = $event->getForm()->get('bootstrap4Design')->get('display_no_language')->getData(); - - $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } public function formPreSetData(FormEvent $event) @@ -86,5 +78,15 @@ class Design implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $shopEntity */ + $shopEntity = $this->options['shopEntity']; + + $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); + $layoutSettings[$shopEntity->getLayout()]['b2bshop'] = $event->getForm()->get('bootstrap4Design')->get('b2bshop')->getData(); + $layoutSettings[$shopEntity->getLayout()]['einbetten'] = $event->getForm()->get('bootstrap4Design')->get('einbetten')->getData(); + $layoutSettings[$shopEntity->getLayout()]['display_no_language'] = $event->getForm()->get('bootstrap4Design')->get('display_no_language')->getData(); + + $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } } \ No newline at end of file diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Formulare.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Formulare.php index e3cb8bc04..08eb6de9b 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Formulare.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Formulare.php @@ -217,6 +217,15 @@ class Formulare extends AbstractController implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -318,14 +327,7 @@ class Formulare extends AbstractController implements Field $shopEntity->setTemplateDisplayUserApproval( $event->getForm()->get('bootstrap4General')->get('templateDisplayUserApproval')->getData(), ); - } - - public function formPreSetData(FormEvent $event) - { - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/General.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/General.php index 595f60928..dbd983f8b 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/General.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/General.php @@ -127,6 +127,16 @@ class General implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -144,14 +154,6 @@ class General implements Field $shopEntity->setDefaultParam($event->getForm()->get('bootstrap4General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap4General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap4General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } \ No newline at end of file diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Images.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Images.php index 2ea4951b4..0a07fef64 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Images.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Images.php @@ -137,6 +137,15 @@ class Images extends AbstractController implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -177,13 +186,6 @@ class Images extends AbstractController implements Field $shopEntity->setTemplateDisplayUserApproval( $event->getForm()->get('bootstrap4General')->get('templateDisplayUserApproval')->getData(), ); - } - - public function formPreSetData(FormEvent $event) - { - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Product/PostUpload.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Product/PostUpload.php index 129eeeab2..77afaeefd 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Product/PostUpload.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Product/PostUpload.php @@ -80,15 +80,7 @@ class PostUpload implements Field public function formPostSubmit(FormEvent $event) { - /** @var Shop $shopEntity */ - $shopEntity = $this->options['shopEntity']; - - $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); - - $layoutSettings[$shopEntity->getLayout()]['textPost'] = $event->getForm()->get('bootstrap4Product')->get('textPost')->getData(); - $layoutSettings[$shopEntity->getLayout()]['textMail'] = $event->getForm()->get('bootstrap4Product')->get('textMail')->getData(); - - $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } public function formPreSetData(FormEvent $event) @@ -113,6 +105,16 @@ class PostUpload implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $shopEntity */ + $shopEntity = $this->options['shopEntity']; + + $layoutSettings = json_decode($shopEntity->getLayoutSettings(), true); + + $layoutSettings[$shopEntity->getLayout()]['textPost'] = $event->getForm()->get('bootstrap4Product')->get('textPost')->getData(); + $layoutSettings[$shopEntity->getLayout()]['textMail'] = $event->getForm()->get('bootstrap4Product')->get('textMail')->getData(); + + $shopEntity->setLayoutSettings(json_encode($layoutSettings)); + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Sites.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Sites.php index c010822dc..c67622254 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Sites.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Sites.php @@ -328,6 +328,16 @@ if(isset($_POST["settings"]["bootstrap4Images"]["layout"])) { } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -498,14 +508,6 @@ if(isset($_POST["settings"]["bootstrap4Images"]["layout"])) { $shopEntity->setDefaultParam($event->getForm()->get('bootstrap4General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap4General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap4General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Startseite.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Startseite.php index 50ac16574..a86256748 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Startseite.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Startseite.php @@ -145,6 +145,31 @@ class Startseite implements Field } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + } + + /** + * @param mixed $entityManager + */ + public function setEntityManager($entityManager) + { + $this->_entityManager = $entityManager; + } + + /** + * @param \PSC\System\SettingsBundle\Service\Shop $shopService + */ + public function setShopService($shopService) + { + $this->_shopService = $shopService; + } + + public function formSubmit(FormEvent $event) { /** * @var Shop $shopEntity @@ -175,30 +200,7 @@ class Startseite implements Field $layoutSettings[$shopEntity->getLayout()]['index_slogan'] = $event->getForm()->get('bootstrap4Startseite')->get('index_slogan')->getData(); $shopEntity->setLayoutSettings(json_encode($layoutSettings)); - } - - public function formPreSetData(FormEvent $event) - { - } - - /** - * @param mixed $entityManager - */ - public function setEntityManager($entityManager) - { - $this->_entityManager = $entityManager; - } - - /** - * @param \PSC\System\SettingsBundle\Service\Shop $shopService - */ - public function setShopService($shopService) - { - $this->_shopService = $shopService; - } - - public function formSubmit(FormEvent $event) - { + } } diff --git a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Style.php b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Style.php index 8849cb201..314e578a1 100755 --- a/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Style.php +++ b/src/new/var/plugins/System/PSC/Bootstrap4/Form/Field/Style.php @@ -112,6 +112,16 @@ if(isset($_POST["settings"]["bootstrap4General"]["layout"])) { } public function formPostSubmit(FormEvent $event) + { + + } + + public function formPreSetData(FormEvent $event) + { + + } + + public function formSubmit(FormEvent $event) { /** @var Shop $shopEntity */ $shopEntity = $this->options['shopEntity']; @@ -141,14 +151,6 @@ if(isset($_POST["settings"]["bootstrap4General"]["layout"])) { $shopEntity->setDefaultParam($event->getForm()->get('bootstrap4General')->get('defaultParam')->getData()); $shopEntity->setTemplateDisplayProductsCrossselling($event->getForm()->get('bootstrap4General')->get('templateDisplayProductsCrossselling')->getData()); $shopEntity->setTemplateDisplayUserApproval($event->getForm()->get('bootstrap4General')->get('templateDisplayUserApproval')->getData()); - } - - public function formPreSetData(FormEvent $event) - { - - } - - public function formSubmit(FormEvent $event) - { + } } \ No newline at end of file diff --git a/src/new/var/plugins/System/PSC/CaptchaFox/Form/Field/ShopSettings.php b/src/new/var/plugins/System/PSC/CaptchaFox/Form/Field/ShopSettings.php index 71e5b7828..04130b75a 100755 --- a/src/new/var/plugins/System/PSC/CaptchaFox/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/System/PSC/CaptchaFox/Form/Field/ShopSettings.php @@ -28,19 +28,7 @@ class ShopSettings implements Field */ public function formPostSubmit(FormEvent $event) { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule( - 'captchafox', - 'secretkey', - $event->getForm()->get('captchafox')->get('secretkey')->getData(), - ); - $data->setPluginSettingModule( - 'captchafox', - 'publickey', - $event->getForm()->get('captchafox')->get('publickey')->getData(), - ); - $event->setData($data); + } public function formPostSetData(FormEvent $event) @@ -91,5 +79,19 @@ class ShopSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule( + 'captchafox', + 'secretkey', + $event->getForm()->get('captchafox')->get('secretkey')->getData(), + ); + $data->setPluginSettingModule( + 'captchafox', + 'publickey', + $event->getForm()->get('captchafox')->get('publickey')->getData(), + ); + $event->setData($data); + } } diff --git a/src/new/var/plugins/System/PSC/FriendlyCaptcha/Form/Field/ShopSettings.php b/src/new/var/plugins/System/PSC/FriendlyCaptcha/Form/Field/ShopSettings.php index 8286119ea..167ba7ab4 100755 --- a/src/new/var/plugins/System/PSC/FriendlyCaptcha/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/System/PSC/FriendlyCaptcha/Form/Field/ShopSettings.php @@ -28,19 +28,7 @@ class ShopSettings implements Field */ public function formPostSubmit(FormEvent $event) { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule( - 'friendlycaptcha', - 'secret', - $event->getForm()->get('friendlycaptcha')->get('secret')->getData(), - ); - $data->setPluginSettingModule( - 'friendlycaptcha', - 'siteKey', - $event->getForm()->get('friendlycaptcha')->get('siteKey')->getData(), - ); - $event->setData($data); + } public function formPostSetData(FormEvent $event) @@ -91,5 +79,19 @@ class ShopSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule( + 'friendlycaptcha', + 'secret', + $event->getForm()->get('friendlycaptcha')->get('secret')->getData(), + ); + $data->setPluginSettingModule( + 'friendlycaptcha', + 'siteKey', + $event->getForm()->get('friendlycaptcha')->get('siteKey')->getData(), + ); + $event->setData($data); + } } diff --git a/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ResellerProduct.php b/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ResellerProduct.php index 3ec1f3150..9e973018c 100755 --- a/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ResellerProduct.php +++ b/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ResellerProduct.php @@ -95,11 +95,7 @@ class ResellerProduct implements Field public function formPostSubmit(FormEvent $event) { - /** @var Product $data */ - $data = $event->getData(); - $data->setMwert($event->getForm()->get('reseller')->get('mwert')->getData()); - $data->setCalcXml($event->getForm()->get('reseller')->get('uploadXML')->getData()); - $event->setData($data); + } public function formPreSetData(FormEvent $event) @@ -109,6 +105,12 @@ class ResellerProduct implements Field public function formSubmit(FormEvent $event) { + /** @var Product $data */ + $data = $event->getData(); + $data->setMwert($event->getForm()->get('reseller')->get('mwert')->getData()); + $data->setCalcXml($event->getForm()->get('reseller')->get('uploadXML')->getData()); + $event->setData($data); + } } diff --git a/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ShopSettings.php b/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ShopSettings.php index 7bf89b8ec..23028f68d 100755 --- a/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ShopSettings.php +++ b/src/new/var/plugins/System/PSC/PSC_Reseller_Products/Form/Field/ShopSettings.php @@ -34,34 +34,7 @@ class ShopSettings implements Field */ public function formPostSubmit(FormEvent $event) { - /** @var Shop $data */ - $data = $event->getData(); - $data->setPluginSettingModule('reseller', 'name1', $event->getForm()->get('reseller')->get('name1')->getData()); - $data->setPluginSettingModule('reseller', 'url1', $event->getForm()->get('reseller')->get('url1')->getData()); - $data->setPluginSettingModule('reseller', 'uuid1', $event->getForm()->get('reseller')->get('uuid1')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag1', $event->getForm()->get('reseller')->get('aufschlag1')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag1Fix', $event->getForm()->get('reseller')->get('aufschlag1Fix')->getData()); - $data->setPluginSettingModule('reseller', 'name2', $event->getForm()->get('reseller')->get('name2')->getData()); - $data->setPluginSettingModule('reseller', 'url2', $event->getForm()->get('reseller')->get('url2')->getData()); - $data->setPluginSettingModule('reseller', 'uuid2', $event->getForm()->get('reseller')->get('uuid2')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag2', $event->getForm()->get('reseller')->get('aufschlag2')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag2Fix', $event->getForm()->get('reseller')->get('aufschlag2Fix')->getData()); - $data->setPluginSettingModule('reseller', 'name3', $event->getForm()->get('reseller')->get('name3')->getData()); - $data->setPluginSettingModule('reseller', 'url3', $event->getForm()->get('reseller')->get('url3')->getData()); - $data->setPluginSettingModule('reseller', 'uuid3', $event->getForm()->get('reseller')->get('uuid3')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag3', $event->getForm()->get('reseller')->get('aufschlag3')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag3Fix', $event->getForm()->get('reseller')->get('aufschlag3Fix')->getData()); - $data->setPluginSettingModule('reseller', 'name4', $event->getForm()->get('reseller')->get('name4')->getData()); - $data->setPluginSettingModule('reseller', 'url4', $event->getForm()->get('reseller')->get('url4')->getData()); - $data->setPluginSettingModule('reseller', 'uuid4', $event->getForm()->get('reseller')->get('uuid4')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag4', $event->getForm()->get('reseller')->get('aufschlag4')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag4Fix', $event->getForm()->get('reseller')->get('aufschlag4Fix')->getData()); - $data->setPluginSettingModule('reseller', 'name5', $event->getForm()->get('reseller')->get('name5')->getData()); - $data->setPluginSettingModule('reseller', 'url5', $event->getForm()->get('reseller')->get('url5')->getData()); - $data->setPluginSettingModule('reseller', 'uuid5', $event->getForm()->get('reseller')->get('uuid5')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag5', $event->getForm()->get('reseller')->get('aufschlag5')->getData()); - $data->setPluginSettingModule('reseller', 'aufschlag5Fix', $event->getForm()->get('reseller')->get('aufschlag5Fix')->getData()); - $event->setData($data); + } public function formPostSetData(FormEvent $event) @@ -246,5 +219,34 @@ class ShopSettings implements Field public function formSubmit(FormEvent $event) { + /** @var Shop $data */ + $data = $event->getData(); + $data->setPluginSettingModule('reseller', 'name1', $event->getForm()->get('reseller')->get('name1')->getData()); + $data->setPluginSettingModule('reseller', 'url1', $event->getForm()->get('reseller')->get('url1')->getData()); + $data->setPluginSettingModule('reseller', 'uuid1', $event->getForm()->get('reseller')->get('uuid1')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag1', $event->getForm()->get('reseller')->get('aufschlag1')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag1Fix', $event->getForm()->get('reseller')->get('aufschlag1Fix')->getData()); + $data->setPluginSettingModule('reseller', 'name2', $event->getForm()->get('reseller')->get('name2')->getData()); + $data->setPluginSettingModule('reseller', 'url2', $event->getForm()->get('reseller')->get('url2')->getData()); + $data->setPluginSettingModule('reseller', 'uuid2', $event->getForm()->get('reseller')->get('uuid2')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag2', $event->getForm()->get('reseller')->get('aufschlag2')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag2Fix', $event->getForm()->get('reseller')->get('aufschlag2Fix')->getData()); + $data->setPluginSettingModule('reseller', 'name3', $event->getForm()->get('reseller')->get('name3')->getData()); + $data->setPluginSettingModule('reseller', 'url3', $event->getForm()->get('reseller')->get('url3')->getData()); + $data->setPluginSettingModule('reseller', 'uuid3', $event->getForm()->get('reseller')->get('uuid3')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag3', $event->getForm()->get('reseller')->get('aufschlag3')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag3Fix', $event->getForm()->get('reseller')->get('aufschlag3Fix')->getData()); + $data->setPluginSettingModule('reseller', 'name4', $event->getForm()->get('reseller')->get('name4')->getData()); + $data->setPluginSettingModule('reseller', 'url4', $event->getForm()->get('reseller')->get('url4')->getData()); + $data->setPluginSettingModule('reseller', 'uuid4', $event->getForm()->get('reseller')->get('uuid4')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag4', $event->getForm()->get('reseller')->get('aufschlag4')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag4Fix', $event->getForm()->get('reseller')->get('aufschlag4Fix')->getData()); + $data->setPluginSettingModule('reseller', 'name5', $event->getForm()->get('reseller')->get('name5')->getData()); + $data->setPluginSettingModule('reseller', 'url5', $event->getForm()->get('reseller')->get('url5')->getData()); + $data->setPluginSettingModule('reseller', 'uuid5', $event->getForm()->get('reseller')->get('uuid5')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag5', $event->getForm()->get('reseller')->get('aufschlag5')->getData()); + $data->setPluginSettingModule('reseller', 'aufschlag5Fix', $event->getForm()->get('reseller')->get('aufschlag5Fix')->getData()); + $event->setData($data); + } }