diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php index 401696a18..ddc708f04 100644 --- a/Layout/default/Address/Form.php +++ b/Layout/default/Address/Form.php @@ -6,9 +6,6 @@ if($f) { $urlfilter['f'] = $f; } - if(is_array($filter) && count($filter)) { - $urlfilter["filter"] = $filter; - } $posturl = self::getUrl("Address", "save", $urlfilter); ?> @@ -232,6 +229,14 @@ + can("Fibu")): ?> +
+ +
+ sepa_date) : ""?>" /> +
+
+ @@ -429,6 +434,14 @@ - \ No newline at end of file + +log->debug("Rendering Dashboard page took $thetime microseconds"); +?> \ No newline at end of file diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php index 14d661e0a..340c71953 100644 --- a/Layout/default/Linework/Index.php +++ b/Layout/default/Linework/Index.php @@ -688,8 +688,8 @@ function validateWorkflowItem(id) { } return true; } - - + + var export_uid = ""; var export_progress = 0; var downloadUrl; diff --git a/Layout/default/OpenAccessId/ChangeUnit.php b/Layout/default/OpenAccessId/ChangeUnit.php index e5ff8b8f5..5eb66bd5a 100644 --- a/Layout/default/OpenAccessId/ChangeUnit.php +++ b/Layout/default/OpenAccessId/ChangeUnit.php @@ -41,7 +41,7 @@
adb_wohneinheit_id && is_object($oaid->adb_wohneinheit)): ?> adb_wohneinheit : ""?>" + value="[adb_wohneinheit->hausnummer->strasse->gemeinde->name?>] adb_wohneinheit->hausnummer->plz->plz?>adb_wohneinheit->hausnummer->ortschaft->name?>, adb_wohneinheit->hausnummer->strasse->name?> adb_wohneinheit->hausnummer->hausnummer?>adb_wohneinheit) ? " - ".(string)$oaid->adb_wohneinheit : ""?>" />
diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php index 1b37a350b..5d598095c 100644 --- a/Layout/default/Order/Form.php +++ b/Layout/default/Order/Form.php @@ -8,7 +8,7 @@ if($noTermProducts) { $urlfilter['noTermProducts'] = 1; } - if(is_array($filter) && count($filter)) { + if(isset($filter) && is_array($filter) && count($filter)) { $urlfilter["filter"] = $filter; } $posturl = self::getUrl("Order", "save", $urlfilter); @@ -589,8 +589,8 @@ " placeholder="Anzahl/Menge" />
- - @@ -649,10 +649,22 @@
-
+
+
+ + +
@@ -718,7 +730,7 @@
- @@ -757,10 +769,22 @@
-
+
+
+ + +
@@ -1195,12 +1219,13 @@ form_id: id }, function (success) { - //console.log(success); + console.log(success); p = success.result.product; id = success.result.form_id; $('#billing_delay-' + id).val(p.billing_delay); $('#billing_period-' + id).val(p.billing_period); + $('#contract_term-' + id).val(p.contract_term); $('#price-' + id).val(p.price); $('#price_setup-' + id).val(p.price_setup); $('#price_nne-' + id).val(p.price_nne); @@ -1293,7 +1318,7 @@ $("#bank-error").hide(); $("#bank-error").text(""); - if(data.iban_correct && !data.iban_sus && data.bic_correct) { + if(data.iban_correct && data.bic_correct && (!data.iban_sus || data.iban_sus === "www")) { bankdata_valid = true; $('#orderForm').submit(); return; @@ -1305,7 +1330,7 @@ $("#bank_account_iban").addClass("invalid"); bank_error.push("Ungültige IBAN!"); } - if(data.iban_sus) { + if(data.iban_sus && data.iban_sus !== "www") { $("#bank_account_iban").addClass("invalid"); bank_error.push("IBAN verdächtig (" + data.iban_sus + ")!"); } @@ -1576,7 +1601,7 @@
\
\ \ - \ \ \ \ @@ -1616,10 +1641,22 @@ \
\ \ -
\ +
\ \ \
\ +
\ + \ + \ +
\
\ \ \ diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index dc08e6ca6..74ce3357e 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -105,18 +105,14 @@ " />
+
+ + " /> +
+
-
- - -
-
-
- - -
- - fulfillment == "rimo"): ?> -
+ fulfillment == "rimo") || !isset($campaign) || !$campaign->id): ?> +
+
+ + +
+ +
+ + " /> +
+
+
+ +
+ +
+
@@ -222,7 +236,16 @@
- + type == "salespartner"): ?> + + + + description): ?> description?> @@ -263,6 +286,10 @@