diff --git a/src/new/.mimocode/.cron-lock b/src/new/.mimocode/.cron-lock new file mode 100644 index 000000000..0c161b20a --- /dev/null +++ b/src/new/.mimocode/.cron-lock @@ -0,0 +1 @@ +{"pid":2966987,"startedAt":1783596410229} \ No newline at end of file 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 27134c490..6df43bc61 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 @@ -122,7 +122,7 @@ ordernumber: Auftragsnummer createdat: Erzeugt name: Name wkpos1: WK/Pos 1 -wkpos2: WK/Pos 2 +wkpos2: WK/Pos 2 (für XRechnung BT-13) grossprice: Preis Brutto status: Status details: Details 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 bfe1ad940..ac13a6c22 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 @@ -116,7 +116,7 @@ ordernumber: Order Number createdat: Created at name: Name wkpos1: WK/Pos 1 -wkpos2: WK/Pos 2 +wkpos2: WK/Pos 2 (for XRechnung BT-13) grossprice: Gross Price status: Status details: Details diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.de.yaml b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.de.yaml index b4193d705..81eb68ad4 100755 --- a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.de.yaml +++ b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.de.yaml @@ -12,13 +12,13 @@ street: Straße EMail: EMail company: Firma wkpos1: WK_Pos_1 -wkpos2: WK_Pos_2 +wkpos2: WK_Pos_2 (für XRechnung BT-13) orderdate: Auftragsdatum paymentmethod: Zahlart payment: Zahlung Gateway (Ref) shippingmethod: Versandart shoppingcartfield1: Warenkorbfeld 1 -shoppingcartfield2: Warenkorbfeld 2 +shoppingcartfield2: Warenkorbfeld 2 (für XRechnung BT-13) coupon: Gutschein (Code) weight: Gewicht paymentCost: Zahlartkosten diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.en.yaml b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.en.yaml index 353e279b5..1660196b8 100755 --- a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.en.yaml +++ b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_detail.en.yaml @@ -12,13 +12,13 @@ street: Street EMail: E-Mail company: Company wkpos1: WK/Pos 1 -wkpos2: WK/Pos 2 +wkpos2: WK/Pos 2 (for XRechnung BT-13) orderdate: Order Date paymentmethod: Payment Method payment: Payment (Ref) shippingmethod: Shipping Method shoppingcartfield1: Shopping Cart Field 1 -shoppingcartfield2: Shopping Cart Field 2 +shoppingcartfield2: Shopping Cart Field 2 (for XRechnung BT-13) coupon: Coupon Packageexported: Package exported packagenumber: Package Number diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.de.yaml b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.de.yaml index fb5746b18..f09f32622 100755 --- a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.de.yaml +++ b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.de.yaml @@ -7,7 +7,7 @@ Name: Username/Login firstname: Vorname lastname: Nachname wkpos1: WK/Pos 1 -wkpos2: WK/Pos 2 +wkpos2: WK/Pos 2 (für XRechnung BT-13) grossprice: Preis Netto (Brutto) status: Status details: Details diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.en.yaml b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.en.yaml index 1fd178d3b..3b6aeb95e 100755 --- a/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.en.yaml +++ b/src/new/src/PSC/Shop/OrderBundle/Resources/translations/core_order_list.en.yaml @@ -7,7 +7,7 @@ Name: Username/Login firstname: First Name lastname: Last Name wkpos1: WK/Pos 1 -wkpos2: WK/Pos 2 +wkpos2: WK/Pos 2 (for XRechnung BT-13) grossprice: Gross Price status: Status details: Details diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig b/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig index 228ba0c34..705a4e6ed 100755 --- a/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig +++ b/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig @@ -147,8 +147,8 @@
- {# Download - GRÜN #} - + {# Download - ORANGE #} + @@ -157,8 +157,8 @@ {% for customListButton in customListButtons %} {{ customListButton.render(orderObj)|raw }} {% endfor %} - {# Details - BLAU #} - + {# Details - GRÜN #} + diff --git a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.de.yaml b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.de.yaml index 066b09035..fdfcaa206 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.de.yaml +++ b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.de.yaml @@ -107,7 +107,7 @@ ordernumber: Auftragsnummer createdat: Erzeugt name: Name wkpos1: WK/Pos 1 -wkpos2: WK/Pos 2 +wkpos2: WK/Pos 2 (für XRechnung BT-13) grossprice: Preis Brutto status: Status details: Details diff --git a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.en.yaml b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.en.yaml index a9975f213..934efc9b2 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.en.yaml +++ b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_edit.en.yaml @@ -105,7 +105,7 @@ ordernumber: Order Number createdat: Created at name: Name wkpos1: WK/Pos 1 -wkpos2: WK/Pos 2 +wkpos2: WK/Pos 2 (for XRechnung BT-13) grossprice: Gross Price status: Status details: Details diff --git a/src/new/src/PSC/System/SettingsBundle/Controller/Backend/SettingsController.php b/src/new/src/PSC/System/SettingsBundle/Controller/Backend/SettingsController.php index 886918dd6..4feebd88a 100755 --- a/src/new/src/PSC/System/SettingsBundle/Controller/Backend/SettingsController.php +++ b/src/new/src/PSC/System/SettingsBundle/Controller/Backend/SettingsController.php @@ -67,7 +67,7 @@ class SettingsController extends AbstractController $form = $this->createForm(SettingsType::class, $instance); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - if ($instance->getSmtpPassword() == "") { + if (empty($instance->getSmtpPassword())) { $instance->setSmtpPassword($password); } $documentManager->persist($instance); diff --git a/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php b/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php index 1d39d8e56..76a4e0438 100755 --- a/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php +++ b/src/new/src/PSC/System/SettingsBundle/Form/Backend/SettingsType.php @@ -21,7 +21,6 @@ use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\Extension\Core\Type\NumberType; -use Symfony\Component\Form\Extension\Core\Type\PasswordType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -87,7 +86,11 @@ class SettingsType extends AbstractType ->add('smtpPort', NumberType::class, ['required' => false, 'label' => 'Port']) ->add('smtpHost', TextType::class, ['required' => false, 'label' => 'Host']) ->add('smtpUsername', TextType::class, ['required' => false, 'label' => 'Username']) - ->add('smtpPassword', PasswordType::class, ['required' => false, 'label' => 'Password']) + ->add('smtpPassword', TextType::class, [ + 'required' => false, + 'label' => 'Password', + 'attr' => ['type' => 'password', 'autocomplete' => 'new-password'], + ]) ->add('smtpSenderEmail', TextType::class, ['required' => false, 'label' => 'Absender E-Mail']) ->add('smtpSenderName', TextType::class, ['required' => false, 'label' => 'Absender Name']) ->add('extraSettings', TextareaType::class, ['required' => false, 'label' => 'Extra Einstellungen']) diff --git a/src/new/src/PSC/System/SettingsBundle/Resources/views/backend/settings/index.html.twig b/src/new/src/PSC/System/SettingsBundle/Resources/views/backend/settings/index.html.twig index f9b8de54a..8075cceeb 100755 --- a/src/new/src/PSC/System/SettingsBundle/Resources/views/backend/settings/index.html.twig +++ b/src/new/src/PSC/System/SettingsBundle/Resources/views/backend/settings/index.html.twig @@ -100,7 +100,7 @@ {{ form_label(form.smtpPassword) }}
{{ form_widget(form.smtpPassword, {'attr': {'style': 'padding-right:2.5rem'}}) }} - @@ -154,7 +154,7 @@
•••••••••• - @@ -287,6 +287,40 @@ } }); +