2730 checkboxes

CHANGELOG.md

@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use event bus to emit 'application-after-init' event (#2852)
 - Validation of fields 'company name' and 'tax' in checkout doesn't work correctly - @dimasch (#2741)
 - Fixed wrong price displayed in instant checkout module - @vishal-7037 (#2884)
+- Incorrect working of checkboxes in checkout - @dimasch (#2730)
 
 ### Changed / Improved
 - Changed the way to access the configuration. Currently the `rootStore.state.config` is deprecated. Please do use the `import config from 'config'` > `config` instead - @pkarw (#2649)

core/modules/checkout/components/Payment.ts

@@ -59,6 +59,16 @@ export const Payment = {
       handler () {
         this.useShippingAddress()
       }
+    },
+    sendToBillingAddress: {
+      handler () {
+        this.useBillingAddress()
+      }
+    },
+    generateInvoice: {
+      handler () {
+        this.useGenerateInvoice()
+      }
     }
   },
   methods: {

core/modules/checkout/components/Shipping.ts

@@ -51,6 +51,13 @@ export const Shipping = {
       return this.$store.state.payment.methods
     }
   },
+  watch: {
+    shipToMyAddress: {
+      handler () {
+        this.useMyAddress()
+      }
+    }
+  },
   mounted () {
     if (!this.shipping.shippingMethod || this.notInMethods(this.shipping.shippingMethod)) {
       let shipping = this.shippingMethods.find(item => item.default)

core/modules/user/components/UserShippingDetails.ts

@@ -38,6 +38,13 @@ export const UserShippingDetails = {
   mounted () {
     this.shippingDetails = this.getShippingDetails()
   },
+  watch: {
+    useCompanyAddress: {
+      handler () {
+        this.fillCompanyAddress()
+      }
+    }
+  },
   methods: {
     onLoggedIn () {
       this.currentUser = Object.assign({}, this.$store.state.user.current)

src/themes/default/components/core/blocks/Checkout/Payment.vue

@@ -47,7 +47,6 @@
             class="col-xs-12 mb15"
             id="sendToBillingAddressCheckbox"
             v-model="sendToBillingAddress"
-            @click="useBillingAddress"
           >
             {{ $t('Use my billing data') }}
           </base-checkbox>

src/themes/default/components/core/blocks/Checkout/Shipping.vue

@@ -37,7 +37,6 @@
             v-if="currentUser && hasShippingDetails()"
             class="col-xs-12 mb10"
             id="shipToMyAddressCheckbox"
-            @click="useMyAddress"
             v-model="shipToMyAddress"
           >
             {{ $t('Ship to my default address') }}

src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue

@@ -61,7 +61,6 @@
           class="col-xs-12 mb10"
           id="addCompanyFilled"
           v-model="useCompanyAddress"
-          @click="fillCompanyAddress"
         >
           {{ $t("Use my company's address details") }}
         </base-checkbox>