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

order form retains input after failed save

Browse Source
This commit is contained in:
Frank Schubert
2022-03-31 18:08:11 +02:00
parent 5979b09df7
commit 4384fd1cb1
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<?php
//var_dump($order);exit;
$includes_external_product = false;
?>
<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
@@ -52,10 +52,10 @@
</div>
<div class="col-lg-12 mb-2">
<div class="mt-2"><label><input type="checkbox" id="owner_new" /> Neukunde anlegen</label></div>
<div class="mt-2"><label><input type="checkbox" name="new_owner" id="owner_new" <?=($order->new_owner) ? "checked='checked'" : ""?> /> Neukunde anlegen</label></div>
</div>
<div class="col-lg-12 hidden" id="owner-form">
<div class="col-lg-12 <?=($order->new_owner) ? "" : "hidden"?>" id="owner-form">
<div class="row">
<div class="col-lg-12">
<div class="form-group">
@@ -171,10 +171,10 @@
</div>
<div class="col-lg-12 mb-2">
<div class="mt-2"><label><input type="checkbox" id="billingaddress_new" /> Neue Rechnungsadresse anlegen</label></div>
<div class="mt-2"><label><input type="checkbox" name="new_billingaddress" id="billingaddress_new" <?=($order->new_billingaddress) ? "checked='checked'" : ""?> /> Neue Rechnungsadresse anlegen</label></div>
</div>
<div class="col-lg-12 hidden" id="billingaddress-form">
<div class="col-lg-12 <?=(!$order->new_billingaddress) ? "hidden" : ""?>" id="billingaddress-form">
<div class="row">
<div class="col-lg-12">
<div class="form-group">
@@ -526,7 +526,7 @@
<!-- pos number -->
<div class="form-group">
<label class="form-label" for="pos-new" >Position</label>
<input type="number" class="form-control" name="products[new][pos]" id="pos-new" value="" placeholder="Position" />
<input type="number" class="form-control" name="products[new][pos]" id="pos-new" value="<?=$order->products['new']['pos']?>" placeholder="Position" />
</div>
</div>
@@ -539,43 +539,43 @@
<select name="products[new][product_id]" id="product_id-new" class="form-control" onchange="updateProduct('new')">
<option></option>
<?php foreach($products as $p): ?>
<option value="<?=$p->id?>" <?=($p->id == $product->id) ? "checked='checked'" : ""?>><?=$p->name?></option>
<option value="<?=$p->id?>" <?=($p->id == $order->products['new']['product_id']) ? "selected='selected'" : ""?>><?=$p->name?></option>
<?php endforeach; ?>
</select>
</div>
<div class="col-2">
<label class="form-label" for="amount-new">Anzahl/Menge</label>
<input type="number" class="form-control" name="products[new][amount]" id="amount-new" value="" placeholder="Anzahl/Menge (Standard: 1)" />
<input type="number" class="form-control" name="products[new][amount]" id="amount-new" value="<?=$order->products['new']['amount']?>" placeholder="Anzahl/Menge (Standard: 1)" />
</div>
<div class="col-2">
<label class="form-label" for="billing_period-new" >Verrechungsperiode</label>
<select class="form-control" name="products[new][billing_period]" id="billing_period-new" placeholder="Verrechnungsperiode">
<select class="form-control" name="products[new][billing_period]" id="billing_period-new" value="<?=$order->products['new']['billing_period']?>" placeholder="Verrechnungsperiode">
<option value="1">Monatlich</option>
<option value="12">Jährlich</option>
</select>
</div>
<div class="col-2">
<label class="form-label" for="price-new" >Preis p. Periode</label>
<input type="text" class="form-control" name="products[new][price]" id="price-new" value="" placeholder="Preis p. Periode" />
<input type="text" class="form-control" name="products[new][price]" id="price-new" value="<?=$order->products['new']['price']?>" placeholder="Preis p. Periode" />
</div>
<div class="col-2">
<label class="form-label" for="price_setup-new" >Preis Setup</label>
<input type="text" class="form-control" name="products[new][price_setup]" id="price_setup-new" value="" placeholder="Preis Setup" />
<input type="text" class="form-control" name="products[new][price_setup]" id="price_setup-new" value="<?=$order->products['new']['price_setup']?>" placeholder="Preis Setup" />
</div>
</div>
<div class="row mt-1 mb-2 hidden" id="termination_id-new-line">
<div class="row mt-1 mb-2" id="termination_id-new-line">
<!-- line to choose termination -->
<div class="col-12">
<label class="form-label" for="termination_id-new">Anschluss</label>
<select name="products[new][termination_id]" id="termination_id-new" class="form-control">
<option></option>
<?php foreach($terminations as $t): ?>
<option value="<?=$t->id?>"><?=$t->code?> - <?=$t->getAddress()?></option>
<option value="<?=$t->id?>" <?=($t->id == $order->products['new']['termination_id']) ? "selected='selected'" : ""?> ><?=$t->code?> - <?=$t->getAddress()?></option>
<?php endforeach; ?>
</select>
</div>
@@ -585,23 +585,23 @@
<!-- line 2 -->
<div class="col-8">
<label class="form-label" for="description-new" >Zusatztext</label>
<textarea class="form-control" name="products[new][description]" id="description-new" placeholder="Zusatztext"></textarea>
<textarea class="form-control" name="products[new][description]" id="description-new" placeholder="Zusatztext"><?=$order->products['new']['description']?></textarea>
</div>
<div class="col-2">
<label class="form-label" for="billing_delay-new" >Verzögerter Verrechnungsstart</label>
<input type="number" class="form-control" name="products[new][billing_delay]" id="billing_delay-new" value="" placeholder="Freimonate" />
<input type="number" class="form-control" name="products[new][billing_delay]" id="billing_delay-new" value="<?=$order->products['new']['billing_delay']?>" placeholder="Freimonate" />
<small>Max. 6 Monate</small>
</div>
<?php if($me->is("Admin")): ?>
<div class="col-1">
<label class="form-label" for="price_nne-new">Preis NNE</label>
<input type="text" class="form-control" name="products[new][price_nne]" id="price_nne-new" value="" placeholder="NNE" />
<input type="text" class="form-control" name="products[new][price_nne]" id="price_nne-new" value="<?=$order->products['new']['price_nne']?>" placeholder="NNE" />
</div>
<div class="col-1">
<label class="form-label" for="price_nbe-new">Preis NBE</label>
<input type="text" class="form-control" name="products[new][price_nbe]" id="price_nbe-new" value="" placeholder="NBE" />
<input type="text" class="form-control" name="products[new][price_nbe]" id="price_nbe-new" value="<?=$order->products['new']['price_nbe']?>" placeholder="NBE" />
</div>
<?php endif; ?>
@@ -724,7 +724,7 @@
<?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) : date("d.m.Y")?>" />
<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; ?>
</div>
</div>

2
application/OrderFile/OrderFileController.php
View File

@@ -9,7 +9,7 @@ class OrderFileController extends mfBaseController {
$this->me = $me;
$this->layout()->set("me",$me);
if(!$me->isAdmin()) {
if(!$me->is(["Admin","salespartner"])) {
$this->redirect("Dashboard");
}
}