The-Mechanic/the_mechanic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_Remaining issues

Browse Source
This commit is contained in:
venba-Inspriron-3558 2025-11-03 10:57:17 +05:30
parent aaa91e1493
commit e36d04770b
3 changed files with 292 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
app/Views/invoice_pdf_layout_old.php Normal file
View File

File diff suppressed because one or more lines are too long

61
app/Views/layout/header.php
View File

@ -303,12 +303,15 @@
<li>
<a href="<?php echo base_url('sales_order_index') ?>">Sales Order</a>
</li>
<!-- Pavithira Told
Move Client and Vehicle under Masters for reuse across Sales and Job Card as these are common entities used in multiple modules, so centralizing them under Masters will improve consistency and usability.
<li>
<a href="<?php echo base_url('vehicle_index') ?>">Vehicles</a>
</li>
<li>
<a href="<?php echo base_url('client_index') ?>">Clients</a>
</li>
</li>
Pavithira Told -->
</ul>
</div>
</li>
@ -336,12 +339,15 @@
<li>
<a href="<?php echo base_url('job_card_index') ?>">Job Card</a>
</li>
<li>
<!-- Pavithira Told
Move Client and Vehicle under Masters for reuse across Sales and Job Card as these are common entities used in multiple modules, so centralizing them under Masters will improve consistency and usability.
<li>
<a href="<?php echo base_url('vehicle_index') ?>">Vehicles</a>
</li>
<li>
<a href="<?php echo base_url('client_index') ?>">Clients</a>
</li>
</li>
Pavithira Told -->
<li>
<a href="<?php echo base_url('service_index') ?>">
<!-- <i class="ri-e-bike-fill"></i> -->
@ -470,14 +476,52 @@
</div>
</li> -->
<!-- Pavithira Told
Move Client and Vehicle under Masters for reuse across Sales and Job Card as these are common entities used in multiple modules, so centralizing them under Masters will improve consistency and usability.
-->
<?php
$role = session()->get('logged_user_role');
$allowed_roles = [ 'Floor Manager', 'Administrator', 'Job Card Manager',
'Store Manager', 'Senior Mechanic', 'Mechanic', 'Sales'
];
if (in_array($role, $allowed_roles)):
?>
<li class="menu-title">Masters</li>
<li>
<?php
$vehicle_roles = ['Floor Manager', 'Administrator', 'Job Card Manager', 'Store Manager', 'Senior Mechanic', 'Mechanic'];
if (in_array($role, $vehicle_roles)): ?>
<a href="<?= base_url('vehicle_index') ?>">
<i class="fas fa-motorcycle"></i>
<span> Vehicles</span>
</a>
<?php endif; ?>
<?php
$make_roles = ['Administrator', 'Floor Manager', 'Store Manager'];
if (in_array($role, $make_roles)): ?>
<a href="<?= base_url('make_index') ?>">
<i class="fas fa-tags"></i>
<span> Make & Models</span>
</a>
<?php endif; ?>
<?php
$client_roles = ['Floor Manager', 'Administrator', 'Job Card Manager', 'Store Manager', 'Senior Mechanic', 'Sales', 'Mechanic'];
if (in_array($role, $client_roles)): ?>
<a href="<?= base_url('client_index') ?>">
<i class="fas fa-id-card"></i>
<span> Clients</span>
</a>
<?php endif; ?>
</li>
<?php endif; ?>
<!-- Pavithira Told -->
<?php if(session()->get('logged_user_role') == 'Administrator' ||
<!-- Pavithira Told
Move Client and Vehicle under Masters for reuse across Sales and Job Card as these are common entities used in multiple modules, so centralizing them under Masters will improve consistency and usability.
<?php if(session()->get('logged_user_role') == 'Administrator' ||
session()->get('logged_user_role') == 'Floor Manager' ||
session()->get('logged_user_role') == 'Store Manager' ||
session()->get('logged_user_role') == 'Sales') { ?>
@ -502,7 +546,8 @@
<?php } ?>
<?php } ?>
<?php } ?>
Pavithira Told -->
</ul>
</div>

2
app/Views/vehicle_form.php
View File

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