diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php index 748780916..869b72bea 100644 --- a/Layout/default/Order/Index.php +++ b/Layout/default/Order/Index.php @@ -105,7 +105,7 @@

Bestellungen ohne Anschluss

- +
@@ -115,8 +115,9 @@ + - + " id="order-id?>"> + " id="order-dates-id?>"> + + + +
KundeBearbeitet von
id?> owner->getCompanyOrName())?> @@ -137,6 +138,15 @@ $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen">
+
+
Versandtermin: --.--.----
+
">Vorortinstallation: install_date) ? "".date("d.m.Y",$order->install_date)."" : "--.--.----"?>
+
+
@@ -226,7 +237,7 @@ - +
@@ -238,8 +249,9 @@ + - + " id="order-id?>"> + " id="order-dates-id?>"> + + + +
Bearbeitet von
id?> terminations) && count($order->terminations)): ?> @@ -305,6 +317,18 @@ $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen">
+
+
value->value_string) ? "active" : ""?>">Tiefbau: terminations[0]->workflowitems["bautermin"]->value->value_string) ? "".$order->terminations[0]->workflowitems["bautermin"]->value->value_string."" : "--.--.----"?>
+
value->value_string) ? "active" : ""?>">Backbone Bautermin: terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "".$order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string."" : "--.--.----"?>
+
value->value_string) ? "active" : ""?>">Kunde Bautermin: terminations[0]->workflowitems["customer_setup_date"]->value->value_string) ? "".$order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string."" : "--.--.----"?>
+
Versandtermin: --.--.----
+
">Vorortinstallation: install_date) ? "".date("d.m.Y",$order->install_date)."" : "--.--.----"?>
+
+
@@ -436,9 +461,13 @@ 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"); } } diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css index 607daa3d4..a4e92ec94 100644 --- a/public/assets/css/thetool.css +++ b/public/assets/css/thetool.css @@ -37,6 +37,15 @@ cursor: pointer; } +.order-list-tr { + cursor: pointer; + padding-bottom: 0; +} + +.order-list-tr td { + padding-bottom: 4px; +} + .table-bg-even { background-color: #f1f5f7; } @@ -249,4 +258,24 @@ td.controls { .btn-outline-rosa { color: #FF0088; border-color: #FF0088; +} + + + + + + + + + +.order-date-pill { + border: 1px dashed #999; + border-radius: 4px; + padding-left: 4px; + padding-right: 4px; +} + +.order-date-pill.active { + border-color: #25b343; + background-color: #f0fff0; } \ No newline at end of file