commit

Author: degami

app/base/controllers/Frontend/Commerce/Checkout/Shipping.php

@@ -236,9 +236,6 @@ protected function addShippingMethodsAccordion(FAPI\Form $form, array &$form_sta
             'container_attributes' => ['id' => 'shipping_methods-container'],
         ]);
 
-
-
-
         $checkAddress = null;
 
         if (!empty($form_state['input_values']['copy_address'])) {

app/base/models/Cart.php

@@ -504,6 +504,7 @@ public function requireShipping(): bool
     public function calculateShipping(): float
     {
         if (!$this->requireShipping()) {
+            $this->setShippingAddressId(null);
             $this->setShippingMethod(null);
             $this->setShippingAmount(0.0);
             $this->setAdminShippingAmount(0.0);