Merge branch 'fronkdev' into 'master'

always showing finish_date in Order/Form

See merge request fronk/thetool!546
This commit is contained in:
Frank Schubert
2024-08-01 16:15:00 +00:00

View File

@@ -980,11 +980,7 @@
<div class="form-group row" id="finish_date_field">
<label class="col-lg-2 col-form-label" for="finish_date">Abgeschlossen am</label>
<div class="col-lg-4">
<?php if($order->shippingdate): ?>
<input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=date("d.m.Y", $order->shippingdate)?>" />
<?php else: ?>
<input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=($order->shippingdate ? $order->shippingdate : $order->finish_date) ? date("d.m.Y", $order->finish_date) : ""?>" />
<?php endif; ?>
<input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=($order->finish_date) ? date("d.m.Y", $order->finish_date) : ""?>" />
</div>
</div>
<?php endif; ?>