fix: candyman-gmbh/projektplanung#96

bin/frontend/controls/orderProcess/CustomerData.js

@@ -72,7 +72,9 @@ define('package/quiqqer/order/bin/frontend/controls/orderProcess/CustomerData',
             var val = parseInt(this.getElm().get('data-validate'));
 
             if (isNaN(val) || !val) {
-                this.openAddressEdit();
+                this.openAddressEdit().catch(function (err) {
+                    console.error(err);
+                });
             }
         },
 
@@ -167,24 +169,9 @@ define('package/quiqqer/order/bin/frontend/controls/orderProcess/CustomerData',
                 EditContainer    = Elm.getElement('.quiqqer-order-customerData-edit'),
                 Header           = Elm.getElement('.quiqqer-order-customerData header');
 
-            var VatId        = Elm.getElement('[name="vatId"]');
-            var Company      = Elm.getElement('[name="company"]');
             var BusinessType = Elm.getElement('[name="businessType"]');
             var OrderProcess = self.$getOrderProcess();
 
-            if (VatId.value !== '') {
-                //VatId.disabled = true;
-            }
-
-            if (Company.value !== '') {
-                //Company.disabled = true;
-            }
-
-            if (BusinessType.value !== '') {
-                //BusinessType.disabled = true;
-            }
-
-
             if (OrderProcess) {
                 OrderProcess.resize();
             }
@@ -216,9 +203,11 @@ define('package/quiqqer/order/bin/frontend/controls/orderProcess/CustomerData',
                     opacity: 1
                 });
             }).then(function () {
-                self.$onBusinessTypeChange({
-                    target: self.getElm().getElement('[name="businessType"]')
-                });
+                if (BusinessType) {
+                    self.$onBusinessTypeChange({
+                        target: BusinessType
+                    });
+                }
 
                 EditContainer.setStyle('display', 'inline');
                 Container.setStyle('height', null);

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

@@ -54,6 +54,7 @@
                value="{$Address->getId()}"
         />
 
+        {if $businessTypeIsChangeable}
         <label class="quiqqer-order-customerData-edit-businessType">
             <span>
                 {locale group="quiqqer/order" var="ordering.step.title.CustomerData.businessType"}
@@ -67,7 +68,9 @@
                 </option>
             </select>
         </label>
+        {/if}
 
+        {if $isB2B}
         <label class="quiqqer-order-customerData-edit-company">
             <span>{locale group="quiqqer/order" var="company"}</span>
             <input type="text"
@@ -83,6 +86,7 @@
                    value="{$User->getAttribute('quiqqer.erp.euVatId')|escape:'html'}"
             />
         </label>
+        {/if}
 
         {if $isB2B}
         <style type="text/css">
@@ -212,4 +216,4 @@
     </label>
 </section>
 
-{template_event name="quiqqer::order::orderProcessCustomerEnd" User=$User Address=$Address Order=$Order}
\ No newline at end of file
+{template_event name="quiqqer::order::orderProcessCustomerEnd" User=$User Address=$Address Order=$Order}

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

@@ -132,10 +132,13 @@ public function getBody()
             'User'            => $User,
             'Address'         => $Address,
             'Order'           => $this->getOrder(),
-            'isB2B'           => QUI\ERP\Utils\Shop::isOnlyB2B() || QUI\ERP\Utils\Shop::isOnlyB2C(),
             'b2bSelected'     => $isB2B(),
             'commentMessage'  => $commentMessage,
-            'commentCustomer' => $commentCustomer
+            'commentCustomer' => $commentCustomer,
+
+            'businessTypeIsChangeable' => !(QUI\ERP\Utils\Shop::isOnlyB2C() || QUI\ERP\Utils\Shop::isOnlyB2B()),
+            'isB2C'                    => QUI\ERP\Utils\Shop::isB2C(),
+            'isB2B'                    => QUI\ERP\Utils\Shop::isB2B(),
         ]);
 
         return $Engine->fetch(\dirname(__FILE__).'/CustomerData.html');