ali 2 lat temu
rodzic
commit
9e07deeb59

+ 5 - 0
src/components/Widgets/Store/Basket/UserStoreBasketList/UserStoreBasketList.vue

@@ -140,6 +140,11 @@ export default {
 
 <style scoped lang="scss">
 .UserStoreBasketList {
+  :deep(.entity-index) {
+    .entity-crud-formBuilder {
+      display: none;
+    }
+  }
   .more-action {
     display: flex;
     flex-flow: row;

+ 4 - 1
src/components/Widgets/Store/Cart/components/step2/step2.vue

@@ -122,7 +122,10 @@ export default {
     },
     onComplete () {
       if (!this.basket.address || !this.basket.province || !this.basket.city || !this.basket.postal_code) {
-        alert('empty address!')
+        this.$q.notify({
+          type: 'negative',
+          message: 'آدرس را مشخص کنید.'
+        })
         return ''
       }
       this.openDialog()

+ 6 - 4
src/components/Widgets/Store/Cart/components/step3/step3.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="step3">
-    <q-linear-progress v-if="basket.loading"
+    <q-linear-progress v-if="basket.loading || invoice.loading"
                        indeterminate />
     <template v-if="!basket.loading">
       <invoice-info v-if="!invoice.loading"
@@ -107,6 +107,9 @@ export default {
     goToShop () {
       this.$router.push({ name: 'Public.Shop' })
     },
+    goToMyOrders () {
+      this.$router.push({ name: 'UserPanel.MyOrders.List' })
+    },
     onAccept () {
       this.payInvoice()
     },
@@ -123,9 +126,8 @@ export default {
     payInvoiceByWallet () {
       this.invoice.loading = true
       APIGateway.invoice.pay(this.invoice.id)
-        .then((message) => {
-          this.payMessage = message
-          this.goToShop()
+        .then(() => {
+          this.goToMyOrders()
         })
         .finally(() => {
           this.invoice.loading = false