+
+
diff --git a/Layout/default/VueViews/Vue.php b/Layout/default/VueViews/Vue.php
index 190f88aed..491c0e354 100644
--- a/Layout/default/VueViews/Vue.php
+++ b/Layout/default/VueViews/Vue.php
@@ -51,7 +51,12 @@ function pascalToSnakeCase(string $str): string {
$vueTagName = pascalToSnakeCase($vueViewName);
-include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/vueHeader.php"); ?>
+$vueHeaderPath = realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/vueHeader.php";
+if(!file_exists($vueHeaderPath)) {
+ $vueHeaderPath = realpath(dirname(__FILE__) . "/../../default") . "/vueHeader.php";
+}
+
+include($vueHeaderPath); ?>
+
+
+ Störungs-Ticket erstellen
+ +
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Layout/andom-tec/Address/View.php b/Layout/andom-tec/Address/View.php
new file mode 100644
index 000000000..58e854665
--- /dev/null
+++ b/Layout/andom-tec/Address/View.php
@@ -0,0 +1,350 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Personen & Firmen
+
+
+
+
\ No newline at end of file
diff --git a/Layout/andom-tec/Address/bmd_export.csv.php b/Layout/andom-tec/Address/bmd_export.csv.php
new file mode 100644
index 000000000..2c38122a1
--- /dev/null
+++ b/Layout/andom-tec/Address/bmd_export.csv.php
@@ -0,0 +1,10 @@
+setReturnValue(["header" => $header]);
+
+foreach($addresses as $a):
+?>
+;;;;;nl2ws($a["firstname"])?>;nl2ws($a["lastname"])?>;nl2ws($a["street"])?>;nl2ws($a["zip"])?>;nl2ws($a["city"])?>;nl2ws($a["countrycode"])?>;nl2ws($a["phone"])?>;nl2ws($a["email"])?>;nl2ws($a["uid"])?>;;;;;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ active_contracts) && count($address->active_contracts)): ?>
+
+
+
+
+
+
+
+
+
+
+ getCompanyOrName()?>customer_number) ? " [".$address->customer_number."]" : ""?>
+ +| Kundennummer | +customer_number?> | +
|---|---|
| Firmenname | +company)?> | +
| Vorname | +firstname?> | +
| Nachname | +lastname?> | +
| Straße | +street?> | +
| PLZ / Ort | +zip?> city?> | +
| Land | +country->name?> | +
| Telefon | +phone?> | +
| Mobil | +mobile?> | +
| Fax | +fax?> | +
| email?> | +|
| Geburtsdatum | +birthdate) ? (new DateTime($address->birthdate))->format("d.m.Y") : ""?> | +
| Interne Notiz | +note)?> | +
| + | + |
| Service PIN | +spin?> | +
| Einwilligungen | +
+ "> Informationen per Post/Email/Telefon +">Auskunft mit Service PIN + |
+
| Rollen | +
+ types) && count($address->types)): ?>
+
+
|
+
+ + Verrechnungsdaten + links_to) && is_array($address->links_to["billing"]) && count($address->links_to["billing"])): ?> + (Achtung: Seperate Rechnungsadresse vorhanden) + linked_as) && is_array($address->linked_as["billing"]) && count($address->linked_as["billing"])): ?> + (Ist aktive Rechnungsadresse) + + ++ |
+ |
| UID | +uid?> | +
| Verrechnungsart | +billing_type == "sepa") ? "SEPA Bankeinzug" : "Rechnung"?> | +
| Rechnungsversand | +billing_delivery == "paper" || !$address->billing_delivery) ? "Post" : "Email"?> | +
| Kreditinstitut | +bank_account_bank?> | +
| Kontoinhaber | +bank_account_owner?> | +
| IBAN | +bank_account_iban; + $iban = preg_replace('/\s+/', '', $iban); + $iban = chunk_split($iban, 4, ' '); + $iban = trim($iban); + echo $iban; + ?> | +
| BIC | +bank_account_bic?> | +
| Sepa Mandatsdatum | +sepa_date) ? date("d.m.Y", $address->sepa_date) : ""?> | +
FIBU |
+ |
| Ist primäres Verrechnungskonto | +fibu_primary_account) ? "" : ""?> | +
| Verrechnungskonto | +fibu_account_number?> | +
| Lieferantenkonto | +fibu_supplier_number?> | +
| Zahlungsziel Lieferant | +fibu_supplier_due?> | +
| Lieferant Skontotage | +fibu_supplier_skonto?> | +
| Lieferant Skonto % | +fibu_supplier_skonto_rate?> | +
| Lieferant Zahlsperre | +fibu_supplier_paymentblock) ? " Automatische Zahlungen gesperrt" : "Nicht gesperrt"?> | +
Zusatzdaten |
+ |
| RTR Code | +attributes) && array_key_exists("rtrcode", $address->attributes)) ? $address->attributes['rtrcode']->value : ""?> | +
| + | + |
| Erstellt | +create)?> (creator->name?>) | +
| Letzte Bearbeitung | +edit)?> (editor->name?>) | +
Verknüpfungen
+ links) && count($address->links)): ?> +
+
+
+
+ linked_as) && count($address->linked_as)): ?>
+
+
+
+
+ | Typ | +Firma | +Name | +Telefon | +Mobil | ++ | |
|---|---|---|---|---|---|---|
| + | $link->address_id])?>">address->company?> | +$link->address_id])?>">address->getFullName()?> | +address->phone?> | +address->mobile?> | +address->email?> | ++ $link->address_id])?>"> + | +
Verknüpft als
+
+
+
+
+
+
+
+ linked_as)): ?>
+ linked_as[$type] as $link): ?>
+
+
+ | für: | +$link->origin_address_id])?>">origin->getCompanyOrName()?>origin->customer_number) ? " [".$link->origin->customer_number."]" : ""?> | +
+
+
+
+
+
+
+
+ Aktive Produkte (Contracts)
+
+ contracts) && count($address->contracts)): ?>
+ -
+ contracts as $contract): ?>
+ owner_id != $address->id) continue; ?>
+
- "> + billingaddress_id && $contract->owner_id != $contract->billingaddress_id): ?> + $contract->billingaddress_id])?>" class="mr-1"> + + + + cancel_date && $contract->cancel_date > date("U")): ?> + cancel_date)?>"> + + $contract->id])?>" class="price < 0) ? "text-danger" : ""?>"> + product_name?> matchcode) ? "[".$contract->matchcode."]" : ""?> + + voicenumbers)): ?> + + (voicenumbers)?>) + + + + finish_date) ? "Fertigstellung: ".date('d.m.Y', $contract->finish_date) : "in Herstellung"?> + cancel_date) ? "Kündigung: ".date('d.m.Y', $contract->cancel_date) : ""?> + + + +
+
+
+
+
+
+
+ Verträge
+
+
+
+
+
+
+ | Rolle | +Contract ID | +Produkt | +Matchcode | +Preis | +Setup | +Bestelldatum | +Fertigstellung | +Kündigung | +
|---|---|---|---|---|---|---|---|---|
| "> + $contract->id])?>"> + owner_id == $address->id): ?> + Vertragsinhaber + billingaddress_id == $address->id): ?> + Rechnungsempfänger + + + | +"> $contract->id])?>">id?> | +"> $contract->id])?>">product_name?> | +"> $contract->id])?>">matchcode?> | +price < 0) ? "text-danger" : ""?>">€ price,4,",",".")?> | +price_setup < 0) ? "text-danger" : ""?>">€ price_setup,4,",",".")?> | +">order_date) ? date('d.m.Y', $contract->order_date) : ""?> | +">finish_date) ? date('d.m.Y', $contract->finish_date) : ""?> | +cancel_date) ? "font-weight-bold text-danger" : ""?>">cancel_date) ? date('d.m.Y', $contract->cancel_date) : ""?> | + +
+
+
+
+
+
+
+
+
+
+
+ Personen & Firmen
+
+
+
+
diff --git a/Layout/andom-tec/Dashboard/Dashboard.php b/Layout/andom-tec/Dashboard/Dashboard.php
new file mode 100644
index 000000000..5bf7e8042
--- /dev/null
+++ b/Layout/andom-tec/Dashboard/Dashboard.php
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rechnungen zu Kundennummer customer_number?>
+Verrechnungskonto: fibu_account_number?>
+
+ getCompanyOrName()?>
+ street?>
+ zip?> city?>
+ country->name?>
+
+ | Typ | +Rechnungsnummer | +Rechnungsdatum | +Betrag Netto | +Betrag Brutto | +Zahlungsart | +Versand | ++ |
|---|---|---|---|---|---|---|---|
+
|
+ $invoice->id])?>"> invoice_number?> | +invoice_date)?> | +">€ total, 2, ",", ".")?> | +">€ total_gross, 2, ",", ".")?> | +billing_type == "sepa") ? "Einzug" : "Einzahlung" ?> | +billing_delivery == "email") ? "Email (".$invoice->email.")" : "Postversand" ?> | +$invoice->id])?>" title="CSV-Download"> | + +
+
+
+
+
+
+
+
diff --git a/Layout/andom-tec/Dashboard/Index.php b/Layout/andom-tec/Dashboard/Index.php
new file mode 100644
index 000000000..5bf7e8042
--- /dev/null
+++ b/Layout/andom-tec/Dashboard/Index.php
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+ Neuigkeiten
+
+
+
+ create)?>:
+ subject): ?>
+ subject?>
+
+
+
+
+
+
+
+ text?>
+
+
+
+
+
+
+
+
diff --git a/Layout/andom-tec/Order/Form.php b/Layout/andom-tec/Order/Form.php
new file mode 100644
index 000000000..51738f0fd
--- /dev/null
+++ b/Layout/andom-tec/Order/Form.php
@@ -0,0 +1,2013 @@
+
+
+
+
+
+
+ Neuigkeiten
+
+
+
+ create)?>:
+ subject): ?>
+ subject?>
+
+
+
+
+
+
+
+ text?>
+
+
+
+
+
+
+
+
+
+
+
+ Bestellungen
+
+
+
+
-
-
+
+
+
+ Diese Bestellung kann nicht mehr bearbeitet werden, da sie bereits abgeschlossen und in Verrechnung ist.
+
+
+
+
+
+
+
+
diff --git a/Layout/andom-tec/Order/Index.php b/Layout/andom-tec/Order/Index.php
new file mode 100644
index 000000000..bb0e06ae3
--- /dev/null
+++ b/Layout/andom-tec/Order/Index.php
@@ -0,0 +1,1273 @@
+getUrl($Mod,"Index");
+$pagination_baseurl_params = ["filter" => $filter];
+$pagination_entity_name = "Bestellungen";
+//var_dump($mynetworks);
+
+$sorted_networks = [];
+if(is_array($mynetworks) && count($mynetworks)) {
+ foreach($mynetworks as $net) {
+ $sorted_networks[$net->name] = $net->id;
+ }
+}
+ksort($sorted_networks);
+
+//var_dump($mynetworks);
+//var_dump($sorted_networks);exit;
+
+?>
+
+
+
+
+
+id) ? "Bestellung bearbeiten" : "Neue Bestellung"?>
+ +
+
+
+
+
+
+
+
+
+
+
+ Bestellungen
+
+
+
+
+
+
diff --git a/Layout/andom-tec/User/Form.php b/Layout/andom-tec/User/Form.php
new file mode 100644
index 000000000..85131e23a
--- /dev/null
+++ b/Layout/andom-tec/User/Form.php
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Filter
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Keine Bestellungen zu den Suchkriterien gefunden
+
+
+ | + | + | Kunde | +Adresse | +Bestelldatum | +Zuletzt bearbeitet | +Bearbeitet von | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + customer_type == "business") ? "" : ""?> + id?> + | ++ products)) { + foreach($order->products as $product) { + if(is_array($product->product->attributes) && count($product->product->attributes)) { + if(array_key_exists("hw_only", $product->product->attributes)) { + if($product->product->attributes["hw_only"]->value) { + $hw = true; + } + } + if(array_key_exists("voip_chan", $product->product->attributes)) { + if($product->product->attributes["voip_chan"]->value) { + $voip = true; + } + } + if(array_key_exists("bras_type", $product->product->attributes)) { + if($product->cpeprovisioning->routerconfig_finished) { + $cpe_config_finished = true; + } + } + if($hw && $voip_chan && $patched && $cpe_config_finished) { + break; + } + } + } + } + if(is_array($order->terminations) && count($order->terminations)) { + if($order->terminations[0]->patching->patched) { + $patched = true; + } + } + + ?> + " : ""?> + " : ""?> + + " :""?> + " :""?> + | +
+ owner->getCompanyOrName())?>
+ owner->spin) ? " ".$order->owner->spin."" : ""?> + partner_number) ? " ".$order->partner_number."" : ""?> + |
+
+ owner->street?> + owner->zip?> owner->city?> + |
+
+ order_date)?> | +edit)?> | +editor->name?> | ++ waiting == 1): ?> + $order->id, "unset" => "1", "filter" => $filter, "s" => $pagination['start']])?>"> + + $order->id, "filter" => $filter, "s" => $pagination['start']])?>"> + + $order->id])?>"> + $order->id])?>" onclick="if(!confirm('Soll der Service-PIN an den Vertragsinhaber gesendet werden?')) return false;"> + $order->id, "filter" => $filter, "noTermProducts" => 1])?>"> + $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen"> + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + |
+
+ ">Versandtermin: shippingdate) ? "".date("d.m.Y", $order->shippingdate)."" : "--.--.----"?>
+ install_date): ?>
+
+ Vorortinstallation: install_date)?>
+
+ install_products)): ?>
+
+
+ Vorortinstallation: --.--.----
+
+
+
+ Vorortinstallation: --.--.----
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bestelljournal
+
+
+
+
+
+ journals) && count($order->journals)): ?>
+ journals as $journal): ?>
+
+
+
+
+ create)?> Eingetragen von creator->name?>
+
+ text)?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Kontaktdaten
+
+
+
+
+
+
+
+ billingaddress_id): ?>
+ Vertragsinhaber+
+
+
+ Rechungsempfänger+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ products) && count($order->products)): ?>
+
+
+
+
+ install_date) : ""?>" placeholder="--.--.----" />
+
+
+
+
+
+
+ Produkte+
+
+
+
+
+
+
+
+
+
+ files) && count($order->files)): ?>
+
+
Keine Dokumente hinterlegt. + + +
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Keine Bestellungen mit Anschluss zu den Suchkriterien gefunden
+
+
+ | + | + | Kunde | +Adresse | +Anschlussadresse | +Bestelldatum | +Zuletzt bearbeitet | +Bearbeitet von | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + customer_type == "business") ? "" : ""?> + id?> + | ++ terminations) && count($order->terminations)): ?> + terminations[0]->status->code >= TT_TERMSTATUS_CONNECTED): ?> + CON + terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?> + ["code" => $order->terminations[0]->code, "status_id" => ""]])?>" target="_blank">B-C + + ["code" => $order->terminations[0]->building->code, "status_id" => ""]])?>" target="_blank">BNC + + + + products)) { + foreach($order->products as $product) { + if(is_array($product->product->attributes) && count($product->product->attributes)) { + if(array_key_exists("hw_only", $product->product->attributes)) { + if($product->product->attributes["hw_only"]->value) { + $hw = true; + } + } + if(array_key_exists("voip_chan", $product->product->attributes)) { + if($product->product->attributes["voip_chan"]->value) { + $voip = true; + } + } + if(array_key_exists("bras_type", $product->product->attributes)) { + if($product->cpeprovisioning->routerconfig_finished) { + $cpe_config_finished = true; + } + } + if($hw && $voip_chan && $patched && $cpe_config_finished) { + break; + } + } + } + } + if(is_array($order->terminations) && count($order->terminations)) { + if($order->terminations[0]->patching->patched) { + $patched = true; + } + } + + ?> + " : ""?> + " : ""?> + + " :""?> + " :""?> + | +
+ owner->getCompanyOrName())?>
+ owner->spin) ? " ".$order->owner->spin."" : ""?> + partner_number) ? " ".$order->partner_number."" : ""?> + |
+
+ owner->street?> + owner->zip?> owner->city?> + |
+
+ terminations) && count($order->terminations)): ?>
+ terminations[0]->building->street?>terminations[0]->name) ? " ".$order->terminations[0]->name : ""?> + terminations[0]->building->zip?> terminations[0]->building->city?> + + |
+ order_date) ? date("d.m.Y", $order->order_date) : ""?> | +edit)?> | +editor->name?> | ++ waiting == 1): ?> + $order->id, "unset" => "1", "filter" => $filter, "s" => $pagination['start']])?>"> + + $order->id, "filter" => $filter, "s" => $pagination['start']])?>"> + + $order->id])?>"> + $order->id])?>" onclick="if(!confirm('Soll der Service-PIN an den Vertragsinhaber gesendet werden?')) return false;"> + $order->id, "filter" => $filter, "s" => $pagination['start']])?>"> + $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen"> + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + terminations) && $order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?> + terminations[0]->lineworker->getCompanyOrName(), 15)?> + + terminations) && $order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code < TT_BUILDINGSTATUS_CONNECTED): ?> + terminations[0]->building->pipeworker->getCompanyOrName(), 15)?> + + | +
+
+ value->value_string) ? "active" : ""?>">Tiefbau: terminations) && $order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "".$order->terminations[0]->workflowitems["bautermin"]->value->value_string."" : "--.--.----"?>
+ value->value_string) ? "active" : ""?>">Leitungsbau Backbone: terminations) && $order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "".$order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string."" : "--.--.----"?>
+ ">Leitungsbau Kunde: terminations) && $order->terminations[0]->getWorkflowvalue("customer_setup_date")) ? "".$order->terminations[0]->getWorkflowvalue("customer_setup_date")."" : "--.--.----"?>
+ ">Versandtermin: shippingdate) ? "".date("d.m.Y", $order->shippingdate)."" : "--.--.----"?>
+
+ install_date): ?>
+
+ Vorortinstallation: install_date)?>
+
+ install_products)): ?>
+
+
+ Vorortinstallation: --.--.----
+
+
+
+ Vorortinstallation: --.--.----
+
+
+
+
+ |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bestelljournal
+
+
+
+
+
+ journals) && count($order->journals)): ?>
+ journals as $journal): ?>
+
+
+
+
+ create)?> Eingetragen von creator->name?>
+
+ text)?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Kontaktdaten
+
+
+
+
+
+
+
+ billingaddress_id): ?>
+ Vertragsinhaber+
+
+
+ Rechungsempfänger+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ products) && count($order->products)): ?>
+
+
+
+
+
+ install_date) : ""?>" placeholder="--.--.----" />
+
+ Fehler beim Speichern!
+
+
+
+
+
+
+
+
+
+ cpeprovisioning_enabled) ? "checked='checked'" : ""?> />
+
+ Gespeichert!
+ Fehler beim Speichern!
+ Produkte+
+
+
+
+
+
+
+
+
+
+ files) && count($order->files)): ?>
+
+
Keine Dokumente hinterlegt. + + + |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+
+
+
+
+
+
+
+
+
+
+ Benutzer
+
+
+
+id): ?>
+
+
+
+
+
+
+
+ Benutzer bearbeiten
+ + +
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Layout/andom-tec/menu.php b/Layout/andom-tec/menu.php
index e39879a15..8a456a236 100644
--- a/Layout/andom-tec/menu.php
+++ b/Layout/andom-tec/menu.php
@@ -1,129 +1,124 @@
+
+
+
+
+
+ API Key
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
\ No newline at end of file
+
diff --git a/Layout/andom-tec/topbar.php b/Layout/andom-tec/topbar.php
index 42bd3f2a8..a24cc95eb 100644
--- a/Layout/andom-tec/topbar.php
+++ b/Layout/andom-tec/topbar.php
@@ -1,133 +1,67 @@
-
\ No newline at end of file
diff --git a/Layout/andom-tec/tpl/pagination-summary.php b/Layout/andom-tec/tpl/pagination-summary.php
new file mode 100644
index 000000000..620f9a84a
--- /dev/null
+++ b/Layout/andom-tec/tpl/pagination-summary.php
@@ -0,0 +1,7 @@
+
-
-
+
-
-
-
- - - - -- - -
-
-
-
-
-
-
-
- - - ---+ + -
- - - Clear All +
-- + + +
Notification -+ + + +-+- - - - View all - - - -- + + + + +
- - ---?>assets/images/users/avatar-2.jpg)
Cristina Pride
-- Hi, How are you? What about our next meeting -
- +- + "> + + + twofactor): ?> + + + + - - - -
Caleb Flakelar commented on Admin1 min ago
- - - - - -New user registered.5 hours ago
- - - - ---?>assets/images/users/avatar-4.jpg)
Karen Robinson
-- Wow ! this admin looks good and awesome design -
- - - - - -Caleb Flakelar commented on Admin4 days ago
- - - - - -Carlos Crouch liked - Admin - 13 days ago -
- -
-
- - + + +
- - - - - - username?> + + username?> - - + + -
- - " class="nav-link nav-user"> - - Abmelden - - +
- + " class="nav-link nav-user"> + + Abmelden + + -
+
+ -
-
?>assets/images/<?=MFAPPNAME_SLUG?>-logo-top.png){kind=logo}
+
+ bis $pagination['maxItems']) ? $pagination['maxItems'] : $pagination['start'] + $pagination['count']?> von
+
+ Keine gefunden
+
+
\ No newline at end of file
diff --git a/Layout/andom-tec/tpl/pagination.php b/Layout/andom-tec/tpl/pagination.php
new file mode 100644
index 000000000..ea28cedcb
--- /dev/null
+++ b/Layout/andom-tec/tpl/pagination.php
@@ -0,0 +1,106 @@
+ $pagination['count']): ?>
+
+ $i * $pagination['count'],
+ 'url' => $pagination_baseurl."?".http_build_query($mfPagination_baseurl_params),
+ 'current' => ($pagination['start'] == $i*$pagination['count']),
+ ];
+ $mfPagination_pages[$i] = $page;
+ }
+} else {
+
+ if($pagination['maxItems'] % $pagination['count'] != 0) {
+ $mfPagination_pagecount_add = 1;
+ }
+
+
+ $show_from = $mfPagination_currentpage - 4;
+ $show_to = $mfPagination_currentpage + 4;
+
+ if($show_from < 1) {
+ $show_from = 1;
+ }
+ if($show_to > $mfPagination_pagecount) {
+ $show_to = $mfPagination_pagecount + $mfPagination_pagecount_add;
+ }
+
+ for($i = 0; $i < $mfPagination_pagecount + $mfPagination_pagecount_add; $i++) {
+ if($show_from > 1 && $i == $show_from) {
+ $mfPagination_pages[$i] = "separator_before";
+ continue;
+ }
+ if($i == $show_to && $show_to < $mfPagination_pagecount) {
+ $mfPagination_pages[$i] = "separator_after";
+ continue;
+ }
+
+ $mfPagination_baseurl_params['s'] = $i * $pagination['count'];
+
+ if(($i == 0 || $i == $mfPagination_pagecount) || ($i >= $show_from && $i <= $show_to)) {
+ //$log->debug("show_from: $show_from, show_to: $show_to");
+
+ $page = [
+ 's' => $i * $pagination['count'],
+ 'url' => $pagination_baseurl."?".http_build_query($mfPagination_baseurl_params),
+ 'current' => ($pagination['start'] == $i*$pagination['count']),
+ ];
+ $mfPagination_pages[$i] = $page;
+ }
+ }
+
+}
+
+if(count($pagination_baseurl_params)) {
+ $baseurl_with_params = $pagination_baseurl."?".http_build_query($pagination_baseurl_params);
+ if(substr($baseurl_with_params, -1, 1) != "&" && substr($baseurl_with_params, -1, 1) != "?") {
+ $baseurl_with_params .= "&";
+ }
+} else {
+ $baseurl_with_params = $pagination_baseurl."?";
+}
+
+?>
+
+
+
\ No newline at end of file
diff --git a/Layout/default/User/Form.php b/Layout/default/User/Form.php
index f19912276..6626590de 100644
--- a/Layout/default/User/Form.php
+++ b/Layout/default/User/Form.php
@@ -62,18 +62,18 @@
-
+
" id="employee-number-container">
-
+
value() : ""?>" />
" id="project-api-key-container">
-
+
value() : ""?>" />
diff --git a/Layout/default/UserProfile/Index.php b/Layout/default/UserProfile/Index.php
index 38da83fdb..b8029ef2c 100644
--- a/Layout/default/UserProfile/Index.php
+++ b/Layout/default/UserProfile/Index.php
@@ -127,60 +127,64 @@ if ($userprofile->twofactor == 0) {
2FA
- - twofactor): ?> - Derzeit ist keine Methode für die Zwei-Faktor-Authentifizerung aktiviert. Bitte aktivieren Sie eine Zwei-Faktor-Authentifizerungsmethode!
+
+
+
+
+ 2FA
+ + twofactor): ?> + Derzeit ist keine Methode für die Zwei-Faktor-Authentifizerung aktiviert. Bitte aktivieren Sie eine Zwei-Faktor-Authentifizerungsmethode!
+
+
+
+
-
-
-
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 7a10638df..1c22f9b41 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -102,13 +102,15 @@ class AddressController extends mfBaseController {
if(!array_key_exists("customer_number", $filter) || !$filter["customer_number"]) {
if(array_key_exists("type", $filter)) {
- if($filter["type"] == "xinon") {
+ if($filter["type"] == "systemowner") {
$new_filter["customer_or_fibu_numbers"] = true;
} elseif($filter["type"] == "others") {
$new_filter["customer_or_fibu_numbers"] = false;
}
} else {
- $new_filter["customer_or_fibu_numbers"] = true; // default
+ if(defined("TT_ADDRESS_FILTER_DEFAULT_SYSOWNER") && TT_ADDRESS_FILTER_DEFAULT_SYSOWNER) {
+ $new_filter["customer_or_fibu_numbers"] = true; // default
+ }
}
unset($filter["type"]);
unset($filter["customer_number"]);
diff --git a/application/Device/DeviceController.php b/application/Device/DeviceController.php
index 341b29cac..8f549a316 100644
--- a/application/Device/DeviceController.php
+++ b/application/Device/DeviceController.php
@@ -49,8 +49,8 @@ class DeviceController extends mfBaseController
"DEVICE_MANUFACTURERS" => $deviceManufacturers,
"DEVICE_TYPES" => $deviceTypes,
"DEVICES" => $this->getDevices(),
- "ZABBIX_URL" => ZABBIX_URL,
- "GRAFANA_URL" => GRAFANA_URL,
+ "ZABBIX_URL" => (defined("ZABBIX_URL")) ? ZABBIX_URL : "",
+ "GRAFANA_URL" => (defined("GRAFANA_URL")) ? GRAFANA_URL : "",
];
$this->layout()->set("vueViewName", "Device");
diff --git a/application/Order/Order.php b/application/Order/Order.php
index 664775cdb..354c5d316 100644
--- a/application/Order/Order.php
+++ b/application/Order/Order.php
@@ -145,7 +145,7 @@ class Order extends mfBaseModel {
$to = $owner->email;
if(!$subject || !$from || !$from_name || !$to) {
- $this->log->warn("Service PIN Email not sent. (subject: '$subject', from: '$from_email', from_email: '$from', to: '$to')");
+ $this->log->warn("Service PIN Email not sent. (subject: '$subject', from: '$from_name', from_email: '$from', to: '$to')");
} else {
$email = new Emailnotification();
$email->setSubject($subject);
diff --git a/application/User/UserController.php b/application/User/UserController.php
index 36fd45fcb..5d61ef44d 100644
--- a/application/User/UserController.php
+++ b/application/User/UserController.php
@@ -39,8 +39,8 @@ class UserController extends mfBaseController
}
$this->layout()->set('users', $users);
- $addresses = AddressModel::getAll();
- $this->layout()->set("addresses", $addresses);
+ //$addresses = AddressModel::getAll();
+ //$this->layout()->set("addresses", $addresses);
$this->layout()->set("filter", $this->request->filter);
}
diff --git a/db/migrations/20240220192901_create_vat_tables.php b/db/migrations/20240220192901_create_vat_tables.php
index d2ba9480a..bfa4552ce 100644
--- a/db/migrations/20240220192901_create_vat_tables.php
+++ b/db/migrations/20240220192901_create_vat_tables.php
@@ -33,7 +33,7 @@ final class CreateVatTables extends AbstractMigration
$table->create();
$table = $this->table("Product");
- $table->addColumn("vatgroup_id", "integer", ["null" => false, "default" => 1]);
+ $table->addColumn("vatgroup_id", "integer", ["null" => false, "default" => 1, "after" => "price_setup"]);
$table->save();
}
diff --git a/lib/IbanValidator/IbanValidator.php b/lib/IbanValidator/IbanValidator.php
index 2d2fd2790..56e870a1c 100644
--- a/lib/IbanValidator/IbanValidator.php
+++ b/lib/IbanValidator/IbanValidator.php
@@ -6,6 +6,10 @@ class IbanValidator {
if(!$iban) {
return false;
}
+
+ if(!defined("TT_IBAN_VALIDATOR_BASEURL") || !TT_IBAN_VALIDATOR_BASEURL) {
+ return ["bank" => "none", "iban" => "none", "bic" => [], "iban_correct" => true, "iban_sus" => false, "bic_correct" => true];
+ }
$creds = TT_IBAN_VALIDATOR_USER.":".TT_IBAN_VALIDATOR_PASS;
$b64creds = base64_encode($creds);
diff --git a/lib/mvcfronk/mfBase/mfBaseController.php b/lib/mvcfronk/mfBase/mfBaseController.php
index 8b45c2da5..775bfb910 100644
--- a/lib/mvcfronk/mfBase/mfBaseController.php
+++ b/lib/mvcfronk/mfBase/mfBaseController.php
@@ -287,6 +287,7 @@ class mfBaseController
public static function getUrl($mod, $action = null, $param = null)
{
if (!$mod) {
+ if (MFUSEFANCYURLS) return MFFANCYBASEURL;
return "";
}