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

Button to create Order from Preorder

Browse Source
This commit is contained in:
Frank Schubert
2026-01-19 16:29:22 +01:00
parent d3f35a4cd8
commit 4e4c5a9c18
10 changed files with 254 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Layout/default/Order/Form.php
View File

@@ -437,7 +437,7 @@
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="order_date">Bestelldatum</label>
<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) : ""?>" />
<input type="text" class="form-control" name="order_date" id="order_date" value="<?=(is_numeric($order->order_date)) ? date("d.m.Y", $order->order_date) : $order->order_date ?>" />
</div>
</div>
<div class="form-group row">
@@ -553,7 +553,6 @@
</div>
</div>
<div class="card">
<div class="card-body" id="products-form">
<h4>Produkte</h4>
@@ -585,6 +584,12 @@
<div class="row product-container" id="position-<?=$i?>">
<input type="hidden" name="products[<?=$i?>][delete]" id="products-<?=$i?>-delete" value="0" />
<input type="hidden" name="products[<?=$i?>][orderproduct_id]" value="<?=$product->id?>" />
<?php if($product->preorder_id): ?>
<input type="hidden" name="products[<?=$i?>][preorder_id]" value="<?=$product->preorder_id?>" />
<?php endif; ?>
<?php if($product->oaid): ?>
<input type="hidden" name="products[<?=$i?>][oaid]" value="<?=$product->oaid?>" />
<?php endif; ?>
<div class="col-md-1 product-<?=$i?>">
<div class="row">
<div class="col-md-12">
@@ -596,9 +601,11 @@
</div>
</div>
<div class="row">
<div class="col-md-12 delete-button-container">
<?php if(!$product->preorder_id): ?>
<div class="col-md-12 delete-button-container">
<a href="#" class="btn btn-xl btn-outline-danger" onclick="toggleDeletePos(<?=$i?>); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>
</div>
</div>
<?php endif; ?>
</div>
</div>

1
Layout/default/Order/Index.php
View File

@@ -290,6 +290,7 @@
<td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=date("d.m.Y", $order->edit)?></td>
<td onclick="toggleOrder(<?=$order->id?>)" class="text-monospace"><?=$order->editor->name?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<!--a href="<?=self::getUrl("Order", "createSnoppOrder", ["id" => $order->id, "filter" => $filter, "noTermProducts" => 1])?>" class="mr-2"><img src="<?=self::getResourcePath()?>img/snop-logo.png" /></a-->
<?php if($order->waiting == 1): ?>
<a href="<?=self::getUrl("Order", "setwaiting", ["id" => $order->id, "unset" => "1", "filter" => $filter, "s" => $pagination['start']])?>"><i class="fas fa-eye-slash" title="Einblenden"></i></a>
<?php else: ?>

16
Layout/default/Preorder/include/preorder-detail.php
View File

@@ -36,7 +36,9 @@
<div class="card">
<div class="card-body">
<div class="card-header bg-info text-white pl-2 pr-2 pt-1 pb-1">Details</div>
<div class="row">
<div class="col-8">
<div class="loader-big hidden" ><img src="<?=self::getResourcePath()?>assets/images/loader-big.gif" /></div>
@@ -170,6 +172,18 @@
</tr>
</table>
<div class="row mb-2">
<div class="col-8">
<?php if($preorder->orderproduct): ?>
<a href="<?=self::getUrl("Order", "index", ["id" => $preorder->orderproduct->order_id])?>" target="_blank"><i class="far fa-fw fa-angle-double-right"></i> Internetbestellung anzeigen</a>
<?php else: ?>
<a href="<?=self::getUrl("Preorder","createOrderFromPreorder", ["preorder_id" => $preorder->id])?>" target="_blank" class="btn btn-outline-primary"><i class="far fa-fw fa-angle-double-right"></i> Internetbestellung anlegen</a>
<?php endif; ?>
</div>
</div>
</div>
<div class="col-4">