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

WIP Snopp Order

Browse Source
This commit is contained in:
Frank Schubert
2026-01-22 17:07:51 +01:00
parent 225e14c74d
commit 976844d623
7 changed files with 334 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,9 +587,6 @@
<?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">
@@ -648,7 +645,17 @@
</div>
<?php if($product->product->getAttributeValue("oaid_enabled")): ?>
<div class="row mt-1 mb-2" id="oaid-<?=$i?>-line">
<?php else: ?>
<div class="row mt-1 mb-2 hidden" id="oaid-<?=$i?>-line">
<?php endif; ?>
<div class="col-4">
<label class="form-label" for="oaid-<?=$i?>">OAID</label>
<input type="text" name="products[<?=$i?>][oaid]" id="oaid-<?=$i?>" class="form-control" value="<?=$product->oaid?>" placeholder="optional">
</div>
</div>
<?php if(
(is_array($product->product->attributes) && count($product->product->attributes))
&& (array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $product->product->attributes)
@@ -876,7 +883,14 @@
<input type="text" class="form-control" name="products[<?=$i?>][price_setup]" id="price_setup-<?=$i?>" value="" placeholder="Preis Setup" />
</div>
</div>
<div class="row mt-1 mb-2 hidden" id="oaid-<?=$i?>-line">
<div class="col-4">
<label class="form-label" for="oaid-<?=$i?>">OAID</label>
<input type="text" name="products[<?=$i?>][oaid]" id="oaid-<?=$i?>" class="form-control" value="<?=$product->oaid?>" placeholder="optional">
</div>
</div>
<div class="row mt-1 mb-2 hidden" id="termination_id-<?=$i?>-line">
<!-- line to choose termination -->
<div class="col-12">
@@ -1390,8 +1404,15 @@
});
} else {
$('#termination_id-' + id + '-line').hide();
//$('#termination_id-' + id + '-line').hide();
}
if(typeof p.attributes === 'object' && "oaid_enabled" in p.attributes && p.attributes.oaid_enabled == 1) {
console.log("oaid_enabled");
$('#oaid-' + id + '-line').show();
console.log($('#oaid-' + id).val());
} else {
$('#oaid-' + id + '-line').hide();
}
if(typeof p.attributes === 'object' && "needs_number" in p.attributes && p.attributes.needs_number == 1) {
console.log("needs_number");
@@ -1980,7 +2001,14 @@
<input type="text" class="form-control" name="products[' + i +'][price_setup]" id="price_setup-' + i +'" value="" placeholder="Preis Setup" /> \
</div> \
</div> \
\
\
<div class="row mt-1 mb-2 hidden" id="oaid-<?=$i?>-line"> \
<div class="col-4"> \
<label class="form-label" for="oaid-<?=$i?>">OAID</label> \
<input type="text" name="products[<?=$i?>][oaid]" id="oaid-<?=$i?>" class="form-control" value="" placeholder="optional"> \
</div> \
</div> \
\
<div class="row mt-1 mb-2 hidden" id="termination_id-' + i +'-line"> \
<!-- line to choose termination --> \
<div class="col-12"> \

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

@@ -290,7 +290,6 @@
<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: ?>
@@ -300,6 +299,10 @@
<a href="<?=self::getUrl("Order", "sendServicePin", ["id" => $order->id])?>" onclick="if(!confirm('Soll der Service-PIN an den Vertragsinhaber gesendet werden?')) return false;"><i class="fas fa-paper-plane" title="Service PIN als PDF per Email an Vertragsinhaber"></i></a>
<a href="<?=self::getUrl("Order", "edit", ["id" => $order->id, "filter" => $filter, "noTermProducts" => 1])?>"><i class="far fa-edit" title="Bearbeiten"></i></a>
<a href="<?=self::getUrl("Order", "delete", ["id" => $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
<?php if(!$order->getSnoppProduct() && ($order->getPreorderProduct() || $order->getOaidProduct())): ?>
<a href="<?=self::getUrl("Order", "createSnoppOrder", ["id" => $order->id, "filter" => $filter, "noTermProducts" => 1])?>" class="ml-2"><img src="<?=self::getResourcePath()?>img/snop-logo.png" style="width:24px;height:auto;" /></a>
<?php endif; ?>
</td>
</tr>
<tr class="building-list-tr <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-dates-<?=$order->id?>">
@@ -544,7 +547,10 @@
<td class="text-right"><?=$product->pos?></td>
<td class="text-right"><?=$product->formatAmount()?></td>
<td>
<?=$product->product->name?>
<?php if($product->snopp_order_id): ?>
<img src="<?=self::getResourcePath()?>/img/snop-logo.png" style="width:24px;height:auto;" title="Bestellung in Snopp">
<?php endif; ?>
<?=$product->product->name?> <?=$product->oaid ? "<span class='text-pink font-italic'>{$product->oaid}</span>" : ""?>
<?php
if(
(is_array($product->product->attributes) && count($product->product->attributes))