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

 Conflicts:

	src/store/Auth/actions.js

src/components/InvoicePaymentCard/InvoicePaymentCard.vue

@@ -98,7 +98,7 @@
       <div>
         <instalments :wallet="wallet"
                      :invoice="invoice"
-                     :can-action="canAction"
+                     :can-action="true"
                      @onInstalmentPayed="onInstalmentPayed" />
       </div>
     </div>

src/components/Widgets/Content/AdminContentCreate/AdminContentCreate.vue

@@ -53,7 +53,7 @@ export default {
       inputs: [
         { type: 'input', name: 'title', responseKey: 'title', label: 'عنوان', placeholder: ' ', col: 'col-md-6 col-12' },
         { type: 'file', name: 'thumbnail', responseKey: 'thumbnail', label: 'عکس', placeholder: ' ', col: 'col-md-6 col-12' },
-        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'نمایش/عدم نمایش', placeholder: ' ', value: true, col: 'col-12' },
+        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'پنهان باشد؟', placeholder: ' ', value: true, col: 'col-12' },
         { type: ContentCategorySelectorComp, name: 'category', responseKey: 'category', col: 'col-12' },
         { type: 'inputEditor', name: 'description', responseKey: 'description', label: 'توضیحات', col: 'col-12' },
         { type: ContentMediasComp, name: 'medias', responseKey: 'medias_info', col: 'col-12' },

src/components/Widgets/Content/AdminContentList/AdminContentList.vue

