Address: changed country to country_id with Country table

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);