Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'eshop-add-ext-art-nr' into 'master'

Browse Source 
added external article number for csv and email

See merge request fronk/thetool!1082
This commit is contained in:
Luca Haid
2025-03-06 13:08:32 +00:00
parent 9f3bced079 0613e765fe
commit 41c41c7777
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/WarehouseEShopOrder/WarehouseEShopOrderController.php
View File

@@ -151,6 +151,7 @@ class WarehouseEShopOrderController extends TTCrud {
$order = WarehouseEShopOrderModel::get($id);
$orderItems = WarehouseEShopOrderItemModel::getAll(['orderId' => $id]);
$articles = WarehouseArticleModel::getAll();
$articleDistributor = WarehouseArticleDistributorModel::getAll(['distributorId' => 1]);
$articlePackets = WarehouseArticlePacketModel::getAll();
$paddedId = str_pad($id, 3, '0', STR_PAD_LEFT);
@@ -164,9 +165,11 @@ class WarehouseEShopOrderController extends TTCrud {
$article = $item->articleId ? array_search($item->articleId, array_column($articles, 'id')) : null;
$articlePacket = $item->articlePacketId ? array_search($item->articlePacketId, array_column($articlePackets, 'id')) : null;
$articleExtRef = $articleDistributor[array_search($item->articleId, array_column($articleDistributor, 'articleId'))];
$articleExtRef = $articleExtRef->externalArticleNumber ?? null;
$articleTitle = $item->articleId ? $articles[$article]->title : $articlePackets[$articlePacket]->title;
$quantity = $item->quantity;
$body .= "$quantity x $articleTitle\n";
$body .= "$quantity x $articleExtRef ($articleTitle)\n";
}
$body .= "\n\n";
$body .= "CSV der Bestellung ist im Anhang.\n\n";
@@ -253,8 +256,9 @@ class WarehouseEShopOrderController extends TTCrud {
$orderItemsStr = join('; ', array_map(function ($item) {
$articleTitle = $item['articleTitle'] ?? $item['articlePacketTitle'];
$articleExtRef = $item['articleExtRef'];
$quantity = $item['quantity'];
return "$quantity x $articleTitle";
return "$quantity x $articleExtRef ($articleTitle)";
}, $orderItems));
$rows[] = ['AddressNumber' => '23000539',
@@ -292,6 +296,7 @@ class WarehouseEShopOrderController extends TTCrud {
if (isset($_GET['orderId'])) return WarehouseEShopOrderItemModel::getAll(['orderId' => $_GET['orderId']]);
else $items = WarehouseEShopOrderItemModel::getAll();
$articles = WarehouseArticleModel::getAll();
$articleDistributor = WarehouseArticleDistributorModel::getAll(['distributorId' => 1]);
$articlePackets = WarehouseArticlePacketModel::getAll();
$orderItems = [];
@@ -303,9 +308,11 @@ class WarehouseEShopOrderController extends TTCrud {
$article = $item['articleId'] ? array_search($item['articleId'], array_column($articles, 'id')) : null;
$articlePacket = $item['articlePacketId'] ? array_search($item['articlePacketId'], array_column($articlePackets, 'id')) : null;
$articleExtRef = array_search($item['articleId'], array_column($articleDistributor, 'articleId'))['externalArticleNumber'] ?? null;
$orderItems[$item['orderId']][] = ['id' => $item['id'],
'articleId' => $item['articleId'],
'articleExtRef' => $articleExtRef,
'articleTitle' => isset($articles[$article]) ? $articles[$article]->title : null,
'articlePacketId' => $item['articlePacketId'],
'articlePacketTitle' => isset($articlePackets[$articlePacket]) ? $articlePackets[$articlePacket]->title : null,