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 3faad39ef..e37a04e89 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
@@ -55,8 +55,15 @@ class ContactType extends AbstractType
protected $statusService = null;
protected $formFactory;
protected EntityManagerInterface $entityManager;
- public function __construct(EntityManagerInterface $entityManager, Shop $shop, Field $fields, FormFactoryInterface $formFactory, General $general, Status $statusService)
- {
+
+ public function __construct(
+ EntityManagerInterface $entityManager,
+ Shop $shop,
+ Field $fields,
+ FormFactoryInterface $formFactory,
+ General $general,
+ Status $statusService,
+ ) {
$this->fields = $fields;
$this->formFactory = $formFactory;
$this->general = $general;
@@ -92,40 +99,46 @@ class ContactType extends AbstractType
$tempShippings[] = $shipping->getUid();
}
- $payments = $this->entityManager->getRepository(Payment::class)->findBy(['shop' => $this->shop->getSelectedShop()->getId()]);
+ $payments = $this->entityManager
+ ->getRepository(Payment::class)
+ ->findBy(['shop' => $this->shop->getSelectedShop()->getId()]);
$defaultPayments = [];
foreach ($payments as $payment) {
$defaultPayments[$payment->getTitle()] = $payment->getUid();
}
- $shippings = $this->entityManager->getRepository(Shipping::class)->findBy(['shop' => $this->shop->getSelectedShop()->getId()]);
+ $shippings = $this->entityManager
+ ->getRepository(Shipping::class)
+ ->findBy(['shop' => $this->shop->getSelectedShop()->getId()]);
$defaultShipments = [];
foreach ($shippings as $shipping) {
$defaultShipments[$shipping->getTitle()] = $shipping->getUid();
}
-
$builder
->add('uuid', TextType::class, [
'disabled' => true,
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.uuid }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.uuid }}',
+ ],
])
->add('username', TextType::class, ['label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.username }}']])
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.username }}',
+ ]])
->add('account', EntityType::class, array(
'label' => 'Company',
'class' => 'PSC\Shop\EntityBundle\Entity\Account',
'choice_label' => 'titleAppendix',
'choice_value' => 'uid',
'query_builder' => function (EntityRepository $er) {
-
- return $er->createQueryBuilder('u')
+ return $er
+ ->createQueryBuilder('u')
->join('u.shops', 's')
- ->where('s.uid = :shop')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ ->where('s.uid = :shop')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('payments', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Payment',
@@ -134,17 +147,26 @@ class ContactType extends AbstractType
'multiple' => true,
'required' => false,
'query_builder' => function (EntityRepository $er) use ($tempPayments) {
-
- return $er->createQueryBuilder('u')
- ->where('(u.shop = :shop OR u.uid in (' . implode(",", $tempPayments) . '))')->andWhere('u.private = 1')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ return $er
+ ->createQueryBuilder('u')
+ ->where('(u.shop = :shop OR u.uid in (' . implode(',', $tempPayments) . '))')
+ ->andWhere('u.private = 1')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
- ->add('defaultPayment', ChoiceType::class, ['required' => false, 'label' => 'defaultPayment', 'choices' => $defaultPayments])
- ->add('defaultShipment', ChoiceType::class, ['required' => false, 'label' => 'defaultShipment', 'choices' => $defaultShipments])
+ ->add('defaultPayment', ChoiceType::class, [
+ 'required' => false,
+ 'label' => 'defaultPayment',
+ 'choices' => $defaultPayments,
+ ])
+ ->add('defaultShipment', ChoiceType::class, [
+ 'required' => false,
+ 'label' => 'defaultShipment',
+ 'choices' => $defaultShipments,
+ ])
->add('productGroups', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Productgroup',
'choice_label' => function (Productgroup $choice, $key, $value) {
-
if ($choice->isEnable()) {
return $choice->getTitle();
} else {
@@ -155,10 +177,12 @@ class ContactType extends AbstractType
'multiple' => true,
'required' => false,
'query_builder' => function (EntityRepository $er) use ($tempProductGroups) {
-
- return $er->createQueryBuilder('u')
- ->where('(u.shop = :shop OR u.uid in (' . implode(",", $tempProductGroups) . '))')->andWhere('u.private = 1')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ return $er
+ ->createQueryBuilder('u')
+ ->where('(u.shop = :shop OR u.uid in (' . implode(',', $tempProductGroups) . '))')
+ ->andWhere('u.private = 1')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('shippings', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Shipping',
@@ -167,10 +191,12 @@ class ContactType extends AbstractType
'required' => false,
'multiple' => true,
'query_builder' => function (EntityRepository $er) use ($tempShippings) {
-
- return $er->createQueryBuilder('u')
- ->where('(u.shop = :shop OR u.uid in (' . implode(",", $tempShippings) . '))')->andWhere('u.private = 1')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ return $er
+ ->createQueryBuilder('u')
+ ->where('(u.shop = :shop OR u.uid in (' . implode(',', $tempShippings) . '))')
+ ->andWhere('u.private = 1')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('productsOrg', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Product',
@@ -179,10 +205,12 @@ class ContactType extends AbstractType
'required' => false,
'multiple' => true,
'query_builder' => function (EntityRepository $er) use ($tempProducts) {
-
- return $er->createQueryBuilder('u')
- ->where('(u.shop = :shop OR u.uid in (' . implode(",", $tempProducts) . '))')->andWhere('u.private = 1 AND u.originalProduct = 0')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ return $er
+ ->createQueryBuilder('u')
+ ->where('(u.shop = :shop OR u.uid in (' . implode(',', $tempProducts) . '))')
+ ->andWhere('u.private = 1 AND u.originalProduct = 0')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('productsSub', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Product',
@@ -191,10 +219,12 @@ class ContactType extends AbstractType
'required' => false,
'multiple' => true,
'query_builder' => function (EntityRepository $er) use ($tempProducts) {
-
- return $er->createQueryBuilder('u')
- ->where('(u.shop = :shop OR u.uid in (' . implode(",", $tempProducts) . '))')->andWhere('u.private = 1 AND u.originalProduct != 0')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ return $er
+ ->createQueryBuilder('u')
+ ->where('(u.shop = :shop OR u.uid in (' . implode(',', $tempProducts) . '))')
+ ->andWhere('u.private = 1 AND u.originalProduct != 0')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('cms', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Cms',
@@ -203,10 +233,12 @@ class ContactType extends AbstractType
'multiple' => true,
'required' => false,
'query_builder' => function (EntityRepository $er) use ($tempCms) {
-
- return $er->createQueryBuilder('u')
- ->where('(u.shop = :shop OR u.uid in (' . implode(",", $tempCms) . '))')->andWhere('u.private = 1')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ return $er
+ ->createQueryBuilder('u')
+ ->where('(u.shop = :shop OR u.uid in (' . implode(',', $tempCms) . '))')
+ ->andWhere('u.private = 1')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('collectingOrdersAccounts', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Account',
@@ -215,102 +247,104 @@ class ContactType extends AbstractType
'required' => false,
'multiple' => true,
'query_builder' => function (EntityRepository $er) {
-
- return $er->createQueryBuilder('u')
+ return $er
+ ->createQueryBuilder('u')
->join('u.shops', 's')
- ->where('s.uid = :shop')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ ->where('s.uid = :shop')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('shops', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Shop',
'choice_label' => 'title',
'required' => false,
'choice_value' => 'uid',
- 'multiple' => true
+ 'multiple' => true,
))
->add('rolesForm', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Role',
'choice_label' => 'title',
'required' => false,
'choice_value' => 'uid',
- 'multiple' => true
+ 'multiple' => true,
))
->add('accountType', EnumType::class, [
'required' => true,
'class' => AccountType::class,
'label' => 'accountType',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.accountType }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.accountType }}',
+ ],
])
->add('bankKtoName', TextType::class, [
'required' => false,
'label' => 'accountowner',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.bankKtoName }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.bankKtoName }}',
+ ],
])
->add('bankKTO', TextType::class, [
'required' => false,
'label' => 'accountnumber',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.bankKTO }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.bankKTO }}',
+ ],
])
->add('bankBLZ', TextType::class, [
'required' => false,
'label' => 'bankcode',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.bankBLZ }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.bankBLZ }}',
+ ],
])
->add('bankIban', TextType::class, [
'required' => false,
'label' => 'Iban',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.bankIban }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.bankIban }}',
+ ],
])
->add('bankBic', TextType::class, [
'required' => false,
'label' => 'BIC',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.bankBic }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.bankBic }}',
+ ],
])
->add('bankName', TextType::class, [
'required' => false,
'label' => 'bankname',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.bankName }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.bankName }}',
+ ],
])
-
->add('image', MediaType::class, ['required' => false, 'label' => 'pic'])
->add('image2', MediaType::class, ['required' => false, 'label' => 'pic'])
->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('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('required' => false, 'label' => 'factor', 'scale' => 5, 'html5' => true,
+ ->add('priceFactor', NumberType::class, array(
+ 'required' => false,
+ 'label' => 'factor',
+ 'scale' => 5,
+ 'html5' => true,
'attr' => array(
'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'])
@@ -320,282 +354,320 @@ class ContactType extends AbstractType
->add('mwert', CheckboxType::class, ['required' => false, 'label' => 'vat'])
->add('calcValue1', TextType::class, ['required' => false, 'label' => 'value1'])
->add('calcValue2', TextType::class, ['required' => false, 'label' => 'value2'])
-
->add('company', TextType::class, [
'required' => false,
'label' => 'Company',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.company }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.company }}',
+ ],
])
->add('company2', TextType::class, [
'required' => false,
'label' => 'Companyaddition',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.company2 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.company2 }}',
+ ],
])
->add('salutation', ChoiceType::class, [
'label' => 'salutations',
'choices' => $this->general->getSalutation(),
'required' => false,
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.salutation }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.salutation }}',
+ ],
])
->add('firstname', TextType::class, [
'required' => false,
'label' => 'firstname',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.firstname }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.firstname }}',
+ ],
])
->add('lastname', TextType::class, [
'required' => false,
'label' => 'lastname',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.lastname }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.lastname }}',
+ ],
])
->add('street', TextType::class, [
'required' => false,
'label' => 'street',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.street }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.street }}',
+ ],
])
->add('houseNumber', TextType::class, [
'required' => false,
'label' => 'housenumber',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.houseNumber }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.houseNumber }}',
+ ],
])
->add('zip', TextType::class, [
'required' => false,
'label' => 'zip',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.zip }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.zip }}',
+ ],
])
->add('city', TextType::class, [
'required' => false,
'label' => 'city',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.city }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.city }}',
+ ],
])
- ->add('destrict', TextType::class, [
+ ->add('district', TextType::class, [
'required' => false,
- 'label' => 'destrict',
+ 'label' => 'district',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.destrict }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.district }}',
+ ],
])
->add('state', TextType::class, [
'required' => false,
'label' => 'state',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.state }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.state }}',
+ ],
])
->add('country', TextType::class, [
'required' => false,
'disabled' => true,
'label' => 'country',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.country }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.country }}',
+ ],
])
->add('layouterCountryCode', TextType::class, [
'required' => false,
'label' => 'countryCode',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.getlayouterdata().countryCode }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.getlayouterdata().countryCode }}',
+ ],
+ ])
+ ->add('layouterCountryName', TextType::class, [
+ 'required' => false,
+ 'label' => 'countryName',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.getlayouterdata().countryName }}',
+ ],
+ ])
+ ->add('layouterEmail', TextType::class, [
+ 'required' => false,
+ 'label' => 'email',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.getlayouterdata().email }}',
+ ],
])
- ->add('layouterCountryName', TextType::class, ['required' => false, 'label' => 'countryName', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.getlayouterdata().countryName }}']])
- ->add('layouterEmail', TextType::class, ['required' => false, 'label' => 'email', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.getlayouterdata().email }}']])
->add('homepage', TextType::class, [
'required' => false,
'label' => 'homepage',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.homepage }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.homepage }}',
+ ],
])
-
->add('phoneAreaCode', TextType::class, [
'required' => false,
'label' => 'Countrycode',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.phoneAreaCode }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.phoneAreaCode }}',
+ ],
])
->add('phonePrefix', TextType::class, [
'required' => false,
'label' => 'prefix',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.phonePrefix }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.phonePrefix }}',
+ ],
])
->add('phone', TextType::class, [
'required' => false,
'label' => 'number',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.phone }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.phone }}',
+ ],
])
->add('phoneAppendix', TextType::class, [
'required' => false,
'label' => 'extension',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.phoneAppendix }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.phoneAppendix }}',
+ ],
])
-
->add('mobileAreaCode', TextType::class, [
'required' => false,
'label' => 'Countrycode',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.mobileAreaCode }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.mobileAreaCode }}',
+ ],
])
->add('mobilePrefix', TextType::class, [
'required' => false,
'label' => 'prefix',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.mobilePrefix }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.mobilePrefix }}',
+ ],
])
->add('mobile', TextType::class, [
'required' => false,
'label' => 'number',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.mobile }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.mobile }}',
+ ],
])
->add('mobileAppendix', TextType::class, [
'required' => false,
'label' => 'extension',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.mobileAppendix }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.mobileAppendix }}',
+ ],
])
->add('faxAreaCode', TextType::class, [
'required' => false,
'label' => 'Countrycode',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.faxAreaCode }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.faxAreaCode }}',
+ ],
])
->add('faxPrefix', TextType::class, [
'required' => false,
'label' => 'prefix',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.faxPrefix }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.faxPrefix }}',
+ ],
])
->add('fax', TextType::class, [
'required' => false,
'label' => 'number',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.fax }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.fax }}',
+ ],
])
->add('faxAppendix', TextType::class, [
'required' => false,
'label' => 'extension',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.faxAppendix }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.faxAppendix }}',
+ ],
])
->add('alternativAreaCode', TextType::class, [
'required' => false,
'label' => 'Countrycode',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.alternativAreaCode }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.alternativAreaCode }}',
+ ],
])
->add('alternativType', TextType::class, [
'required' => false,
'label' => 'Typ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.alternativType }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.alternativType }}',
+ ],
])
->add('alternativ', TextType::class, [
'required' => false,
'label' => 'number',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.alternativ }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.alternativ }}',
+ ],
])
->add('alternativAppendix', TextType::class, [
'required' => false,
'label' => 'extension',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.alternativAppendix }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.alternativAppendix }}',
+ ],
])
-
->add('birthday', TextType::class, [
'required' => false,
'label' => 'birthday',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.birthday }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.birthday }}',
+ ],
])
->add('kostenstellung', TextType::class, [
'required' => false,
'label' => 'kostenstellung',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.kostenstellung }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.kostenstellung }}',
+ ],
+ ])
+ ->add('ustid', TextType::class, [
+ 'required' => false,
+ 'label' => 'vatid',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.ustid }}',
+ ],
+ ])
+ ->add('function', TextType::class, [
+ 'required' => false,
+ 'label' => 'function',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.function }}',
+ ],
+ ])
+ ->add('abteilung', TextType::class, [
+ 'required' => false,
+ 'label' => 'department',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.abteilung }}',
+ ],
+ ])
+ ->add('position', TextType::class, [
+ 'required' => false,
+ 'label' => 'position',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.position }}',
+ ],
+ ])
+ ->add('title', TextType::class, [
+ 'required' => false,
+ 'label' => 'title',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.title }}',
+ ],
])
- ->add('ustid', TextType::class, ['required' => false, 'label' => 'vatid', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.ustid }}']])
- ->add('function', TextType::class, ['required' => false, 'label' => 'function', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.function }}']])
- ->add('abteilung', TextType::class, ['required' => false, 'label' => 'department', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.abteilung }}']])
- ->add('position', TextType::class, ['required' => false, 'label' => 'position', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.position }}']])
- ->add('title', TextType::class, ['required' => false, 'label' => 'title', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.title }}']])
->add('showOtherOrders', CheckboxType::class, ['required' => false, 'label' => 'Mayseeordersfromothers'])
->add('showOtherOrdersAccountFilter', ChoiceType::class, array(
'choices' => array(
@@ -603,7 +675,7 @@ class ContactType extends AbstractType
'Samecompany' => 2,
'Filterselectedcompany' => 3,
),
- 'label' => 'Companyfilter'
+ 'label' => 'Companyfilter',
))
->add('showOtherOrdersAccount', EntityType::class, array(
'class' => 'PSC\Shop\EntityBundle\Entity\Account',
@@ -614,242 +686,254 @@ class ContactType extends AbstractType
'required' => false,
'label' => 'Chosencompany',
'query_builder' => function (EntityRepository $er) {
-
- return $er->createQueryBuilder('a')
+ return $er
+ ->createQueryBuilder('a')
->join('a.shops', 's')
- ->where('s.uid = :shop')->setParameter('shop', $this->shop->getSelectedShop()->getId());
- }
+ ->where('s.uid = :shop')
+ ->setParameter('shop', $this->shop->getSelectedShop()->getId());
+ },
))
->add('custom1', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName1() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName1() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom1 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom1 }}',
+ ],
])
->add('custom2', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName2() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName2() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom2 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom2 }}',
+ ],
])
->add('custom3', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName3() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName3() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom3 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom3 }}',
+ ],
])
->add('custom4', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName4() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName4() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom4 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom4 }}',
+ ],
])
->add('custom5', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName5() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName5() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom5 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom5 }}',
+ ],
])
->add('custom6', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName6() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName6() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom6 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom6 }}',
+ ],
])
->add('custom7', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName7() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName7() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom7 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom7 }}',
+ ],
])
->add('custom8', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName8() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName8() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom8 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom8 }}',
+ ],
])
->add('custom9', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName9() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName9() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom9 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom9 }}',
+ ],
])
->add('custom10', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName10() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName10() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom10 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom10 }}',
+ ],
])
->add('custom11', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName11() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName11() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom11 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom11 }}',
+ ],
])
->add('custom12', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName12() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName12() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom12 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom12 }}',
+ ],
])
->add('custom13', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName13() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName13() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom13 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom13 }}',
+ ],
])
->add('custom14', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName14() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName14() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom14 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom14 }}',
+ ],
])
->add('custom15', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName15() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName15() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom15 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom15 }}',
+ ],
])
->add('custom16', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName16() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName16() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom16 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom16 }}',
+ ],
])
->add('custom17', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName17() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName17() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom17 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom17 }}',
+ ],
])
->add('custom18', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName18() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName18() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom18 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom18 }}',
+ ],
])
->add('custom19', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName19() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName19() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom19 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom19 }}',
+ ],
])
->add('custom20', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName20() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName20() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom20 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom20 }}',
+ ],
])
->add('custom21', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName21() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName21() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom21 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom21 }}',
+ ],
])
->add('custom22', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName22() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName22() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom22 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom22 }}',
+ ],
])
->add('custom23', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName23() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName23() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom23 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom23 }}',
+ ],
])
->add('custom24', TextType::class, [
'required' => false,
- 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName24() ?? " ",
+ 'label' => $this->shop->getMongoSelectedShop()->getCustomerFieldName24() ?? ' ',
'label_attr' => [
- 'data-bs-toggle' => "tooltip",
- 'data-bs-html' => '{{ contact.custom24 }}'
- ]
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.custom24 }}',
+ ],
])
- ->add('kundenNr', TextType::class, ['required' => false, 'label' => 'Customernumber', 'label_attr' => [
- 'data-bs-toggle' => "tooltip", 'data-bs-html' => '{{ contact.kundenNr }}']])
- ->add('password', PasswordType::class, array('required' => false, 'disabled' => false, 'label' => 'password'))
+ ->add('kundenNr', TextType::class, [
+ 'required' => false,
+ 'label' => 'Customernumber',
+ 'label_attr' => [
+ 'data-bs-toggle' => 'tooltip',
+ 'data-bs-html' => '{{ contact.kundenNr }}',
+ ],
+ ])
+ ->add('password', PasswordType::class, array(
+ 'required' => false,
+ 'disabled' => false,
+ 'label' => 'password',
+ ))
->add('productionStatus', ChoiceType::class, array(
- 'label' => 'Productionstatus',
- 'required' => false,
- 'choices' => $this->statusService->getOrderStatusAsArray(),
- 'translation_domain' => 'status'
+ '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($field->getGroup(), FormType::class, null, ['mapped' => false]), $options));
+ $builder->add($field->buildForm($this->formFactory->createNamedBuilder(
+ $field->getGroup(),
+ FormType::class,
+ null,
+ ['mapped' => false],
+ ), $options));
}
$builder->add('save', SubmitType::class, array('label' => 'Save'));
$builder->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) {
$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::Contact) 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::Contact) 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::Contact) as $field) {
$field->formPreSubmit($event);
@@ -871,7 +955,7 @@ class ContactType extends AbstractType
'cms' => [],
'payments' => [],
'shippings' => [],
- 'translation_domain' => 'core_contact_edit'
+ 'translation_domain' => 'core_contact_edit',
));
}
}
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.de.yaml b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.de.yaml
index fd4bb4131..a63a49a2b 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.de.yaml
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.de.yaml
@@ -14,7 +14,7 @@ street: Straße
housenumber: Hausnummer
zip: PLZ
city: Ort
-destrict: Bezirk
+district: Bezirk
state: Bundesland
country: Land
Phonenumber: Telefonnummer
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.en.yaml b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.en.yaml
index 90eeecd12..596ea1e84 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.en.yaml
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_detail_create_and_edit.en.yaml
@@ -12,7 +12,7 @@ street: Street
housenumber: House number
zip: Zip/Postal Code
city: City
-destrict: Destrict
+district: District
state: State
country: Country
Phonenumber: Phone Number
@@ -30,4 +30,4 @@ additiveone: Additive 1
additivetwo: Additive 2
customernumber: Customer number
vatid: Vat ID
-save: Save
\ No newline at end of file
+save: Save
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.de.yaml b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.de.yaml
index 5765e04c3..2d52a0426 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.de.yaml
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.de.yaml
@@ -12,7 +12,7 @@ housenumber: Hausnummer
zip: PLZ
city: Ort
vatid: USt-IdNr.
-destrict: Bezirk
+district: Bezirk
state: Bundesland
country: Land
homepage: Homepage
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.en.yaml b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.en.yaml
index d3080905c..91ee50997 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.en.yaml
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/translations/core_contact_edit.en.yaml
@@ -11,7 +11,7 @@ housenumber: House number
zip: Zip/Postal Code
city: City
vatid: VAT ID
-destrict: Destrict
+district: District
state: State
country: Country
homepage: Homepage
@@ -120,4 +120,4 @@ grossprice: Gross Price
status: Status
details: Details
yes: Yes
-no: No
\ No newline at end of file
+no: No
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig
index 02e5747e0..d5d7774bf 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig
@@ -463,12 +463,12 @@
- {{ form_label(form.destrict) }}
+ {{ form_label(form.district) }}
- {{ form_widget(form.destrict) }}
+ {{ form_widget(form.district) }}
- {{ form_errors(form.destrict) }}
+ {{ form_errors(form.district) }}
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig
index 6f5a61a79..06028993c 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig
@@ -435,12 +435,12 @@
- {{ form_label(form.destrict) }}
+ {{ form_label(form.district) }}
- {{ form_widget(form.destrict) }}
+ {{ form_widget(form.district) }}
- {{ form_errors(form.destrict) }}
+ {{ form_errors(form.district) }}
diff --git a/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php b/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php
index 9116a20bb..30d10b97a 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php
+++ b/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php
@@ -13,22 +13,32 @@ use PSC\Shop\MediaBundle\Service\MediaManager;
use PSC\Shop\MediaBundle\Transformer\Media as PSCMedia;
use PSC\System\SettingsBundle\Service\Shop;
-class Contact
+readonly class Contact
{
- public function __construct(private readonly MediaManager $mediaManager, private readonly ContactRepository $contactRepository, private readonly Shop $shopService, private readonly EntityManagerInterface $entityManager, private readonly DocumentManager $documentManager, private readonly PSCMedia $mediaTransformer, private readonly Account $accountTransformer)
- {
- }
+ public function __construct(
+ private MediaManager $mediaManager,
+ private ContactRepository $contactRepository,
+ private Shop $shopService,
+ private EntityManagerInterface $entityManager,
+ private DocumentManager $documentManager,
+ private PSCMedia $mediaTransformer,
+ private Account $accountTransformer,
+ ) {}
public function toDb(\PSC\Shop\ContactBundle\Model\Contact $contact): void
{
- if ($contact->getUuid() !== "") {
+ if ($contact->getUuid() !== '') {
/** @var \PSC\Shop\EntityBundle\Entity\Contact $contactEntity */
$contactEntity = $this->contactRepository->findOneBy(['uuid' => $contact->getUuid()]);
- $contactDoc = $this->documentManager->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)->findOneBy(['uid' => $contactEntity->getUid()]);
+ $contactDoc = $this->documentManager
+ ->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)
+ ->findOneBy(['uid' => $contactEntity->getUid()]);
} else {
if ($contact->getUid() !== 0) {
$contactEntity = $this->contactRepository->findOneBy(['uid' => $contact->getUuid()]);
- $contactDoc = $this->documentManager->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)->findOneBy(['uid' => $contactEntity->getUid()]);
+ $contactDoc = $this->documentManager
+ ->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)
+ ->findOneBy(['uid' => $contactEntity->getUid()]);
} else {
$contactEntity = new \PSC\Shop\EntityBundle\Entity\Contact();
$contactDoc = new \PSC\Shop\EntityBundle\Document\Contact();
@@ -46,55 +56,55 @@ class Contact
if (count($shops) > 0) {
$contactEntity->setShops($shops);
}
- if ($contact->getEmail() != "") {
+ if ($contact->getEmail() != '') {
$contactEntity->setEmail($contact->getEmail());
}
$contactEntity->setEnable(true);
- $contactEntity->setFirstname((string)$contact->getLayouterData()->getFirstname());
- $contactEntity->setCompany((string)$contact->getLayouterData()->getCompany());
- $contactEntity->setCompany2((string)$contact->getLayouterData()->getCompany2());
- $contactEntity->setLastname((string)$contact->getLayouterData()->getLastname());
- $contactEntity->setZip((string)$contact->getLayouterData()->getZip());
- $contactEntity->setCity((string)$contact->getLayouterData()->getCity());
- $contactEntity->setStreet((string)$contact->getLayouterData()->getStreet());
- $contactEntity->setHouseNumber((string)$contact->getLayouterData()->getHouseNumber());
- $contactEntity->setHomepage((string)$contact->getLayouterData()->getHomepage());
+ $contactEntity->setFirstname((string) $contact->getLayouterData()->getFirstname());
+ $contactEntity->setCompany((string) $contact->getLayouterData()->getCompany());
+ $contactEntity->setCompany2((string) $contact->getLayouterData()->getCompany2());
+ $contactEntity->setLastname((string) $contact->getLayouterData()->getLastname());
+ $contactEntity->setZip((string) $contact->getLayouterData()->getZip());
+ $contactEntity->setCity((string) $contact->getLayouterData()->getCity());
+ $contactEntity->setStreet((string) $contact->getLayouterData()->getStreet());
+ $contactEntity->setHouseNumber((string) $contact->getLayouterData()->getHouseNumber());
+ $contactEntity->setHomepage((string) $contact->getLayouterData()->getHomepage());
if ($contact->getLayouterData()->getImage1() != null) {
- $contactEntity->setImage((string)$contact->getLayouterData()->getImage1()->getUuid());
+ $contactEntity->setImage((string) $contact->getLayouterData()->getImage1()->getUuid());
}
if ($contact->getLayouterData()->getImage2() != null) {
- $contactEntity->setImage2((string)$contact->getLayouterData()->getImage2()->getUuid());
+ $contactEntity->setImage2((string) $contact->getLayouterData()->getImage2()->getUuid());
}
- $contactEntity->setBirthday((string)$contact->getLayouterData()->getBirthday());
- $contactEntity->setKostenstellung((string)$contact->getLayouterData()->getKst());
- $contactEntity->setState((string)$contact->getLayouterData()->getState());
- $contactEntity->setDestrict((string)$contact->getLayouterData()->getDistrict());
+ $contactEntity->setBirthday((string) $contact->getLayouterData()->getBirthday());
+ $contactEntity->setKostenstellung((string) $contact->getLayouterData()->getKst());
+ $contactEntity->setState((string) $contact->getLayouterData()->getState());
+ $contactEntity->setDistrict((string) $contact->getLayouterData()->getDistrict());
- $contactEntity->setPhoneAreaCode((string)$contact->getLayouterData()->getPhoneAreaCode());
- $contactEntity->setPhoneAppendix((string)$contact->getLayouterData()->getPhoneAppendix());
- $contactEntity->setPhone((string)$contact->getLayouterData()->getPhone());
- $contactEntity->setPhonePrefix((string)$contact->getLayouterData()->getPhonePrefix());
+ $contactEntity->setPhoneAreaCode((string) $contact->getLayouterData()->getPhoneAreaCode());
+ $contactEntity->setPhoneAppendix((string) $contact->getLayouterData()->getPhoneAppendix());
+ $contactEntity->setPhone((string) $contact->getLayouterData()->getPhone());
+ $contactEntity->setPhonePrefix((string) $contact->getLayouterData()->getPhonePrefix());
- $contactEntity->setMobileAreaCode((string)$contact->getLayouterData()->getMobileAreaCode());
- $contactEntity->setMobileAppendix((string)$contact->getLayouterData()->getMobileAppendix());
- $contactEntity->setMobile((string)$contact->getLayouterData()->getMobile());
- $contactEntity->setMobilePrefix((string)$contact->getLayouterData()->getMobilePrefix());
+ $contactEntity->setMobileAreaCode((string) $contact->getLayouterData()->getMobileAreaCode());
+ $contactEntity->setMobileAppendix((string) $contact->getLayouterData()->getMobileAppendix());
+ $contactEntity->setMobile((string) $contact->getLayouterData()->getMobile());
+ $contactEntity->setMobilePrefix((string) $contact->getLayouterData()->getMobilePrefix());
- $contactEntity->setFaxAreaCode((string)$contact->getLayouterData()->getFaxAreaCode());
- $contactEntity->setFaxPrefix((string)$contact->getLayouterData()->getFaxPrefix());
- $contactEntity->setFax((string)$contact->getLayouterData()->getFax());
- $contactEntity->setFaxAppendix((string)$contact->getLayouterData()->getFaxAppendix());
+ $contactEntity->setFaxAreaCode((string) $contact->getLayouterData()->getFaxAreaCode());
+ $contactEntity->setFaxPrefix((string) $contact->getLayouterData()->getFaxPrefix());
+ $contactEntity->setFax((string) $contact->getLayouterData()->getFax());
+ $contactEntity->setFaxAppendix((string) $contact->getLayouterData()->getFaxAppendix());
- $contactEntity->setCountry((string)$contact->getCountryCode());
+ $contactEntity->setCountry((string) $contact->getCountryCode());
- $contactEntity->setPosition((string)$contact->getLayouterData()->getPosition());
- $contactEntity->setFunction((string)$contact->getLayouterData()->getFunction());
- $contactEntity->setAbteilung((string)$contact->getLayouterData()->getAbteilung());
- $contactEntity->setTitle((string)$contact->getLayouterData()->getTitle());
+ $contactEntity->setPosition((string) $contact->getLayouterData()->getPosition());
+ $contactEntity->setFunction((string) $contact->getLayouterData()->getFunction());
+ $contactEntity->setAbteilung((string) $contact->getLayouterData()->getAbteilung());
+ $contactEntity->setTitle((string) $contact->getLayouterData()->getTitle());
- $contactEntity->setUstid((string)$contact->getLayouterData()->getUstid());
+ $contactEntity->setUstid((string) $contact->getLayouterData()->getUstid());
$contactEntity->setEnable($contact->isEnable());
$contactEntity->setLocked($contact->isLocked());
$contactEntity->setCollectingOrders($contact->isCollectingOrders());
@@ -107,7 +117,7 @@ class Contact
for ($i = 1; $i <= 24; $i++) {
$setMethod = 'setCustom' . $i;
- $getMethod = 'getCustom'. $i;
+ $getMethod = 'getCustom' . $i;
if (method_exists($contactDoc, $setMethod) && method_exists($contact, $getMethod)) {
$contactDoc->$setMethod($contact->$getMethod());
@@ -118,7 +128,9 @@ class Contact
$roles = [];
/** @var Role $role */
foreach ($contact->getRoles() as $role) {
- $role = $this->entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Role')->findOneByUid($role->getId());
+ $role = $this->entityManager
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Role')
+ ->findOneByUid($role->getId());
$roles[] = $role;
}
$contactEntity->setRolesForm($roles);
@@ -133,9 +145,13 @@ class Contact
$contact->setUuid($contactEntity->getUuid());
}
- public function fromDb(\PSC\Shop\ContactBundle\Model\Contact $contact, \PSC\Shop\EntityBundle\Entity\Contact $contactEntity): void
- {
- $contactDoc = $this->documentManager->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)->findOneBy(['uid' => $contactEntity->getUid()]);
+ public function fromDb(
+ \PSC\Shop\ContactBundle\Model\Contact $contact,
+ \PSC\Shop\EntityBundle\Entity\Contact $contactEntity,
+ ): void {
+ $contactDoc = $this->documentManager
+ ->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)
+ ->findOneBy(['uid' => $contactEntity->getUid()]);
if (!$contactDoc) {
$contactDoc = new \PSC\Shop\EntityBundle\Document\Contact();
$contactDoc->setUid($contactEntity->getUid());
@@ -147,91 +163,90 @@ class Contact
}
$contact->setAccount($account);
- $contact->setUuid((string)$contactEntity->getUuid());
- $contact->setEmail((string)$contactEntity->getEmail());
- $contact->setUid((int)$contactEntity->getUid());
- $contact->setUsername((string)$contactEntity->getEmail());
+ $contact->setUuid((string) $contactEntity->getUuid());
+ $contact->setEmail((string) $contactEntity->getEmail());
+ $contact->setUid((int) $contactEntity->getUid());
+ $contact->setUsername((string) $contactEntity->getEmail());
$contact->setCreated($contactEntity->getCreatedAt());
$contact->setUpdated($contactEntity->getUpdatedAt());
- $contact->setCustomerNumber((string)$contactDoc->getKundenNr());
+ $contact->setCustomerNumber((string) $contactDoc->getKundenNr());
- $contact->setLocked((bool)$contactEntity->isLocked());
- $contact->setEnable((bool)$contactEntity->isEnabled());
- $contact->setCollectingOrders((bool)$contactEntity->getCollectingOrders());
+ $contact->setLocked((bool) $contactEntity->isLocked());
+ $contact->setEnable((bool) $contactEntity->isEnabled());
+ $contact->setCollectingOrders((bool) $contactEntity->getCollectingOrders());
$contact->setAccountType($contactDoc->getAccountType());
- $contact->setCustom1((string)$contactDoc->getCustom1());
- $contact->setCustom2((string)$contactDoc->getCustom2());
- $contact->setCustom3((string)$contactDoc->getCustom3());
- $contact->setCustom4((string)$contactDoc->getCustom4());
- $contact->setCustom5((string)$contactDoc->getCustom5());
- $contact->setCustom6((string)$contactDoc->getCustom6());
- $contact->setCustom7((string)$contactDoc->getCustom7());
- $contact->setCustom8((string)$contactDoc->getCustom8());
- $contact->setCustom9((string)$contactDoc->getCustom9());
- $contact->setCustom10((string)$contactDoc->getCustom10());
- $contact->setCustom11((string)$contactDoc->getCustom11());
- $contact->setCustom12((string)$contactDoc->getCustom12());
- $contact->setCustom13((string)$contactDoc->getCustom13());
- $contact->setCustom14((string)$contactDoc->getCustom14());
- $contact->setCustom15((string)$contactDoc->getCustom15());
- $contact->setCustom16((string)$contactDoc->getCustom16());
- $contact->setCustom17((string)$contactDoc->getCustom17());
- $contact->setCustom18((string)$contactDoc->getCustom18());
- $contact->setCustom19((string)$contactDoc->getCustom19());
- $contact->setCustom20((string)$contactDoc->getCustom20());
- $contact->setCustom21((string)$contactDoc->getCustom21());
- $contact->setCustom22((string)$contactDoc->getCustom22());
- $contact->setCustom23((string)$contactDoc->getCustom23());
- $contact->setCustom24((string)$contactDoc->getCustom24());
- $contact->setCountryCode((string)$contactEntity->getCountry());
+ $contact->setCustom1((string) $contactDoc->getCustom1());
+ $contact->setCustom2((string) $contactDoc->getCustom2());
+ $contact->setCustom3((string) $contactDoc->getCustom3());
+ $contact->setCustom4((string) $contactDoc->getCustom4());
+ $contact->setCustom5((string) $contactDoc->getCustom5());
+ $contact->setCustom6((string) $contactDoc->getCustom6());
+ $contact->setCustom7((string) $contactDoc->getCustom7());
+ $contact->setCustom8((string) $contactDoc->getCustom8());
+ $contact->setCustom9((string) $contactDoc->getCustom9());
+ $contact->setCustom10((string) $contactDoc->getCustom10());
+ $contact->setCustom11((string) $contactDoc->getCustom11());
+ $contact->setCustom12((string) $contactDoc->getCustom12());
+ $contact->setCustom13((string) $contactDoc->getCustom13());
+ $contact->setCustom14((string) $contactDoc->getCustom14());
+ $contact->setCustom15((string) $contactDoc->getCustom15());
+ $contact->setCustom16((string) $contactDoc->getCustom16());
+ $contact->setCustom17((string) $contactDoc->getCustom17());
+ $contact->setCustom18((string) $contactDoc->getCustom18());
+ $contact->setCustom19((string) $contactDoc->getCustom19());
+ $contact->setCustom20((string) $contactDoc->getCustom20());
+ $contact->setCustom21((string) $contactDoc->getCustom21());
+ $contact->setCustom22((string) $contactDoc->getCustom22());
+ $contact->setCustom23((string) $contactDoc->getCustom23());
+ $contact->setCustom24((string) $contactDoc->getCustom24());
+ $contact->setCountryCode((string) $contactEntity->getCountry());
- $contact->getLayouterData()->setCompany((string)$contactEntity->getCompany());
- $contact->getLayouterData()->setCompany2((string)$contactEntity->getCompany2());
- $contact->getLayouterData()->setFirstname((string)$contactEntity->getFirstname());
- $contact->getLayouterData()->setLastname((string)$contactEntity->getLastname());
- $contact->getLayouterData()->setStreet((string)$contactEntity->getStreet());
- $contact->getLayouterData()->setHouseNumber((string)$contactEntity->getHouseNumber());
- $contact->getLayouterData()->setZip((string)$contactEntity->getZip());
- $contact->getLayouterData()->setCity((string)$contactEntity->getCity());
- $contact->getLayouterData()->setHomepage((string)$contactEntity->getHomepage());
+ $contact->getLayouterData()->setCompany((string) $contactEntity->getCompany());
+ $contact->getLayouterData()->setCompany2((string) $contactEntity->getCompany2());
+ $contact->getLayouterData()->setFirstname((string) $contactEntity->getFirstname());
+ $contact->getLayouterData()->setLastname((string) $contactEntity->getLastname());
+ $contact->getLayouterData()->setStreet((string) $contactEntity->getStreet());
+ $contact->getLayouterData()->setHouseNumber((string) $contactEntity->getHouseNumber());
+ $contact->getLayouterData()->setZip((string) $contactEntity->getZip());
+ $contact->getLayouterData()->setCity((string) $contactEntity->getCity());
+ $contact->getLayouterData()->setHomepage((string) $contactEntity->getHomepage());
- $contact->getLayouterData()->setPhoneAppendix((string)$contactEntity->getPhoneAppendix());
- $contact->getLayouterData()->setPhoneAreaCode((string)$contactEntity->getPhoneAreaCode());
- $contact->getLayouterData()->setPhonePrefix((string)$contactEntity->getPhonePrefix());
- $contact->getLayouterData()->setPhone((string)$contactEntity->getPhone());
+ $contact->getLayouterData()->setPhoneAppendix((string) $contactEntity->getPhoneAppendix());
+ $contact->getLayouterData()->setPhoneAreaCode((string) $contactEntity->getPhoneAreaCode());
+ $contact->getLayouterData()->setPhonePrefix((string) $contactEntity->getPhonePrefix());
+ $contact->getLayouterData()->setPhone((string) $contactEntity->getPhone());
- $contact->getLayouterData()->setMobileAppendix((string)$contactEntity->getMobileAppendix());
- $contact->getLayouterData()->setMobileAreaCode((string)$contactEntity->getMobileAreaCode());
- $contact->getLayouterData()->setMobilePrefix((string)$contactEntity->getMobilePrefix());
- $contact->getLayouterData()->setMobile((string)$contactEntity->getMobile());
+ $contact->getLayouterData()->setMobileAppendix((string) $contactEntity->getMobileAppendix());
+ $contact->getLayouterData()->setMobileAreaCode((string) $contactEntity->getMobileAreaCode());
+ $contact->getLayouterData()->setMobilePrefix((string) $contactEntity->getMobilePrefix());
+ $contact->getLayouterData()->setMobile((string) $contactEntity->getMobile());
- $contact->getLayouterData()->setFaxAppendix((string)$contactEntity->getFaxAppendix());
- $contact->getLayouterData()->setFaxAreaCode((string)$contactEntity->getFaxAreaCode());
- $contact->getLayouterData()->setFaxPrefix((string)$contactEntity->getFaxPrefix());
- $contact->getLayouterData()->setFax((string)$contactEntity->getFax());
+ $contact->getLayouterData()->setFaxAppendix((string) $contactEntity->getFaxAppendix());
+ $contact->getLayouterData()->setFaxAreaCode((string) $contactEntity->getFaxAreaCode());
+ $contact->getLayouterData()->setFaxPrefix((string) $contactEntity->getFaxPrefix());
+ $contact->getLayouterData()->setFax((string) $contactEntity->getFax());
-
- $contact->getLayouterData()->setUstid((string)$contactEntity->getUstid());
- $contact->getLayouterData()->setFunction((string)$contactEntity->getFunction());
- $contact->getLayouterData()->setPosition((string)$contactEntity->getPosition());
- $contact->getLayouterData()->setAbteilung((string)$contactEntity->getAbteilung());
- $contact->getLayouterData()->setTitle((string)$contactEntity->getTitle());
+ $contact->getLayouterData()->setUstid((string) $contactEntity->getUstid());
+ $contact->getLayouterData()->setFunction((string) $contactEntity->getFunction());
+ $contact->getLayouterData()->setPosition((string) $contactEntity->getPosition());
+ $contact->getLayouterData()->setAbteilung((string) $contactEntity->getAbteilung());
+ $contact->getLayouterData()->setTitle((string) $contactEntity->getTitle());
$contact->getLayouterData()->setSettings($contactDoc->getLayouterSettings());
- $contact->getLayouterData()->setCountryCode((string)$contactDoc->getLayouterCountryCode());
- $contact->getLayouterData()->setCountryName((string)$contactDoc->getLayouterCountryName());
+ $contact->getLayouterData()->setCountryCode((string) $contactDoc->getLayouterCountryCode());
+ $contact->getLayouterData()->setCountryName((string) $contactDoc->getLayouterCountryName());
- $contact->getLayouterData()->setBirthday((string)$contactEntity->getBirthday());
- $contact->getLayouterData()->setKst((string)$contactEntity->getKostenstellung());
- $contact->getLayouterData()->setUstid((string)$contactEntity->getUstid());
- $contact->getLayouterData()->setDistrict((string)$contactEntity->getDestrict());
- $contact->getLayouterData()->setState((string)$contactEntity->getState());
+ $contact->getLayouterData()->setBirthday((string) $contactEntity->getBirthday());
+ $contact->getLayouterData()->setKst((string) $contactEntity->getKostenstellung());
+ $contact->getLayouterData()->setUstid((string) $contactEntity->getUstid());
+ $contact->getLayouterData()->setDistrict((string) $contactEntity->getDistrict());
+ $contact->getLayouterData()->setState((string) $contactEntity->getState());
- $contact->getLayouterData()->setEmail((string)$contactDoc->getLayouterEmail());
+ $contact->getLayouterData()->setEmail((string) $contactDoc->getLayouterEmail());
- if ($contactEntity->getImage() != "") {
+ if ($contactEntity->getImage() != '') {
$media = $this->mediaManager->getMedia($contactEntity->getImage());
if ($media) {
$mediaModel = new Media();
@@ -239,7 +254,7 @@ class Contact
$contact->getLayouterData()->setImage1($mediaModel);
}
}
- if ($contactEntity->getImage2() != "") {
+ if ($contactEntity->getImage2() != '') {
$media = $this->mediaManager->getMedia($contactEntity->getImage2());
if ($media) {
$mediaModel = new Media();
diff --git a/src/new/src/PSC/Shop/EntityBundle/Document/Product.php b/src/new/src/PSC/Shop/EntityBundle/Document/Product.php
index 3b33263a9..a73d7a364 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Document/Product.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Document/Product.php
@@ -13,9 +13,9 @@
namespace PSC\Shop\EntityBundle\Document;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
use Doctrine\ODM\MongoDB\Mapping\Annotations\Field;
use Doctrine\ODM\MongoDB\Mapping\Annotations\Id;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
#[Document]
class Product
@@ -272,6 +272,11 @@ class Product
#[Field(type: 'bool')]
protected $uploadProvidedDownload = false;
+ #[Field(type: 'string')]
+ protected null|string $aribaUnitOfMeasure = '';
+
+ #[Field(type: 'string')]
+ protected null|string $aribaUNSPSC = '';
/**
* @var string $uploadProvidedFile;
@@ -289,7 +294,7 @@ class Product
*/
public function getSalesUnit(): int
{
- return (int)$this->salesUnit;
+ return (int) $this->salesUnit;
}
/**
@@ -305,7 +310,7 @@ class Product
*/
public function getBaseUnit(): int
{
- return (int)$this->baseUnit;
+ return (int) $this->baseUnit;
}
/**
@@ -321,7 +326,7 @@ class Product
*/
public function getPackagingUnit(): int
{
- return (int)$this->packagingUnit;
+ return (int) $this->packagingUnit;
}
/**
@@ -763,14 +768,11 @@ class Product
return $this->collectingOrdersAccountFilter;
}
-
-
/**
* @return array
*/
public function getPluginSettings()
{
-
return $this->pluginSettings;
}
@@ -790,16 +792,16 @@ class Product
*/
public function setPluginSettingModule($module, $key, $value)
{
- $this->pluginSettings[$module ] [$key] = $value;
+ $this->pluginSettings[$module][$key] = $value;
}
public function getPluginSettingModule($module, $key)
{
- if (!isset($this->pluginSettings[$module ]) || !isset($this->pluginSettings[$module ] [$key])) {
+ if (!isset($this->pluginSettings[$module]) || !isset($this->pluginSettings[$module][$key])) {
return null;
}
- return $this->pluginSettings[$module ] [$key];
+ return $this->pluginSettings[$module][$key];
}
/**
@@ -879,7 +881,7 @@ class Product
*/
public function getUploadFromLatestOrderInitalStatus(): int
{
- return (int)$this->uploadFromLatestOrderInitalStatus;
+ return (int) $this->uploadFromLatestOrderInitalStatus;
}
/**
@@ -895,7 +897,7 @@ class Product
*/
public function isUploadFromLatestOrder(): bool
{
- return (bool)$this->uploadFromLatestOrder;
+ return (bool) $this->uploadFromLatestOrder;
}
/**
@@ -911,7 +913,7 @@ class Product
*/
public function getUploadProvidedInitalStatus(): int
{
- return (int)$this->uploadProvidedInitalStatus;
+ return (int) $this->uploadProvidedInitalStatus;
}
/**
@@ -927,7 +929,7 @@ class Product
*/
public function isUploadProvided(): bool
{
- return (bool)$this->uploadProvided;
+ return (bool) $this->uploadProvided;
}
/**
@@ -943,7 +945,7 @@ class Product
*/
public function getUploadProvidedFile(): string
{
- return (string)$this->uploadProvidedFile;
+ return (string) $this->uploadProvidedFile;
}
/**
@@ -1024,11 +1026,31 @@ class Product
public function isRawText(): bool
{
- return (bool)$this->rawText;
+ return (bool) $this->rawText;
}
public function setRawText(bool $var): void
{
$this->rawText = $var;
}
+
+ public function setAribaUNSPSC(null|string $aribaUNSPSC): void
+ {
+ $this->aribaUNSPSC = $aribaUNSPSC;
+ }
+
+ public function getAribaUNSPSC(): null|string
+ {
+ return $this->aribaUNSPSC;
+ }
+
+ public function setAribaUnitOfMeasure(null|string $aribaUnitOfMeasure): void
+ {
+ $this->aribaUnitOfMeasure = $aribaUnitOfMeasure;
+ }
+
+ public function getAribaUnitOfMeasure(): null|string
+ {
+ return $this->aribaUnitOfMeasure;
+ }
}
diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php b/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php
index b051cc195..61d8fd04e 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php
@@ -13,8 +13,8 @@
namespace PSC\Shop\EntityBundle\Entity;
-use Doctrine\ORM\Mapping as ORM;
use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
/**
* Account
@@ -34,214 +34,214 @@ class Account
protected $priceFactor;
protected $extraSettings;
/**
- * Id der Firma
- *
- * @var integer
- */
+ * Id der Firma
+ *
+ * @var integer
+ */
#[ORM\Column(name: 'id', type: 'integer')]
#[ORM\Id]
#[ORM\GeneratedValue(strategy: 'AUTO')]
protected $uid;
/**
- * Titel der Firma
- *
- * @var string
- */
+ * Titel der Firma
+ *
+ * @var string
+ */
#[ORM\Column(name: 'company', type: 'string', length: 255)]
protected $title;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'appendix', type: 'string', length: 255)]
protected $appendix;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'street', type: 'string', length: 255)]
protected $street;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'destrict', type: 'string', length: 255)]
- protected $destrict;
+ protected $district;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'zip', type: 'string', length: 255)]
protected $zip;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'city', type: 'string', length: 255)]
protected $city;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'state', type: 'string', length: 255)]
protected $state;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'country', type: 'string', length: 255)]
protected $country;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'email', type: 'string', length: 255)]
protected $email;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'house_number', type: 'string', length: 255)]
protected $houseNumber;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'homepage', type: 'string', length: 255)]
protected $homepage;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'phone_lv', type: 'string', length: 255)]
protected $phoneAreaCode;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'phone_vorwahl', type: 'string', length: 255)]
protected $phonePrefix;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'phone', type: 'string', length: 255)]
protected $phone;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'phone_durchwahl', type: 'string', length: 255)]
protected $phoneAppendix;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'mobile_lv', type: 'string', length: 255)]
protected $mobileAreaCode;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'mobile_vorwahl', type: 'string', length: 255)]
protected $mobilePrefix;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'mobile', type: 'string', length: 255)]
protected $mobile;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'mobile_durchwahl', type: 'string', length: 255)]
protected $mobileAppendix;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'fax_lv', type: 'string', length: 255)]
protected $faxAreaCode;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'fax_vorwahl', type: 'string', length: 255)]
protected $faxPrefix;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'fax', type: 'string', length: 255)]
protected $fax;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'fax_durchwahl', type: 'string', length: 255)]
protected $faxAppendix;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'alternativ_lv', type: 'string', length: 255)]
protected $alternativAreaCode;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'alternativ_type', type: 'string', length: 255)]
protected $alternativType;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'alternativ', type: 'string', length: 255)]
protected $alternativ;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'alternativ_durchwahl', type: 'string', length: 255)]
protected $alternativAppendix;
/**
- * Vorgänger der Firma
- */
+ * Vorgänger der Firma
+ */
#[ORM\ManyToOne(targetEntity: 'Account', inversedBy: 'children')]
#[ORM\JoinColumn(name: 'filiale_id', referencedColumnName: 'id')]
protected $parent;
/**
- * Vorgänger der Firma
- *
- * @var int
- */
+ * Vorgänger der Firma
+ *
+ * @var int
+ */
#[ORM\Column(name: 'filiale_id', type: 'integer', nullable: true)]
protected $parentId = 0;
/**
- * Unterfirmen der Firma
- */
+ * Unterfirmen der Firma
+ */
#[ORM\OneToMany(targetEntity: 'Account', mappedBy: 'parent')]
protected $children;
/**
- * Gesperter Account
- *
- * @var boolean
- */
+ * Gesperter Account
+ *
+ * @var boolean
+ */
#[ORM\Column(name: 'locked', type: 'boolean')]
protected $locked;
/**
- * Benutze Account als Rechnungsadresse
- *
- * @var boolean
- */
+ * Benutze Account als Rechnungsadresse
+ *
+ * @var boolean
+ */
#[ORM\Column(name: 'use_account_as_invoice', type: 'boolean')]
protected $useAccountAsInvoiceAddress;
/**
- * Install
- *
- * @var int
- */
+ * Install
+ *
+ * @var int
+ */
#[ORM\ManyToOne(targetEntity: 'Install')]
#[ORM\JoinColumn(name: 'install_id', referencedColumnName: 'id')]
protected $install;
@@ -276,171 +276,171 @@ class Account
#[ORM\ManyToMany(targetEntity: 'Productgroup', inversedBy: 'accounts')]
public $productGroups;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'bank_name', type: 'string', length: 255)]
protected $bankKtoName;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'bank_kto', type: 'string', length: 255)]
protected $bankKTO;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'bank_blz', type: 'string', length: 255)]
protected $bankBLZ;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'bank_iban', type: 'string', length: 255)]
protected $bankIban;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'bank_bic', type: 'string', length: 255)]
protected $bankBic;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'bank_bank_name', type: 'string', length: 255)]
protected $bankName;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'usid', type: 'string', length: 255)]
protected $ustid;
/**
- *
- * @var int
- */
+ *
+ * @var int
+ */
#[ORM\Column(name: 'typ', type: 'integer', length: 2)]
protected $typ;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'logo1', type: 'string', length: 255)]
protected $image;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'template_switch', type: 'string', length: 255)]
protected $templateSwitch;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'informations', type: 'string')]
protected $information;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'mega_code', type: 'string', length: 255)]
protected $megaCode;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'hotel_name', type: 'string', length: 255)]
protected $hotelName;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'sub_hotel_name', type: 'string', length: 255)]
protected $subHotelName;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'email_gm', type: 'string', length: 255)]
protected $emailGm;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'zimmer', type: 'string', length: 255)]
protected $room;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'gz', type: 'string', length: 255)]
protected $gz;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'gf', type: 'string', length: 255)]
protected $gf;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'gsitz', type: 'string', length: 255)]
protected $gSitz;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'handelsregister', type: 'string', length: 255)]
protected $handelsRegister;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'hrb', type: 'string', length: 255)]
protected $hrb;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'vorsitz', type: 'string', length: 255)]
protected $vorsitz;
/**
- *
- * @var int
- */
+ *
+ * @var int
+ */
#[ORM\Column(name: 'anrede1', type: 'integer', length: 2)]
protected $salutation1;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'firstname1', type: 'string', length: 255)]
protected $firstname1;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'lastname1', type: 'string', length: 255)]
protected $lastname1;
/**
- *
- * @var int
- */
+ *
+ * @var int
+ */
#[ORM\Column(name: 'anrede2', type: 'integer', length: 2)]
protected $salutation2;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'firstname2', type: 'string', length: 255)]
protected $firstname2;
/**
- *
- * @var string
- */
+ *
+ * @var string
+ */
#[ORM\Column(name: 'lastname2', type: 'string', length: 255)]
protected $lastname2;
@@ -450,11 +450,10 @@ class Account
#[ORM\ManyToMany(targetEntity: 'Cms', inversedBy: 'accounts')]
public $cms;
-
/**
- * Constructor
- * @param null $id
- */
+ * Constructor
+ * @param null $id
+ */
public function __construct($id = null)
{
$this->children = new ArrayCollection();
@@ -530,9 +529,9 @@ class Account
*/
public function getArray()
{
- return array(
- 'title' => $this->getTitle()
- );
+ return [
+ 'title' => $this->getTitle(),
+ ];
}
/**
@@ -671,20 +670,14 @@ class Account
$this->street = $street;
}
- /**
- * @return string
- */
- public function getDestrict()
+ public function getDistrict(): string
{
- return $this->destrict;
+ return (string) $this->district;
}
- /**
- * @param string $destrict
- */
- public function setDestrict($destrict)
+ public function setDistrict($district): void
{
- $this->destrict = $destrict;
+ $this->district = $district;
}
/**
diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php b/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php
index d9e4c9355..ac31d5dcd 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php
@@ -187,12 +187,12 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
*
* @param string $email Emailadresse
*/
- public function __construct($email = "")
+ public function __construct($email = '')
{
$this->createdAt = new \DateTime();
$this->updatedAt = new \DateTime();
$this->uuid = Uuid::uuid4();
- if ($email == "") {
+ if ($email == '') {
$this->setEmail($this->uuid);
} else {
$this->setEmail($email);
@@ -251,7 +251,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
$this->username = $username;
}
- public function getPassword(): ?string
+ public function getPassword(): null|string
{
return $this->password;
}
@@ -263,7 +263,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
*/
public function setPassword($password)
{
- if ($password != "") {
+ if ($password != '') {
$this->password = $password;
}
}
@@ -280,13 +280,12 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
public function asArray()
{
- return array(
+ return [
'id' => $this->getId(),
- 'email' => $this->getUsername()
- );
+ 'email' => $this->getUsername(),
+ ];
}
-
/**
* Returns the salt that was originally used to encode the password.
*
@@ -339,6 +338,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
*
* @return string
*/
+ #[\Override]
public function __toString()
{
return $this->getEmail();
@@ -474,7 +474,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
* @var string
*/
#[ORM\Column(name: 'self_destrict', type: 'string', length: 255, nullable: true)]
- private $destrict;
+ private $district;
/**
* @var string
@@ -508,7 +508,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
#[ORM\Column(name: 'self_foto', type: 'string', length: 255, nullable: true)]
private $image;
- #
+
#[ORM\Column(name: 'foto', type: 'string', length: 255, nullable: true)]
private $image2;
@@ -922,7 +922,6 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
$this->ustid = $ustid;
}
-
/**
* @return ContactAddress
*/
@@ -1062,16 +1061,16 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
public function anonymisieren()
{
- $this->setFirstname("anonym");
- $this->setLastname("anonym");
- $this->setAbteilung("anonym");
- $this->setStreet("anonym");
- $this->setHouseNumber("anonym");
- $this->setZip("anonym");
- $this->setCity("anonym");
- $this->setCountry("anonym");
- $this->setPosition("anonym");
- $this->setPhone("anonym");
+ $this->setFirstname('anonym');
+ $this->setLastname('anonym');
+ $this->setAbteilung('anonym');
+ $this->setStreet('anonym');
+ $this->setHouseNumber('anonym');
+ $this->setZip('anonym');
+ $this->setCity('anonym');
+ $this->setCountry('anonym');
+ $this->setPosition('anonym');
+ $this->setPhone('anonym');
$this->setPhoneAreaCode('');
$this->setPhonePrefix('');
$this->setPhoneAppendix('');
@@ -1088,8 +1087,8 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
$this->setName('anonym@anonym.de');
$this->setEnable(false);
$this->setPassword('anonym');
- $this->setImage("");
- $this->setImage2("");
+ $this->setImage('');
+ $this->setImage2('');
}
/**
@@ -1627,17 +1626,14 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
/**
* @return string
*/
- public function getDestrict()
+ public function getDistrict()
{
- return $this->destrict;
+ return $this->district;
}
- /**
- * @param string $destrict
- */
- public function setDestrict($destrict)
+ public function setDistrict($district)
{
- $this->destrict = $destrict;
+ $this->district = $district;
}
/**
@@ -1783,6 +1779,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
{
$this->abteilung = $abteilung;
}
+
/**
* @return string
*/
@@ -2341,28 +2338,28 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
public function getRolesAsString()
{
- $temp = array();
+ $temp = [];
foreach ($this->roles as $row) {
if ($row->getLevel() == 10 || $row->getLevel() == 20) {
- $temp[] = "ROLE_USER";
+ $temp[] = 'ROLE_USER';
}
if ($row->getLevel() == 25) {
- $temp[] = "ROLE_PRODUCT_EDITOR";
+ $temp[] = 'ROLE_PRODUCT_EDITOR';
}
if ($row->getLevel() == 30) {
- $temp[] = "ROLE_SHOP_OPERATOR";
+ $temp[] = 'ROLE_SHOP_OPERATOR';
}
if ($row->getLevel() == 35) {
- $temp[] = "ROLE_PRODUCTION";
+ $temp[] = 'ROLE_PRODUCTION';
}
if ($row->getLevel() == 40) {
- $temp[] = "ROLE_ADMIN";
+ $temp[] = 'ROLE_ADMIN';
}
if ($row->getLevel() == 50) {
- $temp[] = "ROLE_SYSTEM_ADMIN";
+ $temp[] = 'ROLE_SYSTEM_ADMIN';
}
- if (!in_array($row->getLevel(), [10,20,25,30,35,40,50,0])) {
+ if (!in_array($row->getLevel(), [10, 20, 25, 30, 35, 40, 50, 0])) {
$temp[] = $row->getTitle();
}
}
@@ -2699,7 +2696,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
'id' => $this->getId(),
'email' => $this->getEmail(),
'password' => $this->getPassword(),
- 'roles' => $this->getRolesForm()
+ 'roles' => $this->getRolesForm(),
];
}
@@ -2709,19 +2706,20 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
$this->setEmail($data['email']);
$this->setPassword($data['password']);
$this->setRolesForm($data['roles']);
-
}
+ #[\Override]
public function serialize()
{
return serialize([
'id' => $this->getId(),
'email' => $this->getEmail(),
'password' => $this->getPassword(),
- 'roles' => $this->getRolesForm()
+ 'roles' => $this->getRolesForm(),
]);
}
+ #[\Override]
public function unserialize($data)
{
$unserialized = unserialize($data);
diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/Product.php b/src/new/src/PSC/Shop/EntityBundle/Entity/Product.php
index dd39e1b9c..a43e3a9a3 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Entity/Product.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Entity/Product.php
@@ -54,6 +54,9 @@ class Product
protected $weight;
protected $rawText = false;
protected $text;
+ protected null|string $aribaUnitOfMeasure = '';
+ protected null|string $aribaUNSPSC = '';
+
/**
* @var integer
*/
@@ -127,7 +130,7 @@ class Product
*/
public function isUploadProvidedDownload(): bool
{
- return (bool)$this->uploadProvidedDownload;
+ return (bool) $this->uploadProvidedDownload;
}
/**
@@ -213,7 +216,6 @@ class Product
#[ORM\Column(name: 'sub_title', type: 'string', length: 255)]
protected $subTitle;
-
/**
* Art des Product
*
@@ -885,8 +887,8 @@ class Product
*/
public function __construct()
{
- $this->enable = false;
- $this->notBuy = false;
+ $this->enable = false;
+ $this->notBuy = false;
$this->private = false;
$this->displayNotInOverview = false;
$this->uuid = UUID::uuid4();
@@ -906,48 +908,45 @@ class Product
*/
public function getExportArray()
{
-
- return array(
- 'id' => (string)$this->getId(),
- 'uid' => (string)$this->getUID(),
- 'uuid' => (string)$this->getUUID(),
- 'title' => (string)$this->getTitle(),
- 'subTitle' => (string)$this->getSubTitle(),
- 'textArt' => (string)$this->getTextArt(),
- 'textFormat' => (string)$this->getTextFormat(),
- 'nrExtern' => (string)$this->getNrExtern(),
- 'nrIntern' => (string)$this->getNrIntern(),
- 'ablaufDatum' => ($this->ablaufDatum == null) ? '' : $this->ablaufDatum->format("d.m.Y"),
- 'ansprechPartner' => (string)$this->ansprechPartner,
- 'preis' => (string)$this->getPrice(),
- 'enable' => (string)$this->isEnable(),
- 'shopId' => (string)$this->getShop()->getUid(),
- 'productType' => (string)$this->getType(),
- 'isStock' => $this->isStock() ? "1" : "0",
- 'stockCount' => (string)$this->getStockCount(),
- 'stockMinCount' => (string)$this->getStockMinCount(),
- 'stockPlace' => (string)$this->getStockPlace(),
- 'stockMaxBuy' => (string)$this->getStockMaxBuy(),
- 'buyed' => (string)$this->getBuyed(),
- 'printPartnerEmail' => (string)$this->getPrintPartnerEmail(),
- 'zusatzAbmessung' => (string)$this->getZusatzAbmessung(),
- 'zusatzDesigner' => (string)$this->getZusatzDesigner(),
- 'zusatzShipping' => (string)$this->getZusatzShipping(),
- 'custom1' => (string)$this->getCustom1(),
- 'custom2' => (string)$this->getCustom2(),
- 'custom3' => (string)$this->getCustom3(),
- 'custom4' => (string)$this->getCustom4(),
- 'custom5' => (string)$this->getCustom5(),
- 'custom6' => (string)$this->getCustom6(),
- 'custom7' => (string)$this->getCustom7(),
- 'custom8' => (string)$this->getCustom8(),
- 'custom9' => (string)$this->getCustom9(),
- 'custom10' => (string)$this->getCustom10(),
- 'custom11' => (string)$this->getCustom11(),
- 'custom12' => (string)$this->getCustom12(),
-
-
- );
+ return [
+ 'id' => (string) $this->getId(),
+ 'uid' => (string) $this->getUID(),
+ 'uuid' => (string) $this->getUUID(),
+ 'title' => (string) $this->getTitle(),
+ 'subTitle' => (string) $this->getSubTitle(),
+ 'textArt' => (string) $this->getTextArt(),
+ 'textFormat' => (string) $this->getTextFormat(),
+ 'nrExtern' => (string) $this->getNrExtern(),
+ 'nrIntern' => (string) $this->getNrIntern(),
+ 'ablaufDatum' => $this->ablaufDatum == null ? '' : $this->ablaufDatum->format('d.m.Y'),
+ 'ansprechPartner' => (string) $this->ansprechPartner,
+ 'preis' => (string) $this->getPrice(),
+ 'enable' => (string) $this->isEnable(),
+ 'shopId' => (string) $this->getShop()->getUid(),
+ 'productType' => (string) $this->getType(),
+ 'isStock' => $this->isStock() ? '1' : '0',
+ 'stockCount' => (string) $this->getStockCount(),
+ 'stockMinCount' => (string) $this->getStockMinCount(),
+ 'stockPlace' => (string) $this->getStockPlace(),
+ 'stockMaxBuy' => (string) $this->getStockMaxBuy(),
+ 'buyed' => (string) $this->getBuyed(),
+ 'printPartnerEmail' => (string) $this->getPrintPartnerEmail(),
+ 'zusatzAbmessung' => (string) $this->getZusatzAbmessung(),
+ 'zusatzDesigner' => (string) $this->getZusatzDesigner(),
+ 'zusatzShipping' => (string) $this->getZusatzShipping(),
+ 'custom1' => (string) $this->getCustom1(),
+ 'custom2' => (string) $this->getCustom2(),
+ 'custom3' => (string) $this->getCustom3(),
+ 'custom4' => (string) $this->getCustom4(),
+ 'custom5' => (string) $this->getCustom5(),
+ 'custom6' => (string) $this->getCustom6(),
+ 'custom7' => (string) $this->getCustom7(),
+ 'custom8' => (string) $this->getCustom8(),
+ 'custom9' => (string) $this->getCustom9(),
+ 'custom10' => (string) $this->getCustom10(),
+ 'custom11' => (string) $this->getCustom11(),
+ 'custom12' => (string) $this->getCustom12(),
+ ];
}
/**
@@ -975,33 +974,33 @@ class Product
*
* @return string
*/
+ #[\Override]
public function __toString()
{
return $this->getTitle();
}
- public function getTitle(): ?string
+ public function getTitle(): null|string
{
return $this->title;
}
- public function getTitleSubTitle(): ?string
+ public function getTitleSubTitle(): null|string
{
return $this->title . ' ' . $this->subTitle;
}
-
- public function setTitle(?string $title): void
+ public function setTitle(null|string $title): void
{
$this->title = $title;
}
- public function getSubTitle(): ?string
+ public function getSubTitle(): null|string
{
return $this->subTitle;
}
- public function setSubTitle(?string $subTitle): void
+ public function setSubTitle(null|string $subTitle): void
{
$this->subTitle = $subTitle;
}
@@ -1280,7 +1279,7 @@ class Product
public function hasCalcXml()
{
- return ($this->calcXml != "" && strpos($this->calcXml, "artikel") !== false);
+ return $this->calcXml != '' && str_contains($this->calcXml, 'artikel');
}
/**
@@ -1320,8 +1319,8 @@ class Product
*/
public function getLangData()
{
- if ($this->langData == "") {
- return array();
+ if ($this->langData == '') {
+ return [];
}
return json_decode($this->langData, true);
}
@@ -1332,7 +1331,7 @@ class Product
public function setLangData($langData)
{
if (!is_array($langData)) {
- $langData = array();
+ $langData = [];
}
$this->langData = json_encode($langData);
}
@@ -1359,7 +1358,7 @@ class Product
public function getPackageFormat()
{
if ($this->packageFormat === null) {
- return "";
+ return '';
}
return $this->packageFormat;
}
@@ -2841,7 +2840,7 @@ class Product
*/
public function getSetConfig(bool $asArray = false)
{
- if ($this->setConfig != "") {
+ if ($this->setConfig != '') {
$setConfig = json_decode($this->setConfig, $asArray);
if (is_array($setConfig) && count($setConfig) > 0) {
@@ -2965,7 +2964,7 @@ class Product
*/
public function getBaseUnit(): int
{
- return (int)$this->baseUnit;
+ return (int) $this->baseUnit;
}
/**
@@ -2981,7 +2980,7 @@ class Product
*/
public function getSalesUnit(): int
{
- return (int)$this->salesUnit;
+ return (int) $this->salesUnit;
}
/**
@@ -2997,7 +2996,7 @@ class Product
*/
public function getPackagingUnit(): int
{
- return (int)$this->packagingUnit;
+ return (int) $this->packagingUnit;
}
/**
@@ -3013,7 +3012,7 @@ class Product
*/
public function isUploadFromLatestOrder(): bool
{
- return (bool)$this->uploadFromLatestOrder;
+ return (bool) $this->uploadFromLatestOrder;
}
/**
@@ -3029,7 +3028,7 @@ class Product
*/
public function getUploadFromLatestOrderInitalStatus(): int
{
- return (int)$this->uploadFromLatestOrderInitalStatus;
+ return (int) $this->uploadFromLatestOrderInitalStatus;
}
/**
@@ -3045,7 +3044,7 @@ class Product
*/
public function isUploadProvided(): bool
{
- return (bool)$this->uploadProvided;
+ return (bool) $this->uploadProvided;
}
/**
@@ -3061,7 +3060,7 @@ class Product
*/
public function getUploadProvidedFile(): string
{
- return (string)$this->uploadProvidedFile;
+ return (string) $this->uploadProvidedFile;
}
/**
@@ -3077,7 +3076,7 @@ class Product
*/
public function getUploadProvidedInitalStatus(): int
{
- return (int)$this->uploadProvidedInitalStatus;
+ return (int) $this->uploadProvidedInitalStatus;
}
/**
@@ -3139,13 +3138,34 @@ class Product
{
$this->noIndex = $noIndex;
}
+
public function isRawText(): bool
{
- return (bool)$this->rawText;
+ return (bool) $this->rawText;
}
public function setRawText(bool $rawText): void
{
$this->rawText = $rawText;
}
+
+ public function setAribaUnitOfMeasure(null|string $aribaUnitOfMeasure): void
+ {
+ $this->aribaUnitOfMeasure = $aribaUnitOfMeasure;
+ }
+
+ public function getAribaUnitOfMeasure(): null|string
+ {
+ return $this->aribaUnitOfMeasure;
+ }
+
+ public function setAribaUNSPSC(null|string $aribaUNSPSC): void
+ {
+ $this->aribaUNSPSC = $aribaUNSPSC;
+ }
+
+ public function getAribaUNSPSC(): null|string
+ {
+ return $this->aribaUNSPSC;
+ }
}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Api/All.php b/src/new/src/PSC/Shop/MediaBundle/Api/All.php
index 74f480655..44265eda1 100644
--- a/src/new/src/PSC/Shop/MediaBundle/Api/All.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Api/All.php
@@ -27,7 +27,7 @@ class All extends AbstractController
description: 'get all media',
content: new JsonContent(ref: new Model(type: PSCAll::class)),
)]
- #[Route(path: '/media/all{:uuid}', methods: ['GET'])]
+ #[Route(path: '/media/all', methods: ['GET'])]
#[Tag('Media')]
#[IsGranted('ROLE_ADMIN')]
#[Security(name: 'Bearer')]
diff --git a/src/new/src/PSC/Shop/MediaBundle/Api/AllFolderPage.php b/src/new/src/PSC/Shop/MediaBundle/Api/AllFolderPage.php
index 6e4377e61..7dd94c643 100644
--- a/src/new/src/PSC/Shop/MediaBundle/Api/AllFolderPage.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Api/AllFolderPage.php
@@ -51,6 +51,7 @@ class AllFolderPage extends AbstractController
$f = new PSCMedia();
$f->setTitle($media->getTitle());
$f->setUrl($media->getUrl());
+ $f->setUuid($media->getId());
$output->data[] = $f;
}
return $this->json($output);
diff --git a/src/new/src/PSC/Shop/MediaBundle/Api/One.php b/src/new/src/PSC/Shop/MediaBundle/Api/One.php
new file mode 100644
index 000000000..2971bf50d
--- /dev/null
+++ b/src/new/src/PSC/Shop/MediaBundle/Api/One.php
@@ -0,0 +1,29 @@
+json(new Media());
+ }
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Api/UploadVariant.php b/src/new/src/PSC/Shop/MediaBundle/Api/UploadVariant.php
index f493e4af4..c5e6ec4c7 100644
--- a/src/new/src/PSC/Shop/MediaBundle/Api/UploadVariant.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Api/UploadVariant.php
@@ -3,22 +3,22 @@
namespace PSC\Shop\MediaBundle\Api;
use Doctrine\ODM\MongoDB\DocumentManager;
+use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Annotation\Security;
+use OpenApi\Annotations as OA;
use PSC\Shop\MediaBundle\Document\Embed\Variant;
use PSC\Shop\MediaBundle\Document\Media;
-use PSC\Shop\MediaBundle\Model\Media as MediaModel;
use PSC\Shop\MediaBundle\Helper\MediaManager;
+use PSC\Shop\MediaBundle\Model\Media as MediaModel;
use PSC\Shop\MediaBundle\Service\MediaManager as PSCMediaManager;
use PSC\Shop\MediaBundle\Transformer\Media as PSCMedia;
use PSC\System\SettingsBundle\Service\Shop;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Attribute\Route;
-use OpenApi\Annotations as OA;
-use Nelmio\ApiDocBundle\Annotation\Security;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
-use Nelmio\ApiDocBundle\Annotation\Model;
class UploadVariant extends AbstractController
{
@@ -28,7 +28,7 @@ class UploadVariant extends AbstractController
* @OA\Response(
* response=200,
* description="media",
- * @OA\JsonContent(ref=@Model(type=\PSC\Shop\MediaBundle\Model\Media::class))
+ * @OA\JsonContent(ref=\PSC\Shop\MediaBundle\Model\Media::class)
* )
* @OA\RequestBody(
* description="This is a request body",
@@ -61,13 +61,19 @@ class UploadVariant extends AbstractController
* @Security(name="Bearer")
*/
#[Route(path: '/variant/create', methods: ['POST'])]
- public function create(PSCMediaManager $mediaService, PSCMedia $mediaTransformer, MediaManager $mediaManager, Shop $shopService, DocumentManager $documentManager, Request $req): JsonResponse
- {
+ public function create(
+ PSCMediaManager $mediaService,
+ PSCMedia $mediaTransformer,
+ MediaManager $mediaManager,
+ Shop $shopService,
+ DocumentManager $documentManager,
+ Request $req,
+ ): JsonResponse {
$mediaVariant = new Variant();
$media = $mediaService->getMedia($req->get('uuid'));
- $handler = $mediaManager->getHandlerForType('pdf');
- $helper = $handler->getFormHelper($mediaVariant);
+ $handler = $mediaManager->getHandlerForType('pdf');
+ $helper = $handler->getFormHelper($mediaVariant);
$mediaVariant->setContent($req->files->get('file'));
$mediaVariant->setSettings($req->get('settings'));
$handler->prepareMedia($mediaVariant);
@@ -79,5 +85,4 @@ class UploadVariant extends AbstractController
$mediaTransformer->fromDb($mediaModel, $media);
return $this->json($mediaModel);
}
-
}
diff --git a/src/new/src/PSC/Shop/PaymentBundle/Api/All.php b/src/new/src/PSC/Shop/PaymentBundle/Api/All.php
index a9b862f01..43e0aec10 100755
--- a/src/new/src/PSC/Shop/PaymentBundle/Api/All.php
+++ b/src/new/src/PSC/Shop/PaymentBundle/Api/All.php
@@ -3,17 +3,14 @@
namespace PSC\Shop\PaymentBundle\Api;
use Doctrine\ORM\EntityManagerInterface;
+use Nelmio\ApiDocBundle\Attribute\Security;
use PSC\Shop\EntityBundle\Entity\Payment;
use PSC\Shop\PaymentBundle\Dto\All\Output;
use PSC\Shop\PaymentBundle\Model\Payment as PSCPayment;
use PSC\System\SettingsBundle\Service\Shop;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\Routing\Annotation\Route;
-use OpenApi\Annotations as OA;
-use Nelmio\ApiDocBundle\Annotation\Model;
-use Nelmio\ApiDocBundle\Annotation\Security;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
class All extends AbstractController
@@ -24,28 +21,29 @@ class All extends AbstractController
private TokenStorageInterface $tokenStorage;
- public function __construct(EntityManagerInterface $entityManager, Shop $shopService, TokenStorageInterface $tokenStorage)
- {
+ public function __construct(
+ EntityManagerInterface $entityManager,
+ Shop $shopService,
+ TokenStorageInterface $tokenStorage,
+ ) {
$this->entityManager = $entityManager;
$this->shopService = $shopService;
$this->tokenStorage = $tokenStorage;
}
- /**
- * get all payments
- *
- * @OA\Response(
- * response=200,
- * description="payments",
- * @OA\JsonContent(ref=@Model(type=\PSC\Shop\PaymentBundle\Dto\All\Output::class))
- * )
- * @OA\Tag(name="Payment")
- */
+ #[Response(
+ response: 200,
+ description: 'get payments',
+ content: new JsonContent(ref: new Model(type: Output::class)),
+ )]
+ #[Tag(name: 'Payment')]
#[Route(path: '/', methods: ['GET'])]
public function all(): JsonResponse
{
$output = [];
- $result = $this->entityManager->getRepository(Payment::class)->findBy(['shop' => $this->shopService->getShopByDomain(), 'private' => 0]);
+ $result = $this->entityManager
+ ->getRepository(Payment::class)
+ ->findBy(['shop' => $this->shopService->getShopByDomain(), 'private' => 0]);
/** Payment $payment */
foreach ($result as $payment) {
@@ -58,17 +56,13 @@ class All extends AbstractController
return $this->json(new Output($output));
}
- /**
- * get all payments by Shop Uuid
- *
- * @OA\Response(
- * response=200,
- * description="payments",
- * @OA\JsonContent(ref=@Model(type=\PSC\Shop\PaymentBundle\Dto\All\Output::class))
- * )
- * @OA\Tag(name="Payment")
- * @Security(name="Bearer")
- */
+ #[Response(
+ response: 200,
+ description: 'get payments by shops',
+ content: new JsonContent(ref: new Model(type: Output::class)),
+ )]
+ #[Tag(name: 'Payment')]
+ #[Security(name: 'Bearer')]
#[Route(path: '/by/shop/{shopUuid}', methods: ['GET'])]
#[IsGranted('ROLE_SHOP')]
public function byShops(string $shopUuid): JsonResponse
@@ -89,23 +83,21 @@ class All extends AbstractController
return $this->json(new Output($output));
}
- /**
- * get all payments
- *
- * @OA\Response(
- * response=200,
- * description="get my payments",
- * @OA\JsonContent(ref=@Model(type=\PSC\Shop\PaymentBundle\Dto\All\Output::class))
- * )
- * @OA\Tag(name="Payment")
- * @Security(name="Bearer")
- */
+ #[Response(
+ response: 200,
+ description: 'get my payments ',
+ content: new JsonContent(ref: new Model(type: Output::class)),
+ )]
+ #[Tag(name: 'Payment')]
+ #[Security(name: 'Bearer')]
#[Route(path: '/my', methods: ['GET'])]
#[IsGranted('ROLE_USER')]
public function my(): JsonResponse
{
$output = [];
- $result = $this->entityManager->getRepository(Payment::class)->findBy(['shop' => $this->shopService->getShopByDomain(), 'private' => 0]);
+ $result = $this->entityManager
+ ->getRepository(Payment::class)
+ ->findBy(['shop' => $this->shopService->getShopByDomain(), 'private' => 0]);
/** Payment $payment */
foreach ($result as $payment) {
diff --git a/src/new/src/PSC/Shop/PaymentBundle/Api/One.php b/src/new/src/PSC/Shop/PaymentBundle/Api/One.php
index e57d61eb6..bce2cd7ed 100755
--- a/src/new/src/PSC/Shop/PaymentBundle/Api/One.php
+++ b/src/new/src/PSC/Shop/PaymentBundle/Api/One.php
@@ -3,39 +3,40 @@
namespace PSC\Shop\PaymentBundle\Api;
use Doctrine\ORM\EntityManagerInterface;
+use Nelmio\ApiDocBundle\Attribute\Model;
+use OpenApi\Attributes\JsonContent;
+use OpenApi\Attributes\Response;
+use OpenApi\Attributes\Tag;
use PSC\Component\ApiBundle\Dto\Error\NotFound;
use PSC\Shop\EntityBundle\Entity\Payment as PSCPayment;
use PSC\Shop\PaymentBundle\Model\Payment;
use PSC\System\SettingsBundle\Service\Shop;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;
-use OpenApi\Annotations as OA;
-use Nelmio\ApiDocBundle\Annotation\Model;
class One extends AbstractController
{
private EntityManagerInterface $entityManager;
private Shop $shopService;
+
public function __construct(EntityManagerInterface $entityManager, Shop $shopService)
{
$this->entityManager = $entityManager;
$this->shopService = $shopService;
}
- /**
- * get one payment
- *
- * @OA\Response(
- * response=200,
- * description="orders",
- * @OA\JsonContent(ref=@Model(type=\PSC\Shop\PaymentBundle\Model\Payment::class))
- * )
- * @OA\Tag(name="Payment")
- */
+ #[Response(
+ response: 200,
+ description: 'get Payment',
+ content: new JsonContent(ref: new Model(type: Payment::class)),
+ )]
+ #[Tag(name: 'Payment')]
#[Route(path: '/{id}', methods: ['GET'])]
public function one(string $id)
{
- $result = $this->entityManager->getRepository(PSCPayment::class)->findOneBy(['shop' => $this->shopService->getShopByDomain(), 'private' => 0, 'uid' => $id]);
+ $result = $this->entityManager
+ ->getRepository(PSCPayment::class)
+ ->findOneBy(['shop' => $this->shopService->getShopByDomain(), 'private' => 0, 'uid' => $id]);
if ($result) {
$output = new Payment();
$output->setTitle($result->getTitle());
diff --git a/src/new/src/PSC/Shop/ProductBundle/Controller/Backend/Product/EditController.php b/src/new/src/PSC/Shop/ProductBundle/Controller/Backend/Product/EditController.php
index 64dc2e740..a92d848df 100755
--- a/src/new/src/PSC/Shop/ProductBundle/Controller/Backend/Product/EditController.php
+++ b/src/new/src/PSC/Shop/ProductBundle/Controller/Backend/Product/EditController.php
@@ -1,23 +1,12 @@
- * @copyright 2012-2013 PrintshopCreator GmbH
- * @license Private
- * @link http://www.printshopcreator.de
- */
-
namespace PSC\Shop\ProductBundle\Controller\Backend\Product;
use Doctrine\ODM\MongoDB\DocumentManager;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityManagerInterface;
-use Knp\Component\Pager\PaginatorInterface;
use Doctrine\ORM\Mapping\Entity;
+use Knp\Component\Pager\PaginatorInterface;
use PSC\Shop\EntityBundle\Document\Queue;
use PSC\Shop\EntityBundle\Document\Shop;
use PSC\Shop\EntityBundle\Entity\Account;
@@ -29,21 +18,22 @@ use PSC\Shop\ProductBundle\Document\Product\History as PSCHistory;
use PSC\Shop\ProductBundle\Form\Backend\Product\ProductType;
use PSC\Shop\ProductBundle\PSCShopProductBundle;
use PSC\System\PluginBundle\Form\Chain\Field;
+use PSC\System\PluginBundle\Model\PluginButtonArea;
use PSC\System\SettingsBundle\Document\LogEntry;
use PSC\System\SettingsBundle\Form\Backend\CopyType;
use PSC\System\SettingsBundle\Service\History;
use PSC\System\SettingsBundle\Service\Log;
+use PSC\System\SettingsBundle\Service\Status;
use Ramsey\Uuid\Uuid;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Routing\Annotation\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\HttpFoundation\Request;
-use PSC\System\SettingsBundle\Service\Status;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\SecurityContext;
/**
* DashboardController fürs Backend
@@ -68,20 +58,17 @@ class EditController extends AbstractController
#[Route(path: '/edit/save/lang/data/{uid}', name: 'backend_production_product_edit_save_lang_data')]
public function saveLangDataAction(Request $request, EntityManagerInterface $entityManager, $uid)
{
- $product = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(['uid' => $uid]);
-
+ $product = $entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(['uid' => $uid]);
if ($product) {
$tmp = $product->getLangData();
-
$tmp[$request->getPayload()->get('langcode')] = [
'title' => $request->getPayload()->get('title'),
'einleitung' => $request->getPayload()->get('einleitung'),
'text_art' => $request->getPayload()->get('text_art'),
'info' => $request->getPayload()->get('info'),
- 'uuid' => Uuid::uuid4()
+ 'uuid' => Uuid::uuid4(),
];
$product->setLangData($tmp);
@@ -103,14 +90,19 @@ class EditController extends AbstractController
#[Route(path: '/edit/add/lang/data/{uid}', name: 'backend_production_product_edit_add_lang_data')]
public function addLangDataAction(Request $request, EntityManagerInterface $entityManager, $uid)
{
- $product = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(['uid' => $uid]);
+ $product = $entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(['uid' => $uid]);
if ($product) {
$tmp = $product->getLangData();
if (!isset($tmp[$request->getPayload()->get('langcode')])) {
- $tmp[$request->getPayload()->get('langcode')] = ['title' => $product->getTitle(), 'einleitung' => '', 'text_art' => '', 'info' => '', 'uuid' => Uuid::uuid4()];
+ $tmp[$request->getPayload()->get('langcode')] = [
+ 'title' => $product->getTitle(),
+ 'einleitung' => '',
+ 'text_art' => '',
+ 'info' => '',
+ 'uuid' => Uuid::uuid4(),
+ ];
$product->setLangData($tmp);
$entityManager->persist($product);
@@ -132,11 +124,10 @@ class EditController extends AbstractController
#[Route(path: '/edit/fetch/lang/data/{uid}', name: 'backend_production_product_edit_fetch_lang_data')]
public function fetchLangDataAction(Request $request, EntityManagerInterface $entityManager, $uid)
{
- $product = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(['uid' => $uid]);
+ $product = $entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(['uid' => $uid]);
if ($product) {
- $tmp = array();
+ $tmp = [];
foreach ($product->getLangData() as $key => $row) {
$tmp[] = [
@@ -145,7 +136,7 @@ class EditController extends AbstractController
'einleitung' => $row['einleitung'],
'text_art' => $row['text_art'],
'info' => $row['info'],
- 'uuid' => $row['uuid']
+ 'uuid' => $row['uuid'],
];
}
@@ -166,25 +157,30 @@ class EditController extends AbstractController
* @throws \Doctrine\ORM\ORMException
*/
#[Route(path: '/edit/check/url/{url}', name: 'backend_production_product_check_url')]
- public function checkUrlAction(Request $request, EntityManagerInterface $entityManager, \PSC\System\SettingsBundle\Service\Shop $shopService, $url)
- {
+ public function checkUrlAction(
+ Request $request,
+ EntityManagerInterface $entityManager,
+ \PSC\System\SettingsBundle\Service\Shop $shopService,
+ $url,
+ ) {
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
-*/
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ */
$selectedShop = $shopService->getSelectedShop();
$products = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findBy(array('enable' => 1, 'url' => $url, 'shop' => $selectedShop));
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Product')
+ ->findBy(['enable' => 1, 'url' => $url, 'shop' => $selectedShop]);
if (count($products) > 0) {
- $tmp = array();
+ $tmp = [];
/**
- * @var Product $product
-*/
+ * @var Product $product
+ */
foreach ($products as $product) {
$tmp[] = $product->getTitle();
}
- return new JsonResponse(['success' => true, 'found' => true, 'error' => implode(", ", $tmp)]);
+ return new JsonResponse(['success' => true, 'found' => true, 'error' => implode(', ', $tmp)]);
}
return new JsonResponse(['success' => true, 'found' => false]);
@@ -214,34 +210,40 @@ class EditController extends AbstractController
\PSC\System\SettingsBundle\Service\Shop $shopService,
DocumentManager $documentManager,
SessionInterface $session,
- $type
+ $type,
) {
$customFields = $fieldService->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Product);
$customGroups = $fieldService->getGroups(\PSC\System\PluginBundle\Form\Interfaces\Field::Product);
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
-*/
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ */
$selectedShop = $shopService->getSelectedShop();
/**
- * @var Shop $shop
-*/
+ * @var Shop $shop
+ */
$shop = $documentManager
->getRepository('PSC\Shop\EntityBundle\Document\Shop')
- ->findOneBy(array('uid' => (string) $selectedShop->getUid()));
+ ->findOneBy(['uid' => (string) $selectedShop->getUid()]);
$articlegroups = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Productgroup')->findBy(array('parent' => 0, 'shop' => $selectedShop));
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Productgroup')
+ ->findBy(['parent' => 0, 'shop' => $selectedShop]);
- $customProductFields = $fieldService->getProductFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Product, $type);
- $customProductGroups = $fieldService->getProductGroups(\PSC\System\PluginBundle\Form\Interfaces\Field::Product, $type);
+ $customProductFields = $fieldService->getProductFields(
+ \PSC\System\PluginBundle\Form\Interfaces\Field::Product,
+ $type,
+ );
+ $customProductGroups = $fieldService->getProductGroups(
+ \PSC\System\PluginBundle\Form\Interfaces\Field::Product,
+ $type,
+ );
/**
- * @var Domain[] $domains
-*/
- $domains = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Domain')->getAllByShopId($selectedShop);
+ * @var Domain[] $domains
+ */
+ $domains = $entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Domain')->getAllByShopId($selectedShop);
$product = new Product();
$product->setShop($selectedShop);
@@ -292,28 +294,34 @@ class EditController extends AbstractController
$productDoc->setSalesUnit($product->getSalesUnit());
$productDoc->setBaseUnit($product->getBaseUnit());
$productDoc->setUploadFromLatestOrder($product->isUploadFromLatestOrder());
- $productDoc->setUploadFromLatestOrderInitalStatus((int)$product->getUploadFromLatestOrderInitalStatus());
+ $productDoc->setUploadFromLatestOrderInitalStatus((int) $product->getUploadFromLatestOrderInitalStatus());
$productDoc->setUploadProvided($product->isUploadProvided());
$productDoc->setUploadProvidedDownload($product->isUploadProvidedDownload());
$productDoc->setUploadProvidedFile($product->getUploadProvidedFile());
- $productDoc->setUploadProvidedInitalStatus((int)$product->getUploadProvidedInitalStatus());
+ $productDoc->setUploadProvidedInitalStatus((int) $product->getUploadProvidedInitalStatus());
$productDoc->setCustomTabEnable($product->isCustomTabEnable());
$productDoc->setHintEnable($product->isHintEnable());
$productDoc->setAsRequest($product->isAsRequest());
$productDoc->setRawText($product->isRawText());
+ $productDoc->setAribaUNSPSC($product->getAribaUNSPSC());
+ $productDoc->setAribaUnitOfMeasure($product->getAribaUnitOfMeasure());
$documentManager->persist($productDoc);
$documentManager->flush();
- $session->getFlashBag()->add(
- 'success',
- 'Product \'' . $product->getTitle() . '\' has been created!'
+ $session->getFlashBag()->add('success', 'Product \'' . $product->getTitle() . '\' has been created!');
+ $this->logService->createLogEntry(
+ $selectedShop,
+ $this->getUser(),
+ LogEntry::INFO,
+ PSCShopProductBundle::class,
+ $product->getTitle(),
+ 'Product has been created',
);
- $this->logService->createLogEntry($selectedShop, $this->getUser(), LogEntry::INFO, PSCShopProductBundle::class, $product->getTitle(), "Product has been created");
return $this->redirectToRoute('backend_production_product_edit', ['uuid' => $product->getUUID()]);
}
- return array(
+ return [
'domain' => $domains[0]->getHost(),
'form' => $form->createView(),
'product' => $product,
@@ -323,8 +331,8 @@ class EditController extends AbstractController
'customProductFields' => $customProductFields,
'customProductGroups' => $customProductGroups,
'customGroups' => $customGroups,
- 'selectedShop' => $selectedShop
- );
+ 'selectedShop' => $selectedShop,
+ ];
}
/**
@@ -358,43 +366,59 @@ class EditController extends AbstractController
\PSC\System\SettingsBundle\Service\Shop $shopService,
Status $statusService,
\PSC\Shop\OrderBundle\Service\Order $orderService,
- $uuid
+ $uuid,
) {
$customFields = $fieldService->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Product);
$customGroups = $fieldService->getGroups(\PSC\System\PluginBundle\Form\Interfaces\Field::Product);
+ $customButtons = $fieldService->getButtons(
+ \PSC\System\PluginBundle\Form\Interfaces\Button::Product,
+ PluginButtonArea::Global,
+ );
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
-*/
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ */
$selectedShop = $shopService->getSelectedShop();
/**
- * @var Shop $shop
-*/
+ * @var Shop $shop
+ */
$shop = $documentManager
->getRepository('PSC\Shop\EntityBundle\Document\Shop')
- ->findOneBy(array('uid' => (string) $selectedShop->getUid()));
+ ->findOneBy(['uid' => (string) $selectedShop->getUid()]);
/**
- * @var Product $product
-*/
+ * @var Product $product
+ */
$product = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(array('uuid' => $uuid, 'shop' => $selectedShop));
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Product')
+ ->findOneBy(['uuid' => $uuid, 'shop' => $selectedShop]);
/**
- * @var \PSC\Shop\EntityBundle\Document\Product $productDoc
-*/
+ * @var \PSC\Shop\EntityBundle\Document\Product $productDoc
+ */
$productDoc = $documentManager
->getRepository('PSC\Shop\EntityBundle\Document\Product')
- ->findOneBy(array('uid' => (string) $product->getUid()));
-
+ ->findOneBy(['uid' => (string) $product->getUid()]);
$articlegroups = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Productgroup')->findBy(array('parent' => 0, 'shop' => $selectedShop));
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Productgroup')
+ ->findBy(['parent' => 0, 'shop' => $selectedShop]);
+ $customProductFields = $fieldService->getProductFields(
+ \PSC\System\PluginBundle\Form\Interfaces\Field::Product,
+ $product->getType(),
+ );
+ $customProductGroups = $fieldService->getProductGroups(
+ \PSC\System\PluginBundle\Form\Interfaces\Field::Product,
+ $product->getType(),
+ );
+ $customProductButtons = $fieldService->getProductButtons(
+ \PSC\System\PluginBundle\Form\Interfaces\Button::Product,
+ $product->getType(),
+ PluginButtonArea::Global,
+ );
- $customProductFields = $fieldService->getProductFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Product, $product->getType());
- $customProductGroups = $fieldService->getProductGroups(\PSC\System\PluginBundle\Form\Interfaces\Field::Product, $product->getType());
$product->setUpdatedAt(new \DateTime());
if (!$request->isMethod('POST') && $productDoc) {
@@ -433,8 +457,8 @@ class EditController extends AbstractController
$product->setBaseUnit($productDoc->getBaseUnit());
$product->setNoIndex($productDoc->isNoIndex());
$product->setUploadFromLatestOrder($productDoc->isUploadFromLatestOrder());
- $product->setUploadFromLatestOrderInitalStatus((int)$productDoc->getUploadFromLatestOrderInitalStatus());
- $product->setUploadProvidedInitalStatus((int)$productDoc->getUploadProvidedInitalStatus());
+ $product->setUploadFromLatestOrderInitalStatus((int) $productDoc->getUploadFromLatestOrderInitalStatus());
+ $product->setUploadProvidedInitalStatus((int) $productDoc->getUploadProvidedInitalStatus());
$product->setUploadProvided($productDoc->isUploadProvided());
$product->setUploadProvidedDownload($productDoc->isUploadProvidedDownload());
$product->setUploadProvidedFile($productDoc->getUploadProvidedFile());
@@ -442,6 +466,8 @@ class EditController extends AbstractController
$product->setHintEnable($productDoc->isHintEnable());
$product->setAsRequest($productDoc->isAsRequest());
$product->setRawText($productDoc->isRawText());
+ $product->setAribaUNSPSC($productDoc->getAribaUNSPSC());
+ $product->setAribaUnitOfMeasure($productDoc->getAribaUnitOfMeasure());
} elseif (!$productDoc) {
$productDoc = new \PSC\Shop\EntityBundle\Document\Product();
$productDoc->setAblaufDatum($product->getAblaufDatum());
@@ -479,16 +505,18 @@ class EditController extends AbstractController
$productDoc->setSalesUnit($product->getSalesUnit());
$productDoc->setBaseUnit($product->getBaseUnit());
$productDoc->setUploadFromLatestOrder($product->isUploadFromLatestOrder());
- $productDoc->setUploadFromLatestOrderInitalStatus((int)$product->getUploadFromLatestOrderInitalStatus());
+ $productDoc->setUploadFromLatestOrderInitalStatus((int) $product->getUploadFromLatestOrderInitalStatus());
$productDoc->setUploadProvided($product->isUploadProvided());
$productDoc->setUploadProvidedDownload($product->isUploadProvidedDownload());
$productDoc->setUploadProvidedFile($product->getUploadProvidedFile());
- $productDoc->setUploadProvidedInitalStatus((int)$product->getUploadProvidedInitalStatus());
+ $productDoc->setUploadProvidedInitalStatus((int) $product->getUploadProvidedInitalStatus());
$productDoc->setCustomTabEnable($product->isCustomTabEnable());
$productDoc->setHintEnable($product->isHintEnable());
$productDoc->setAsRequest($product->isAsRequest());
$productDoc->setNoIndex($product->isNoIndex());
$productDoc->setRawText($product->isRawText());
+ $productDoc->setAribaUNSPSC($product->getAribaUNSPSC());
+ $productDoc->setAribaUnitOfMeasure($product->getAribaUnitOfMeasure());
$documentManager->persist($productDoc);
$documentManager->flush();
@@ -528,8 +556,8 @@ class EditController extends AbstractController
$product->setSalesUnit($productDoc->getSalesUnit());
$product->setBaseUnit($productDoc->getBaseUnit());
$product->setUploadFromLatestOrder($productDoc->isUploadFromLatestOrder());
- $product->setUploadFromLatestOrderInitalStatus((int)$productDoc->getUploadFromLatestOrderInitalStatus());
- $product->setUploadProvidedInitalStatus((int)$productDoc->getUploadProvidedInitalStatus());
+ $product->setUploadFromLatestOrderInitalStatus((int) $productDoc->getUploadFromLatestOrderInitalStatus());
+ $product->setUploadProvidedInitalStatus((int) $productDoc->getUploadProvidedInitalStatus());
$product->setUploadProvided($productDoc->isUploadProvided());
$product->setUploadProvidedDownload($productDoc->isUploadProvidedDownload());
$product->setUploadProvidedFile($productDoc->getUploadProvidedFile());
@@ -537,16 +565,21 @@ class EditController extends AbstractController
$product->setHintEnable($productDoc->isHintEnable());
$product->setAsRequest($productDoc->isAsRequest());
$product->setRawText($productDoc->isRawText());
+ $product->setAribaUNSPSC($productDoc->getAribaUNSPSC());
+ $product->setAribaUnitOfMeasure($productDoc->getAribaUnitOfMeasure());
}
if ($request->isMethod('POST') && $productDoc) {
$product->setPluginSettings($productDoc->getPluginSettings());
}
- $form = $this->createForm(ProductType::class, $product, ['productType' => intval($product->getType()), 'productDoc' => $productDoc, 'product' => $product]);
+ $form = $this->createForm(ProductType::class, $product, [
+ 'productType' => intval($product->getType()),
+ 'productDoc' => $productDoc,
+ 'product' => $product,
+ ]);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
-
$productDoc->setAnsprechPartner($product->getAnsprechPartner());
$productDoc->setAblaufDatum($product->getAblaufDatum());
$productDoc->setZusatzAbmessung($product->getZusatzAbmessung());
@@ -582,75 +615,82 @@ class EditController extends AbstractController
$productDoc->setBaseUnit($product->getBaseUnit());
$productDoc->setSalesUnit($product->getSalesUnit());
$productDoc->setUploadFromLatestOrder($product->isUploadFromLatestOrder());
- $productDoc->setUploadFromLatestOrderInitalStatus((int)$product->getUploadFromLatestOrderInitalStatus());
+ $productDoc->setUploadFromLatestOrderInitalStatus((int) $product->getUploadFromLatestOrderInitalStatus());
$productDoc->setUploadProvided($product->isUploadProvided());
$productDoc->setUploadProvidedDownload($product->isUploadProvidedDownload());
$productDoc->setUploadProvidedFile($product->getUploadProvidedFile());
- $productDoc->setUploadProvidedInitalStatus((int)$product->getUploadProvidedInitalStatus());
+ $productDoc->setUploadProvidedInitalStatus((int) $product->getUploadProvidedInitalStatus());
$productDoc->setCustomTabEnable($product->isCustomTabEnable());
$productDoc->setHintEnable($product->isHintEnable());
$productDoc->setAsRequest($product->isAsRequest());
$productDoc->setRawText($product->isRawText());
+ $productDoc->setAribaUNSPSC($product->getAribaUNSPSC());
+ $productDoc->setAribaUnitOfMeasure($product->getAribaUnitOfMeasure());
- $this->historyService->createHistoryEntry(new PSCHistory((string)$product->getUID()), $product, $productDoc);
+ $this->historyService->createHistoryEntry(
+ new PSCHistory((string) $product->getUID()),
+ $product,
+ $productDoc,
+ );
$entityManager->persist($product);
$entityManager->flush();
$documentManager->persist($productDoc);
$documentManager->flush();
- $session->getFlashBag()->add(
- 'success',
- 'Product \'' . $product->getTitle() . '\' has been updated!'
+ $session->getFlashBag()->add('success', 'Product \'' . $product->getTitle() . '\' has been updated!');
+ $this->logService->createLogEntry(
+ $selectedShop,
+ $this->getUser(),
+ LogEntry::INFO,
+ PSCShopProductBundle::class,
+ $product->getTitle(),
+ 'Product has been updated',
);
- $this->logService->createLogEntry($selectedShop, $this->getUser(), LogEntry::INFO, PSCShopProductBundle::class, $product->getTitle(), "Product has been updated");
}
/**
- * @var Domain[] $domains
-*/
- $domains = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Domain')->getAllByShopId($selectedShop);
+ * @var Domain[] $domains
+ */
+ $domains = $entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Domain')->getAllByShopId($selectedShop);
$userRepository = $entityManager->getRepository('PSC\Shop\EntityBundle\Entity\Order');
- $qb = $userRepository->createQueryBuilder('orders')
+ $qb = $userRepository
+ ->createQueryBuilder('orders')
->leftJoin('orders.positions', 'pos')
->leftJoin('pos.product', 'product')
- ->andwhere('(pos.product = :product_id OR product.originalProduct = :product_id)')->setParameter("product_id", $product->getUid())
+ ->andwhere('(pos.product = :product_id OR product.originalProduct = :product_id)')
+ ->setParameter('product_id', $product->getUid())
->orderBy('orders.uid', 'desc');
- $qbCount = $userRepository->createQueryBuilder('orders')
+ $qbCount = $userRepository
+ ->createQueryBuilder('orders')
->select('count(orders.uid)')
->leftJoin('orders.positions', 'pos')
->leftJoin('pos.product', 'product')
- ->andwhere('(pos.product = :product_id OR product.originalProduct = :product_id)')->setParameter("product_id", $product->getUid())
+ ->andwhere('(pos.product = :product_id OR product.originalProduct = :product_id)')
+ ->setParameter('product_id', $product->getUid())
->orderBy('orders.uid', 'desc');
-
$query = $qb->getQuery();
$count = $qbCount->getQuery()->getSingleScalarResult();
$query->setHint('knp_paginator.count', $count);
- $pagination2 = $paginator->paginate(
- $query,
- $request->query->getInt('pages_order', 1),
- 15,
- [
- 'distinct' => false,
- 'pageParameterName' => 'pages_order',
- 'sortFieldParameterName' => 'sorts'
- ]
- );
+ $pagination2 = $paginator->paginate($query, $request->query->getInt('pages_order', 1), 15, [
+ 'distinct' => false,
+ 'pageParameterName' => 'pages_order',
+ 'sortFieldParameterName' => 'sorts',
+ ]);
$subProduct = false;
if ($product->getOriginalProduct() != 0) {
$subProduct = $entityManager->getRepository(Product::class)->find($product->getOriginalProduct());
}
- return array(
+ return [
'domain' => $domains[0]->getHost(),
'form' => $form->createView(),
'product' => $product,
@@ -658,15 +698,16 @@ class EditController extends AbstractController
'shopDoc' => $shop,
'customFields' => $customFields,
'customProductFields' => $customProductFields,
+ 'customProductButtons' => $customProductButtons,
'customProductGroups' => $customProductGroups,
'customGroups' => $customGroups,
'selectedShop' => $selectedShop,
- 'changes' => $this->historyService->getHistory(new PSCHistory(), (string)$product->getUid()),
+ 'changes' => $this->historyService->getHistory(new PSCHistory(), (string) $product->getUid()),
'pagination2' => $pagination2,
'orderStatuse' => $statusService,
'orderService' => $orderService,
- 'subProduct' => $subProduct
- );
+ 'subProduct' => $subProduct,
+ ];
}
/**
@@ -686,24 +727,25 @@ class EditController extends AbstractController
\PSC\System\SettingsBundle\Service\Shop $shopService,
EntityManagerInterface $entityManager,
SessionInterface $session,
- $uuid
+ $uuid,
) {
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
-*/
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ */
$selectedShop = $shopService->getSelectedShop();
/**
- * @var Product $product
-*/
+ * @var Product $product
+ */
$product = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(array('uuid' => $uuid, 'shop' => $selectedShop));
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Product')
+ ->findOneBy(['uuid' => $uuid, 'shop' => $selectedShop]);
$sql = 'select count(article_id) as sum from orderspos where article_id = :article_id';
$stmt = $entityManager->getConnection()->prepare($sql);
- $result = $stmt->executeQuery(array('article_id' => $product->getUID()));
- $count = (int)$result->fetchOne();
+ $result = $stmt->executeQuery(['article_id' => $product->getUID()]);
+ $count = (int) $result->fetchOne();
$form = $this->createForm(DeleteType::class);
@@ -714,22 +756,25 @@ class EditController extends AbstractController
$title = $product->getTitle();
$entityManager->remove($product);
$entityManager->flush();
- $session->getFlashBag()->add(
- 'success',
- 'Product \'' . $title . '\' has been deleted!'
+ $session->getFlashBag()->add('success', 'Product \'' . $title . '\' has been deleted!');
+ $this->logService->createLogEntry(
+ $selectedShop,
+ $this->getUser(),
+ LogEntry::INFO,
+ PSCShopProductBundle::class,
+ $product->getTitle(),
+ 'Product has been deleted',
);
- $this->logService->createLogEntry($selectedShop, $this->getUser(), LogEntry::INFO, PSCShopProductBundle::class, $product->getTitle(), "Product has been deleted");
return $this->redirectToRoute('psc_shop_product_backend_list');
}
return $this->redirectToRoute('psc_shop_product_backend_list');
}
-
- return array(
+ return [
'product' => $product,
'count' => $count,
- 'form' => $form->createView()
- );
+ 'form' => $form->createView(),
+ ];
}
/**
@@ -746,21 +791,26 @@ class EditController extends AbstractController
*/
#[Route(path: '/{uuid}/copy', name: 'psc_shop_product_backend_edit_copy')]
#[Template]
- public function copyAction(Request $request, \PSC\System\SettingsBundle\Service\Shop $shopService, \PSC\Shop\ProductBundle\Service\Product $productService, EntityManagerInterface $entityManager, $uuid)
- {
-
+ public function copyAction(
+ Request $request,
+ \PSC\System\SettingsBundle\Service\Shop $shopService,
+ \PSC\Shop\ProductBundle\Service\Product $productService,
+ EntityManagerInterface $entityManager,
+ $uuid,
+ ) {
$obj = ['which' => 1];
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
-*/
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ */
$selectedShop = $shopService->getSelectedShop();
/**
- * @var Product $product
-*/
+ * @var Product $product
+ */
$product = $entityManager
- ->getRepository('PSC\Shop\EntityBundle\Entity\Product')->findOneBy(array('uuid' => $uuid, 'shop' => $selectedShop));
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Product')
+ ->findOneBy(['uuid' => $uuid, 'shop' => $selectedShop]);
$form = $this->createForm(CopyType::class, $obj);
@@ -779,6 +829,6 @@ class EditController extends AbstractController
}
}
- return array('form' => $form->createView(), 'product' => $product);
+ return ['form' => $form->createView(), 'product' => $product];
}
}
diff --git a/src/new/src/PSC/Shop/ProductBundle/Form/Backend/Product/ProductType.php b/src/new/src/PSC/Shop/ProductBundle/Form/Backend/Product/ProductType.php
index 4b8cc571d..a5542fed5 100755
--- a/src/new/src/PSC/Shop/ProductBundle/Form/Backend/Product/ProductType.php
+++ b/src/new/src/PSC/Shop/ProductBundle/Form/Backend/Product/ProductType.php
@@ -96,6 +96,8 @@ class ProductType extends AbstractType
->add('notBuy', CheckboxType::class, ['required' => false, 'label' => 'notshoworderbtn'])
->add('notEdit', CheckboxType::class, ['required' => false, 'label' => 'Sellasproduct'])
->add('url', TextType::class, ['required' => true, 'label' => 'Url'])
+ ->add('aribaUNSPSC', TextType::class, ['required' => false, 'label' => 'Ariba UNSPSC Identifikation'])
+ ->add('aribaUnitOfMeasure', TextType::class, ['required' => false, 'label' => 'Ariba UnitOfMeasure'])
->add('title', TextType::class)
->add('subTitle', TextType::class, ['required' => false, 'label' => 'subTitle'])
->add('createdAt', DatePickerType::class, ['disabled' => true])
diff --git a/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/edit/create.html.twig b/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/edit/create.html.twig
index 40b5dd05e..6dfb8b1b0 100755
--- a/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/edit/create.html.twig
+++ b/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/edit/create.html.twig
@@ -235,6 +235,25 @@