Merge branch 'fix-date-formate-issue' into 'master'

date formatting issue fix

See merge request mohit.panjvani/crater-web!1339

resources/scripts/views/expenses/Index.vue

@@ -185,6 +185,10 @@
           />
         </template>
 
+        <template #cell-expense_date="{ row }">
+          {{ row.data.formatted_expense_date }}
+        </template>
+
         <template #cell-user_name="{ row }">
           <BaseText
             :text="row.data.customer ? row.data.customer.name : '-'"

resources/scripts/views/payments/Index.vue

@@ -151,6 +151,10 @@
           </div>
         </template>
 
+        <template #cell-payment_date="{ row }">
+          {{ row.data.formatted_payment_date }}
+        </template>
+
         <template #cell-payment_number="{ row }">
           <router-link
             :to="{ path: `payments/${row.data.id}/view` }"
@@ -161,11 +165,7 @@
         </template>
 
         <template #cell-name="{ row }">
-          <BaseText
-            :text="row.data.customer.name"
-            :length="30"
-            tag="span"
-          />
+          <BaseText :text="row.data.customer.name" :length="30" tag="span" />
         </template>
 
         <template #cell-payment_mode="{ row }">

resources/scripts/views/payments/View.vue

@@ -163,7 +163,7 @@
           >
             <div class="flex-2">
               <BaseText
-                :text="payment?.customer?.name "
+                :text="payment?.customer?.name"
                 :length="30"
                 class="
                   pr-2
@@ -219,11 +219,11 @@
                   text-right text-gray-900
                 "
                 :amount="payment?.amount"
-                :currency="payment?.currency"
+                :currency="payment.customer.currency"
               />
 
               <div class="text-sm text-right text-gray-500 non-italic">
-                {{ paymentDate }}
+                {{ payment.formatted_payment_date }}
               </div>
             </div>
           </router-link>