Merge branch 'dev'

bin/frontend/controls/orderProcess/CustomerData.js

@@ -159,15 +159,15 @@ define('package/quiqqer/order/bin/frontend/controls/orderProcess/CustomerData',
             var OrderProcess = self.$getOrderProcess();
 
             if (VatId.value !== '') {
-                VatId.disabled = true;
+                //VatId.disabled = true;
             }
 
             if (Company.value !== '') {
-                Company.disabled = true;
+                //Company.disabled = true;
             }
 
             if (BusinessType.value !== '') {
-                BusinessType.disabled = true;
+                //BusinessType.disabled = true;
             }
 
             return this.$fx(DisplayContainer, {

src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.css

@@ -138,11 +138,11 @@
     color: #75b947;
 }
 
-.quiqqer-order-customerData [name="open-edit"] {
-    position: absolute;
-    top: 0;
-    right: 0;
-}
+/*.quiqqer-order-customerData [name="open-edit"] {*/
+    /*position: absolute;*/
+    /*top: 0;*/
+    /*right: 0;*/
+/*}*/
 
 .quiqqer-order-customerData [name="open-edit"] .quiqqer-order-customerData-edit-text {
     display: none;

src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.html

 <section class="quiqqer-order-customerData">
     <header>
-        <h1>{locale group="quiqqer/order" var="ordering.step.title.CustomerData"}</h1>
+        <h1>
+            {locale group="quiqqer/order" var="ordering.step.title.CustomerData"}
+
+            <button name="open-edit" disabled class="btn-light">
+                <span class="quiqqer-order-customerData-edit-icon fa fa-edit"></span>
+                <span class="quiqqer-order-customerData-edit-text">
+                    {locale group="quiqqer/order" var="ordering.step.title.CustomerData.addressEdit"}
+                </span>
+            </button>
+        </h1>
     </header>
 
     {template_event name="quiqqer::order::orderProcessCustomerDataBegin" User=$User Address=$Address}
@@ -33,13 +42,6 @@
             </span>
             {$Address->render()}
         </div>
-
-        <button name="open-edit" disabled class="btn-light">
-            <span class="quiqqer-order-customerData-edit-icon fa fa-edit"></span>
-            <span class="quiqqer-order-customerData-edit-text">
-                {locale group="quiqqer/order" var="ordering.step.title.CustomerData.addressEdit"}
-            </span>
-        </button>
     </div>
 
     <div class="quiqqer-order-customerData-edit">
@@ -161,9 +163,9 @@
         <label class="quiqqer-order-customerData-edit-country">
             <span>{locale group="quiqqer/frontend-users" var="country"}</span>
             {control name="country" control="QUI\Countries\Controls\Select"
-                selected=$Address->getAttribute('country')
-                required="required"
-                use-geo-location=true
+            selected=$Address->getAttribute('country')
+            required="required"
+            use-geo-location=true
             }
         </label>
 

src/QUI/ERP/Order/Controls/OrderProcess/CustomerData.php

@@ -297,8 +297,10 @@ public function save()
         if (isset($_REQUEST['businessType'])) {
             if ($_REQUEST['businessType'] === 'b2b') {
                 $User->setAttribute('quiqqer.erp.isNettoUser', QUI\ERP\Utils\User::IS_NETTO_USER);
+                $User->setCompanyStatus(true);
             } else {
                 $User->setAttribute('quiqqer.erp.isNettoUser', QUI\ERP\Utils\User::IS_BRUTTO_USER);
+                $User->setCompanyStatus(false);
             }
         }