From 378dcbba0b28e9a7e3120e66c3ba5c4448beffba Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 2 Jan 2025 05:25:12 +0000 Subject: [PATCH] FIX_PDF --- app/Controllers/Jobcard.php | 3 +++ app/Models/JobcardModel.php | 2 +- app/Models/SalesOrderModel.php | 2 +- app/Views/invoice_pdf_template.php | 16 ++++++++++------ app/Views/invoice_pdf_template_jobcard.php | 20 ++++++++++++-------- 5 files changed, 27 insertions(+), 16 deletions(-) mode change 100644 => 100755 app/Views/invoice_pdf_template.php diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php index 393010c..2fe5572 100755 --- a/app/Controllers/Jobcard.php +++ b/app/Controllers/Jobcard.php @@ -112,6 +112,7 @@ class Jobcard extends BaseController /** CALCULATE LABOURCOST WITH TAX */ $totalAmount = 0; $totalTax = 0; + $hsn_sac = 0; // Calculate total amount and total tax foreach ($labourcost as $product) { @@ -150,6 +151,8 @@ class Jobcard extends BaseController //asign values to same array $data['job_card_products'][$key]['tax_amount'] = $tax; $data['job_card_products'][$key]['total_amount'] = $total; + $data['job_card_products'][$key]['taxable_value'] = $amount; + $data['job_card_products'][$key]['hsn_sac'] = $hsn_sac; //calculate sum $data['sum_of_tax'] += $tax; diff --git a/app/Models/JobcardModel.php b/app/Models/JobcardModel.php index 1844692..607b366 100755 --- a/app/Models/JobcardModel.php +++ b/app/Models/JobcardModel.php @@ -83,7 +83,7 @@ class JobcardModel extends Model public function get_jobcard_products_details($job_id) { - $this->select('job_card_product.*, products.product_name, products.per'); + $this->select('job_card_product.*, products.product_name, products.per,products.hsn_sac'); $this->join('job_card_product', 'job_card_product.job_card_id = job_card.job_card_id'); $this->join('products', 'products.product_id = job_card_product.product_id'); $this->where('job_card_product.is_active', 1); diff --git a/app/Models/SalesOrderModel.php b/app/Models/SalesOrderModel.php index aa14d53..dd5b3ac 100755 --- a/app/Models/SalesOrderModel.php +++ b/app/Models/SalesOrderModel.php @@ -46,7 +46,7 @@ class SalesOrderModel extends Model $result = $this->db->table('sales_order_product') ->where('sales_order_product.sales_order_id', $sales_order_id) ->join('products', 'products.product_id = sales_order_product.product_id') - ->select('sales_order_product.*, products.product_name, products.per, products.ml') + ->select('sales_order_product.*, products.product_name, products.per, products.ml,products.hsn_sac') ->get() ->getResult(); diff --git a/app/Views/invoice_pdf_template.php b/app/Views/invoice_pdf_template.php old mode 100644 new mode 100755 index ef5640e..8ceb584 --- a/app/Views/invoice_pdf_template.php +++ b/app/Views/invoice_pdf_template.php @@ -88,11 +88,13 @@ - No + No Description + HSN/SAC Rate(₹) - Qty - Per + Qty + Taxable Value + Per GST(%) Total Tax(₹) Total(₹) @@ -114,9 +116,11 @@ product_name; ?> - net_price; ?> - qty; ?> - per; ?> + hsn_sac; ?> + net_price; ?> + qty; ?> + net_price * $value->qty); ?> + per; ?> tax; ?>   amount, 2, '.', ''); ?> diff --git a/app/Views/invoice_pdf_template_jobcard.php b/app/Views/invoice_pdf_template_jobcard.php index d7a07c8..e4178a7 100755 --- a/app/Views/invoice_pdf_template_jobcard.php +++ b/app/Views/invoice_pdf_template_jobcard.php @@ -89,10 +89,12 @@ No - Description + Description + HSN/SAC Rate(₹) - Qty - Per + Qty + Taxable Value + Per GST(%) Total Tax(₹) Total(₹) @@ -105,12 +107,14 @@ $value) { ?> - - + + + - - - + + + +