From af17f9a563ec0868318d98e359b9b7d69b890d8e Mon Sep 17 00:00:00 2001 From: Venba Date: Wed, 18 Dec 2024 07:26:47 +0000 Subject: [PATCH] Ipinvoice_model.php edited online with Bitbucket --- app/Models/Ipinvoice_model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php index a421d26f..ede1b0bb 100755 --- a/app/Models/Ipinvoice_model.php +++ b/app/Models/Ipinvoice_model.php @@ -348,7 +348,7 @@ class Ipinvoice_model extends Model ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left') ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left') ->where('a.invoice_date_created >=', $fiscalYearStartCurrent) - ->where('a.invoice_status_id', 2) + ->whereIn('a.invoice_status_id', [2,5]) ->groupBy("DATE_FORMAT(a.invoice_date_created, '%b')") ->orderBy('MONTH(a.invoice_date_created)'); @@ -360,7 +360,7 @@ class Ipinvoice_model extends Model ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left') ->where('a.invoice_date_created >=', $fiscalYearStartLast) ->where('a.invoice_date_created <', $fiscalYearStartCurrent) - ->where('a.invoice_status_id', 2) + ->whereIn('a.invoice_status_id', [2,5]) ->groupBy("DATE_FORMAT(a.invoice_date_created, '%b')") ->orderBy('MONTH(a.invoice_date_created)'); @@ -412,8 +412,8 @@ class Ipinvoice_model extends Model SUM(iia.item_cgst_amt) AS 'CGST', SUM(iia.item_sgst_amt) AS 'SGST', SUM(iia.item_igst_amt) AS 'IGST', - SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) AS 'TCS', - SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) + SUM(iia.item_total) AS 'Total' + truncate(SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)),2) AS 'TCS', + truncate(SUM(IFNULL(tcs.tax_rate_percent * iia.item_total / 100, 0)) + SUM(iia.item_total),2) AS 'Total' ") ->join('ip_invoice_custom icf', 'icf.invoice_id = ii.invoice_id', 'left') ->join('ip_invoice_tax_rates tc', 'tc.invoice_id = ii.invoice_id', 'left')