From f444899af4be4fe05ad021d23e33467ab9647858 Mon Sep 17 00:00:00 2001
From: Antony Thorpe <1023740+AntonyThorpe@users.noreply.github.com>
Date: Thu, 2 May 2024 18:14:01 +1200
Subject: [PATCH] Configuration API (#823)

Replace the use of self::variable_name with the Configuration API so that properties can be set via config yaml
---
 src/Forms/RestrictionRegionCountryDropdownField.php | 2 +-
 src/Model/Address.php                               | 6 +++---
 src/Model/Order.php                                 | 4 ++--
 src/Tasks/ShopMigrationTask.php                     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Forms/RestrictionRegionCountryDropdownField.php b/src/Forms/RestrictionRegionCountryDropdownField.php
index 4981bd528..197dac01f 100644
--- a/src/Forms/RestrictionRegionCountryDropdownField.php
+++ b/src/Forms/RestrictionRegionCountryDropdownField.php
@@ -14,6 +14,6 @@ public function __construct($name, $title = null, $source = null, $value = "")
         $source = SiteConfig::current_site_config()->getCountriesList(true);
         parent::__construct($name, $title, $source, $value);
         $this->setHasEmptyDefault(true);
-        $this->setEmptyString(self::$defaultname);
+        $this->setEmptyString(static::config()->get('defaultname'));
     }
 }
diff --git a/src/Model/Address.php b/src/Model/Address.php
index 976ffbdce..4c5be7a61 100644
--- a/src/Model/Address.php
+++ b/src/Model/Address.php
@@ -173,14 +173,14 @@ public function getCountryField()
 
     /**
      * Get an array of data fields that must be populated for model to be valid.
-     * Required fields can be customised via self::$required_fields
+     * Required fields can be customised via private static $required_fields
      */
     public function getRequiredFields()
     {
         $fields = self::config()->required_fields;
         //hack to allow overriding arrays in ss config
-        if (self::$required_fields != $fields) {
-            foreach (self::$required_fields as $requirement) {
+        if (static::config()->get('required_fields') != $fields) {
+            foreach (static::config()->get('required_fields') as $requirement) {
                 if (($key = array_search($requirement, $fields)) !== false) {
                     unset($fields[$key]);
                 }
diff --git a/src/Model/Order.php b/src/Model/Order.php
index f86066f0b..939beaa7d 100644
--- a/src/Model/Order.php
+++ b/src/Model/Order.php
@@ -462,7 +462,7 @@ public function getModifier($className, $forcecreate = false)
      */
     public function setTotal($val)
     {
-        $this->setField('Total', round($val, self::$rounding_precision));
+        $this->setField('Total', round($val, static::config()->get('rounding_precision')));
     }
 
     /**
@@ -807,7 +807,7 @@ public function getReference()
     protected function onBeforeWrite()
     {
         parent::onBeforeWrite();
-        if (!$this->getField('Reference') && in_array($this->Status, self::$placed_status)) {
+        if (!$this->getField('Reference') && in_array($this->Status, static::config()->get('placed_status'))) {
             $this->generateReference();
         }
 
diff --git a/src/Tasks/ShopMigrationTask.php b/src/Tasks/ShopMigrationTask.php
index 30dcb65a8..22cea9772 100644
--- a/src/Tasks/ShopMigrationTask.php
+++ b/src/Tasks/ShopMigrationTask.php
@@ -42,15 +42,15 @@ public function up()
     public function migrateOrders()
     {
         $start = $count = 0;
-        $batch = Order::get()->sort('Created', 'ASC')->limit($start, self::$batch_size);
+        $batch = Order::get()->sort('Created', 'ASC')->limit($start, static::config()->get('batch_size'));
         while ($batch->exists()) {
             foreach ($batch as $order) {
                 $this->migrate($order);
                 echo '. ';
                 $count++;
             }
-            $start += self::$batch_size;
-            $batch = $batch->limit($start, self::$batch_size);
+            $start += static::config()->get('batch_size');
+            $batch = $batch->limit($start, static::config()->get('batch_size'));
         };
         echo "$count orders updated.\n<br/>";
     }