blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 15:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-61758/stv_kontakte_get_funktionen_null_abfangen'

Browse Source
This commit is contained in:
Harald Bamberger
2025-05-21 07:11:18 +02:00
parent 2db7f812ab 1222d33e6e
commit e9a373afb8
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Kontakt.php
+25 -7
View File
@@ -85,7 +85,10 @@ class Kontakt extends FHCAPI_Controller
|| $this->router->method == 'addNewBankverbindung' || $this->router->method == 'addNewBankverbindung'
) { ) {
$person_id = current(array_slice($this->uri->rsegments, 2)); $person_id = current(array_slice($this->uri->rsegments, 2));
if (is_null($person_id) || !ctype_digit((string)$person_id))
$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud); $this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
} elseif ($this->router->method == 'loadAddress' } elseif ($this->router->method == 'loadAddress'
|| $this->router->method == 'loadContact' || $this->router->method == 'loadContact'
@@ -119,6 +122,9 @@ class Kontakt extends FHCAPI_Controller
$model = 'person/Bankverbindung_model'; $model = 'person/Bankverbindung_model';
} }
if (!isset($id) || !ctype_digit((string)$id))
$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
$this->load->model($model, 'TempModel'); $this->load->model($model, 'TempModel');
$result = $this->TempModel->load($id); $result = $this->TempModel->load($id);
$data = $this->getDataOrTerminateWithError($result); $data = $this->getDataOrTerminateWithError($result);
@@ -387,8 +393,11 @@ class Kontakt extends FHCAPI_Controller
$this->terminateWithSuccess(getData($result) ?: []); $this->terminateWithSuccess(getData($result) ?: []);
} }
public function getFirmen($searchString) public function getFirmen($searchString = null)
{ {
if (is_null($searchString))
$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
$this->load->model('ressource/firma_model', 'FirmaModel'); $this->load->model('ressource/firma_model', 'FirmaModel');
$result = $this->FirmaModel->searchFirmen($searchString); $result = $this->FirmaModel->searchFirmen($searchString);
@@ -398,8 +407,11 @@ class Kontakt extends FHCAPI_Controller
$this->terminateWithSuccess($result ?: []); $this->terminateWithSuccess($result ?: []);
} }
public function getStandorte($searchString) public function getStandorte($searchString = null)
{ {
if (is_null($searchString))
$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
$this->load->model('organisation/standort_model', 'StandortModel'); $this->load->model('organisation/standort_model', 'StandortModel');
$result = $this->StandortModel->searchStandorte($searchString); $result = $this->StandortModel->searchStandorte($searchString);
@@ -409,8 +421,11 @@ class Kontakt extends FHCAPI_Controller
$this->terminateWithSuccess($data); $this->terminateWithSuccess($data);
} }
public function getStandorteByFirma($firma_id) public function getStandorteByFirma($firma_id = null)
{ {
if (is_null($firma_id) || !ctype_digit((string)$firma_id))
$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
$this->load->model('organisation/standort_model', 'StandortModel'); $this->load->model('organisation/standort_model', 'StandortModel');
$result = $this->StandortModel->getStandorteByFirma($firma_id); $result = $this->StandortModel->getStandorteByFirma($firma_id);
@@ -652,6 +667,9 @@ class Kontakt extends FHCAPI_Controller
$bic = $this->input->post('bic'); $bic = $this->input->post('bic');
$blz = $this->input->post('blz'); $blz = $this->input->post('blz');
$kontonr = $this->input->post('kontonr'); $kontonr = $this->input->post('kontonr');
$iban = $this->input->post('iban');
$typ = $this->input->post('typ');
$verrechnung = $this->input->post('verrechnung');
$result = $this->BankverbindungModel->insert( $result = $this->BankverbindungModel->insert(
[ [
@@ -659,13 +677,13 @@ class Kontakt extends FHCAPI_Controller
'name' => $name, 'name' => $name,
'anschrift' => $anschrift, 'anschrift' => $anschrift,
'bic' => $bic, 'bic' => $bic,
'iban' => $_POST['iban'], 'iban' => $iban,
'blz' => $blz, 'blz' => $blz,
'kontonr' => $kontonr, 'kontonr' => $kontonr,
'insertvon' => 'uid', 'insertvon' => 'uid',
'insertamum' => date('c'), 'insertamum' => date('c'),
'typ' => $_POST['typ'], 'typ' => $typ,
'verrechnung' => $_POST['verrechnung'], 'verrechnung' => $verrechnung,
'ext_id' => $ext_id, 'ext_id' => $ext_id,
'oe_kurzbz' => $oe_kurzbz, 'oe_kurzbz' => $oe_kurzbz,
'orgform_kurzbz' => $orgform_kurzbz 'orgform_kurzbz' => $orgform_kurzbz