This commit is contained in:
VE10-Sanjeev 2025-01-20 10:04:59 +00:00
parent 7d22f3ebd3
commit 7a9e898c6a
2 changed files with 9 additions and 3 deletions

View File

@ -166,8 +166,8 @@
<input type="date" class="form-control job_card_basic_details" name="delivery_date" placeholder="Delivery Date" value="<?= isset($jobs['delivery_date']) ? $jobs['delivery_date'] : '' ?>"> <input type="date" class="form-control job_card_basic_details" name="delivery_date" placeholder="Delivery Date" value="<?= isset($jobs['delivery_date']) ? $jobs['delivery_date'] : '' ?>">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="inputPassword4" class="col-form-label">Status<span class="text-danger">*</span><?php echo isset($jobs['status']) ? '( '.$jobs['status'].' )' : '' ?></label> <label for="inputPassword4" class="col-form-label">Status<?php echo isset($jobs['status']) ? '( '.$jobs['status'].' )' : '' ?></label>
<select class="form-control status-select status_class_for_change" name="status" required data-toggle="select2"> <select class="form-control status-select status_class_for_change" name="status" data-toggle="select2">
<?php if (isset($jobs['status'])): ?> <?php if (isset($jobs['status'])): ?>
<?php if ($jobs['status'] === 'Cancelled'): ?> <?php if ($jobs['status'] === 'Cancelled'): ?>
@ -181,6 +181,8 @@
<option value="Cancelled" <?= $jobs['status'] === 'Cancelled' ? 'selected' : '' ?>>Cancelled</option> <option value="Cancelled" <?= $jobs['status'] === 'Cancelled' ? 'selected' : '' ?>>Cancelled</option>
<?php if(isset($logged_user_role) && ( $logged_user_role == "Store Manager" ) ) { ?> <?php if(isset($logged_user_role) && ( $logged_user_role == "Store Manager" ) ) { ?>
<option value="Issued" <?= $jobs['status'] === 'Issued' ? 'selected' : '' ?>>Issued</option> <option value="Issued" <?= $jobs['status'] === 'Issued' ? 'selected' : '' ?>>Issued</option>
<?php }else{ ?>
<option value="Created" <?= $jobs['status'] === 'Created' ? 'selected' : '' ?>>Created </option>
<?php } ?> <?php } ?>
<?php endif; ?> <?php endif; ?>

View File

@ -51,7 +51,11 @@
font-weight: 600;"><?= $vehicle[0]['colour']; ?></span> </td> font-weight: 600;"><?= $vehicle[0]['colour']; ?></span> </td>
<td style="width: 2.3333%;"></td> <td style="width: 2.3333%;"></td>
<td style="width: 33.3333%;border: 2px solid black;"><span style="float: left;font-size: small;">&nbsp;Expected Delivery:</span><span style="float: inline-end; font-size: small; <td style="width: 33.3333%;border: 2px solid black;"><span style="float: left;font-size: small;">&nbsp;Expected Delivery:</span><span style="float: inline-end; font-size: small;
font-weight: 600;"><?= date("d-m-Y", strtotime($job_card[0]['delivery_date'])); ?> </span> </td> font-weight: 600;"><?php
$delivery_date = $job_card[0]['delivery_date'];
echo (!empty($delivery_date) && $delivery_date != "0000-00-00" && strtotime($delivery_date))
? date("d-m-Y", strtotime($delivery_date))
: ""; ?> </span> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>