Changeset 2701 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php

Timestamp:

03/07/2016 11:34:12 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Remove redundant country fields.

ISO 3166-compliant country fields were added in r2420, and these old ones should have been removed then.

We don't need to worry about back-compat because there aren't any current requests that are missing the new fields, and the data for the old fields is still in the database if we ever need it.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php (modified) (4 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php

@@ -441 +441 @@
 
     /**
+     * Get a country name from an alpha-2 or alpha-3 code
+     *
+     * @param string $country_code
+     *
+     * @return string
+     */
+    public static function get_country_name( $country_code ) {
+        $countries = self::get_valid_countries_iso3166();
+        $name      = '';
+
+        foreach ( $countries as $country ) {
+            if ( $country_code === $country['alpha2'] || $country_code === $country['alpha3'] ) {
+                $name = $country['name'];
+            }
+        }
+
+        return $name;
+    }
+
+    /**
      * Get a list of valid payment methods
      *
@@ -473 +493 @@
                 case 'bank_state':
                 case 'bank_zip_code':
-                case 'bank_country':
                 case 'bank_bic':
 
@@ -490 +509 @@
                 case 'beneficiary_state':
                 case 'beneficiary_zip_code':
-                case 'beneficiary_country':
 
                 case 'payable_to':
@@ -575 +593 @@
             'beneficiary_state',
             'beneficiary_zip_code',
-            'beneficiary_country',
             'beneficiary_country_iso3166',
             'ach_bank_name',