Merge branch 'master' of http://git.hghweb.ir/ali.s/palizvani-front-vite

src/components/Widgets/Store/Cart/components/step1/cartItem.vue

@@ -47,12 +47,13 @@
                            @remove="onRemove" />
       </div>
       <div class="cart-item__price">
-        <div class="cart-item__price-base">
+        <div v-if="packageOrProductObject.unit_price != packageOrProductObject.sellable_price"
+             class="cart-item__price-base">
           {{ packageOrProductObject.unit_price.toLocaleString('fa') }}
           تومان
         </div>
         <div class="cart-item__price-final">
-          {{ packageOrProductObject.getFinalPrice() }}
+          {{ packageOrProductObject.sellable_price.toLocaleString('fa') }}
           تومان
         </div>
       </div>

src/components/Widgets/Store/Cart/components/step1/sidebar.vue

@@ -5,16 +5,29 @@
         قیمت کالاها
       </div>
       <div class="step1__sidebar-total-price-value">
-        {{ basket.order_price.toLocaleString('fa') }}
+        {{ basket.price.toLocaleString('fa') }}
         تومان
       </div>
     </div>
-    <div class="step1__sidebar-total-discount">
+    <div v-if="basket.margin_amount"
+         class="step1__sidebar-total-discount">
       <div class="step1__sidebar-total-discount-label">
         تخفیف ها
       </div>
       <div class="step1__sidebar-total-discount-value">
-        {{ basket.overall_discount_amount.toLocaleString('fa') }}
+        {{ basket.margin_amount.toLocaleString('fa') }}
+        تومان
+      </div>
+    </div>
+    <div v-if="basket.margin_amount"
+         class="step1__sidebar-separator" />
+    <div v-if="basket.margin_amount"
+         class="step1__sidebar-total-price">
+      <div class="step1__sidebar-total-price-label">
+        قابل سفارش
+      </div>
+      <div class="step1__sidebar-total-price-value">
+        {{ basket.sellable_price.toLocaleString('fa') }}
         تومان
       </div>
     </div>
@@ -24,16 +37,17 @@
         کد تخفیف
       </div>
       <div class="step1__sidebar-discount-code-value">
-        {{ basket.discount_info.code }}
+        {{ basket.discount_amount.toLocaleString('fa') }}
+        تومان
       </div>
     </div>
     <div class="step1__sidebar-separator" />
     <div class="step1__sidebar-final-price">
       <div class="step1__sidebar-final-price-label">
-        قیمت کالاها
+        مجموع
       </div>
       <div class="step1__sidebar-final-price-value">
-        {{ basket.sellable_price.toLocaleString('fa') }}
+        {{ basket.order_price.toLocaleString('fa') }}
         تومان
       </div>
     </div>

src/components/Widgets/Store/Cart/components/step2/cartAddress.vue

@@ -2,7 +2,7 @@
   <div class="cart-address">
     <div class="cart-address__title">
       <q-icon name="place" />
-      انتخاب آدرس:
+      آدرس:
     </div>
     <div v-if="mounted"
          class="cart-address__info">

src/components/Widgets/Store/Cart/components/step2/sidebar.vue

@@ -5,7 +5,16 @@
         قیمت کالاها
       </div>
       <div class="step2__sidebar-total-price-value">
-        {{ basket.order_price.toLocaleString('fa') }}
+        {{ basket.price.toLocaleString('fa') }}
+        تومان
+      </div>
+    </div>
+    <div class="step2__sidebar-overall-discount-amount">
+      <div class="step2__sidebar-overall-discount-amount-label">
+        تخفیف ها
+      </div>
+      <div class="step2__sidebar-overall-discount-amount-value">
+        {{ basket.overall_discount_amount.toLocaleString('fa') }}
         تومان
       </div>
     </div>
@@ -18,14 +27,6 @@
         تومان
       </div>
     </div>
-    <div class="step2__sidebar-overall-discount-amount">
-      <div class="step2__sidebar-overall-discount-amount-label">
-        تخفیف ها
-      </div>
-      <div class="step2__sidebar-overall-discount-amount-value">
-        {{ basket.overall_discount_amount.toLocaleString('fa') }}
-      </div>
-    </div>
     <div class="step2__sidebar-separator" />
     <div class="step2__sidebar-final-price">
       <div class="step2__sidebar-final-price-label">

src/components/Widgets/Store/Cart/components/step2/step2.vue

@@ -121,6 +121,10 @@ export default {
       this.checkoutReview()
     },
     onComplete () {
+      if (!this.basket.address || !this.basket.province || !this.basket.city || !this.basket.postal_code) {
+        alert('empty address!')
+        return ''
+      }
       this.openDialog()
     }
   }

src/models/Package.js

@@ -11,6 +11,7 @@ class Package extends Model {
       { key: 'store_category' },
       { key: 'content_category' },
       { key: 'unit_price' },
+      { key: 'sellable_price' },
       { key: 'discount_percent' },
       { key: 'description' },
       { key: 'is_physical' },

src/models/Product.js

@@ -9,10 +9,8 @@ class Product extends Model {
       { key: 'inventory' },
       { key: 'store_category' },
       { key: 'content_category' },
-      {
-        key: 'unit_price',
-        default: 0
-      },
+      { key: 'unit_price' },
+      { key: 'sellable_price' },
       {
         key: 'discount_percent',
         default: 0