diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php index ddc708f04..907e976e2 100644 --- a/Layout/default/Address/Form.php +++ b/Layout/default/Address/Form.php @@ -89,7 +89,11 @@
- +
@@ -449,6 +453,7 @@ placeholder: "" }); $("#addresstypes").select2(); + $("#country_id").select2(); function validateIbanFormat(iban) { diff --git a/Layout/default/Address/View.php b/Layout/default/Address/View.php index 4992a7702..54a9cc146 100644 --- a/Layout/default/Address/View.php +++ b/Layout/default/Address/View.php @@ -55,7 +55,7 @@ zip?> city?> Land - country?> + country->name?> Telefon phone?> diff --git a/Layout/default/Emailtemplates/order/billing_external_energie.php b/Layout/default/Emailtemplates/order/billing_external_energie.php index a5a441533..26773eb6d 100644 --- a/Layout/default/Emailtemplates/order/billing_external_energie.php +++ b/Layout/default/Emailtemplates/order/billing_external_energie.php @@ -74,7 +74,7 @@ PLZ: owner->zip?> Ort: owner->city?> -Land: owner->country?> +Land: owner->country->name?> Telefon: owner->phone?> @@ -101,7 +101,7 @@ PLZ: billingaddress->zip?> Ort: billingaddress->city?> -Land: billingaddress->country?> +Land: billingaddress->country->name?> Telefon: billingaddress->phone?> diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php index 420485e4c..7da0a3d98 100644 --- a/Layout/default/Order/Form.php +++ b/Layout/default/Order/Form.php @@ -122,12 +122,16 @@
- - + +
- +
@@ -241,12 +245,16 @@
- - + +
- +
@@ -362,8 +370,12 @@
- - + +
@@ -1360,8 +1372,8 @@ function validateOrderForm() { var allFields = [ - "owner_company", "owner_firstname", "owner_lastname", "owner_street", "owner_zip", "owner_city", "owner_country", "owner_phone", "owner_email", - "billing_company", "billing_firstname", "billing_lastname", "billing_street", "billing_zip", "billing_city", "billing_country", "billing_phone", "billing_email", + "owner_company", "owner_firstname", "owner_lastname", "owner_street", "owner_zip", "owner_city", "owner_country_id", "owner_phone", "owner_email", + "billing_company", "billing_firstname", "billing_lastname", "billing_street", "billing_zip", "billing_city", "billing_country_id", "billing_phone", "billing_email", "order_date", "finish_after", "finish_after_comment", "billing_type", "bank_account_bank", "bank_account_owner", "bank_account_iban", "bank_account_bic" ]; var checkEmpty = []; diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php index 6620abe22..0c2c8f93b 100644 --- a/Layout/default/Order/Index.php +++ b/Layout/default/Order/Index.php @@ -401,7 +401,7 @@ owner->city?> Land - owner->country?> + owner->country->name?> Telefon owner->phone) ? "".$order->owner->phone."" : ""?> @@ -442,7 +442,7 @@ billingaddress->city?> Land - billingaddress->country?> + billingaddress->country->name?> Telefon billingaddress->phone) ? "".$order->billingaddress->phone."" : ""?> @@ -852,7 +852,7 @@ owner->city?> Land - owner->country?> + owner->country->name?> Telefon owner->phone) ? "".$order->owner->phone."" : ""?> @@ -893,7 +893,7 @@ billingaddress->city?> Land - billingaddress->country?> + billingaddress->country->name?> Telefon billingaddress->phone) ? "".$order->billingaddress->phone."" : ""?> diff --git a/application/Address/Address.php b/application/Address/Address.php index f4827ec1d..a4d43e7b0 100644 --- a/application/Address/Address.php +++ b/application/Address/Address.php @@ -4,6 +4,7 @@ class Address extends mfBaseModel { protected $forcestr = ['street','company','zip','phone','fax','mobile','note']; private $in_after_save = 0; + private $country; private $parent; private $childaddresses; private $links = []; @@ -384,7 +385,7 @@ class Address extends mfBaseModel { } - $country_code_errors = []; + //$country_code_errors = []; $export_addresses = []; foreach($addresses as $fibu_num => $address) { @@ -409,28 +410,7 @@ class Address extends mfBaseModel { $a["street"] = $address->street; $a["zip"] = $address->zip; $a["city"] = $address->city; - if(strlen($address->country) == 2) { - $a["countrycode"] = trim($address->country); - } else { - $a["countrycode"] = "AT"; - - if(trim($address->country)) { - $acountry = strtolower(trim($address->country)); - $cc = __($acountry, "cc"); - - $log->debug("is $cc == cc.$acountry"); - $log->debug("last translation failed: ".(__last_translation_failed() ? "true" : "false")); - - if(__last_translation_failed()) { - //if($cc == "cc.".$acountry) { - $a["countrycode"] = "AT"; - // email to buchhaltung - $country_code_errors[$fibu_num] = $address; - } else { - $a["countrycode"] = $cc; - } - } - } + $a["countrycode"] = $address->country->isocode; $a["phone"] = ""; if($address->mobile) $a["phone"] = $address->mobile; if($address->phone) $a["phone"] = $address->phone; @@ -477,6 +457,8 @@ class Address extends mfBaseModel { $export_addresses[] = $a; } + /* + * Irrelevant since Country table if(count($country_code_errors)) { $msg = "Hallo,\r\n\r\ndas in thetool eingetragene Land von folgenden Kunden/Lieferanten konnte nicht in einen ISO-Code übersetzt werden:\r\n\r\n"; foreach($country_code_errors as $fibu_num => $address) { @@ -490,7 +472,7 @@ class Address extends mfBaseModel { $email->setBody($msg); $email->send(); } - + */ $tpl = new Layout(); $tpl->setTemplate("Address/bmd_export.csv"); $tpl->set("addresses", $export_addresses); diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php index e9319ab8a..cdc1c8ee1 100644 --- a/application/Address/AddressController.php +++ b/application/Address/AddressController.php @@ -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"; diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php index cb25371f5..a7593fe8a 100644 --- a/application/Address/AddressModel.php +++ b/application/Address/AddressModel.php @@ -17,7 +17,7 @@ class AddressModel { public $street; public $zip; public $city; - public $country; + public $country_id; public $phone; public $fax; public $mobile; @@ -71,7 +71,19 @@ class AddressModel { $where = self::getSqlFilter($filter); //mfLoghandler::singleton()->debug($where); - $res = $db->select("Address", "*", "$where ORDER BY company, lastname, firstname, zip, city LIMIT 1"); + + $sql = "SELECT Address.* FROM Address + LEFT JOIN Addresstype ON (Addresstype.address_id = Address.id) + LEFT JOIN Country ON (Country.id = Address.country_id) + WHERE $where + GROUP BY Address.id + ORDER BY company, lastname, firstname, zip, city, Address.id + LIMIT 1 + "; + + $res = $db->query($sql); + //$res = $db->select("Address", "*", "$where ORDER BY company, lastname, firstname, zip, city LIMIT 1"); + if($db->num_rows($res)) { $data = $db->fetch_object($res); $item = new Address($data); @@ -165,6 +177,7 @@ class AddressModel { SELECT Address.id as address_id FROM Address LEFT JOIN Addresstype ON (Addresstype.address_id = Address.id) + LEFT JOIN Country ON (Country.id = Address.country_id) WHERE $where GROUP BY Address.id ) as tbl"; @@ -193,6 +206,7 @@ class AddressModel { ORDER BY Address.id";*/ $sql = "SELECT Address.* FROM Address LEFT JOIN Addresstype ON (Addresstype.address_id = Address.id) + LEFT JOIN Country ON (Country.id = Address.country_id) WHERE $where GROUP BY Address.id ORDER BY company, lastname, firstname, zip, city, Address.id"; @@ -349,7 +363,7 @@ class AddressModel { if(array_key_exists("country", $filter)) { $country = FronkDB::singleton()->escape($filter["country"]); if($country) { - $where .= " AND country like '%$country%'"; + $where .= " AND (Country.name like '%$country%' OR Country.isocode = '$country')"; } } diff --git a/application/Country/CountryModel.php b/application/Country/CountryModel.php index 91b686eed..12dd2b0d9 100644 --- a/application/Country/CountryModel.php +++ b/application/Country/CountryModel.php @@ -37,7 +37,7 @@ class CountryModel { $db = FronkDB::singleton(); - $res = $db->select("Country", "*", "1 = 1 ORDER BY owner_id,`create`"); + $res = $db->select("Country", "*", "1 = 1 ORDER BY isocode"); if($db->num_rows($res)) { while($data = $db->fetch_object($res)) { $items[] = new Country($data); diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php index a0e63ea5d..66f9dbb01 100644 --- a/application/Order/OrderController.php +++ b/application/Order/OrderController.php @@ -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); diff --git a/application/XinonFibuMerge/XinonFibuMergeModel.php b/application/XinonFibuMerge/XinonFibuMergeModel.php index 6a3c66934..d0565b02e 100644 --- a/application/XinonFibuMerge/XinonFibuMergeModel.php +++ b/application/XinonFibuMerge/XinonFibuMergeModel.php @@ -135,6 +135,11 @@ class XinonFibuMergeModel { if(array_key_exists("name", $filter)) { $name = $filter["name"]; if(is_array($name)) { + + $name = array_map(function ($value) { + return FronkDB::singleton()->escape($value); + }, $name); + $where .= " AND XinonFibuMerge.name IN ('".implode("','", $name)."')"; } elseif($name) { $name = FronkDB::singleton()->escape($filter['name']); diff --git a/db/migrations/20240220140716_add_country_table.php b/db/migrations/20240220140716_add_country_table.php index 9e77d223b..3e8d22a0e 100644 --- a/db/migrations/20240220140716_add_country_table.php +++ b/db/migrations/20240220140716_add_country_table.php @@ -19,6 +19,260 @@ final class AddCountryTable extends AbstractMigration $table->addIndex("isocode"); $table->addIndex("name", ["limit" => 4]); $table->create(); + + $Country = [ + ['id' => '1','isocode' => 'EG','name' => 'Ägypten','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '2','isocode' => 'GQ','name' => 'Äquatorial Guinea','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '3','isocode' => 'ET','name' => 'Äthiopien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '4','isocode' => 'AF','name' => 'Afghanistan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '5','isocode' => 'AX','name' => 'Aland','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '6','isocode' => 'AL','name' => 'Albanien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '7','isocode' => 'DZ','name' => 'Algerien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '8','isocode' => 'AD','name' => 'Andorra','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '9','isocode' => 'AO','name' => 'Angola','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '10','isocode' => 'AI','name' => 'Anguilla','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '11','isocode' => 'AQ','name' => 'Antarktis','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '12','isocode' => 'AG','name' => 'Antigua und Barbuda','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '13','isocode' => 'AR','name' => 'Argentinien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '14','isocode' => 'AM','name' => 'Armenien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '15','isocode' => 'AW','name' => 'Aruba','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '16','isocode' => 'AZ','name' => 'Aserbeidschan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '17','isocode' => 'AU','name' => 'Australien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '18','isocode' => 'BS','name' => 'Bahamas','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '19','isocode' => 'BH','name' => 'Bahrain','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '20','isocode' => 'BD','name' => 'Bangladesch','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '21','isocode' => 'BB','name' => 'Barbados','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '22','isocode' => 'BY','name' => 'Belarus (Weissrussland)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '23','isocode' => 'BE','name' => 'Belgien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '24','isocode' => 'BZ','name' => 'Belize','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '25','isocode' => 'BJ','name' => 'Benin','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '26','isocode' => 'BM','name' => 'Bermuda','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '27','isocode' => 'BT','name' => 'Bhutan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '28','isocode' => 'BO','name' => 'Bolivien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '29','isocode' => 'BQ','name' => 'Bonaire, St. Eustatius und Saba','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '30','isocode' => 'BA','name' => 'Bosnien und Herzegowina','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '31','isocode' => 'BW','name' => 'Botsuana','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '32','isocode' => 'BV','name' => 'Bouvetinsel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '33','isocode' => 'BR','name' => 'Brasilien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '34','isocode' => 'IO','name' => 'Brit.Terr.Im Indischen Ozean','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '35','isocode' => 'BN','name' => 'Brunei Darussalam','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '36','isocode' => 'BG','name' => 'Bulgarien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '37','isocode' => 'BF','name' => 'Burkina Faso','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '38','isocode' => 'BI','name' => 'Burundi','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '39','isocode' => 'CL','name' => 'Chile','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '40','isocode' => 'CN','name' => 'China','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '41','isocode' => 'CK','name' => 'Cook-Inseln Neuseel.Verwaltung','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '42','isocode' => 'CR','name' => 'Costa Rica','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '43','isocode' => 'CI','name' => 'Cote D\'Ivoire (Elfenbeinkueste)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '44','isocode' => 'CW','name' => 'Curaçao','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '45','isocode' => 'DK','name' => 'Dänemark','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '46','isocode' => 'DE','name' => 'Deutschland','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '47','isocode' => 'DM','name' => 'Dominica','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '48','isocode' => 'DO','name' => 'Dominikanische Republik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '49','isocode' => 'DJ','name' => 'Dschibuti','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '50','isocode' => 'EC','name' => 'Ecuador','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '51','isocode' => 'SV','name' => 'El Salvador','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '52','isocode' => 'ER','name' => 'Eritrea','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '53','isocode' => 'EE','name' => 'Estland','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '54','isocode' => 'SZ','name' => 'Eswatini','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '55','isocode' => 'FO','name' => 'Faeroeer Inseln Dän.Verwaltung','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '56','isocode' => 'FK','name' => 'Falklandinseln (Malvinen)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '57','isocode' => 'FJ','name' => 'Fidschi','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '58','isocode' => 'FI','name' => 'Finnland','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '59','isocode' => 'FR','name' => 'Frankreich','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '60','isocode' => 'TF','name' => 'Franz. Südgebiete','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '61','isocode' => 'GF','name' => 'Französisch Guayana','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '62','isocode' => 'PF','name' => 'Französisch Polynesien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '63','isocode' => 'GA','name' => 'Gabun','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '64','isocode' => 'GM','name' => 'Gambia','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '65','isocode' => 'GE','name' => 'Georgien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '66','isocode' => 'GH','name' => 'Ghana','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '67','isocode' => 'GI','name' => 'Gibraltar','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '68','isocode' => 'GD','name' => 'Grenada','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '69','isocode' => 'GR','name' => 'Griechenland','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '70','isocode' => 'GL','name' => 'Grönland (Dän.Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '71','isocode' => 'GB','name' => 'Großbritannien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '72','isocode' => 'GP','name' => 'Guadeloupe (Franz.Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '73','isocode' => 'GU','name' => 'Guam (US-Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '74','isocode' => 'GT','name' => 'Guatemala','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '75','isocode' => 'GG','name' => 'Guernsey Insel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '76','isocode' => 'GW','name' => 'Guinea-Bissau','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '77','isocode' => 'GY','name' => 'Guyana','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '78','isocode' => 'HT','name' => 'Haiti','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '79','isocode' => 'HM','name' => 'Heard und Mc Donald Inseln (unter Austr.Verw.)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '80','isocode' => 'HN','name' => 'Honduras','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '81','isocode' => 'HK','name' => 'Hongkong','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '82','isocode' => 'IN','name' => 'Indien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '83','isocode' => 'ID','name' => 'Indonesien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '84','isocode' => 'IQ','name' => 'Irak','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '85','isocode' => 'IR','name' => 'Iran','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '86','isocode' => 'IE','name' => 'Irland','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '87','isocode' => 'IS','name' => 'Island','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '88','isocode' => 'IL','name' => 'Israel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '89','isocode' => 'IT','name' => 'Italien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '90','isocode' => 'JM','name' => 'Jamaika','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '91','isocode' => 'JP','name' => 'Japan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '92','isocode' => 'YE','name' => 'Jemen','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '93','isocode' => 'JE','name' => 'Jersey Insel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '94','isocode' => 'JO','name' => 'Jordanien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '95','isocode' => 'VG','name' => 'Jungfern-Inseln (Britisch)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '96','isocode' => 'VI','name' => 'Jungfern-Inseln (USA)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '97','isocode' => 'KY','name' => 'Kaimaninseln','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '98','isocode' => 'KH','name' => 'Kambodscha','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '99','isocode' => 'CM','name' => 'Kamerun','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '100','isocode' => 'CA','name' => 'Kanada','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '101','isocode' => 'CV','name' => 'Kap Verde','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '102','isocode' => 'KZ','name' => 'Kasachstan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '103','isocode' => 'QA','name' => 'Katar','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '104','isocode' => 'KE','name' => 'Kenia','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '105','isocode' => 'KG','name' => 'Kirgisistan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '106','isocode' => 'KI','name' => 'Kiribati','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '107','isocode' => 'CC','name' => 'Kokosinseln (Keeling)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '108','isocode' => 'CO','name' => 'Kolumbien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '109','isocode' => 'KM','name' => 'Komoren','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '110','isocode' => 'CG','name' => 'Kongo','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '111','isocode' => 'CD','name' => 'Kongo, Demokratische Republik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '112','isocode' => 'KP','name' => 'Korea, Demokratische Volksrepublik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '113','isocode' => 'KR','name' => 'Korea, Republik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454759','edit' => '1708454759'], + ['id' => '114','isocode' => 'XK','name' => 'Kosovo','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '115','isocode' => 'HR','name' => 'Kroatien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '116','isocode' => 'CU','name' => 'Kuba','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '117','isocode' => 'KW','name' => 'Kuwait','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '118','isocode' => 'LA','name' => 'Laos','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '119','isocode' => 'LS','name' => 'Lesotho','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '120','isocode' => 'LV','name' => 'Lettland','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '121','isocode' => 'LB','name' => 'Libanon','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '122','isocode' => 'LR','name' => 'Liberien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '123','isocode' => 'LY','name' => 'Libysch-Arabische Dschamahirija','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '124','isocode' => 'LI','name' => 'Liechtenstein','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '125','isocode' => 'LT','name' => 'Litauen','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '126','isocode' => 'LU','name' => 'Luxemburg','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '127','isocode' => 'MO','name' => 'Macao','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '128','isocode' => 'MG','name' => 'Madagaskar','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '129','isocode' => 'MW','name' => 'Malawi','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '130','isocode' => 'MY','name' => 'Malaysia','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '131','isocode' => 'MV','name' => 'Malediven','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '132','isocode' => 'ML','name' => 'Mali','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '133','isocode' => 'MT','name' => 'Malta','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '134','isocode' => 'IM','name' => 'Man, Insel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '135','isocode' => 'MP','name' => 'Marianen, Nördliche','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '136','isocode' => 'MA','name' => 'Marokko','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '137','isocode' => 'MH','name' => 'Marshall Inseln','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '138','isocode' => 'MQ','name' => 'Martinique Franz.Verwaltung','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '139','isocode' => 'MR','name' => 'Mauretanien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '140','isocode' => 'MU','name' => 'Mauritius','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '141','isocode' => 'YT','name' => 'Mayotte','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '142','isocode' => 'MX','name' => 'Mexiko','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '143','isocode' => 'FM','name' => 'Mikronesien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '144','isocode' => 'MD','name' => 'Moldau, Republik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '145','isocode' => 'MC','name' => 'Monaco','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '146','isocode' => 'MN','name' => 'Mongolei','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '147','isocode' => 'ME','name' => 'Montenegro','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '148','isocode' => 'MS','name' => 'Montserrat (GB-Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '149','isocode' => 'MZ','name' => 'Mosambik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '150','isocode' => 'MM','name' => 'Myanmar','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '151','isocode' => 'NA','name' => 'Namibia','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '152','isocode' => 'NR','name' => 'Nauru','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '153','isocode' => 'NP','name' => 'Nepal','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '154','isocode' => 'NC','name' => 'Neukaledonien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '155','isocode' => 'NZ','name' => 'Neuseeland','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '156','isocode' => 'NI','name' => 'Nicaragua','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '157','isocode' => 'NL','name' => 'Niederlande','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '158','isocode' => 'NE','name' => 'Niger','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '159','isocode' => 'NG','name' => 'Nigeria','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '160','isocode' => 'NU','name' => 'Niue (Neuseel.Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '161','isocode' => 'NF','name' => 'Norfolkinsel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '162','isocode' => 'NO','name' => 'Norwegen','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '163','isocode' => 'AT','name' => 'Österreich','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '164','isocode' => 'OM','name' => 'Oman','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '165','isocode' => 'PK','name' => 'Pakistan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '166','isocode' => 'PS','name' => 'Palästina','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '167','isocode' => 'PW','name' => 'Palau','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '168','isocode' => 'PA','name' => 'Panama','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '169','isocode' => 'PG','name' => 'Papua Neuguinea','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '170','isocode' => 'PY','name' => 'Paraguay','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '171','isocode' => 'PE','name' => 'Peru','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '172','isocode' => 'PH','name' => 'Philippinen','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '173','isocode' => 'PN','name' => 'Pitcairninsel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '174','isocode' => 'PL','name' => 'Polen','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '175','isocode' => 'PT','name' => 'Portugal','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '176','isocode' => 'PR','name' => 'Puerto Rico (US-Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '177','isocode' => 'MK','name' => 'Republik Nordmazedonien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '178','isocode' => 'RE','name' => 'Reunion','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '179','isocode' => 'RW','name' => 'Ruanda','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '180','isocode' => 'RO','name' => 'Rumänien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '181','isocode' => 'RU','name' => 'Russische Föderation','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '182','isocode' => 'BL','name' => 'Saint Barthélemy (Franz.Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '183','isocode' => 'MF','name' => 'Saint Martin (Franz. Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '184','isocode' => 'SB','name' => 'Salomonen','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '185','isocode' => 'ZM','name' => 'Sambia','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '186','isocode' => 'AS','name' => 'Samoa-Amerikanisch (US-Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '187','isocode' => 'WS','name' => 'Samoa-West','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '188','isocode' => 'SM','name' => 'San Marino','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '189','isocode' => 'ST','name' => 'Sao Tome und Principe','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '190','isocode' => 'SA','name' => 'Saudi-Arabien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '191','isocode' => 'SE','name' => 'Schweden','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '192','isocode' => 'CH','name' => 'Schweiz','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '193','isocode' => 'SN','name' => 'Senegal','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '194','isocode' => 'RS','name' => 'Serbien (exkl. Kosovo)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '195','isocode' => 'SC','name' => 'Seychellen','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '196','isocode' => 'SL','name' => 'Sierra Leone','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '197','isocode' => 'ZW','name' => 'Simbabwe','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '198','isocode' => 'SG','name' => 'Singapur','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '199','isocode' => 'SK','name' => 'Slowakei','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '200','isocode' => 'SI','name' => 'Slowenien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '201','isocode' => 'SO','name' => 'Somalia','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '202','isocode' => 'ES','name' => 'Spanien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '203','isocode' => 'SJ','name' => 'Spitzb. und Jan Mayen Insel (Norw.Verw.)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '204','isocode' => 'LK','name' => 'Sri Lanka','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '205','isocode' => 'SX','name' => 'St. Martin','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '206','isocode' => 'VC','name' => 'St. Vincent und die Grenadinen','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '207','isocode' => 'SH','name' => 'St.Helena','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '208','isocode' => 'KN','name' => 'St.Kitts und Nevis','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '209','isocode' => 'LC','name' => 'St.Lucia','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '210','isocode' => 'PM','name' => 'St.Pierre und Miquelon','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '211','isocode' => 'SD','name' => 'Sudan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '212','isocode' => 'ZA','name' => 'Südafrika','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '213','isocode' => 'GS','name' => 'Südgeorgien und Süd-Sandwich-Insel','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '214','isocode' => 'SS','name' => 'Südsudan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '215','isocode' => 'SR','name' => 'Suriname','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '216','isocode' => 'SY','name' => 'Syrien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '217','isocode' => 'TJ','name' => 'Tadschikistan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '218','isocode' => 'TW','name' => 'Taiwan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '219','isocode' => 'TZ','name' => 'Tansania, Vereinigte Republik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '220','isocode' => 'TH','name' => 'Thailand','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '221','isocode' => 'TL','name' => 'Timor-Leste','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '222','isocode' => 'TG','name' => 'Togo','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '223','isocode' => 'TK','name' => 'Tokelau (Neuseel.Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '224','isocode' => 'TO','name' => 'Tonga','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '225','isocode' => 'TT','name' => 'Trinidad und Tobago','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '226','isocode' => 'TD','name' => 'Tschad','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '227','isocode' => 'CZ','name' => 'Tschechien','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '228','isocode' => 'TR','name' => 'Türkei','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '229','isocode' => 'TN','name' => 'Tunesien','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '230','isocode' => 'TM','name' => 'Turkmenistan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '231','isocode' => 'TC','name' => 'Turks- und Caicosinseln','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '232','isocode' => 'TV','name' => 'Tuvalu','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '233','isocode' => 'UG','name' => 'Uganda','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '234','isocode' => 'UA','name' => 'Ukraine','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '235','isocode' => 'HU','name' => 'Ungarn','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '236','isocode' => 'UY','name' => 'Uruguay','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '237','isocode' => 'UM','name' => 'USA - Sonstige Kleine Inseln','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '238','isocode' => 'US','name' => 'USA - Vereinigte Staaten','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '239','isocode' => 'UZ','name' => 'Usbekistan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '240','isocode' => 'VU','name' => 'Vanuatu','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '241','isocode' => 'VA','name' => 'Vatikan','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '242','isocode' => 'VE','name' => 'Venezuela','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '243','isocode' => 'AE','name' => 'Vereinigte Arabische Emirate','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '244','isocode' => 'VN','name' => 'Vietnam','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '245','isocode' => 'WF','name' => 'Wallis und Futuna','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '246','isocode' => 'CX','name' => 'Weihnachtsinsel (Austr.Verwaltung)','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '247','isocode' => 'EH','name' => 'Westsahara Eigenst.Staat','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '248','isocode' => 'CF','name' => 'Zentralafrikanische Republik','is_eu' => '0','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'], + ['id' => '249','isocode' => 'CY','name' => 'Zypern','is_eu' => '1','create_by' => '1','edit_by' => '1','create' => '1708454760','edit' => '1708454760'] + ]; + + $this->table("Country")->insert($Country)->saveData(); } if($this->getEnvironment() == "addressdb") { diff --git a/db/migrations/20240220145156_address_add_country_id.php b/db/migrations/20240220145156_address_add_country_id.php new file mode 100644 index 000000000..72e02b808 --- /dev/null +++ b/db/migrations/20240220145156_address_add_country_id.php @@ -0,0 +1,56 @@ +getEnvironment() == "thetool") { + $table = $this->table("Address"); + $table->addColumn("country_id", "integer", ["null" => true, "default" => null, "after" => "country"]); + $table->save(); + + // call country_id update script + $orig_dir = getcwd(); + chdir(BASEDIR."/scripts"); + + echo " * running \033[1;32mscripts/address-update-country_id.php\033[0m to populate Address.country_id\n"; + $return = shell_exec("/usr/bin/env php ".BASEDIR."/scripts/address-update-country_id.php"); + chdir($orig_dir); + + if($return) { + die("Error while running county_id update script:\n\n\033[1;31m$return\033[0m\n\nAborting."); + } + + echo "\033[1;31m=====================================\033[0m\n"; + echo "\033[1;31m===\033[0m address-update-country_id.php \033[1;31m===\033[0m\n"; + echo "\033[1;31m===\033[0m ist gelaufen. \033[1;31m===\033[0m\n"; + echo "\033[1;31m===\033[0m ----------------------------- \033[1;31m===\033[0m\n"; + echo "\033[1;31m===\033[0m \033[1;32mWenn keine Fehler:\033[0m \033[1;31m===\033[0m\n"; + echo "\033[1;31m===\033[0m \033[1;31m===\033[0m\n"; + echo "\033[1;31m===\033[0m \033[1;32mBitte Spalte 'country' aus\033[0m \033[1;31m===\033[0m\n"; + echo "\033[1;31m===\033[0m \033[1;32mtable 'Address' löschen!!!\033[0m \033[1;31m===\033[0m\n"; + echo "\033[1;31m=====================================\033[0m\n"; + + // remove country + //$this->table("Address")->removeColumn("country")->save(); + } + + if($this->getEnvironment() == "addressdb") { + + } + } + + public function down(): void + { + if($this->getEnvironment() == "thetool") { + $this->table("Address")->removeColumn("country_id")->save(); + } + + if($this->getEnvironment() == "addressdb") { + + } + } +} diff --git a/lang/de.php b/lang/de.php index f46260b9e..f315b23e3 100644 --- a/lang/de.php +++ b/lang/de.php @@ -134,6 +134,6 @@ $l["cc.u.s.a."] = "US"; $l["cc.america"] = "US"; $l["cc.united states"] = "US"; $l["cc.united states of america"] = "US"; -$l["cc.mm"] = "CW"; +$l["cc.mm"] = "MM"; $lang['de'] = $l; \ No newline at end of file diff --git a/scripts/address-update-country_id.php b/scripts/address-update-country_id.php new file mode 100755 index 000000000..c94c7230b --- /dev/null +++ b/scripts/address-update-country_id.php @@ -0,0 +1,60 @@ +#!/usr/bin/php +id); +define("INTERNAL_USER_USERNAME", $me->username); +$layout = Layout::singleton(); + + +$austria = CountryModel::getFirst(["name" => "Österreich"]); + +if(!$austria) { + die("Österreich nicht gefunden\n"); +} + +foreach(AddressModel::getAll() as $address) { + if($address->country_id) continue; + $country = false; + + $c = strtolower(trim($address->country)); + + if(!$c || $c == "österreich" || $c == "Österreich" || $c == "Österreic" || $c == "Österreicch" || $c == "Österrreich" || $c == "at" || $c == "a") { + $country = $austria; + } + + if($c == "oesterreic" || $c == "oesterreicch" || $c == "oesterrreich") { + $country = $austria; + } + + if(!$country) { + $cc = __($address->country, "cc"); + if(!$cc) { + echo "cc for ".$address->country." not found"; + continue; + } + $country = CountryModel::getFirst(["isocode" => $cc]); + if(!$country) { + echo "Country for isocode $cc ($c) not found\n"; + continue; + } + } + + $address->country_id = $country->id; + if(!$address->save()) { + die(__FILE__.": Error saving address!\n"); + } + + //echo $address->country." => ".$country->name." ".$country->isocode."\n"; + +} \ No newline at end of file diff --git a/scripts/fibu-check/compare-addresses-from-fibu.php b/scripts/fibu-check/compare-addresses-from-fibu.php index b003a054d..db03488d4 100644 --- a/scripts/fibu-check/compare-addresses-from-fibu.php +++ b/scripts/fibu-check/compare-addresses-from-fibu.php @@ -13,6 +13,8 @@ require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php"); $me = new User(1); +die("country auf country_id umbauen!"); + $folder = __DIR__."/files/"; $csvname = "Kontaktliste.csv"; $filename = $folder.$csvname; diff --git a/scripts/import-addresses-no-fibu-num.php b/scripts/import-addresses-no-fibu-num.php index 44b5ff754..8298d23ad 100644 --- a/scripts/import-addresses-no-fibu-num.php +++ b/scripts/import-addresses-no-fibu-num.php @@ -15,6 +15,8 @@ $me = new User(1); define("INTERNAL_USER_ID", $me->id); define("INTERNAL_USER_USERNAME", $me->username); +die("country auf country_id umbauen!"); + $folder = __DIR__."/import/"; $csvname = "kunden_ohne_fibunr.csv"; $filename = $folder.$csvname; diff --git a/scripts/import-countries.php b/scripts/import-countries.php index 1bf5f089d..212a2a259 100755 --- a/scripts/import-countries.php +++ b/scripts/import-countries.php @@ -48,5 +48,7 @@ while($csv = fgetcsv($input, 0, ";")) { "is_eu" => ($is_eu) ? 1 : 0 ]); - $country->save(); + if(!$country->save()) { + die(__FILE__.": Error saving new country!\n"); + } } \ No newline at end of file diff --git a/scripts/import-supplier.php b/scripts/import-supplier.php index e5a3897b0..3016649f1 100644 --- a/scripts/import-supplier.php +++ b/scripts/import-supplier.php @@ -13,6 +13,8 @@ require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php"); $me = new User(1); +die("country auf country_id umbauen!"); + $folder = __DIR__."/import/"; $csvname = "lieferanten_import.csv"; $filename = $folder.$csvname; diff --git a/scripts/import_customers_from_ivt.php b/scripts/import_customers_from_ivt.php index d016f4d24..75f7be658 100644 --- a/scripts/import_customers_from_ivt.php +++ b/scripts/import_customers_from_ivt.php @@ -19,6 +19,8 @@ $me = new User(1); //$db = FronkDB::singleton(); //$ivt = new FronkDB(IVT_DBHOST, IVT_DBUSER, IVT_DBPASS, IVT_DBNAME); +die("country auf country_id umbauen!"); + foreach(IvtCustomerModel::getAll() as $cust) { //var_dump($cust);exit; if(!$cust->id) {