Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit 8b42cc60 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

fix: fixed missing history messages

Übergeordneter 21706db1
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!57Next,!56fix: fixed missing history messages
Pipeline-Nr. 5892 bestanden
......@@ -400,6 +400,28 @@
<de><![CDATA[Versandbestätigungs E-Mail]]></de>
<en><![CDATA[Shipping confirmation E-mail]]></en>
</locale>
<locale name="history.order.created">
<de><![CDATA[Bestellung erstellt]]></de>
<en><![CDATA[Order created]]></en>
</locale>
<locale name="history.order.edit">
<de><![CDATA[Bestellung wurde editiert von #[userId] - [username]]]></de>
<en><![CDATA[Order was edited by #[userId] - [username]]]></en>
</locale>
<locale name="history.order.invoice.created">
<de><![CDATA[Rechnung [invoiceHash] aus Bestellung erstellt]]></de>
<en><![CDATA[Invoice [invoiceHash] created from order]]></en>
</locale>
<locale name="history.order.salesOrder.created">
<de><![CDATA[Auftrag [salesOrderHash] aus Bestellung erstellt]]></de>
<en><![CDATA[Sales order [salesOrderHash] created from order]]></en>
</locale>
<locale name="history.order.copy.created">
<de><![CDATA[Bestellungskopie [orderHash] aus Bestellung erstellt]]></de>
<en><![CDATA[Order copy [orderHash] created from order]]></en>
</locale>
</groups>
<groups name="quiqqer/order" datatype="php">
......
......@@ -104,6 +104,12 @@ public function create(
$orderId = QUI::getDataBase()->getPDO()->lastInsertId();
$Order = $Orders->get($orderId);
$Order->addHistory(
QUI::getLocale()->get('quiqqer/order', 'history.order.created')
);
$Order->updateHistory();
try {
QUI::getEvents()->fireEvent('onQuiqqerOrderFactoryCreate', [$Order]);
} catch (\Exception $Exception) {
......
......@@ -7,6 +7,7 @@
namespace QUI\ERP\Order;
use QUI;
use QUI\Database\Exception;
use QUI\ERP\Accounting\Invoice\Handler as InvoiceHandler;
use QUI\ERP\SalesOrders\Handler as SalesOrdersHandler;
use QUI\ERP\SalesOrders\SalesOrder;
......@@ -141,6 +142,20 @@ public function createInvoice($PermissionUser = null)
$this->getHash()
);
$this->History->addComment(
QUI::getLocale()->get(
'quiqqer/order',
'history.order.invoice.created',
[
'userId' => QUI::getUserBySession()->getId(),
'username' => QUI::getUserBySession()->getUsername(),
'invoiceHash' => $TemporaryInvoice->getHash()
]
)
);
$this->updateHistory();
QUI::getDataBase()->update(
Handler::getInstance()->table(),
['temporary_invoice_id' => $TemporaryInvoice->getCleanId()],
......@@ -279,6 +294,20 @@ public function createSalesOrder(): SalesOrder
$SalesOrder = SalesOrdersHandler::createSalesOrder(null, $this->getHash());
$this->History->addComment(
QUI::getLocale()->get(
'quiqqer/order',
'history.order.salesOrder.created',
[
'userId' => QUI::getUserBySession()->getId(),
'username' => QUI::getUserBySession()->getUsername(),
'salesOrderHash' => $SalesOrder->getHash()
]
)
);
$this->updateHistory();
// set the data to the temporary invoice
$payment = '';
......@@ -589,6 +618,17 @@ public function update($PermissionUser = null)
$this->statusChanged = false;
}
$this->History->addComment(
QUI::getLocale()->get(
'quiqqer/order',
'history.order.edit',
[
'userId' => QUI::getUserBySession()->getId(),
'username' => QUI::getUserBySession()->getUsername()
]
)
);
// save data
$data = $this->getDataForSaving();
......@@ -657,6 +697,21 @@ public function save($PermissionUser = null)
$this->update($PermissionUser);
}
/**
* Saves the current history to the order
* @throws Exception
*/
public function updateHistory(): void
{
QUI::getDataBase()->update(
Handler::getInstance()->table(),
[
'history' => $this->History->toJSON()
],
['id' => $this->getId()]
);
}
/**
* Set Order payment status (paid_status)
*
......@@ -840,7 +895,7 @@ public function delete($PermissionUser = null)
*
* @throws QUI\Exception
*/
public function copy()
public function copy(): Order
{
$NewOrder = Factory::getInstance()->create();
......@@ -852,7 +907,21 @@ public function copy()
['id' => $NewOrder->getId()]
);
QUI::getEvents()->fireEvent('quiqqerOrderCopy', [$this]);
$this->History->addComment(
QUI::getLocale()->get(
'quiqqer/order',
'history.order.copy.created',
[
'userId' => QUI::getUserBySession()->getId(),
'username' => QUI::getUserBySession()->getUsername(),
'orderHash' => $NewOrder->getHash()
]
)
);
$this->updateHistory();
$NewOrder->addHistory(
QUI::getLocale()->get('quiqqer/order', 'message.copy.from', [
......@@ -860,7 +929,10 @@ public function copy()
])
);
$NewOrder->update(QUI::getUsers()->getSystemUser());
$NewOrder->updateHistory();
QUI::getEvents()->fireEvent('quiqqerOrderCopy', [$this]);
return $NewOrder;
}
......
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