refactor: add trackingNumber and trackingLink to the confirmation mails

locale.xml

@@ -2126,6 +2126,9 @@
                 <li><b>[salutation]:</b> - Anrede des Kunden</li>
                 <li><b>[firstname]:</b> - Vorname des Kunden</li>
                 <li><b>[lastname]:</b> - Nachname des Kunden</li>
+                <li><b>[trackingInfo]:</b> - Tracking Info (Hierzu wird die Sprachvariable [quiqqer/order] shipping.order.mail.body.shippingInformation verwendet)</li>
+                <li><b>[trackingNumber]:</b> - Tracking Nummer (Falls eine existiert)</li>
+                <li><b>[trackingLink]:</b> - Tracking Link (Falls einer existiert)</li>
             </ul>
             ]]></de>
             <en><![CDATA[
@@ -2142,6 +2145,9 @@
                 <li><b>[salutation]:</b> - Salutation of the customer</li>
                 <li><b>[firstname]:</b> - Firstname of the customer/li>
                 <li><b>[lastname]:</b> - Lastname of the customer</li>
+                <li><b>[trackingInfo]:</b> - Tracking Info (The [quiqqer/order] shipping.order.mail.body.shippingInformation language variable is used for this).</li>
+                <li><b>[trackingNumber]:</b> - Tracking Number (If one exists)</li>
+                <li><b>[trackingLink]:</b> - Tracking Link (If one exists)</li>
             </ul>
             ]]></en>
         </locale>
@@ -2160,7 +2166,9 @@
                 <li><b>[salutation]:</b> - Anrede des Kunden</li>
                 <li><b>[firstname]:</b> - Vorname des Kunden</li>
                 <li><b>[lastname]:</b> - Nachname des Kunden</li>
-                <li><b>[trackingInfo]:</b> - Wenn es ein Tracking Info gibt, wird der Tracking Info Text verwendet</li>
+                <li><b>[trackingInfo]:</b> - Tracking Info (Hierzu wird die Sprachvariable [quiqqer/order] shipping.order.mail.body.shippingInformation verwendet)</li>
+                <li><b>[trackingNumber]:</b> - Tracking Nummer (Falls eine existiert)</li>
+                <li><b>[trackingLink]:</b> - Tracking Link (Falls einer existiert)</li>
             </ul>
             ]]></de>
             <en><![CDATA[
@@ -2177,7 +2185,9 @@
                 <li><b>[salutation]:</b> - Salutation of the customer</li>
                 <li><b>[firstname]:</b> - Firstname of the customer/li>
                 <li><b>[lastname]:</b> - Lastname of the customer</li>
-                <li><b>[trackingInfo]:</b> - If there is a tracking info, the tracking info text is used</li>
+                <li><b>[trackingInfo]:</b> - Tracking Info (The [quiqqer/order] shipping.order.mail.body.shippingInformation language variable is used for this).</li>
+                <li><b>[trackingNumber]:</b> - Tracking Number (If one exists)</li>
+                <li><b>[trackingLink]:</b> - Tracking Link (If one exists)</li>
             </ul>
             ]]></en>
         </locale>

src/QUI/ERP/Order/Mail.php

@@ -98,19 +98,19 @@ public static function sendOrderConfirmationMail(Order $Order)
             if ($DeliveryAddress) {
                 $DeliveryAddress->setAttribute(
                     'template',
-                    dirname(__FILE__).'/MailTemplates/orderConfirmationAddress.html'
+                    dirname(__FILE__) . '/MailTemplates/orderConfirmationAddress.html'
                 );
             }
         }
 
         $InvoiceAddress = $Order->getInvoiceAddress();
