Merge branch 'dev' into 'next'

fix: wrong net status at b2b shops

See merge request !58

bin/frontend/controls/frontendUsers/BusinessType.js

@@ -97,6 +97,7 @@ define('package/quiqqer/erp/bin/frontend/controls/frontendUsers/BusinessType', [
                     height : size.height
                 }, {
                     callback: function () {
+                        Node.style.height = null;
                         resolve();
                     }
                 });

src/QUI/ERP/Accounting/Article.php

@@ -145,6 +145,8 @@ public function __construct($attributes = [])
     {
         $defaults = [
             'id',
+            'uuid',
+            'productSetParentUuid',
             'articleNo',
             'gtin',
             'title',
@@ -252,6 +254,26 @@ public function getId()
         return 0;
     }
 
+    /**
+     * Return the Article UUID
+     *
+     * @return string|null
+     */
+    public function getUuid(): ?string
+    {
+        return !empty($this->attributes['uuid']) ? $this->attributes['uuid'] : null;
+    }
+
+    /**
+     * Return the UUID of a parent article, if this article is part of a product set.
+     *
+     * @return string|null
+     */
+    public function getProductSetParentUuid(): ?string
+    {
+        return !empty($this->attributes['productSetParentUuid']) ? $this->attributes['productSetParentUuid'] : null;
+    }
+
     /**
      * Return the Article Number
      *
@@ -699,6 +721,8 @@ public function toArray(): array
         return [
             // article data
             'id' => $this->getId(),
+            'uuid' => $this->getUuid(),
+            'productSetParentUuid' => $this->getProductSetParentUuid(),
             'title' => $this->getTitle(),
             'articleNo' => $this->getArticleNo(),
             'gtin' => $this->getGTIN(),

src/QUI/ERP/FrontendUsers/createAddressBegin.html

@@ -25,6 +25,7 @@
            name="company"
            class="quiqqer-frontendUsers-userdata-field"
            autocomplete="organization"
+           placeholder="{locale group='quiqqer/erp' var='control.profile.CustomerData.company'}"
            {$r}
     />
 </label>

src/QUI/ERP/FrontendUsers/createAddressEnd.html

@@ -9,6 +9,7 @@
            name="vatId"
            class="quiqqer-frontendUsers-userdata-field"
            value="{$User->getAttribute('quiqqer.erp.euVatId')|escape:'html'}"
+           placeholder="{locale group='quiqqer/order' var='vatId'}"
     />
 </label>
 {/if}

src/QUI/ERP/FrontendUsers/editAddressBegin.html

@@ -26,6 +26,7 @@
            class="quiqqer-frontendUsers-userdata-field"
            autocomplete="organization"
            value="{$Address->getAttribute('company')|escape:'html'}"
+           placeholder="{locale group='quiqqer/erp' var='control.profile.CustomerData.company'}"
            {$r}
     />
 </label>

src/QUI/ERP/FrontendUsers/editAddressEnd.html

@@ -9,6 +9,7 @@
            name="vatId"
            class="quiqqer-frontendUsers-userdata-field"
            value="{$User->getAttribute('quiqqer.erp.euVatId')|escape:'html'}"
+           placeholder="{locale group='quiqqer/order' var='vatId'}"
     />
 </label>
 {/if}

src/QUI/ERP/User.php

@@ -463,6 +463,17 @@ public function isCompany()
      */
     public function isNetto()
     {
+        try {
+            $Package = QUI::getPackage('quiqqer/erp');
+            $Config = $Package->getConfig();
+
+            if ($Config->getValue('general', 'businessType') === 'B2B') {
+                return QUI\ERP\Utils\User::IS_NETTO_USER;
+            }
+        } catch (QUI\Exception $Exception) {
+        }
+
+
         if ($this->existsAttribute('erp.isNettoUser')) {
             return (int)$this->getAttribute('erp.isNettoUser') === QUI\ERP\Utils\User::IS_NETTO_USER;
         }

src/QUI/ERP/Utils/User.php

@@ -68,6 +68,18 @@ public static function getBruttoNettoUserStatus(UserInterface $User): int
             return self::$userBruttoNettoStatus[$uid];
         }
 
+        try {
+            $Package = QUI::getPackage('quiqqer/erp');
+            $Config = $Package->getConfig();
+
+            if ($Config->getValue('general', 'businessType') === 'B2B') {
+                self::$userBruttoNettoStatus[$uid] = QUI\ERP\Utils\User::IS_NETTO_USER;
+                return self::$userBruttoNettoStatus[$uid];
+            }
+        } catch (QUI\Exception $Exception) {
+        }
+
+
         if (QUI::getUsers()->isSystemUser($User)) {
             self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
 
@@ -75,7 +87,11 @@ public static function getBruttoNettoUserStatus(UserInterface $User): int
         }
 
         if ($User instanceof QUI\ERP\User && $User->hasBruttoNettoStatus()) {
-            self::$userBruttoNettoStatus[$uid] = $User->isNetto();
+            if ($User->isNetto()) {
+                self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
+            } else {
+                self::$userBruttoNettoStatus[$uid] = self::IS_BRUTTO_USER;
+            }
 
             return self::$userBruttoNettoStatus[$uid];
         }