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

Next 3.x

See merge request !131

ajax/output/getEntityData.php

@@ -37,9 +37,14 @@ function ($entityId, $entityType) {
             QUI\System\Log::writeException($Exception);
         }
 
+        $Processes = new QUI\ERP\Processes();
+        $Entity = $Processes->getEntity($entityId);
+
         return [
             'email' => $OutputProvider::getEmailAddress(Orthos::clear($entityId)),
-            'hideSystemDefaultTemplate' => $hideSystemDefaultTemplate
+            'hideSystemDefaultTemplate' => $hideSystemDefaultTemplate,
+            'uuid' => $Entity->getUUID(),
+            'prefixedNumber' => $Entity->getPrefixedNumber()
         ];
     },
     ['entityId', 'entityType'],

bin/backend/controls/OutputDialog.html

@@ -5,21 +5,21 @@
             <tr>
                 <td>
                     <label class="field-container">
-                    <span class="field-container-item" title="{{labelEntityId}}">
-                        {{labelEntityId}}
-                    </span>
-                        <span class="field-container-field">
-                        {{entityId}}
-                    </span>
+                        <span class="field-container-item" title="{{labelEntityId}}">
+                            {{labelEntityId}}
+                        </span>
+                        <span class="field-container-field quiqqer-erp-outputDialog-options-entityId">
+                            {{entityId}}
+                        </span>
                     </label>
                 </td>
             </tr>
             <tr>
                 <td>
                     <label class="field-container">
-                    <span class="field-container-item" title="{{labelTemplate}}">
-                        {{labelTemplate}}
-                    </span>
+                        <span class="field-container-item" title="{{labelTemplate}}">
+                            {{labelTemplate}}
+                        </span>
                         <select name="template" class="field-container-field"></select>
                     </label>
                 </td>
@@ -27,9 +27,9 @@
             <tr>
                 <td>
                     <label class="field-container">
-                    <span class="field-container-item" title="{{labelOutputType}}">
-                        {{labelOutputType}}
-                    </span>
+                        <span class="field-container-item" title="{{labelOutputType}}">
+                            {{labelOutputType}}
+                        </span>
                         <span class="field-container-field field-container-field-no-padding field-output"></span>
                     </label>
                 </td>
@@ -37,9 +37,9 @@
             <tr style="display: none">
                 <td>
                     <label class="field-container">
-                    <span class="field-container-item" title="{{labelEmail}}">
-                        {{labelEmail}}
-                    </span>
+                        <span class="field-container-item" title="{{labelEmail}}">
+                            {{labelEmail}}
+                        </span>
                         <input type="text"
                                name="recipient"
                                placeholder="email@domain.com"
@@ -57,9 +57,9 @@
             <tr>
                 <td>
                     <label class="field-container">
-                    <span class="field-container-item" title="{{labelMarkAsSent}}">
-                        {{labelMarkAsSent}}
-                    </span>
+                        <span class="field-container-item" title="{{labelMarkAsSent}}">
+                            {{labelMarkAsSent}}
+                        </span>
                         <div class="field-container-field">
                             <input type="checkbox" name="mark_as_sent" checked/>
                         </div>

bin/backend/utils/ERPEntities.js

@@ -60,6 +60,22 @@ define('package/quiqqer/erp/bin/backend/utils/ERPEntities', function() {
             });
         },
 
+        getEntity: function(uuid, entityPlugin) {
+            if (typeof entityPlugin === 'undefined') {
+                entityPlugin = false;
+            }
+
+            return new Promise(function(resolve) {
+                require(['Ajax'], function(QUIAjax) {
+                    QUIAjax.get('package_quiqqer_erp_ajax_getEntity', resolve, {
+                        'package': 'quiqqer/erp',
+                        uuid: uuid,
+                        entityPlugin: entityPlugin
+                    });
+                });
+            });
+        },
+
         openPanelByUUID: function(uuid) {
             return this.getTypeByUUID(uuid).then((entityType) => {
                 const panel = this.getPanelByEntity(entityType);