From 8cf30a84d68d91cd587f75b80cb049a1723cf94f Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Tue, 19 Oct 2021 22:20:27 +0200 Subject: [PATCH] Made shipping data optional --- .../Cpeprovisioning/CpeprovisioningController.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/application/Cpeprovisioning/CpeprovisioningController.php b/application/Cpeprovisioning/CpeprovisioningController.php index d354c445e..b8cd0998b 100644 --- a/application/Cpeprovisioning/CpeprovisioningController.php +++ b/application/Cpeprovisioning/CpeprovisioningController.php @@ -99,10 +99,10 @@ class CpeprovisioningController extends mfBaseController { $prov_data["vlan_public"] = (strlen($r->vlan_public)) ? $r->vlan_public : null; $prov_data["vlan_nat"] = (strlen($r->vlan_nat)) ? $r->vlan_nat : null; $prov_data["vlan_ipv6"] = (strlen($r->vlan_ipv6)) ? $r->vlan_ipv6 : null; - $prov_data["ship_weight"] = $r->ship_weight; - $prov_data["ship_length"] = $r->ship_length; - $prov_data["ship_width"] = $r->ship_width; - $prov_data["ship_height"] = $r->ship_height; + $prov_data["ship_weight"] = (strlen($r->ship_weight)) ? $r->ship_weight : null; + $prov_data["ship_length"] = (strlen($r->ship_length)) ? $r->ship_length : null; + $prov_data["ship_width"] = (strlen($r->ship_width)) ? $r->ship_width : null; + $prov_data["ship_height"] = (strlen($r->ship_height)) ? $r->ship_height : null; $prov_data["edit_by"] = $this->me->id; @@ -151,6 +151,9 @@ class CpeprovisioningController extends mfBaseController { $journal_id = $journal->save(); if(!$journal_id) { $this->layout()->setFlash("Konnte nicht ins Bestelljournal schreiben!", "warning"); + } else { + $cpeprovisioning->order_journal_id = $journal_id; + $cpeprovisioning->save(); } }