blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 09:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Section Kontakt und Bankverbindungen überarbeitet

Browse Source
This commit is contained in:
ma0068
2023-11-28 16:55:20 +01:00
parent 27e2286096
commit 7a3bb2a374
5 changed files with 490 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/stv/Kontakt.php
+35 -11
View File
@@ -47,7 +47,7 @@ class Kontakt extends FHC_Controller
$this->load->library('form_validation');
$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
$this->form_validation->set_rules('plz', 'PLZ', 'required');
$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric');
if ($this->form_validation->run() == false)
{
@@ -56,6 +56,7 @@ class Kontakt extends FHC_Controller
$this->load->model('person/Adresse_model', 'AdresseModel');
$uid = getAuthUID();
$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
@@ -76,7 +77,7 @@ class Kontakt extends FHC_Controller
[
'person_id' => $person_id,
'strasse' => $strasse,
'insertvon' => 'uid',
'insertvon' => $uid,
'insertamum' => date('c'),
'plz' => $_POST['plz'],
'ort' => $ort,
@@ -104,8 +105,9 @@ class Kontakt extends FHC_Controller
public function updateAddress($address_id)
{
$uid = getAuthUID();
$this->load->library('form_validation');
$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
$_POST = json_decode($this->input->raw_input_stream, true);
$this->form_validation->set_rules('plz', 'PLZ', 'required');
@@ -143,7 +145,7 @@ class Kontakt extends FHC_Controller
],
[ 'person_id' => $person_id,
'strasse' => $strasse,
'updatevon' => 'uid',
'updatevon' => $uid,
'updateamum' => date('c'),
'plz' => $_POST['plz'],
'ort' => $ort,
@@ -216,6 +218,7 @@ class Kontakt extends FHC_Controller
return $this->outputJsonSuccess(current(getData($result)));
}
/* TODO Manu bereits in Address.ph*/
public function getNations()
{
$this->load->model('codex/Nation_model', 'NationModel');
@@ -289,12 +292,21 @@ class Kontakt extends FHC_Controller
$this->load->model('person/Adresse_model', 'AdresseModel');
//$ort = isset($ortschaft) ? $ortschaft : null;
if(isset($gemeinde)) {
if(isset($gemeinde)) {var_dump($gemeinde);
$gemeinde = urldecode($gemeinde);
}
else
$gemeinde = null;
$this->load->library('form_validation');
$this->form_validation->set_rules($plz, 'PLZ', 'numeric|less_than[10000]');
if ($this->form_validation->run() == false) {
return $this->outputJsonError($this->form_validation->error_array());
/* $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
return $this->outputJsonError($this->form_validation->error_array());*/
}
$result = $this->AdresseModel->getOrtschaften($plz, $gemeinde);
if (isError($result)) {
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -366,18 +378,18 @@ class Kontakt extends FHC_Controller
}
}
public function loadContact($kontact_id)
public function loadContact($kontakt_id)
{
$this->load->model('person/Kontakt_model', 'KontaktModel');
$this->AdresseModel->addSelect('public.tbl_kontakt.*');
$this->KontaktModel->addSelect('public.tbl_kontakt.*');
$this->KontaktModel->addSelect('st.kurzbz');
$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
$this->KontaktModel->addLimit(1);
$result = $this->KontaktModel->loadWhere(
array('kontakt_id' => $kontact_id)
array('kontakt_id' => $kontakt_id)
);
if (isError($result)) {
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -405,6 +417,13 @@ class Kontakt extends FHC_Controller
else
$this->form_validation->set_rules('kontakt', 'Kontakt', 'required');
/* if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
{
$this->form_validation->set_data(['email' => $_POST['kontakt']]);
$this->form_validation->set_rules('email', 'email', 'valid_email|required]');
}*/
if ($this->form_validation->run() == false)
{
return $this->outputJsonError($this->form_validation->error_array());
@@ -420,6 +439,7 @@ class Kontakt extends FHC_Controller
else
$standort_id = null;
$uid = getAuthUID();
$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
@@ -432,7 +452,7 @@ class Kontakt extends FHC_Controller
'anmerkung' => $anmerkung,
'kontakt' => $kontakt,
'zustellung' => $_POST['zustellung'],
'insertvon' => 'uid',
'insertvon' => $uid,
'insertamum' => date('c'),
'standort_id' => $standort_id,
'ext_id' => $ext_id
@@ -465,6 +485,7 @@ class Kontakt extends FHC_Controller
else
$standort_id = null;
$uid = getAuthUID();
$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
@@ -480,7 +501,7 @@ class Kontakt extends FHC_Controller
'anmerkung' => $anmerkung,
'kontakt' => $kontakt,
'zustellung' => $_POST['zustellung'],
'insertvon' => 'uid',
'insertvon' => $uid,
'insertamum' => date('c'),
'standort_id' => $standort_id,
'ext_id' => $ext_id
@@ -609,6 +630,7 @@ class Kontakt extends FHC_Controller
public function updateBankverbindung($bankverbindung_id)
{
$this->load->library('form_validation');
$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
@@ -627,6 +649,8 @@ class Kontakt extends FHC_Controller
return $this->outputJsonError($this->form_validation->error_array());
}
$uid = getAuthUID();
$result = $this->BankverbindungModel->update([
'bankverbindung_id' => $bankverbindung_id
],
@@ -638,7 +662,7 @@ class Kontakt extends FHC_Controller
'iban' => $_POST['iban'],
'blz' => $_POST['blz'],
'kontonr' => $_POST['kontonr'],
'updatevon' => 'uid',
'updatevon' => $uid,
'updateamum' => date('c'),
'typ' => $_POST['typ'],
'verrechnung' => $_POST['verrechnung'],
application/controllers/components/stv/Notizen.php
View File