Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added trims to BMD Export

Browse Source
This commit is contained in:
Frank Schubert
2024-01-17 17:57:17 +01:00
parent e806dd6d11
commit c5ee7faae1
2 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
application/Address/AddressController.php
View File

@@ -433,31 +433,31 @@ class AddressController extends mfBaseController {
$data = [];
$data['parent_id'] = (!$r->parent_id) ? null : $r->parent_id;
$data['company'] = $r->company;
$data['firstname'] = $r->firstname;
$data['lastname'] = $r->lastname;
$data['street'] = $r->street;
$data['zip'] = $r->zip;
$data['city'] = $r->city;
$data['country'] = $r->country;
$data['phone'] = $r->phone;
$data['fax'] = $r->fax;
$data['mobile'] = $r->mobile;
$data['email'] = $r->email;
$data['note'] = $r->note;
$data['uid'] = $r->uid;
$data['company'] = trim($r->company);
$data['firstname'] = trim($r->firstname);
$data['lastname'] = trim($r->lastname);
$data['street'] = trim($r->street);
$data['zip'] = trim($r->zip);
$data['city'] = trim($r->city);
$data['country'] = trim($r->country);
$data['phone'] = trim($r->phone);
$data['fax'] = trim($r->fax);
$data['mobile'] = trim($r->mobile);
$data['email'] = trim($r->email);
$data['note'] = trim($r->note);
$data['uid'] = trim($r->uid);
if($this->me->can("Fibu")) {
$data['fibu_account_number'] = ($r->fibu_account_number) ? $r->fibu_account_number : null;
$data['fibu_supplier_number'] = ($r->fibu_supplier_number) ? $r->fibu_supplier_number : null;
$data['fibu_account_number'] = ($r->fibu_account_number) ? trim($r->fibu_account_number) : null;
$data['fibu_supplier_number'] = ($r->fibu_supplier_number) ? trim($r->fibu_supplier_number) : null;
if($r->fibu_primary_account) {
$data['fibu_primary_account'] = 1;
} else {
$data['fibu_primary_account'] = 0;
}
$data['fibu_supplier_due'] = ($r->fibu_supplier_due) ? $r->fibu_supplier_due : null;
$data['fibu_supplier_skonto'] = ($r->fibu_supplier_skonto) ? $r->fibu_supplier_skonto : null;
$data['fibu_supplier_skonto_rate'] = ($r->fibu_supplier_skonto_rate) ? $r->fibu_supplier_skonto_rate : null;
$data['fibu_supplier_due'] = ($r->fibu_supplier_due) ? trim($r->fibu_supplier_due) : null;
$data['fibu_supplier_skonto'] = ($r->fibu_supplier_skonto) ? trim($r->fibu_supplier_skonto) : null;
$data['fibu_supplier_skonto_rate'] = ($r->fibu_supplier_skonto_rate) ? trim($r->fibu_supplier_skonto_rate) : null;
}
@@ -492,10 +492,10 @@ class AddressController extends mfBaseController {
}
$data['bank_account_bank'] = $r->bank_account_bank;
$data['bank_account_owner'] = $r->bank_account_owner;
$data['bank_account_iban'] = $r->bank_account_iban;
$data['bank_account_bic'] = $r->bank_account_bic;
$data['bank_account_bank'] = trim($r->bank_account_bank);
$data['bank_account_owner'] = trim($r->bank_account_owner);
$data['bank_account_iban'] = trim($r->bank_account_iban);
$data['bank_account_bic'] = trim($r->bank_account_bic);
$data['allow_contact'] = ($r->allow_contact) ? 1 : 0;
$data['allow_spin'] = ($r->allow_spin) ? 1 : 0;

28
lib/mvcfronk/mfRequest/mfRequest.php
View File

@@ -2,6 +2,7 @@
class mfRequest {
protected static $instance;
protected $original_request = [];
protected $request = [];
public function __construct(Array $request = []) {
@@ -9,8 +10,19 @@ class mfRequest {
$this->request = $request;
} else {
// get request from POST/GET
if(isset($_POST) && isset($_GET)) {
$this->request = array_merge($_GET, $_POST);
$_request = [];
if(isset($_GET)) {
$_request = array_merge($_request, $_GET);
}
if(isset($_POST)) {
$_request = array_merge($_request, $_POST);
}
if(!count($_request)) {
return true;
}
foreach($_request as $key => $name) {
$this->original_request[$key] = $name;
$this->request[$key] = trim($name);
}
}
}
@@ -41,6 +53,18 @@ class mfRequest {
return $this->request;
}
public function getUnmodified($name = null) {
if($name) {
if(array_key_exists($name, $this->original_request)) {
//var_dump($this->request);exit;
return $this->original_request[$name];
} else {
return null;
}
}
return $this->request;
}
public function __get($name) {
return $this->get($name);
}