@@ -76,6 +76,7 @@ export default {
       inputs: [
         { type: ContentCategorySelectorComp, name: 'category', responseKey: 'category', col: 'col-12' },
         { type: 'input', name: 'search', value: null, col: 'col-md-3 col-12', label: 'جست و جو', placeholder: ' ' },
+        { type: 'select', name: 'is_hidden', label: 'وضعیت نمایش', options: (new Content()).is_hiddenEnums, placeholder: ' ', col: 'col-md-3 col-12' },
         { type: BtnControlComp, name: 'btn', label: 'جستجو', placeholder: ' ', atClick: this.search, col: 'col-md-2 col-12' }
       ],
       table: {
@@ -102,18 +103,18 @@ export default {
             field: row => row.title
           },
           {
-            name: 'is_hidden',
+            name: 'category_info',
             required: true,
-            label: 'نمایش/عدم نمایش',
+            label: 'دسته',
             align: 'left',
-            field: row => (new Content(row)).is_hidden_info.label
+            field: row => row.category_info?.title
           },
           {
-            name: 'category_info',
+            name: 'is_hidden',
             required: true,
-            label: 'دسته',
+            label: 'نمایش',
             align: 'left',
-            field: row => row.category_info?.title
+            field: row => (new Content(row)).is_hidden_info.label
           },
           {
             name: 'action',

src/components/Widgets/Content/AdminContentShow/AdminContentShow.vue

@@ -87,7 +87,7 @@ export default {
       inputs: [
         { type: 'input', name: 'title', responseKey: 'title', label: 'عنوان', placeholder: ' ', col: 'col-md-6 col-12' },
         { type: 'file', name: 'thumbnail', responseKey: 'thumbnail', label: 'عکس', placeholder: ' ', col: 'col-md-6 col-12' },
-        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'نمایش/عدم نمایش', placeholder: ' ', col: 'col-12' },
+        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'پنهان باشد؟', placeholder: ' ', col: 'col-12' },
         { type: ContentCategorySelectorComp, name: 'category', responseKey: 'category_info', col: 'col-md-12 col-12' },
         { type: 'inputEditor', name: 'description', responseKey: 'description', label: 'توضیحات', col: 'col-md-12 col-12' },
         { type: ContentMediasComp, name: 'medias', responseKey: 'medias_info', col: 'col-md-12 col-12' },

src/components/Widgets/Invoice/AdminInvoiceList/AdminInvoiceList.vue

@@ -175,11 +175,7 @@ export default {
   },
   methods: {
     getInvoiceTitle (invoice) {
-      if (invoice.item_info.item_type === 'CLASSROOM') {
-        return invoice.item_info.title
-      } else {
-        return invoice.item_info.title || '-'
-      }
+      return invoice.title || '-'
     },
     search () {
       this.$refs.entityIndex.search()

src/components/Widgets/Invoice/AdminInvoiceShow/AdminInvoiceShow.vue

@@ -83,17 +83,29 @@
       <q-separator />
       <q-card-section>
         <div class="row">
-          <div class="col-md-4 col-12 flex items-center justify-start">
+          <div v-if="invoice.item_type==='CLASSROOM'"
+               class="col-md-4 col-12 flex items-center justify-start">
             <q-img :src="invoice.item_info.thumbnail"
                    width="100px" />
             {{ invoice.item_info.title }}
           </div>
-          <div class="col-md-4 col-12">
+          <div v-else
+               class="col-md-4 col-12 flex items-center justify-start">
+            {{ invoice.title }}
+          </div>
+          <div v-if="invoice.item_type==='CLASSROOM'"
+               class="col-md-4 col-12">
             <q-icon name="isax:user" />
             استاد:
             {{ invoice.item_info.professor_info.firstname }}
             {{ invoice.item_info.professor_info.lastname }}
           </div>
+          <div v-else-if="invoice.item_type==='STORE_BASKET'"
+               class="col-md-4 col-12">
+            <q-icon name="isax:user" />
+            کد سفارش:
+            {{ invoice.item_info.id }}
+          </div>
           <div class="col-md-4 col-12">
             <q-icon name="isax:card" />
             قیمت:
@@ -110,7 +122,7 @@
         </q-card-section>
         <q-separator />
         <q-card-section>
-          <invoice-payment-card v-if="!invoice.loading && invoice.status!=='PAID_FULL' && invoice.status!=='PAID_IN_INSTALMENT'"
+          <invoice-payment-card v-if="!invoice.loading && invoice.status!=='PAID_FULL'"
                                 :wallet="wallet"
                                 :invoice="invoice"
                                 :show-invoice-link="false"

src/components/Widgets/Invoice/InvoiceShow/InvoiceShow.vue

@@ -89,13 +89,13 @@
       </q-card-section>
     </q-card>
     <div class="action q-mt-lg">
-      <q-card v-if="!invoice.loading && invoice.status!=='PAYING' && invoice.status!=='PAID_FULL' && invoice.status!=='PAID_IN_INSTALMENT'"
+      <q-card v-if="!invoice.loading && !(invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT')"
               class="q-mb-md">
         <q-card-section>
           تنها در صورتی که وضعیت سفارش در حال پرداخت باشد امکان پرداخت با کیف پول وجود دارد
         </q-card-section>
       </q-card>
-      <q-card v-if="!invoice.loading && (invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT')">
+      <q-card v-if="!invoice.loading && (invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT' || invoice.status==='PAID_IN_INSTALMENT')">
         <q-card-section>
           پرداخت
         </q-card-section>
@@ -105,6 +105,8 @@
                                 :invoice="invoice"
                                 class="payment-card"
                                 :can-action="localOptions.canAction"
+                                :show-message="invoice.status==='PAYING'"
+                                :show-wallet="invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT'"
                                 @onCancel="onCancel"
                                 @onAccept="onAccept"
                                 @onInstalmentPayed="onInstalmentPayed" />

src/components/Widgets/ProjectAttendanceSheet/ProjectAttendanceSheetShow/ProjectAttendanceSheetShow.vue

@@ -88,7 +88,7 @@
           تنها در صورتی که وضعیت سفارش در حال پرداخت باشد امکان پرداخت با کیف پول وجود دارد
         </q-card-section>
       </q-card>
-      <q-card v-if="!invoice.loading && (invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT')">
+      <q-card v-if="!invoice.loading && (invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT' || invoice.status==='PAID_IN_INSTALMENT')">
         <q-card-section>
           پرداخت
         </q-card-section>

src/components/Widgets/Registration/RegistrationShow/RegistrationShow.vue

@@ -88,7 +88,7 @@
           تنها در صورتی که وضعیت سفارش در حال پرداخت باشد امکان پرداخت با کیف پول وجود دارد
         </q-card-section>
       </q-card>
-      <q-card v-if="!invoice.loading && (invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT')">
+      <q-card v-if="!invoice.loading && (invoice.status==='PAYING' || invoice.status==='PAYING_IN_INSTALMENT' || invoice.status==='PAID_IN_INSTALMENT')">
         <q-card-section>
           پرداخت
         </q-card-section>

src/components/Widgets/Store/Basket/AdminStoreBasketList/AdminStoreBasketList.vue

@@ -3,10 +3,10 @@
        :style="localOptions.style">
     <div v-if="showBackBtn"
          class="more-action">
-      <q-btn color="primary">
-        <q-icon name="file_download" />
-        دریافت
-      </q-btn>
+         <!--      <q-btn color="primary">-->
+         <!--        <q-icon name="file_download" />-->
+         <!--        دریافت-->
+         <!--      </q-btn>-->
     </div>
     <entity-index v-if="mounted"
                   ref="entityIndex"

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

@@ -19,7 +19,7 @@
         </div>
         <div class="delivery-info__selected-type-meta">
           <q-icon name="shopping_bag" />
-          هزینه به آدرس و وزن مرصوله متغیر میباشد
+          هزینه به آدرس و وزن مرسوله متغیر میباشد
         </div>
       </div>
       <div class="delivery-info__price-info">

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

@@ -27,7 +27,12 @@
                            indeterminate />
         <template v-else>
           <!--          {{ basket.delivery_cost.toLocaleString('fa') }}-->
-          {{ deliveryCost.toLocaleString('fa') }}
+          <span v-if="basket.order_type!=='VIRTUAL'">
+            {{ deliveryCost.toLocaleString('fa') }}
+          </span>
+          <span v-else>
+            0
+          </span>
           ریال
         </template>
       </div>

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

@@ -7,7 +7,8 @@
         <cart-items :basket-items="basket.items_info" />
         <cart-address :basket="basket"
                       @set-address="onSetAddress" />
-        <delivery-info :basket="basket" />
+        <delivery-info v-if="basket.order_type!=='VIRTUAL'"
+                       :basket="basket" />
       </div>
       <div class="step2__sidebar">
         <sidebar :basket="basket"

src/components/Widgets/Store/StorePackage/AdminStorePackageCreate/AdminStorePackageCreate.vue

@@ -57,7 +57,7 @@ export default {
         { type: ContentCategorySelectorComp, name: 'store_category', responseKey: 'store_category_info', categoryType: 'store', col: 'col-md-12 col-12' },
         { type: 'inputEditor', name: 'description', responseKey: 'description', label: 'توضیحات', col: 'col-md-12 col-12' },
         { type: 'checkbox', name: 'is_physical', responseKey: 'is_physical', label: 'فیزیکی', placeholder: ' ', col: 'col-md-3 col-12' },
-        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'نمایش/عدم نمایش', placeholder: ' ', value: true, col: 'col-md-9 col-12' },
+        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'پنهان باشد؟', placeholder: ' ', value: true, col: 'col-md-9 col-12' },
         { type: 'input', name: 'unit_price', responseKey: 'unit_price', label: 'قیمت واحد(ریال)', placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'discount_percent', responseKey: 'discount_percent', label: 'درصد تخفیف', placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'inventory', responseKey: 'inventory', label: 'موجودی', placeholder: ' ', col: 'col-md-2 col-12' },

src/components/Widgets/Store/StorePackage/AdminStorePackageList/AdminStorePackageList.vue

@@ -116,7 +116,7 @@ export default {
         {
           type: 'select',
           name: 'is_hidden',
-          label: 'مخفی',
+          label: 'وضعیت نمایش',
           options: (new Package()).is_hiddenEnums,
           placeholder: ' ',
           col: 'col-md-3 col-12'
@@ -161,13 +161,6 @@ export default {
             align: 'left',
             field: row => (new Package(row)).is_physical_info.label
           },
-          {
-            name: 'is_hidden',
-            required: true,
-            label: 'نمایش/عدم نمایش',
-            align: 'left',
-            field: row => (new Package(row)).is_hidden_info.label
-          },
           {
             name: 'store_category',
             required: true,
@@ -189,6 +182,13 @@ export default {
             align: 'left',
             field: row => parseInt(row.unit_price.toString()).toLocaleString('fa')
           },
+          {
+            name: 'is_hidden',
+            required: true,
+            label: 'نمایش',
+            align: 'left',
+            field: row => (new Package(row)).is_hidden_info.label
+          },
           {
             name: 'action',
             required: true,

src/components/Widgets/Store/StorePackage/AdminStorePackageShow/AdminStorePackageShow.vue

@@ -63,7 +63,7 @@ export default {
         { type: ContentCategorySelectorComp, name: 'store_category', responseKey: 'store_category_info', categoryType: 'store', col: 'col-md-12 col-12' },
         { type: 'inputEditor', name: 'description', responseKey: 'description', label: 'توضیحات', col: 'col-md-12 col-12' },
         { type: 'checkbox', name: 'is_physical', responseKey: 'is_physical', label: 'فیزیکی', placeholder: ' ', col: 'col-md-3 col-12' },
-        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'نمایش/عدم نمایش', placeholder: ' ', col: 'col-md-9 col-12' },
+        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'پنهان باشد؟', placeholder: ' ', col: 'col-md-9 col-12' },
         { type: 'input', name: 'unit_price', responseKey: 'unit_price', label: 'قیمت واحد(ریال)', placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'discount_percent', responseKey: 'discount_percent', label: 'درصد تخفیف', placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'inventory', responseKey: 'inventory', label: 'موجودی', placeholder: ' ', col: 'col-md-2 col-12' },

src/components/Widgets/Store/StorePackage/StorePackageShow/StorePackageShow.vue

@@ -21,15 +21,8 @@
                   وزن:
                 </div>
                 <div class="package-show__attrs-item-value">
-                  ۲۰۰ گرم
-                </div>
-              </div>
-              <div class="package-show__attrs-item">
-                <div class="package-show__attrs-item-label">
-                  وزن:
-                </div>
-                <div class="package-show__attrs-item-value">
-                  ۲۰۰ گرم
+                  {{ storePackage.weight }}
+                  گرم
                 </div>
               </div>
             </div>
@@ -45,12 +38,13 @@
           <q-icon name="shopping_cart" />
           قیمت محصول
         </div>
-        <div class="package-show__summery-price-base">
-          {{ storePackage.unit_price }}
+        <div v-if="storePackage.unit_price !== storePackage.sellable_price"
+             class="package-show__summery-price-base">
+          {{ parseInt(storePackage.unit_price).toLocaleString('fa') }}
           ریال
         </div>
         <div class="package-show__summery-price-final">
-          {{ storePackage.getFinalPrice() }}
+          {{ parseInt(storePackage.sellable_price).toLocaleString('fa') }}
           ریال
         </div>
         <q-btn label="افزودن به سبد"

src/components/Widgets/Store/StoreProduct/AdminStoreProductCreate/AdminStoreProductCreate.vue

@@ -61,7 +61,7 @@ export default {
         { type: 'input', name: 'unit_price', responseKey: 'unit_price', label: 'قیمت واحد(ریال)', placeholder: ' ', col: 'col-md-6 col-12' },
         { type: 'input', name: 'discount_percent', responseKey: 'discount_percent', label: 'درصد تخفیف', placeholder: ' ', col: 'col-md-6 col-12' },
         { type: 'checkbox', name: 'is_physical', responseKey: 'is_physical', label: 'فیزیکی', placeholder: ' ', value: false, col: 'col-md-3 col-12' },
-        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'نمایش/عدم نمایش', placeholder: ' ', value: true, col: 'col-md-9 col-12' },
+        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'پنهان باشد؟', placeholder: ' ', value: true, col: 'col-md-9 col-12' },
         { type: 'select', name: 'physical_type', responseKey: 'physical_type', label: 'نوع محصول فیزیکی', options: (new Product()).physical_typeEnums, placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'inventory', responseKey: 'inventory', label: 'موجودی', placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'maximum_order_count', responseKey: 'maximum_order_count', label: 'سقف سفارش مجاز', placeholder: ' ', col: 'col-md-3 col-12' },

src/components/Widgets/Store/StoreProduct/AdminStoreProductList/AdminStoreProductList.vue

@@ -85,7 +85,7 @@ export default {
         {
           type: 'select',
           name: 'is_hidden',
-          label: 'مخفی',
+          label: 'وضعیت نمایش',
           options: (new Product()).is_hiddenEnums,
           placeholder: ' ',
           col: 'col-md-3 col-12'
@@ -130,13 +130,6 @@ export default {
             align: 'left',
             field: row => (new Product(row)).is_physical_info.label
           },
-          {
-            name: 'is_hidden',
-            required: true,
-            label: 'نمایش/عدم نمایش',
-            align: 'left',
-            field: row => (new Product(row)).is_hidden_info.label
-          },
           {
             name: 'store_category',
             required: true,
@@ -158,6 +151,13 @@ export default {
             align: 'left',
             field: row => parseInt(row.unit_price.toString()).toLocaleString('fa')
           },
+          {
+            name: 'is_hidden',
+            required: true,
+            label: 'نمایش',
+            align: 'left',
+            field: row => (new Product(row)).is_hidden_info.label
+          },
           {
             name: 'action',
             required: true,

src/components/Widgets/Store/StoreProduct/AdminStoreProductShow/AdminStoreProductShow.vue

@@ -66,7 +66,7 @@ export default {
         { type: 'input', name: 'unit_price', responseKey: 'unit_price', label: 'قیمت واحد(ریال)', placeholder: ' ', col: 'col-md-6 col-12' },
         { type: 'input', name: 'discount_percent', responseKey: 'discount_percent', label: 'درصد تخفیف', placeholder: ' ', col: 'col-md-6 col-12' },
         { type: 'checkbox', name: 'is_physical', responseKey: 'is_physical', label: 'فیزیکی', placeholder: ' ', col: 'col-md-3 col-12' },
-        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'نمایش/عدم نمایش', placeholder: ' ', col: 'col-md-9 col-12' },
+        { type: 'checkbox', name: 'is_hidden', responseKey: 'is_hidden', label: 'پنهان باشد؟', placeholder: ' ', col: 'col-md-9 col-12' },
         { type: 'select', name: 'physical_type', responseKey: 'physical_type', label: 'نوع محصول فیزیکی', options: (new Product()).physical_typeEnums, placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'inventory', responseKey: 'inventory', label: 'موجودی', placeholder: ' ', col: 'col-md-3 col-12' },
         { type: 'input', name: 'maximum_order_count', responseKey: 'maximum_order_count', label: 'سقف سفارش مجاز', placeholder: ' ', col: 'col-md-3 col-12' },

src/models/Content.js

@@ -48,11 +48,11 @@ class Content extends Model {
         enumListKey: 'is_hiddenEnums',
         enums: [
           {
-            label: 'نمایان',
+            label: 'پنهان',
             value: true
           },
           {
-            label: 'مخفی',
+            label: 'نمایان',
             value: false
           }
         ]

src/models/Package.js

@@ -57,11 +57,11 @@ class Package extends Model {
         enumListKey: 'is_hiddenEnums',
         enums: [
           {
-            label: 'نمایان',
+            label: 'پنهان',
             value: true
           },
           {
-            label: 'مخفی',
+            label: 'نمایان',
             value: false
           }
         ]

src/models/Product.js

@@ -64,11 +64,11 @@ class Product extends Model {
         enumListKey: 'is_hiddenEnums',
         enums: [
           {
-            label: 'نمایان',
+            label: 'پنهان',
             value: true
           },
           {
-            label: 'مخفی',
+            label: 'نمایان',
             value: false
           }
         ]

src/store/Auth/actions.js

@@ -91,7 +91,7 @@ export function logOut (context, payload) {
   const clearRedirectTo = payload?.clearRedirectTo
   context.commit('updateAccessToken', null)
   context.commit('updateUser', null)
-  context.commit('Shop/updateBasket', new Basket(), { root: true })
+  context.commit('Shop/clearBasket', new Basket(), { root: true })
   if (typeof window !== 'undefined') {
     Cookies.set('BearerAccessToken', '', {
       // domain: '.' + window.location.host,

src/store/Shop/mutations.js

@@ -1,7 +1,13 @@
+import { Basket } from 'src/models/Basket'
+
 export function updateBasket (state, newInfo) {
   state.basket = newInfo
 }
 
+export function clearBasket (state) {
+  state.basket = new Basket()
+}
+
 export function updateOnRegisterClassroom (state, newInfo) {
   state.onRegisterClassroom = newInfo
 }