Merge pull request #8 from demeritcowboy/upgrade

Civix upgrade
KarinG · Jan 5, 2023 · 9ea65e5 · 9ea65e5
2 parents d37a389 + cc66aaa
commit 9ea65e5
Show file tree

Hide file tree

Showing 5 changed files with 189 additions and 348 deletions.
diff --git a/CRM/DataBCGeocode/Form/Settings.php b/CRM/DataBCGeocode/Form/Settings.php
@@ -44,9 +44,9 @@ function buildQuickForm() {
   function setDefaultValues() {
 
     $defaults = array(
-      'match_threshold' => CRM_Core_BAO_Setting::getItem('bcdatageocode', 'bcdata_match_threshold', NULL, self::D_THRESHOLD),
-      'match_precision' => CRM_Core_BAO_Setting::getItem('bcdatageocode', 'bcdata_match_precision', NULL, self::D_PRECISION),
-      'backup_geoProvider' => CRM_Core_BAO_Setting::getItem('bcdatageocode', 'bcdata_backup_geoProvider'),
+      'match_threshold' => Civi::settings()->get('bcdata_match_threshold') ?? self::D_THRESHOLD,
+      'match_precision' => Civi::settings()->get('bcdata_match_precision') ?? self::D_PRECISION,
+      'backup_geoProvider' => Civi::settings()->get('bcdata_backup_geoProvider'),
     );
 
     return $defaults;
@@ -57,9 +57,9 @@ function postProcess() {
     $values = $this->exportValues();
 
     if (CRM_Utils_Array::value('match_threshold', $values)) {
-      CRM_Core_BAO_Setting::setItem($values['match_threshold'], 'bcdatageocode', 'bcdata_match_threshold');
-      CRM_Core_BAO_Setting::setItem($values['match_precision'], 'bcdatageocode', 'bcdata_match_precision');
-      CRM_Core_BAO_Setting::setItem($values['backup_geoProvider'], 'bcdatageocode', 'bcdata_backup_geoProvider');
+      Civi::settings()->set('bcdata_match_threshold', $values['match_threshold']);
+      Civi::settings()->set('bcdata_match_precision', $values['match_precision']);
+      Civi::settings()->set('bcdata_backup_geoProvider', $values['backup_geoProvider']);
     }
 
     parent::postProcess();

diff --git a/CRM/Utils/Geocode/DataBC.php b/CRM/Utils/Geocode/DataBC.php
@@ -67,7 +67,7 @@ static function format(&$values, $stateName = FALSE) {
     if ((CRM_Utils_Array::value('state_province_id', $values) != '1101') && (CRM_Utils_Array::value('state_province', $values) != 'British Columbia'))
     {
       // if we get here we are NOT in British Columbia - try BackUp method!
-      $backupgeoProvider = CRM_Core_BAO_Setting::getItem('bcdatageocode', 'bcdata_backup_geoProvider');
+      $backupgeoProvider = Civi::settings()->get('bcdata_backup_geoProvider');
 
       if ($backupgeoProvider == 'Google') {
         $class = new CRM_Utils_Geocode_Google();
@@ -105,8 +105,8 @@ static function format(&$values, $stateName = FALSE) {
     $add .= ', BC';
     $add = urlencode($add);
 
-    $minScore = CRM_Core_BAO_Setting::getItem('bcdatageocode','bcdata_match_threshold');
-    $selectedPrecision = CRM_Core_BAO_Setting::getItem('bcdatageocode', 'bcdata_match_precision');
+    $minScore = Civi::settings()->get('bcdata_match_threshold');
+    $selectedPrecision = Civi::settings()->get('bcdata_match_precision');
 
     $precisions = array(
       0 => 'CIVIC_NUMBER',