Beginning design overhaul
This commit is contained in:
Frank Schubert
@@ -23,7 +23,7 @@
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4 class="header-title mb-2"><?=($order->id) ? "Bestellung bearbeiten" : "Neue Bestellung"?></h4>
|
||||
<h4 class="mb-2"><?=($order->id) ? "Bestellung bearbeiten" : "Neue Bestellung"?></h4>
|
||||
|
||||
<form class="form-horizontal" method="post" action="<?=self::getUrl("Order", "save")?>" name="orderForm" id="orderForm" enctype="multipart/form-data">
|
||||
<div class="card">
|
||||
@@ -261,9 +261,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4 class="header-title">Verzögerte Herstellung</h4>
|
||||
<h5 class="mt-3">Verzögerte Herstellung:</h5>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="finish_after">Herstellbar ab</label>
|
||||
<div class="col-lg-4">
|
||||
@@ -278,14 +277,13 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<h4 class="header-title">Verrechnung</h4>
|
||||
<h4>Verrechnung</h4>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
||||
@@ -330,7 +328,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4 class="header-title">Einwilligungen</h4>
|
||||
<h4>Einwilligungen</h4>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="form-group row">
|
||||
@@ -613,7 +611,7 @@
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2"></label>
|
||||
<div class="col-lg-10 mb-2">
|
||||
<button type="button" id="savetoivt-button" class="btn btn-info">Kunde an IVT übertragen</button>
|
||||
<button type="button" id="savetoivt-button" class="btn btn-pink">Kunde an IVT übertragen</button>
|
||||
<span id="savetoivt-info"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th>Kunde</th>
|
||||
<th>Adresse</th>
|
||||
<th>Bestelldatum</th>
|
||||
@@ -119,7 +119,7 @@
|
||||
<?php $order_count = 0; ?>
|
||||
<?php foreach($lonelyOrders as $order): ?>
|
||||
<tr class="order-list-tr pb-0 <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-<?=$order->id?>">
|
||||
<td onclick="toggleOrder(<?=$order->id?>)"><?=$order->id?></td>
|
||||
<td onclick="toggleOrder(<?=$order->id?>)"><?=$order->id?></td>
|
||||
<td>
|
||||
<?php
|
||||
$voip = false;
|
||||
@@ -193,7 +193,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="order-detail-<?=$order->id?>" class="hidden" style="background-color:#fff">
|
||||
<td colspan="9">
|
||||
<td colspan="8">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
@@ -389,65 +389,137 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="order-detail-<?=$order->id?>" class="hidden" style="background-color:#fff">
|
||||
<tr id="order-detail-<?=$order->id?>" class="hidden top-no-border" style="background-color:#cddef7">
|
||||
<td colspan="9">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="row justify-content-center mt-2">
|
||||
<div class="col-xl-8 col-lg-12">
|
||||
|
||||
<div class="card">
|
||||
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-2">Tiefbau: <input type="text" class="form-control" name="bautermin" placeholder="--.--.----" value="<?=$order->terminations[0]->workflowitems["bautermin"]->value->value_string?>" readonly="readonly" /></div>
|
||||
<div class="col-md-2">Leitungsbau Backbone: <input type="text" class="form-control" name="leitungsbautermin_backbone" placeholder="--.--.----" value="<?=$order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string?>" readonly="readonly" /></div>
|
||||
<div class="col-md-2">Leitungsbau Kunde: <input type="text" class="form-control" name="leitungsbautermin_kunde" placeholder="--.--.----" value="<?=$order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string?>" readonly="readonly" /></div>
|
||||
<div class="col-md-2">Versandtermin: <input type="text" class="form-control" name="versandtermin" placeholder="--.--.----" value="" readonly="readonly" /></div>
|
||||
<div class="col-md-2">
|
||||
Vorortinstallation:
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control datepicker" id="vororttermin-<?=$order->id?>" name="vororttermin" value="<?=($order->install_date) ? date("d.m.Y",$order->install_date) : ""?>" placeholder="--.--.----" />
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-outline-primary" id="vororttermin-button-<?=$order->id?>" type="button" title="Vororttermin speichern" onclick="saveVororttermin(<?=$order->id?>)"><i class="fas fa-save"></i></button>
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="nav-item"><a class="nav-link active" href="#order-detail-<?=$order->id?>-journal" data-toggle="tab" aria-expanded="false">Journal</a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-details" data-toggle="tab" aria-expanded="false">Details</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="tab-content">
|
||||
<div id="order-detail-<?=$order->id?>-journal" class="tab-pane show active">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-xl-8 col-lg-12">
|
||||
|
||||
<div class="card">
|
||||
|
||||
<div class="card-body">
|
||||
<div class="card-header bg-info text-white pl-2 pr-2 pt-1 pb-1">Bestelljournal</div>
|
||||
<div class="card mb-3">
|
||||
<div class="card-header bg-light"><button type="button" class="btn btn-sm btn-info" onclick="$('#new-journal-<?=$order->id?>').toggle()"><i class="fas fa-plus"></i> Neuer Eintrag</button></div>
|
||||
<div id="new-journal-<?=$order->id?>" class="card-body hidden">
|
||||
<form method="post" action="<?=self::getUrl("OrderJournal", "save")?>">
|
||||
<input type="hidden" name="order_id" value="<?=$order->id?>" />
|
||||
<textarea name="text" class="form-control mb-2" style="height:120px;"></textarea>
|
||||
<button class="btn btn-sm btn-primary" type="submit"><i class="fas fa-save"></i> Speichern</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if(is_array($order->journals) && count($order->journals)): ?>
|
||||
<?php foreach($order->journals as $journal): ?>
|
||||
<div class="card mb-1" style="border: 1px solid #ddd">
|
||||
<div class="card-header bg-light text-monospace text-muted pl-2 pr-2 pt-1 pb-1"><span class="font-weight-bold" style="float: right"><i class="fas fa-clock"></i> <?=date("d.m.Y H:i:s",$journal->create)?></span> Eingetragen von <strong><?=$journal->creator->name?></strong></div>
|
||||
<div class="card-body pl-2 pr-2 pt-1 pb-1">
|
||||
<?=nl2br($journal->text)?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="card-header bg-primary text-white pl-2 pr-2 pt-1 pb-1">Bestelljournal</div>
|
||||
<div class="card mb-1" style="border: 1px solid #ddd">
|
||||
<div class="card-header bg-light"><button type="button" class="btn btn-sm btn-info" onclick="$('#new-journal-<?=$order->id?>').toggle()"><i class="fas fa-plus"></i> Neuer Eintrag</button></div>
|
||||
<div id="new-journal-<?=$order->id?>" class="card-body hidden">
|
||||
<form method="post" action="<?=self::getUrl("OrderJournal", "save")?>">
|
||||
<input type="hidden" name="order_id" value="<?=$order->id?>" />
|
||||
<textarea name="text" class="form-control mb-2" style="height:120px;"></textarea>
|
||||
<button class="btn btn-sm btn-primary" type="submit"><i class="fas fa-save"></i> Speichern</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if(is_array($order->journals) && count($order->journals)): ?>
|
||||
<?php foreach($order->journals as $journal): ?>
|
||||
<div class="card mb-1" style="border: 1px solid #ddd">
|
||||
<div class="card-header bg-light text-monospace text-muted pl-2 pr-2 pt-1 pb-1"><span class="font-weight-bold" style="float: right"><i class="fas fa-clock"></i> <?=date("d.m.Y H:i:s",$journal->create)?></span> Eingetragen von <strong><?=$journal->creator->name?></strong></div>
|
||||
<div class="card-body pl-2 pr-2 pt-1 pb-1">
|
||||
<?=nl2br($journal->text)?>
|
||||
|
||||
<div id="order-detail-<?=$order->id?>-details" class="tab-pane">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-xl-8 col-lg-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
||||
<table class="table table-sm table-bordered">
|
||||
<tr>
|
||||
<th class="bg-light">Bestelldatum:</th>
|
||||
<td><?=date("d.m.Y",$order->order_date)?></td>
|
||||
|
||||
<th class="bg-light">Herstellbar ab:</th>
|
||||
<td><?=date("d.m.Y",$order->finish_after)?></td>
|
||||
|
||||
<th class="bg-light">Rechnungsart:</th>
|
||||
<td><?=($order->billing_type == "sepa") ? "order-date-pillSEPA" : "Rechnung"?></td>
|
||||
|
||||
<th class="bg-light">Einwilligungen:</th>
|
||||
<td><?=($order->allow_contact) ? "<span class='order-date-pill active'><i class='fas fa-check text-success'></i> Info</span>" : ""?> <?=($order->allow_spin) ? "<span class='order-date-pill active ml-1'><i class='fas fa-check text-success'></i> SPIN</span>" : ""?></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="form-group col-lg-4 col-md-6 col-sm-8">
|
||||
<label>Vorortinstallation:</label>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control datepicker" id="vororttermin-<?=$order->id?>" name="vororttermin" value="<?=($order->install_date) ? date("d.m.Y",$order->install_date) : ""?>" placeholder="--.--.----" />
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-outline-primary" id="vororttermin-button-<?=$order->id?>" type="button" title="Vororttermin speichern" onclick="saveVororttermin(<?=$order->id?>)"><i class="fas fa-save"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if(is_array($order->products) && count($order->products)): ?>
|
||||
<h4>Produkte</h4>
|
||||
<table class="table table-sm table-striped">
|
||||
<tr>
|
||||
<th class="text-right">Pos</th>
|
||||
<th class="text-right">Anzahl</th>
|
||||
<th>Produkt</th>
|
||||
<th>Rechn.Periode</th>
|
||||
<th class="text-right">Preis p. P</th>
|
||||
<th class="text-right">Preis Setup</th>
|
||||
<th>Rechn.verz.</th>
|
||||
</tr>
|
||||
<?php foreach($order->products as $product): ?>
|
||||
<tr>
|
||||
<td class="text-right"><?=$product->pos?></td>
|
||||
<td class="text-right"><?=$product->formatAmount()?></td>
|
||||
<td>
|
||||
<?=$product->product->name?>
|
||||
<?php
|
||||
if(
|
||||
(is_array($product->product->attributes) && count($product->product->attributes))
|
||||
&& (array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $product->product->attributes)
|
||||
&& $product->product->attributes[TT_ATTRIB_TERMINATION_REQUIRED_NAME]->value == 1)
|
||||
|| $product->termination_id
|
||||
):
|
||||
?>
|
||||
<br /><small class="text-pink"><?=$product->termination->code?> - <?= str_replace("\n", " - ", $product->termination->getAddress())?></small>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td><?=($product->billing_period == 12) ? "Jährlich" : "Monatlich"?></td>
|
||||
<td class="text-monospace text-right"><?=number_format($product->price, 4, ",", ".")?></td>
|
||||
<td class="text-monospace text-right"><?=number_format($product->price_setup, 4, ",", ".")?></td>
|
||||
<td><?=($product->billing_delay) ? $product->billing_delay : ""?></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</table>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="display:none;">
|
||||
@@ -520,13 +592,9 @@
|
||||
$('#order-detail-' + id).toggle();
|
||||
if($('#order-detail-' + id).is(":hidden")) {
|
||||
$('#order-' + id).removeClass("table-info");
|
||||
$('#order-' + id).removeClass("text-info");
|
||||
$('#order-dates-' + id).removeClass("table-info");
|
||||
$('#order-dates-' + id).removeClass("text-info");
|
||||
} else {
|
||||
$('#order-' + id).addClass("text-info");
|
||||
$('#order-' + id).addClass("table-info");
|
||||
$('#order-dates-' + id).addClass("text-info");
|
||||
$('#order-dates-' + id).addClass("table-info");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
<!-- App css -->
|
||||
<link href="<?=self::getResourcePath()?>fontawesome/css/all.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/bootstrap.min.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/icons.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/app.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/app.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/leaflet.css" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/css/thetool.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
|
||||
<link href="<?=self::getResourcePath()?>assets/libs/select2/select2.min.css" rel="stylesheet" type="text/css" />
|
||||
|
||||
Reference in New Issue
Block a user