-        $InvoiceAddress->setAttribute('template', dirname(__FILE__).'/MailTemplates/orderConfirmationAddress.html');
+        $InvoiceAddress->setAttribute('template', dirname(__FILE__) . '/MailTemplates/orderConfirmationAddress.html');
 
         // comment
         $comment = '';
 
         if (QUI::getSession()->get('comment-customer')) {
-            $comment .= QUI::getSession()->get('comment-customer')."\n";
+            $comment .= QUI::getSession()->get('comment-customer') . "\n";
         }
 
         if (QUI::getSession()->get('comment-message')) {
@@ -139,7 +139,7 @@ public static function sendOrderConfirmationMail(Order $Order)
         ]);
 
         $Mailer->setBody(
-            $Engine->fetch(dirname(__FILE__).'/MailTemplates/orderConfirmation.html')
+            $Engine->fetch(dirname(__FILE__) . '/MailTemplates/orderConfirmation.html')
         );
 
         $Mailer->send();
@@ -227,14 +227,14 @@ public static function sendAdminOrderConfirmationMail(Order $Order)
             $DeliveryAddress = $Shipping->getAddress();
             $DeliveryAddress->setAttribute(
                 'template',
-                dirname(__FILE__).'/MailTemplates/orderConfirmationAddress.html'
+                dirname(__FILE__) . '/MailTemplates/orderConfirmationAddress.html'
             );
         }
 
         $InvoiceAddress = $Order->getInvoiceAddress();
         $InvoiceAddress->setAttribute(
             'template',
-            dirname(__FILE__).'/MailTemplates/orderConfirmationAddress.html'
+            dirname(__FILE__) . '/MailTemplates/orderConfirmationAddress.html'
         );
 
         $Engine->assign([
@@ -256,7 +256,7 @@ public static function sendAdminOrderConfirmationMail(Order $Order)
         ]);
 
         $Mailer->setBody(
-            $Engine->fetch(dirname(__FILE__).'/MailTemplates/orderConfirmationAdmin.html')
+            $Engine->fetch(dirname(__FILE__) . '/MailTemplates/orderConfirmationAdmin.html')
         );
 
         try {
@@ -331,7 +331,9 @@ public static function sendOrderShippingConfirmation(AbstractOrder $Order)
 
         $localeVar = self::getOrderLocaleVar($Order, $Customer);
 
-        $localeVar['trackingInfo'] = '';
+        $localeVar['trackingInfo']   = '';
+        $localeVar['trackingNumber'] = '';
+        $localeVar['trackingLink']   = '';
 
         if (!empty($shippingTracking) && isset($shippingTracking['type']) && isset($shippingTracking['number'])) {
             $localeVar['trackingInfo'] = QUI::getLocale()->get(
@@ -346,6 +348,13 @@ public static function sendOrderShippingConfirmation(AbstractOrder $Order)
                     'trackingNumber' => $shippingTracking['number']
                 ]
             );
+
+            $localeVar['trackingNumber'] = $shippingTracking['number'];
+            $localeVar['trackingLink']   = QUI\ERP\Shipping\Tracking\Tracking::getUrl(
+                $shippingTracking['number'],
+                $shippingTracking['type'],
+                $Country
+            );
         }
 
 
@@ -457,7 +466,7 @@ protected static function addOrderMailAttachments(
                     $Item = $Media->get($attachment);
                     $Mail->addAttachment($Item->getFullPath());
                 } catch (\Exception $Exception) {
-                    QUI\System\Log::addAlert('Order mail attachment file error :: '.$Exception->getMessage());
+                    QUI\System\Log::addAlert('Order mail attachment file error :: ' . $Exception->getMessage());
                 }
             }
         }
@@ -484,7 +493,7 @@ protected static function generatePdfFromSite(QUI\Projects\Site $Site)
         $title = $Site->getAttribute('title');
 
         ['dirname' => $dirname, 'extension' => $extension] = pathinfo($file);
-        $newFile = $dirname.'/'.$title.'.'.$extension;
+        $newFile = $dirname . '/' . $title . '.' . $extension;
 
         rename($file, $newFile);