Merge branch 'dev'

src/QUI/ERP/Order/AbstractOrder.php

@@ -399,6 +399,16 @@ public function getIdPrefix()
         return QUI\ERP\Order\Utils\Utils::getOrderPrefix();
     }
 
+    /**
+     * Return the real order id for the customer
+     *
+     * @return string
+     */
+    public function getPrefixedId()
+    {
+        return $this->getIdPrefix().$this->getId();
+    }
+
     /**
      * @return QUI\ERP\Accounting\Calculations
      *

src/QUI/ERP/Order/Mail.php

@@ -58,14 +58,14 @@ public static function sendOrderConfirmationMail(Order $Order)
 
         $Mailer->setSubject(
             QUI::getLocale()->get('quiqqer/order', 'order.confirmation.subject', [
-                'orderId' => $Order->getIdPrefix()
+                'orderId' => $Order->getPrefixedId()
             ])
         );
 
 
         $Mailer->setBody(
             QUI::getLocale()->get('quiqqer/order', 'order.confirmation.body', [
-                'orderId'  => $Order->getIdPrefix(),
+                'orderId'  => $Order->getPrefixedId(),
                 'order'    => QUI\ControlUtils::parse($OrderControl),
                 'user'     => $user,
                 'username' => $Customer->getUsername(),