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

@@ -417,6 +417,9 @@ class OrderController extends mfBaseController {
$this->layout()->set("products", $products);
$countries = CountryModel::getAll();
$this->layout()->set("countries", $countries);
if($this->request->filter) {
$this->layout()->set("filter", $this->request->filter);
}
@@ -521,7 +524,7 @@ class OrderController extends mfBaseController {
return $this->add();
}
foreach(["street", "zip", "city", "phone", "email"] as $required) {
foreach(["street", "zip", "city", "phone", "email", "country_id"] as $required) {
if(!$r->{"owner_$required"}) {
$this->layout()->setFlash("Fehler in Vertragsinhaber: Bitte alle benötigten Felder ausfüllen.");
$this->layout()->set("order", $r);
@@ -558,7 +561,7 @@ class OrderController extends mfBaseController {
return $this->add();
}
foreach(["street", "zip", "city", "phone", "email"] as $required) {
foreach(["street", "zip", "city", "phone", "email", "country_id"] as $required) {
if(!$r->{"billing_$required"}) {
$this->layout()->setFlash("Fehler in Rechnungsempfänger: Bitte alle benötigten Felder ausfüllen.");
$this->layout()->set("order", $r);