diff --git a/ajax/process/getEntities.php b/ajax/process/getEntities.php index cf9c8825b540d1f98573ec3dacd49a76bed6404a..ebe4fb856f2f635a60b0b88594a78f66782e68d0 100644 --- a/ajax/process/getEntities.php +++ b/ajax/process/getEntities.php @@ -19,7 +19,27 @@ function ($globalProcessId, $entityHash) { } return array_map(function ($Entity) { - return $Entity->toArray(); + $entityData = $Entity->toArray(); + $entityData['processing_status'] = [ + 'id' => 0, + 'title' => '---', + 'color' => '#999999', + ]; + + if (method_exists($Entity, 'getProcessingStatus')) { + /* @var $ProcessingStatus QUI\ERP\Accounting\Invoice\ProcessingStatus\Status */ + $ProcessingStatus = $Entity->getProcessingStatus(); + + if ($ProcessingStatus) { + $entityData['processing_status'] = [ + 'id' => $ProcessingStatus->getId(), + 'title' => $ProcessingStatus->getTitle(), + 'color' => $ProcessingStatus->getColor() + ]; + } + } + + return $entityData; }, $Process->getEntities()); }, ['globalProcessId', 'entityHash'], diff --git a/bin/backend/controls/process/ProcessGrid.js b/bin/backend/controls/process/ProcessGrid.js index 9c7e0ac9c7606b510594000e3ba9627a83e94950..0487e5345d44b815309dbe4e76dee0364412ef53 100644 --- a/bin/backend/controls/process/ProcessGrid.js +++ b/bin/backend/controls/process/ProcessGrid.js @@ -57,10 +57,11 @@ define('package/quiqqer/erp/bin/backend/controls/process/ProcessGrid', [ dataType: 'QUI', width: 60 }, { - header: QUILocale.get(lg, 'erp.process.state'), - dataIndex: 'paid_status', + header: QUILocale.get(lg, 'erp.process.status'), + dataIndex: 'status', dataType: 'node', - width: 100 + width: 150, + className: 'grid-align-center' }, { header: QUILocale.get(lg, 'erp.process.prefixedNumber'), dataIndex: 'prefixedNumber', @@ -71,6 +72,12 @@ define('package/quiqqer/erp/bin/backend/controls/process/ProcessGrid', [ dataIndex: 'uuid', dataType: 'string', width: 240 + }, { + header: QUILocale.get(lg, 'erp.process.paid_status'), + dataIndex: 'paid_status', + dataType: 'node', + width: 100, + className: 'grid-align-center' } ], pagination: false @@ -129,6 +136,16 @@ define('package/quiqqer/erp/bin/backend/controls/process/ProcessGrid', [ break; } + + const Status = new Element('span', { + 'class': 'processing-status', + text: entry.processing_status.title, + styles: { + color: entry.processing_status.color !== '---' ? entry.processing_status.color : '', + borderColor: entry.processing_status.color !== '---' ? entry.processing_status.color : '' + } + }); + if (typeof entry.paid_status === 'undefined') { entry.paid_status = 0; } @@ -140,6 +157,7 @@ define('package/quiqqer/erp/bin/backend/controls/process/ProcessGrid', [ data.push({ type: Type, + status: Status, paid_status: PaymentStatus, prefixedNumber: entry.prefixedNumber, uuid: entry.uuid diff --git a/locale.xml b/locale.xml index f5e8661ecc5365f93add5412485e6d3c0f1a97e4..f3e09f9d23e21317bf267aa8c8b1579545a0605e 100644 --- a/locale.xml +++ b/locale.xml @@ -277,6 +277,10 @@ <de><![CDATA[Bestellung öffnen]]></de> <en><![CDATA[Open order]]></en> </locale> + <locale name="processGrid.offer.open"> + <de><![CDATA[Angebot öffnen]]></de> + <en><![CDATA[Open offer]]></en> + </locale> <locale name="processGrid.invoice.open"> <de><![CDATA[Rechnung öffnen]]></de> <en><![CDATA[Open invoice]]></en> @@ -297,9 +301,13 @@ <de><![CDATA[Typ]]></de> <en><![CDATA[Type]]></en> </locale> - <locale name="erp.process.state"> + <locale name="erp.process.status"> <de><![CDATA[Status]]></de> - <en><![CDATA[State]]></en> + <en><![CDATA[Status]]></en> + </locale> + <locale name="erp.process.paid_status"> + <de><![CDATA[Zahlungsstatus]]></de> + <en><![CDATA[Payment status]]></en> </locale> <locale name="erp.process.prefixedNumber"> <de><![CDATA[Entitäts-Nr]]></de> diff --git a/src/QUI/ERP/Process.php b/src/QUI/ERP/Process.php index 938f35400a3bda79627d0d6bbaee562000bdef8e..8c4a3240f544a41347320f39033347aee8e5c532 100644 --- a/src/QUI/ERP/Process.php +++ b/src/QUI/ERP/Process.php @@ -503,7 +503,7 @@ protected function parseOffers(Comments $History): void ]), strtotime($Offer->getAttribute('date')), 'quiqqer/offer', - 'fa fa-file-text-o', + 'fa fa-regular fa-handshake', false, $Offer->getHash() ); @@ -516,7 +516,7 @@ protected function parseOffers(Comments $History): void } if (empty($entry['sourceIcon'])) { - $entry['sourceIcon'] = 'fa fa-file-text-o'; + $entry['sourceIcon'] = 'fa fa-regular fa-handshake'; } $History->addComment( diff --git a/src/QUI/ERP/Utils/Utils.php b/src/QUI/ERP/Utils/Utils.php index eb0dc83ce51bf78eb4e3dac77ffd595255e1ab7b..4bd9898b2c6853e9f3b7ce9632f065f24e9a3bc9 100644 --- a/src/QUI/ERP/Utils/Utils.php +++ b/src/QUI/ERP/Utils/Utils.php @@ -18,8 +18,8 @@ class Utils 'QUI\ERP\Accounting\Invoice\InvoiceTemporary' => 'fa-file-text-o', 'QUI\ERP\Accounting\Invoice\Invoice' => 'fa-file-text-o', 'QUI\ERP\SalesOrders\SalesOrder' => 'fa-suitcase', - 'QUI\ERP\Accounting\Offers\Offer' => 'fa-file-text-o', - 'QUI\ERP\Accounting\Offers\OfferTemporary' => 'fa-file-text-o', + 'QUI\ERP\Accounting\Offers\Offer' => 'fa-regular fa-handshake', + 'QUI\ERP\Accounting\Offers\OfferTemporary' => 'fa-handshake', ]; /**