Merge branch 'fronkdev' into 'master'

Address::syncToFibuMerge() checks for old_custnum and name before

See merge request fronk/thetool!180
This commit is contained in:
Frank Schubert
2024-01-18 20:12:23 +00:00

View File

@@ -74,7 +74,11 @@ class Address extends mfBaseModel {
$old_custnum -= 900000;
}
$fibumerge = XinonFibuMergeModel::getFirst(["old_custnum" => $old_custnum]);
$name_search = [];
if($this->company) $name_search[] = $this->company;
if($this->lastname) $name_search[] = $this->lastname;
$fibumerge = XinonFibuMergeModel::getFirst(["old_custnum" => $old_custnum, "name" => $name_search]);
if(!$fibumerge) {
// create fibu merge
$fibumerge = XinonFibuMergeModel::create([