From 603bf637a70a0acb696347ab67ce4b2ef948de4e Mon Sep 17 00:00:00 2001
From: radhika587 <radhikabytefury@gmail.com>
Date: Mon, 6 Dec 2021 12:51:31 +0000
Subject: [PATCH] fix custom field issue and report issues

---
 .../V1/Admin/Report/CustomerSalesReportController.php  |  2 +-
 .../V1/Admin/Report/ProfitLossReportController.php     |  2 +-
 app/Models/Expense.php                                 |  2 +-
 app/Models/InvoiceItem.php                             |  2 +-
 app/Models/Tax.php                                     |  2 +-
 resources/scripts/components/base/BaseCustomInput.vue  | 10 +++++++++-
 .../views/app/pdf/reports/sales-customers.blade.php    |  4 ++--
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
index 736a6576..c807c52f 100644
--- a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
@@ -47,7 +47,7 @@ class CustomerSalesReportController extends Controller
         foreach ($customers as $customer) {
             $customerTotalAmount = 0;
             foreach ($customer->invoices as $invoice) {
-                $customerTotalAmount += $invoice->total;
+                $customerTotalAmount += $invoice->base_total;
             }
             $customer->totalAmount = $customerTotalAmount;
             $totalAmount += $customerTotalAmount;
diff --git a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
index b16272c3..d8ff06f1 100644
--- a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
@@ -34,7 +34,7 @@ class ProfitLossReportController extends Controller
         $invoicesAmount = Invoice::whereCompanyId($company->id)
             ->applyFilters($request->only(['from_date', 'to_date']))
             ->wherePaidStatus(Invoice::STATUS_PAID)
-            ->sum('total');
+            ->sum('base_total');
 
         $expenseCategories = Expense::with('category')
             ->whereCompanyId($company->id)
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index dcb3dc99..516bdcb0 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -226,7 +226,7 @@ class Expense extends Model implements HasMedia
         $query->select(
             DB::raw('
                 count(*) as expenses_count,
-                sum(amount) as total_amount,
+                sum(base_amount) as total_amount,
                 expense_category_id')
         )
             ->groupBy('expense_category_id');
diff --git a/app/Models/InvoiceItem.php b/app/Models/InvoiceItem.php
index 63dc3ca4..2489b6fc 100644
--- a/app/Models/InvoiceItem.php
+++ b/app/Models/InvoiceItem.php
@@ -75,7 +75,7 @@ class InvoiceItem extends Model
     public function scopeItemAttributes($query)
     {
         $query->select(
-            DB::raw('sum(quantity) as total_quantity, sum(total) as total_amount, invoice_items.name')
+            DB::raw('sum(quantity) as total_quantity, sum(base_total) as total_amount, invoice_items.name')
         )->groupBy('invoice_items.name');
     }
 }
diff --git a/app/Models/Tax.php b/app/Models/Tax.php
index 11bd2da3..b8491e2f 100644
--- a/app/Models/Tax.php
+++ b/app/Models/Tax.php
@@ -68,7 +68,7 @@ class Tax extends Model
     public function scopeTaxAttributes($query)
     {
         $query->select(
-            DB::raw('sum(amount) as total_tax_amount, tax_type_id')
+            DB::raw('sum(base_amount) as total_tax_amount, tax_type_id')
         )->groupBy('tax_type_id');
     }
 
diff --git a/resources/scripts/components/base/BaseCustomInput.vue b/resources/scripts/components/base/BaseCustomInput.vue
index dd04bfa4..9f4cdca1 100644
--- a/resources/scripts/components/base/BaseCustomInput.vue
+++ b/resources/scripts/components/base/BaseCustomInput.vue
@@ -64,7 +64,7 @@
 </template>
 
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, ref, watch, onMounted } from 'vue'
 import { useCustomFieldStore } from '@/scripts/stores/custom-field'
 
 const props = defineProps({
@@ -121,6 +121,10 @@ watch(
   }
 )
 
+onMounted(() => {
+  fetchFields()
+})
+
 const value = computed({
   get: () => props.modelValue,
   set: (value) => {
@@ -128,6 +132,10 @@ const value = computed({
   },
 })
 
+async function fetchFields() {
+  await customFieldsStore.fetchCustomFields()
+}
+
 async function getFields() {
   fieldList.value = []
   if (props.fields && props.fields.length > 0) {
diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php
index 6609833d..3aa8221d 100644
--- a/resources/views/app/pdf/reports/sales-customers.blade.php
+++ b/resources/views/app/pdf/reports/sales-customers.blade.php
@@ -6,7 +6,7 @@
         body {
             font-family: "DejaVu Sans";
         }
-        
+
         table {
             border-collapse: collapse;
         }
@@ -168,7 +168,7 @@
                             </td>
                             <td>
                                 <p class="sales-amount">
-                                    {!! format_money_pdf($invoice->total) !!}
+                                    {!! format_money_pdf($invoice->base_total) !!}
                                 </p>
                             </td>
                         </tr>