Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
Fixed order_date

See merge request fronk/thetool!233
This commit is contained in:
Frank Schubert
2024-02-09 11:58:36 +00:00
parent 9c7f565cbc 371e6c8b0e
commit e20b50420b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Order/Form.php
+1 -1
View File
@@ -411,7 +411,7 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-2 col-form-label" for="order_date">Bestelldatum</label> <label class="col-lg-2 col-form-label" for="order_date">Bestelldatum</label>
<div class="col-lg-4"> <div class="col-lg-4">
<input type="text" class="form-control" name="order_date" id="order_date" value="<?=($order->order_date) ? date("d.m.Y", $order->order_date) : date("d.m.Y")?>" /> <input type="text" class="form-control" name="order_date" id="order_date" value="<?=($order->order_date) ? date("d.m.Y", $order->order_date) : ""?>" />
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
application/Order/OrderController.php
+1 -1
View File
@@ -723,7 +723,7 @@ class OrderController extends mfBaseController {
$order_data['allow_spin'] = ($r->allow_spin) ? 1 : 0; $order_data['allow_spin'] = ($r->allow_spin) ? 1 : 0;
$order_data['note'] = $r->note; $order_data['note'] = $r->note;
$order_data['order_date'] = ($order_data['order_date']) ? Layout::dateToInt($r->order_date) : null; $order_data['order_date'] = ($order_data['order_date']) ? Layout::dateToInt($r->order_date) : date("U");
if($r->finish_after) { if($r->finish_after) {
$order_data['finish_after'] = Layout::dateToInt($r->finish_after); $order_data['finish_after'] = Layout::dateToInt($r->finish_after);