Merge branch 'next-2.x' into 'main'

fix: global process id and hash corrected at grid

See merge request !104

bin/backend/controls/panels/Orders.js

@@ -1178,16 +1178,23 @@ define('package/quiqqer/order/bin/backend/controls/panels/Orders', [
                 },
                 {
                     header: QUILocale.get(lg, 'grid.hash'),
-                    dataIndex: 'hash',
+                    dataIndex: 'uuid',
                     dataType: 'string',
                     width: 280,
                     className: 'monospace'
                 },
+                {
+                    header: QUILocale.get(lg, 'grid.globalProcessId'),
+                    dataIndex: 'globalProcessId',
+                    dataType: 'string',
+                    width: 280,
+                    className: 'monospace clickable'
+                },
                 {
                     header: QUILocale.get('quiqqer/system', 'id'),
                     dataIndex: 'id',
                     dataType: 'integer',
-                    width: 80
+                    hidden: true
                 },
                 {
                     dataIndex: 'paymentId',
@@ -1385,6 +1392,23 @@ define('package/quiqqer/order/bin/backend/controls/panels/Orders', [
                         return;
                     }
 
+                    if (typeof data !== 'undefined' && data.cell.get('data-index') === 'globalProcessId') {
+                        const rowData = self.$Grid.getDataByRow(data.row);
+
+                        if (rowData.globalProcessId && rowData.globalProcessId !== '') {
+                            require([
+                                'package/quiqqer/erp/bin/backend/controls/process/ProcessWindow'
+                            ], function(ProcessWindow) {
+                                new ProcessWindow({
+                                    globalProcessId: rowData.globalProcessId
+                                }).open();
+                            });
+
+                            return;
+                        }
+                    }
+
+
                     const selected = self.$Grid.getSelectedData();
 
                     if (selected.length) {

locale.xml

@@ -1732,6 +1732,10 @@
             <en><![CDATA[Payment data]]></en>
         </locale>
         <locale name="grid.hash">
+            <de><![CDATA[Hash]]></de>
+            <en><![CDATA[Hash]]></en>
+        </locale>
+        <locale name="grid.globalProcessId">
             <de><![CDATA[Vorgangsnummer]]></de>
             <en><![CDATA[Procedure number]]></en>
         </locale>

src/QUI/ERP/Order/Search.php

@@ -536,6 +536,8 @@ protected function parseListForGrid(array $data): array
 
             $orderData['id'] = (int)$orderData['id'];
             $orderData['hash'] = $Order->getUUID();
+            $orderData['uuid'] = $Order->getUUID();
+            $orderData['globalProcessId'] = $Order->getGlobalProcessId();
             $orderData['prefixed-id'] = $Order->getPrefixedNumber();
 
             // customer data