Address: changed country to country_id with Country table

This commit is contained in:
Frank Schubert
2024-02-20 20:20:48 +01:00
parent c83fc9bcca
commit 20163e6008
20 changed files with 455 additions and 54 deletions

View File

@@ -119,8 +119,8 @@ class AddressController extends mfBaseController {
$this->layout->set("filter", $this->request->filter);
$parents = AddressModel::search(['parent_id' => null]);
$this->layout()->set("parents", $parents);
//$parents = AddressModel::search(['parent_id' => null]);
//$this->layout()->set("parents", $parents);
}
protected function viewAction() {
@@ -234,7 +234,7 @@ class AddressController extends mfBaseController {
$data['street'] = trim($r->street);
$data['zip'] = trim($r->zip);
$data['city'] = trim($r->city);
$data['country'] = trim($r->country);
$data['country_id'] = $r->country_id;
$data['phone'] = trim($r->phone);
$data['fax'] = trim($r->fax);
$data['mobile'] = trim($r->mobile);
@@ -290,7 +290,7 @@ class AddressController extends mfBaseController {
$data['sepa_date'] = date('U');
}
} else {
$data['sepa_date'] = $r->sepa_date;
$data['sepa_date'] = Layout::dateToInt($r->sepa_date);
}
} else {
$data['billing_type'] = "invoice";