From e36d04770baa735a919c9d9e16bf88a90bba5484 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Mon, 3 Nov 2025 10:57:17 +0530 Subject: [PATCH] FIX_Remaining issues --- app/Views/invoice_pdf_layout_old.php | 238 +++++++++++++++++++++++++++ app/Views/layout/header.php | 61 ++++++- app/Views/vehicle_form.php | 2 +- 3 files changed, 292 insertions(+), 9 deletions(-) create mode 100644 app/Views/invoice_pdf_layout_old.php diff --git a/app/Views/invoice_pdf_layout_old.php b/app/Views/invoice_pdf_layout_old.php new file mode 100644 index 0000000..788bf2c --- /dev/null +++ b/app/Views/invoice_pdf_layout_old.php @@ -0,0 +1,238 @@ + + + + + + + + +
INVOICE +
+ + + + + + + + +
type; ?>  
+ + + + + + + + + + + + + + + + + + + + + + + + +
  company_address; ?>,
   + company_city ?? ''); + $s = trim($invoice[0]->company_state ?? ''); + $p = trim($invoice[0]->company_postal_code ?? ''); + if ($p === '0' || $p === 0) { $p = ''; } + $output = ''; + if ($c && $s && $p) { $output = "$c, $s - $p."; + } elseif ($c && $s) { $output = "$c, $s."; + } elseif ($c && $p) { $output = "$c - $p."; + } elseif ($s && $p) { $output = "$s - $p."; + } elseif ($c) { $output = "$c."; + } elseif ($s) { $output = "$s."; + } elseif ($p) { $output = "$p."; } + echo $output; + ?> +
  Mobile: company_mobile_no_1; ?>
 GSTIN: company_gstno; ?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Bill To,   
client_name; ?>   Invoice Date:created_at)); ?>
+ billing_address ?? ''); + $bc = trim($invoice[0]->billing_city ?? ''); + $bs = trim($invoice[0]->billing_state ?? ''); + $bp = trim($invoice[0]->billing_postal_code ?? ''); + if ($bp === '0' || $bp === 0) {$bp = '';} + $address = ''; + if ($ba && $bc && $bs && $bp) { $address = "$ba, $bc, $bs - $bp,"; + } elseif ($ba && $bc && $bs) { $address = "$ba, $bc, $bs,"; + } elseif ($ba && $bc && $bp) { $address = "$ba, $bc - $bp,"; + } elseif ($ba && $bs && $bp) { $address = "$ba, $bs - $bp,"; + } elseif ($ba && $bc) { $address = "$ba, $bc,"; + } elseif ($ba && $bs) { $address = "$ba, $bs,"; + } elseif ($ba && $bp) { $address = "$ba - $bp,"; + } elseif ($bc && $bs && $bp) { $address = "$bc, $bs - $bp,"; + } elseif ($bc && $bs) { $address = "$bc, $bs,"; + } elseif ($bc && $bp) { $address = "$bc - $bp,"; + } elseif ($bs && $bp) { $address = "$bs - $bp,"; + } elseif ($ba) { $address = "$ba,"; + } elseif ($bc) { $address = "$bc,"; + } elseif ($bs) { $address = "$bs,"; + } elseif ($bp) { $address = "$bp,"; + } else { $address = '-';} + echo $address; + ?> +  Payment Mode:mode_of_payment; ?>
Mobile: mobile_no; ?> , GST: client_gst) ? $invoice[0]->client_gst : 'nil'; ?>   
+

 

+ + + + + + + + + + + + + +
 Vehicle No: Model:  invoice No:invoice_number; ?>
+

 

+ + + + + + + + + + + + + + + + + + + + + $value) + { + $subTotal = $subTotal + ($value->net_price * $value->qty); + $tax = (($value->net_price * $value->qty) * $value->tax / 100); + $subTax = $subTax + $tax; + $grandTotal += $value->amount; + ?> + + + + + + + + + + + + + + + + + + +
NoDescriptionHSN/SACRate(₹)QtyTaxable ValuePerGST(%)Total Tax(₹)Total(₹)
product_name; ?> hsn_sac; ?>net_price; ?>qty; ?>net_price * $value->qty); ?>per; ?>tax; ?> amount, 2, '.', ''); ?>
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Sub Total
 CGST
 SGST
 Total
 Discount0.00
 Grand Total₹ 
+

 

+

 

+ + + + + + + + +
+

  S.A Signature:

+

 

+ 		  +

  Customer Signature:

+

 

+
\ No newline at end of file diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 8c4bd81..82ca49f 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -303,12 +303,15 @@
  • Sales Order
    • + @@ -336,12 +339,15 @@
  • Job Card
    • -
  • +
  • @@ -470,14 +476,52 @@
    • --> - - + + get('logged_user_role'); + $allowed_roles = [ 'Floor Manager', 'Administrator', 'Job Card Manager', + 'Store Manager', 'Senior Mechanic', 'Mechanic', 'Sales' + ]; + if (in_array($role, $allowed_roles)): + ?> +
  • Masters
    • +
  • + + + + Vehicles + + + + + + Make & Models + + + + + + Clients + + +
    • + + - - get('logged_user_role') == 'Administrator' || + diff --git a/app/Views/vehicle_form.php b/app/Views/vehicle_form.php index 63c0c22..70a29bf 100755 --- a/app/Views/vehicle_form.php +++ b/app/Views/vehicle_form.php @@ -243,7 +243,7 @@ $(document).ready(function() { }); // Populate the billing address, city, state, country, and postal code fields - $('input[name="address"]').val(selectedClient.address); + $('textarea[name="address"]').val(selectedClient.address); $('input[name="city"]').val(selectedClient.city); $('input[name="state"]').val(selectedClient.state); $('input[name="mobile_no"]').val(selectedClient.mobile_no);