Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into recurring-index-refresh

resources/scripts/components/base/BaseCustomerSelectPopup.vue

@@ -23,9 +23,11 @@
       @click.stop
     >
       <div class="flex relative justify-between mb-2">
-        <label class="flex-1 text-base font-medium text-left text-gray-900">
-          {{ selectedCustomer.name }}
-        </label>
+        <BaseText
+          :text="selectedCustomer.name"
+          :length="30"
+          class="flex-1 text-base font-medium text-left text-gray-900"
+        />
         <div class="flex">
           <a
             class="
@@ -302,8 +304,10 @@
                   </span>
 
                   <div class="flex flex-col justify-center text-left">
-                    <label
+                    <BaseText
                       v-if="customer.name"
+                      :text="customer.name"
+                      :length="30"
                       class="
                         m-0
                         text-base
@@ -311,12 +315,11 @@
                         leading-tight
                         cursor-pointer
                       "
-                    >
-                      {{ customer.name }}
-                    </label>
-
-                    <label
+                    />
+                    <BaseText
                       v-if="customer.contact_name"
+                      :text="customer.contact_name"
+                      :length="30"
                       class="
                         m-0
                         text-sm
@@ -324,9 +327,7 @@
                         text-gray-400
                         cursor-pointer
                       "
-                    >
-                      {{ customer.contact_name }}
-                    </label>
+                    />
                   </div>
                 </li>
                 <div

resources/scripts/components/base/BaseText.vue

@@ -0,0 +1,31 @@
+<template>
+  <BaseCustomTag :tag="tag" :title="text">
+    {{ displayText }}
+  </BaseCustomTag>
+</template>
+
+<script setup>
+import { computed } from "vue"
+
+const props = defineProps({
+  tag: {
+    type: String,
+    default: 'div',
+  },
+
+  text: {
+    type: String,
+    default: '',
+  },
+
+  length: {
+    type: Number,
+    default: 0,
+  }
+})
+
+const displayText = computed(() => {
+
+  return props.text.length < props.length ?  props.text : `${props.text.substring(0 , props.length)}...`
+})
+</script>

resources/scripts/components/estimate-invoice-common/ExchangeRateConverter.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script setup>
-import { watch, computed, ref, onMounted } from 'vue'
+import { watch, computed, ref, onBeforeUnmount } from 'vue'
 import { useGlobalStore } from '@/scripts/stores/global'
 import { useCompanyStore } from '@/scripts/stores/company'
 import { useExchangeRateStore } from '@/scripts/stores/exchange-rate'
@@ -110,7 +110,8 @@ watch(
   () => props.store[props.storeProp].currency_id,
   (v) => {
     onChangeCurrency(v)
-  }
+  },
+  { immediate: true }
 )
 watch(
   () => props.customerCurrency,
@@ -144,7 +145,7 @@ function setCustomerCurrency(v) {
 
 async function onChangeCurrency(v) {
   if (v !== companyCurrency.value.id) {
-    if (!props.isEdit) {
+    if (!props.isEdit && v) {
       await getCurrenctExchangeRate(v)
     }
 
@@ -170,4 +171,8 @@ function getCurrenctExchangeRate(v) {
       isFetching.value = false
     })
 }
+
+onBeforeUnmount(() => {
+  props.store.showExchangeRate = false
+})
 </script>