fixed conflict merging

This commit is contained in:
Kostya
2023-12-17 12:57:14 +03:00

View File

@@ -69,7 +69,7 @@ export default {
card: 0, card: 0,
clickedBtn: '', clickedBtn: '',
url: '', url: '',
offBtn: true, offBtn: false,
agreeUser: false, agreeUser: false,
PaymentsModalNumbers PaymentsModalNumbers
} }
@@ -83,7 +83,7 @@ export default {
GettingMoneyOperation(newAmount) GettingMoneyOperation(newAmount)
.then((response) => { .then((response) => {
console.log('Payments Modal Working!: ', response) console.log('Payments Modal Working!: ', response)
this.url = response.url // this.url = response.url
this.offBtn = false this.offBtn = false
}) })
} }
@@ -96,8 +96,7 @@ export default {
}, },
computed: { computed: {
checkOffBtn() { checkOffBtn() {
console.log(`offbtn = ${this.offBtn} agreeuser = ${this.agreeUser}`) return this.offBtn === true || this.agreeUser === false
return this.offBtn === false && this.agreeUser !== false
}, },
}, },
methods: { methods: {