Skip to content
Code-Schnipsel Gruppen Projekte
Commit bfd87e7c erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

refactor: set default settings; and cancellation policy attachment only for none company users

Übergeordneter 3de12890
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
...@@ -633,8 +633,8 @@ ...@@ -633,8 +633,8 @@
<en><![CDATA[Privacy Policy]]></en> <en><![CDATA[Privacy Policy]]></en>
</locale> </locale>
<locale name="order.settings.mails.cancellationPolicy"> <locale name="order.settings.mails.cancellationPolicy">
<de><![CDATA[Widerrufsrecht]]></de> <de><![CDATA[Widerrufsrecht (Nur B2C)]]></de>
<en><![CDATA[Cancellation Policy]]></en> <en><![CDATA[Cancellation Policy (Only B2C)]]></en>
</locale> </locale>
<locale name="order.settings.mails.attachments"> <locale name="order.settings.mails.attachments">
<de><![CDATA[Dateianhänge]]></de> <de><![CDATA[Dateianhänge]]></de>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<section name="order"> <section name="order">
<conf name="failedPaymentProcedure"> <conf name="failedPaymentProcedure">
<type><![CDATA[string]]></type> <type><![CDATA[string]]></type>
<defaultvalue>execute</defaultvalue> <defaultvalue>returning</defaultvalue>
</conf> </conf>
<conf name="prefix"> <conf name="prefix">
<type><![CDATA[string]]></type> <type><![CDATA[string]]></type>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</conf> </conf>
<conf name="autoInvoicePost"> <conf name="autoInvoicePost">
<type><![CDATA[bool]]></type> <type><![CDATA[bool]]></type>
<defaultvalue>1</defaultvalue> <defaultvalue>0</defaultvalue>
</conf> </conf>
<conf name="orderAdminMails"> <conf name="orderAdminMails">
<type><![CDATA[string]]></type> <type><![CDATA[string]]></type>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</conf> </conf>
<conf name="sendOrderConfirmationToAdmin"> <conf name="sendOrderConfirmationToAdmin">
<type><![CDATA[bool]]></type> <type><![CDATA[bool]]></type>
<defaultvalue><![CDATA[1]]></defaultvalue> <defaultvalue><![CDATA[0]]></defaultvalue>
</conf> </conf>
<conf name="sendAdminOrderConfirmation"> <conf name="sendAdminOrderConfirmation">
<type><![CDATA[bool]]></type> <type><![CDATA[bool]]></type>
......
...@@ -70,7 +70,7 @@ public static function sendOrderConfirmationMail(Order $Order) ...@@ -70,7 +70,7 @@ public static function sendOrderConfirmationMail(Order $Order)
) )
); );
self::addOrderMailAttachments($Mailer); self::addOrderMailAttachments($Mailer, $Order);
$Engine = QUI::getTemplateManager()->getEngine(); $Engine = QUI::getTemplateManager()->getEngine();
$Order = $OrderControl->getOrder(); $Order = $OrderControl->getOrder();
...@@ -188,7 +188,7 @@ public static function sendAdminOrderConfirmationMail(Order $Order) ...@@ -188,7 +188,7 @@ public static function sendAdminOrderConfirmationMail(Order $Order)
) )
); );
self::addOrderMailAttachments($Mailer); self::addOrderMailAttachments($Mailer, $Order);
try { try {
...@@ -265,12 +265,15 @@ public static function sendAdminOrderConfirmationMail(Order $Order) ...@@ -265,12 +265,15 @@ public static function sendAdminOrderConfirmationMail(Order $Order)
/** /**
* Add the order mail attachments to the * Add the order mail attachments to the
* like privacy policy, terms and condition and cacellation policy * like privacy policy, terms and condition and cancellation policy
* *
* @param QUI\Mail\Mailer $Mail * @param QUI\Mail\Mailer $Mail
* @param OrderInterface $Order
*/ */
protected static function addOrderMailAttachments(QUI\Mail\Mailer $Mail) protected static function addOrderMailAttachments(
{ QUI\Mail\Mailer $Mail,
OrderInterface $Order
) {
// check if html2pdf is installed // check if html2pdf is installed
if (QUI::getPackageManager()->isInstalled('quiqqer/htmltopdf') === false) { if (QUI::getPackageManager()->isInstalled('quiqqer/htmltopdf') === false) {
return; return;
...@@ -284,6 +287,7 @@ protected static function addOrderMailAttachments(QUI\Mail\Mailer $Mail) ...@@ -284,6 +287,7 @@ protected static function addOrderMailAttachments(QUI\Mail\Mailer $Mail)
$termsAndConditions = (int)$Config->getValue('mails', 'termsAndConditions'); $termsAndConditions = (int)$Config->getValue('mails', 'termsAndConditions');
$cancellationPolicy = (int)$Config->getValue('mails', 'cancellationPolicy'); $cancellationPolicy = (int)$Config->getValue('mails', 'cancellationPolicy');
$attachments = $Config->getValue('mails', 'attachments'); $attachments = $Config->getValue('mails', 'attachments');
$Customer = $Order->getCustomer();
if ($privacyPolicy) { if ($privacyPolicy) {
try { try {
...@@ -309,7 +313,7 @@ protected static function addOrderMailAttachments(QUI\Mail\Mailer $Mail) ...@@ -309,7 +313,7 @@ protected static function addOrderMailAttachments(QUI\Mail\Mailer $Mail)
} }
} }
if ($cancellationPolicy) { if ($cancellationPolicy && !$Customer->isCompany()) {
try { try {
$Site = QUI\ERP\Utils\Sites::getRevocation(); $Site = QUI\ERP\Utils\Sites::getRevocation();
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren