Added fields to preorder form

This commit is contained in:
Frank Schubert
2022-09-26 16:13:09 +02:00
parent 2da58d36d3
commit d103984d13
3 changed files with 68 additions and 6 deletions

View File

@@ -94,6 +94,26 @@
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="connection_type">Anschlusstyp *</label>
<div class="col-lg-10">
<select class="form-control" name="connection_type" id="connection_type">
<option value="single-dwelling" <?=($preorder->connection_type == "single-dwelling") ? "selected='selected'" : ""?>>Einfamilienhaus</option>
<option value="multi-dwelling" <?=($preorder->connection_type == "multi-dwelling") ? "selected='selected'" : ""?>>Mehrfamilienhaus</option>
<option value="apartment-building" <?=($preorder->connection_type == "apartment-building") ? "selected='selected'" : ""?>>Mehrparteienhaus</option>
<option value="apartment" <?=($preorder->connection_type == "apartment") ? "selected='selected'" : ""?>>Wohneinheit in Mehrparteienhaus</option>
<option value="business" <?=($preorder->connection_type == "business") ? "selected='selected'" : ""?>>Gewerbebetrieb</option>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="connection_count">Anzahl Anschlüsse *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="connection_count" id="connection_count" value="<?=$preorder->connection_count?>" />
</div>
</div>
<input type="hidden" name="setup_product_id" id="setup_product_id" value="<?=$preorder->setup_product_id?>" />
<?php if($campaign->product_type != "no_setup" && is_array($campaign->setup_products) && count($campaign->setup_products)): ?>
@@ -155,7 +175,7 @@
<?php if($campaign->product_type != "setup_only"): ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="price">Netto Preis Periodisch *</label>
<label class="col-lg-2 col-form-label" for="price">Netto Preis Periodisch</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="price" id="price" value="<?=$preorder->price?>" />
</div>
@@ -163,13 +183,13 @@
<?php if($me->isAdmin()): ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="price_nne">Preis NNE *</label>
<label class="col-lg-2 col-form-label" for="price_nne">Preis NNE</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="price_nne" id="price_nne" value="<?=$preorder->price_nne?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="price_nbe">Preis NBE *</label>
<label class="col-lg-2 col-form-label" for="price_nbe">Preis NBE</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="price_nbe" id="price_nbe" value="<?=$preorder->price_nbe?>" />
</div>
@@ -177,12 +197,26 @@
<?php endif; ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="billing_delay">Verzögerter Verrechnungsstart *</label>
<label class="col-lg-2 col-form-label" for="billing_delay">Verzögerter Verrechnungsstart</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="billing_delay" id="billing_delay" placeholder="Freimonate" value="<?=$preorder->billing_delay?>" />
</div>
</div>
<?php endif; ?>
<h4 class="mt-4">Zustimmungen</h4>
<div class="form-group row">
<div class="col-lg-2"></div>
<div class="col-lg-10">
<label><input type="checkbox" name="accept_agb" id="accept_agb" value="1" disabled="disabled" checked="checked" /> AGB akzeptiert</label><br />
<label><input type="checkbox" name="accept_dsgvo" id="accept_dsgvo" value="1" disabled="disabled" checked="checked" /> DSGVO akzeptiert</label><br />
<label><input type="checkbox" name="accept_withdrawal" id="accept_withdrawal" value="1" disabled="disabled" checked="checked" /> Rücktrittsrecht akzeptiert</label><br />
<label><input type="checkbox" name="accept_marketing" id="accept_marketing" value="1" <?=($preorder->accept_marketing) ? "checked='checked'" : ""?> /> Datenweitergabe akzeptiert</label>
</div>
</div>
<h4 class="mt-4">Kundendaten</h4>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="company">Firma</label>

View File

@@ -152,6 +152,7 @@ class PreorderController extends mfBaseController {
$data['adb_wohneinheit_id'] = ($r->adb_wohneinheit_id) ? $r->adb_wohneinheit_id : null;
$data['termination_id'] = ($r->termination_id) ? $r->termination_id : null;
if($campaign->product_type != "setup_only") {
$data['product_id'] = $r->product_id;
}
@@ -178,6 +179,33 @@ class PreorderController extends mfBaseController {
break;
}
switch($r->connection_type) {
case "single-dwelling":
$data['connection_type'] = "single-dwelling";
break;
case "multi-dwelling":
$data['connection_type'] = "multi-dwelling";
break;
case "apartment-building":
$data['connection_type'] = "apartment-building";
break;
case "apartment":
$data['connection_type'] = "apartment";
break;
case "business":
$data['connection_type'] = "business";
break;
}
$data['accept_agb'] = 1;
$data['accept_dsgvo'] = 1;
$data['accept_withdrawal'] = 1;
$data['accept_marketing'] = 0;
if($r->accept_marketing == 1) {
$data['accept_marketing'] = 1;
}
$data['price'] = ($r->price) ? $r->price : 0;
$data['price_setup'] = ($r->price_setup) ? $r->price_setup : 0;
$data['price_nne'] = ($r->price_nne) ? $r->price_nne : 0;

View File

@@ -93,7 +93,7 @@ class PreorderModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("Preorder", "*", "$where ORDER BY zip, city, company, lastname, firstname");
$res = $db->select("Preorder", "*", "$where ORDER BY lastname, firstname");
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new Preorder($data);
@@ -111,7 +111,7 @@ class PreorderModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("Preorder", "*", "$where ORDER BY zip, city, company, lastname, firstname");
$res = $db->select("Preorder", "*", "$where ORDER BY lastname, firstname");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new Preorder($data);