fix custom field issue and report issues

This commit is contained in:
radhika587
2021-12-06 12:51:31 +00:00
committed by Mohit Panjwani
parent 7b6a88ad4e
commit 603bf637a7
7 changed files with 16 additions and 8 deletions

View File

@ -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;

View File

@ -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)

View File

@ -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');

View File

@ -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');
}
}

View File

@ -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');
}

View File

@ -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) {

View File

@ -168,7 +168,7 @@
</td>
<td>
<p class="sales-amount">
{!! format_money_pdf($invoice->total) !!}
{!! format_money_pdf($invoice->base_total) !!}
</p>
</td>
</tr>