AyeCode / invoicing

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-address.php

Indentation +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -17,10 +17,10 @@ 
 class GetPaid_Meta_Box_Invoice_Address {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Prepare the invoice.
@@ -298,18 +298,18 @@ 
     }
 
     /**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 */
-	public static function save( $post_id ) {
+     * Save meta box data.
+     *
+     * @param int $post_id
+     */
+    public static function save( $post_id ) {
 
         // Prepare the invoice.
         $invoice = new WPInv_Invoice( $post_id );
 
         // Load new data.
         $invoice->set_props(
-			array(
+            array(
                 'template'             => isset( $_POST['wpinv_template'] ) ? wpinv_clean( $_POST['wpinv_template'] ) : null,
                 'email_cc'             => isset( $_POST['wpinv_cc'] ) ? wpinv_clean( $_POST['wpinv_cc'] ) : null,
                 'disable_taxes'        => isset( $_POST['disable_taxes'] ),
@@ -330,7 +330,7 @@ 
                 'due_date'             => isset( $_POST['wpinv_due_date'] ) ? wpinv_clean( $_POST['wpinv_due_date'] ) : null,
                 'number'               => isset( $_POST['wpinv_number'] ) ? wpinv_clean( $_POST['wpinv_number'] ) : null,
                 'status'               => isset( $_POST['wpinv_status'] ) ? wpinv_clean( $_POST['wpinv_status'] ) : null,
-			)
+            )
         );
 
         // Discount code.
@@ -376,6 +376,6 @@ 
         }
 
         // Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
-	}
+        do_action( 'wpinv_invoice_metabox_saved', $invoice );
+    }
 }

includes/data/countries.php

Indentation +252 added lines, -252 removed lines

@@ -12,256 +12,256 @@
 defined( 'ABSPATH' ) || exit;
 
 return array(
-	'US' => __('United States', 'invoicing'),
-	'CA' => __('Canada', 'invoicing'),
-	'GB' => __('United Kingdom', 'invoicing'),
-	'AF' => __('Afghanistan', 'invoicing'),
-	'AX' => __('Aland Islands', 'invoicing'),
-	'AL' => __('Albania', 'invoicing'),
-	'DZ' => __('Algeria', 'invoicing'),
-	'AS' => __('American Samoa', 'invoicing'),
-	'AD' => __('Andorra', 'invoicing'),
-	'AO' => __('Angola', 'invoicing'),
-	'AI' => __('Anguilla', 'invoicing'),
-	'AQ' => __('Antarctica', 'invoicing'),
-	'AG' => __('Antigua and Barbuda', 'invoicing'),
-	'AR' => __('Argentina', 'invoicing'),
-	'AM' => __('Armenia', 'invoicing'),
-	'AW' => __('Aruba', 'invoicing'),
-	'AU' => __('Australia', 'invoicing'),
-	'AT' => __('Austria', 'invoicing'),
-	'AZ' => __('Azerbaijan', 'invoicing'),
-	'BS' => __('Bahamas', 'invoicing'),
-	'BH' => __('Bahrain', 'invoicing'),
-	'BD' => __('Bangladesh', 'invoicing'),
-	'BB' => __('Barbados', 'invoicing'),
-	'BY' => __('Belarus', 'invoicing'),
-	'BE' => __('Belgium', 'invoicing'),
-	'BZ' => __('Belize', 'invoicing'),
-	'BJ' => __('Benin', 'invoicing'),
-	'BM' => __('Bermuda', 'invoicing'),
-	'BT' => __('Bhutan', 'invoicing'),
-	'BO' => __('Bolivia', 'invoicing'),
-	'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
-	'BA' => __('Bosnia and Herzegovina', 'invoicing'),
-	'BW' => __('Botswana', 'invoicing'),
-	'BV' => __('Bouvet Island', 'invoicing'),
-	'BR' => __('Brazil', 'invoicing'),
-	'IO' => __('British Indian Ocean Territory', 'invoicing'),
-	'BN' => __('Brunei Darrussalam', 'invoicing'),
-	'BG' => __('Bulgaria', 'invoicing'),
-	'BF' => __('Burkina Faso', 'invoicing'),
-	'BI' => __('Burundi', 'invoicing'),
-	'KH' => __('Cambodia', 'invoicing'),
-	'CM' => __('Cameroon', 'invoicing'),
-	'CV' => __('Cape Verde', 'invoicing'),
-	'KY' => __('Cayman Islands', 'invoicing'),
-	'CF' => __('Central African Republic', 'invoicing'),
-	'TD' => __('Chad', 'invoicing'),
-	'CL' => __('Chile', 'invoicing'),
-	'CN' => __('China', 'invoicing'),
-	'CX' => __('Christmas Island', 'invoicing'),
-	'CC' => __('Cocos Islands', 'invoicing'),
-	'CO' => __('Colombia', 'invoicing'),
-	'KM' => __('Comoros', 'invoicing'),
-	'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
-	'CG' => __('Congo, Republic of', 'invoicing'),
-	'CK' => __('Cook Islands', 'invoicing'),
-	'CR' => __('Costa Rica', 'invoicing'),
-	'CI' => __('Cote d\'Ivoire', 'invoicing'),
-	'HR' => __('Croatia/Hrvatska', 'invoicing'),
-	'CU' => __('Cuba', 'invoicing'),
-	'CW' => __('CuraÇao', 'invoicing'),
-	'CY' => __('Cyprus', 'invoicing'),
-	'CZ' => __('Czech Republic', 'invoicing'),
-	'DK' => __('Denmark', 'invoicing'),
-	'DJ' => __('Djibouti', 'invoicing'),
-	'DM' => __('Dominica', 'invoicing'),
-	'DO' => __('Dominican Republic', 'invoicing'),
-	'TP' => __('East Timor', 'invoicing'),
-	'EC' => __('Ecuador', 'invoicing'),
-	'EG' => __('Egypt', 'invoicing'),
-	'GQ' => __('Equatorial Guinea', 'invoicing'),
-	'SV' => __('El Salvador', 'invoicing'),
-	'ER' => __('Eritrea', 'invoicing'),
-	'EE' => __('Estonia', 'invoicing'),
-	'ET' => __('Ethiopia', 'invoicing'),
-	'FK' => __('Falkland Islands', 'invoicing'),
-	'FO' => __('Faroe Islands', 'invoicing'),
-	'FJ' => __('Fiji', 'invoicing'),
-	'FI' => __('Finland', 'invoicing'),
-	'FR' => __('France', 'invoicing'),
-	'GF' => __('French Guiana', 'invoicing'),
-	'PF' => __('French Polynesia', 'invoicing'),
-	'TF' => __('French Southern Territories', 'invoicing'),
-	'GA' => __('Gabon', 'invoicing'),
-	'GM' => __('Gambia', 'invoicing'),
-	'GE' => __('Georgia', 'invoicing'),
-	'DE' => __('Germany', 'invoicing'),
-	'GR' => __('Greece', 'invoicing'),
-	'GH' => __('Ghana', 'invoicing'),
-	'GI' => __('Gibraltar', 'invoicing'),
-	'GL' => __('Greenland', 'invoicing'),
-	'GD' => __('Grenada', 'invoicing'),
-	'GP' => __('Guadeloupe', 'invoicing'),
-	'GU' => __('Guam', 'invoicing'),
-	'GT' => __('Guatemala', 'invoicing'),
-	'GG' => __('Guernsey', 'invoicing'),
-	'GN' => __('Guinea', 'invoicing'),
-	'GW' => __('Guinea-Bissau', 'invoicing'),
-	'GY' => __('Guyana', 'invoicing'),
-	'HT' => __('Haiti', 'invoicing'),
-	'HM' => __('Heard and McDonald Islands', 'invoicing'),
-	'VA' => __('Holy See (City Vatican State)', 'invoicing'),
-	'HN' => __('Honduras', 'invoicing'),
-	'HK' => __('Hong Kong', 'invoicing'),
-	'HU' => __('Hungary', 'invoicing'),
-	'IS' => __('Iceland', 'invoicing'),
-	'IN' => __('India', 'invoicing'),
-	'ID' => __('Indonesia', 'invoicing'),
-	'IR' => __('Iran', 'invoicing'),
-	'IQ' => __('Iraq', 'invoicing'),
-	'IE' => __('Ireland', 'invoicing'),
-	'IM' => __('Isle of Man', 'invoicing'),
-	'IL' => __('Israel', 'invoicing'),
-	'IT' => __('Italy', 'invoicing'),
-	'JM' => __('Jamaica', 'invoicing'),
-	'JP' => __('Japan', 'invoicing'),
-	'JE' => __('Jersey', 'invoicing'),
-	'JO' => __('Jordan', 'invoicing'),
-	'KZ' => __('Kazakhstan', 'invoicing'),
-	'KE' => __('Kenya', 'invoicing'),
-	'KI' => __('Kiribati', 'invoicing'),
-	'KW' => __('Kuwait', 'invoicing'),
-	'KG' => __('Kyrgyzstan', 'invoicing'),
-	'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
-	'LV' => __('Latvia', 'invoicing'),
-	'LB' => __('Lebanon', 'invoicing'),
-	'LS' => __('Lesotho', 'invoicing'),
-	'LR' => __('Liberia', 'invoicing'),
-	'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
-	'LI' => __('Liechtenstein', 'invoicing'),
-	'LT' => __('Lithuania', 'invoicing'),
-	'LU' => __('Luxembourg', 'invoicing'),
-	'MO' => __('Macau', 'invoicing'),
-	'MK' => __('Macedonia', 'invoicing'),
-	'MG' => __('Madagascar', 'invoicing'),
-	'MW' => __('Malawi', 'invoicing'),
-	'MY' => __('Malaysia', 'invoicing'),
-	'MV' => __('Maldives', 'invoicing'),
-	'ML' => __('Mali', 'invoicing'),
-	'MT' => __('Malta', 'invoicing'),
-	'MH' => __('Marshall Islands', 'invoicing'),
-	'MQ' => __('Martinique', 'invoicing'),
-	'MR' => __('Mauritania', 'invoicing'),
-	'MU' => __('Mauritius', 'invoicing'),
-	'YT' => __('Mayotte', 'invoicing'),
-	'MX' => __('Mexico', 'invoicing'),
-	'FM' => __('Micronesia', 'invoicing'),
-	'MD' => __('Moldova, Republic of', 'invoicing'),
-	'MC' => __('Monaco', 'invoicing'),
-	'MN' => __('Mongolia', 'invoicing'),
-	'ME' => __('Montenegro', 'invoicing'),
-	'MS' => __('Montserrat', 'invoicing'),
-	'MA' => __('Morocco', 'invoicing'),
-	'MZ' => __('Mozambique', 'invoicing'),
-	'MM' => __('Myanmar', 'invoicing'),
-	'NA' => __('Namibia', 'invoicing'),
-	'NR' => __('Nauru', 'invoicing'),
-	'NP' => __('Nepal', 'invoicing'),
-	'NL' => __('Netherlands', 'invoicing'),
-	'AN' => __('Netherlands Antilles', 'invoicing'),
-	'NC' => __('New Caledonia', 'invoicing'),
-	'NZ' => __('New Zealand', 'invoicing'),
-	'NI' => __('Nicaragua', 'invoicing'),
-	'NE' => __('Niger', 'invoicing'),
-	'NG' => __('Nigeria', 'invoicing'),
-	'NU' => __('Niue', 'invoicing'),
-	'NF' => __('Norfolk Island', 'invoicing'),
-	'KP' => __('North Korea', 'invoicing'),
-	'MP' => __('Northern Mariana Islands', 'invoicing'),
-	'NO' => __('Norway', 'invoicing'),
-	'OM' => __('Oman', 'invoicing'),
-	'PK' => __('Pakistan', 'invoicing'),
-	'PW' => __('Palau', 'invoicing'),
-	'PS' => __('Palestinian Territories', 'invoicing'),
-	'PA' => __('Panama', 'invoicing'),
-	'PG' => __('Papua New Guinea', 'invoicing'),
-	'PY' => __('Paraguay', 'invoicing'),
-	'PE' => __('Peru', 'invoicing'),
-	'PH' => __('Philippines', 'invoicing'),
-	'PN' => __('Pitcairn Island', 'invoicing'),
-	'PL' => __('Poland', 'invoicing'),
-	'PT' => __('Portugal', 'invoicing'),
-	'PR' => __('Puerto Rico', 'invoicing'),
-	'QA' => __('Qatar', 'invoicing'),
-	'XK' => __('Republic of Kosovo', 'invoicing'),
-	'RE' => __('Reunion Island', 'invoicing'),
-	'RO' => __('Romania', 'invoicing'),
-	'RU' => __('Russian Federation', 'invoicing'),
-	'RW' => __('Rwanda', 'invoicing'),
-	'BL' => __('Saint Barthélemy', 'invoicing'),
-	'SH' => __('Saint Helena', 'invoicing'),
-	'KN' => __('Saint Kitts and Nevis', 'invoicing'),
-	'LC' => __('Saint Lucia', 'invoicing'),
-	'MF' => __('Saint Martin (French)', 'invoicing'),
-	'SX' => __('Saint Martin (Dutch)', 'invoicing'),
-	'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
-	'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
-	'SM' => __('San Marino', 'invoicing'),
-	'ST' => __('São Tomé and Príncipe', 'invoicing'),
-	'SA' => __('Saudi Arabia', 'invoicing'),
-	'SN' => __('Senegal', 'invoicing'),
-	'RS' => __('Serbia', 'invoicing'),
-	'SC' => __('Seychelles', 'invoicing'),
-	'SL' => __('Sierra Leone', 'invoicing'),
-	'SG' => __('Singapore', 'invoicing'),
-	'SK' => __('Slovak Republic', 'invoicing'),
-	'SI' => __('Slovenia', 'invoicing'),
-	'SB' => __('Solomon Islands', 'invoicing'),
-	'SO' => __('Somalia', 'invoicing'),
-	'ZA' => __('South Africa', 'invoicing'),
-	'GS' => __('South Georgia', 'invoicing'),
-	'KR' => __('South Korea', 'invoicing'),
-	'SS' => __('South Sudan', 'invoicing'),
-	'ES' => __('Spain', 'invoicing'),
-	'LK' => __('Sri Lanka', 'invoicing'),
-	'SD' => __('Sudan', 'invoicing'),
-	'SR' => __('Suriname', 'invoicing'),
-	'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
-	'SZ' => __('Swaziland', 'invoicing'),
-	'SE' => __('Sweden', 'invoicing'),
-	'CH' => __('Switzerland', 'invoicing'),
-	'SY' => __('Syrian Arab Republic', 'invoicing'),
-	'TW' => __('Taiwan', 'invoicing'),
-	'TJ' => __('Tajikistan', 'invoicing'),
-	'TZ' => __('Tanzania', 'invoicing'),
-	'TH' => __('Thailand', 'invoicing'),
-	'TL' => __('Timor-Leste', 'invoicing'),
-	'TG' => __('Togo', 'invoicing'),
-	'TK' => __('Tokelau', 'invoicing'),
-	'TO' => __('Tonga', 'invoicing'),
-	'TT' => __('Trinidad and Tobago', 'invoicing'),
-	'TN' => __('Tunisia', 'invoicing'),
-	'TR' => __('Turkey', 'invoicing'),
-	'TM' => __('Turkmenistan', 'invoicing'),
-	'TC' => __('Turks and Caicos Islands', 'invoicing'),
-	'TV' => __('Tuvalu', 'invoicing'),
-	'UG' => __('Uganda', 'invoicing'),
-	'UA' => __('Ukraine', 'invoicing'),
-	'AE' => __('United Arab Emirates', 'invoicing'),
-	'UY' => __('Uruguay', 'invoicing'),
-	'UM' => __('US Minor Outlying Islands', 'invoicing'),
-	'UZ' => __('Uzbekistan', 'invoicing'),
-	'VU' => __('Vanuatu', 'invoicing'),
-	'VE' => __('Venezuela', 'invoicing'),
-	'VN' => __('Vietnam', 'invoicing'),
-	'VG' => __('Virgin Islands (British)', 'invoicing'),
-	'VI' => __('Virgin Islands (USA)', 'invoicing'),
-	'WF' => __('Wallis and Futuna Islands', 'invoicing'),
-	'EH' => __('Western Sahara', 'invoicing'),
-	'WS' => __('Western Samoa', 'invoicing'),
-	'YE' => __('Yemen', 'invoicing'),
-	'ZM' => __('Zambia', 'invoicing'),
-	'ZW' => __('Zimbabwe', 'invoicing'),
+    'US' => __('United States', 'invoicing'),
+    'CA' => __('Canada', 'invoicing'),
+    'GB' => __('United Kingdom', 'invoicing'),
+    'AF' => __('Afghanistan', 'invoicing'),
+    'AX' => __('Aland Islands', 'invoicing'),
+    'AL' => __('Albania', 'invoicing'),
+    'DZ' => __('Algeria', 'invoicing'),
+    'AS' => __('American Samoa', 'invoicing'),
+    'AD' => __('Andorra', 'invoicing'),
+    'AO' => __('Angola', 'invoicing'),
+    'AI' => __('Anguilla', 'invoicing'),
+    'AQ' => __('Antarctica', 'invoicing'),
+    'AG' => __('Antigua and Barbuda', 'invoicing'),
+    'AR' => __('Argentina', 'invoicing'),
+    'AM' => __('Armenia', 'invoicing'),
+    'AW' => __('Aruba', 'invoicing'),
+    'AU' => __('Australia', 'invoicing'),
+    'AT' => __('Austria', 'invoicing'),
+    'AZ' => __('Azerbaijan', 'invoicing'),
+    'BS' => __('Bahamas', 'invoicing'),
+    'BH' => __('Bahrain', 'invoicing'),
+    'BD' => __('Bangladesh', 'invoicing'),
+    'BB' => __('Barbados', 'invoicing'),
+    'BY' => __('Belarus', 'invoicing'),
+    'BE' => __('Belgium', 'invoicing'),
+    'BZ' => __('Belize', 'invoicing'),
+    'BJ' => __('Benin', 'invoicing'),
+    'BM' => __('Bermuda', 'invoicing'),
+    'BT' => __('Bhutan', 'invoicing'),
+    'BO' => __('Bolivia', 'invoicing'),
+    'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
+    'BA' => __('Bosnia and Herzegovina', 'invoicing'),
+    'BW' => __('Botswana', 'invoicing'),
+    'BV' => __('Bouvet Island', 'invoicing'),
+    'BR' => __('Brazil', 'invoicing'),
+    'IO' => __('British Indian Ocean Territory', 'invoicing'),
+    'BN' => __('Brunei Darrussalam', 'invoicing'),
+    'BG' => __('Bulgaria', 'invoicing'),
+    'BF' => __('Burkina Faso', 'invoicing'),
+    'BI' => __('Burundi', 'invoicing'),
+    'KH' => __('Cambodia', 'invoicing'),
+    'CM' => __('Cameroon', 'invoicing'),
+    'CV' => __('Cape Verde', 'invoicing'),
+    'KY' => __('Cayman Islands', 'invoicing'),
+    'CF' => __('Central African Republic', 'invoicing'),
+    'TD' => __('Chad', 'invoicing'),
+    'CL' => __('Chile', 'invoicing'),
+    'CN' => __('China', 'invoicing'),
+    'CX' => __('Christmas Island', 'invoicing'),
+    'CC' => __('Cocos Islands', 'invoicing'),
+    'CO' => __('Colombia', 'invoicing'),
+    'KM' => __('Comoros', 'invoicing'),
+    'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
+    'CG' => __('Congo, Republic of', 'invoicing'),
+    'CK' => __('Cook Islands', 'invoicing'),
+    'CR' => __('Costa Rica', 'invoicing'),
+    'CI' => __('Cote d\'Ivoire', 'invoicing'),
+    'HR' => __('Croatia/Hrvatska', 'invoicing'),
+    'CU' => __('Cuba', 'invoicing'),
+    'CW' => __('CuraÇao', 'invoicing'),
+    'CY' => __('Cyprus', 'invoicing'),
+    'CZ' => __('Czech Republic', 'invoicing'),
+    'DK' => __('Denmark', 'invoicing'),
+    'DJ' => __('Djibouti', 'invoicing'),
+    'DM' => __('Dominica', 'invoicing'),
+    'DO' => __('Dominican Republic', 'invoicing'),
+    'TP' => __('East Timor', 'invoicing'),
+    'EC' => __('Ecuador', 'invoicing'),
+    'EG' => __('Egypt', 'invoicing'),
+    'GQ' => __('Equatorial Guinea', 'invoicing'),
+    'SV' => __('El Salvador', 'invoicing'),
+    'ER' => __('Eritrea', 'invoicing'),
+    'EE' => __('Estonia', 'invoicing'),
+    'ET' => __('Ethiopia', 'invoicing'),
+    'FK' => __('Falkland Islands', 'invoicing'),
+    'FO' => __('Faroe Islands', 'invoicing'),
+    'FJ' => __('Fiji', 'invoicing'),
+    'FI' => __('Finland', 'invoicing'),
+    'FR' => __('France', 'invoicing'),
+    'GF' => __('French Guiana', 'invoicing'),
+    'PF' => __('French Polynesia', 'invoicing'),
+    'TF' => __('French Southern Territories', 'invoicing'),
+    'GA' => __('Gabon', 'invoicing'),
+    'GM' => __('Gambia', 'invoicing'),
+    'GE' => __('Georgia', 'invoicing'),
+    'DE' => __('Germany', 'invoicing'),
+    'GR' => __('Greece', 'invoicing'),
+    'GH' => __('Ghana', 'invoicing'),
+    'GI' => __('Gibraltar', 'invoicing'),
+    'GL' => __('Greenland', 'invoicing'),
+    'GD' => __('Grenada', 'invoicing'),
+    'GP' => __('Guadeloupe', 'invoicing'),
+    'GU' => __('Guam', 'invoicing'),
+    'GT' => __('Guatemala', 'invoicing'),
+    'GG' => __('Guernsey', 'invoicing'),
+    'GN' => __('Guinea', 'invoicing'),
+    'GW' => __('Guinea-Bissau', 'invoicing'),
+    'GY' => __('Guyana', 'invoicing'),
+    'HT' => __('Haiti', 'invoicing'),
+    'HM' => __('Heard and McDonald Islands', 'invoicing'),
+    'VA' => __('Holy See (City Vatican State)', 'invoicing'),
+    'HN' => __('Honduras', 'invoicing'),
+    'HK' => __('Hong Kong', 'invoicing'),
+    'HU' => __('Hungary', 'invoicing'),
+    'IS' => __('Iceland', 'invoicing'),
+    'IN' => __('India', 'invoicing'),
+    'ID' => __('Indonesia', 'invoicing'),
+    'IR' => __('Iran', 'invoicing'),
+    'IQ' => __('Iraq', 'invoicing'),
+    'IE' => __('Ireland', 'invoicing'),
+    'IM' => __('Isle of Man', 'invoicing'),
+    'IL' => __('Israel', 'invoicing'),
+    'IT' => __('Italy', 'invoicing'),
+    'JM' => __('Jamaica', 'invoicing'),
+    'JP' => __('Japan', 'invoicing'),
+    'JE' => __('Jersey', 'invoicing'),
+    'JO' => __('Jordan', 'invoicing'),
+    'KZ' => __('Kazakhstan', 'invoicing'),
+    'KE' => __('Kenya', 'invoicing'),
+    'KI' => __('Kiribati', 'invoicing'),
+    'KW' => __('Kuwait', 'invoicing'),
+    'KG' => __('Kyrgyzstan', 'invoicing'),
+    'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
+    'LV' => __('Latvia', 'invoicing'),
+    'LB' => __('Lebanon', 'invoicing'),
+    'LS' => __('Lesotho', 'invoicing'),
+    'LR' => __('Liberia', 'invoicing'),
+    'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
+    'LI' => __('Liechtenstein', 'invoicing'),
+    'LT' => __('Lithuania', 'invoicing'),
+    'LU' => __('Luxembourg', 'invoicing'),
+    'MO' => __('Macau', 'invoicing'),
+    'MK' => __('Macedonia', 'invoicing'),
+    'MG' => __('Madagascar', 'invoicing'),
+    'MW' => __('Malawi', 'invoicing'),
+    'MY' => __('Malaysia', 'invoicing'),
+    'MV' => __('Maldives', 'invoicing'),
+    'ML' => __('Mali', 'invoicing'),
+    'MT' => __('Malta', 'invoicing'),
+    'MH' => __('Marshall Islands', 'invoicing'),
+    'MQ' => __('Martinique', 'invoicing'),
+    'MR' => __('Mauritania', 'invoicing'),
+    'MU' => __('Mauritius', 'invoicing'),
+    'YT' => __('Mayotte', 'invoicing'),
+    'MX' => __('Mexico', 'invoicing'),
+    'FM' => __('Micronesia', 'invoicing'),
+    'MD' => __('Moldova, Republic of', 'invoicing'),
+    'MC' => __('Monaco', 'invoicing'),
+    'MN' => __('Mongolia', 'invoicing'),
+    'ME' => __('Montenegro', 'invoicing'),
+    'MS' => __('Montserrat', 'invoicing'),
+    'MA' => __('Morocco', 'invoicing'),
+    'MZ' => __('Mozambique', 'invoicing'),
+    'MM' => __('Myanmar', 'invoicing'),
+    'NA' => __('Namibia', 'invoicing'),
+    'NR' => __('Nauru', 'invoicing'),
+    'NP' => __('Nepal', 'invoicing'),
+    'NL' => __('Netherlands', 'invoicing'),
+    'AN' => __('Netherlands Antilles', 'invoicing'),
+    'NC' => __('New Caledonia', 'invoicing'),
+    'NZ' => __('New Zealand', 'invoicing'),
+    'NI' => __('Nicaragua', 'invoicing'),
+    'NE' => __('Niger', 'invoicing'),
+    'NG' => __('Nigeria', 'invoicing'),
+    'NU' => __('Niue', 'invoicing'),
+    'NF' => __('Norfolk Island', 'invoicing'),
+    'KP' => __('North Korea', 'invoicing'),
+    'MP' => __('Northern Mariana Islands', 'invoicing'),
+    'NO' => __('Norway', 'invoicing'),
+    'OM' => __('Oman', 'invoicing'),
+    'PK' => __('Pakistan', 'invoicing'),
+    'PW' => __('Palau', 'invoicing'),
+    'PS' => __('Palestinian Territories', 'invoicing'),
+    'PA' => __('Panama', 'invoicing'),
+    'PG' => __('Papua New Guinea', 'invoicing'),
+    'PY' => __('Paraguay', 'invoicing'),
+    'PE' => __('Peru', 'invoicing'),
+    'PH' => __('Philippines', 'invoicing'),
+    'PN' => __('Pitcairn Island', 'invoicing'),
+    'PL' => __('Poland', 'invoicing'),
+    'PT' => __('Portugal', 'invoicing'),
+    'PR' => __('Puerto Rico', 'invoicing'),
+    'QA' => __('Qatar', 'invoicing'),
+    'XK' => __('Republic of Kosovo', 'invoicing'),
+    'RE' => __('Reunion Island', 'invoicing'),
+    'RO' => __('Romania', 'invoicing'),
+    'RU' => __('Russian Federation', 'invoicing'),
+    'RW' => __('Rwanda', 'invoicing'),
+    'BL' => __('Saint Barthélemy', 'invoicing'),
+    'SH' => __('Saint Helena', 'invoicing'),
+    'KN' => __('Saint Kitts and Nevis', 'invoicing'),
+    'LC' => __('Saint Lucia', 'invoicing'),
+    'MF' => __('Saint Martin (French)', 'invoicing'),
+    'SX' => __('Saint Martin (Dutch)', 'invoicing'),
+    'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
+    'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
+    'SM' => __('San Marino', 'invoicing'),
+    'ST' => __('São Tomé and Príncipe', 'invoicing'),
+    'SA' => __('Saudi Arabia', 'invoicing'),
+    'SN' => __('Senegal', 'invoicing'),
+    'RS' => __('Serbia', 'invoicing'),
+    'SC' => __('Seychelles', 'invoicing'),
+    'SL' => __('Sierra Leone', 'invoicing'),
+    'SG' => __('Singapore', 'invoicing'),
+    'SK' => __('Slovak Republic', 'invoicing'),
+    'SI' => __('Slovenia', 'invoicing'),
+    'SB' => __('Solomon Islands', 'invoicing'),
+    'SO' => __('Somalia', 'invoicing'),
+    'ZA' => __('South Africa', 'invoicing'),
+    'GS' => __('South Georgia', 'invoicing'),
+    'KR' => __('South Korea', 'invoicing'),
+    'SS' => __('South Sudan', 'invoicing'),
+    'ES' => __('Spain', 'invoicing'),
+    'LK' => __('Sri Lanka', 'invoicing'),
+    'SD' => __('Sudan', 'invoicing'),
+    'SR' => __('Suriname', 'invoicing'),
+    'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
+    'SZ' => __('Swaziland', 'invoicing'),
+    'SE' => __('Sweden', 'invoicing'),
+    'CH' => __('Switzerland', 'invoicing'),
+    'SY' => __('Syrian Arab Republic', 'invoicing'),
+    'TW' => __('Taiwan', 'invoicing'),
+    'TJ' => __('Tajikistan', 'invoicing'),
+    'TZ' => __('Tanzania', 'invoicing'),
+    'TH' => __('Thailand', 'invoicing'),
+    'TL' => __('Timor-Leste', 'invoicing'),
+    'TG' => __('Togo', 'invoicing'),
+    'TK' => __('Tokelau', 'invoicing'),
+    'TO' => __('Tonga', 'invoicing'),
+    'TT' => __('Trinidad and Tobago', 'invoicing'),
+    'TN' => __('Tunisia', 'invoicing'),
+    'TR' => __('Turkey', 'invoicing'),
+    'TM' => __('Turkmenistan', 'invoicing'),
+    'TC' => __('Turks and Caicos Islands', 'invoicing'),
+    'TV' => __('Tuvalu', 'invoicing'),
+    'UG' => __('Uganda', 'invoicing'),
+    'UA' => __('Ukraine', 'invoicing'),
+    'AE' => __('United Arab Emirates', 'invoicing'),
+    'UY' => __('Uruguay', 'invoicing'),
+    'UM' => __('US Minor Outlying Islands', 'invoicing'),
+    'UZ' => __('Uzbekistan', 'invoicing'),
+    'VU' => __('Vanuatu', 'invoicing'),
+    'VE' => __('Venezuela', 'invoicing'),
+    'VN' => __('Vietnam', 'invoicing'),
+    'VG' => __('Virgin Islands (British)', 'invoicing'),
+    'VI' => __('Virgin Islands (USA)', 'invoicing'),
+    'WF' => __('Wallis and Futuna Islands', 'invoicing'),
+    'EH' => __('Western Sahara', 'invoicing'),
+    'WS' => __('Western Samoa', 'invoicing'),
+    'YE' => __('Yemen', 'invoicing'),
+    'ZM' => __('Zambia', 'invoicing'),
+    'ZW' => __('Zimbabwe', 'invoicing'),
 );

templates/payment-forms/elements/address.php

Indentation +25 added lines, -25 removed lines

@@ -10,7 +10,7 @@ 
 defined( 'ABSPATH' ) || exit;
 
 if ( empty( $fields ) ) {
-	return;
+    return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -18,12 +18,12 @@ 
 
 // Prepare the user's country.
 if ( ! empty( $form->invoice ) ) {
-	$country = $form->invoice->get_country();
+    $country = $form->invoice->get_country();
 }
 
 if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+    $country = empty( $country ) ? getpaid_get_ip_country() : $country;
+    $country = empty( $country ) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -55,10 +55,10 @@ 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
-			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
-		?>
+            $field_type = 'billing';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_billing_fields', $form );
+        ?>
 	</div>
 	<!-- End Billing Address -->
 
@@ -70,20 +70,20 @@ 
 
 	<?php
 
-		echo aui()->input(
-		    array(
-			    'type'       => 'checkbox',
-			    'name'       => 'same-shipping-address',
-			    'id'         => "shipping-toggle$uniqid",
-			    'required'   => false,
-			    'label'      => wp_kses_post( $shipping_address_toggle ),
-			    'value'      => 1,
-			    'checked'    => true,
-				'class'      => 'w-auto',
-		    )
-		);
+        echo aui()->input(
+            array(
+                'type'       => 'checkbox',
+                'name'       => 'same-shipping-address',
+                'id'         => "shipping-toggle$uniqid",
+                'required'   => false,
+                'label'      => wp_kses_post( $shipping_address_toggle ),
+                'value'      => 1,
+                'checked'    => true,
+                'class'      => 'w-auto',
+            )
+        );
 
-	?>
+    ?>
 
 
 	<!-- Start Shipping Address Title -->
@@ -102,10 +102,10 @@ 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
-			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
-		?>
+            $field_type = 'shipping';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+        ?>
 	</div>
 	<!-- End Shipping Address -->
 

includes/data-stores/class-getpaid-invoice-data-store.php

Indentation +475 added lines, -475 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,540 +15,540 @@ 
  */
 class GetPaid_Invoice_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for a discount.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'_wpinv_subscr_profile_id',
-		'_wpinv_subscription_id',
-		'_wpinv_taxes',
-		'_wpinv_fees',
-		'_wpinv_discounts',
-		'_wpinv_submission_id',
-		'_wpinv_payment_form',
-		'_wpinv_is_viewed',
-		'_wpinv_phone',
-		'wpinv_email_cc',
-		'wpinv_template',
-		'wpinv_created_via'
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'_wpinv_subscr_profile_id' => 'remote_subscription_id',
-		'_wpinv_subscription_id'   => 'subscription_id',
-		'_wpinv_taxes'             => 'taxes',
-		'_wpinv_fees'              => 'fees',
-		'_wpinv_discounts'         => 'discounts',
-		'_wpinv_submission_id'     => 'submission_id',
-		'_wpinv_payment_form'      => 'payment_form',
-		'_wpinv_is_viewed'         => 'is_viewed',
-		'wpinv_email_cc'           => 'email_cc',
-		'wpinv_template'           => 'template',
-		'wpinv_created_via'        => 'created_via',
-		'_wpinv_phone'             => 'phone',
-	);
-
-	/**
-	 * A map of database fields to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $database_fields_to_props = array(
-		'post_id'            => 'id',
-		'number'             => 'number',
-		'currency'           => 'currency',
-		'key'                => 'key',
-		'type'               => 'type',
-		'mode'               => 'mode',
-		'user_ip'            => 'user_ip',
-		'first_name'         => 'first_name',
-		'last_name'          => 'last_name',
-		'address'            => 'address',
-		'city'               => 'city',
-		'state'              => 'state',
-		'country'            => 'country',
-		'zip'                => 'zip',
-		'zip'                => 'zip',
-		'adddress_confirmed' => 'address_confirmed',
-		'gateway'            => 'gateway',
-		'transaction_id'     => 'transaction_id',
-		'currency'           => 'currency',
-		'subtotal'           => 'subtotal',
-		'tax'                => 'total_tax',
-		'fees_total'         => 'total_fees',
-		'discount'           => 'total_discount',
-		'total'              => 'total',
-		'discount_code'      => 'discount_code',
-		'disable_taxes'      => 'disable_taxes',
-		'due_date'           => 'due_date',
-		'completed_date'     => 'completed_date',
-		'company'            => 'company',
-		'vat_number'         => 'vat_number',
-		'vat_rate'           => 'vat_rate',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for a discount.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        '_wpinv_subscr_profile_id',
+        '_wpinv_subscription_id',
+        '_wpinv_taxes',
+        '_wpinv_fees',
+        '_wpinv_discounts',
+        '_wpinv_submission_id',
+        '_wpinv_payment_form',
+        '_wpinv_is_viewed',
+        '_wpinv_phone',
+        'wpinv_email_cc',
+        'wpinv_template',
+        'wpinv_created_via'
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        '_wpinv_subscr_profile_id' => 'remote_subscription_id',
+        '_wpinv_subscription_id'   => 'subscription_id',
+        '_wpinv_taxes'             => 'taxes',
+        '_wpinv_fees'              => 'fees',
+        '_wpinv_discounts'         => 'discounts',
+        '_wpinv_submission_id'     => 'submission_id',
+        '_wpinv_payment_form'      => 'payment_form',
+        '_wpinv_is_viewed'         => 'is_viewed',
+        'wpinv_email_cc'           => 'email_cc',
+        'wpinv_template'           => 'template',
+        'wpinv_created_via'        => 'created_via',
+        '_wpinv_phone'             => 'phone',
+    );
+
+    /**
+     * A map of database fields to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $database_fields_to_props = array(
+        'post_id'            => 'id',
+        'number'             => 'number',
+        'currency'           => 'currency',
+        'key'                => 'key',
+        'type'               => 'type',
+        'mode'               => 'mode',
+        'user_ip'            => 'user_ip',
+        'first_name'         => 'first_name',
+        'last_name'          => 'last_name',
+        'address'            => 'address',
+        'city'               => 'city',
+        'state'              => 'state',
+        'country'            => 'country',
+        'zip'                => 'zip',
+        'zip'                => 'zip',
+        'adddress_confirmed' => 'address_confirmed',
+        'gateway'            => 'gateway',
+        'transaction_id'     => 'transaction_id',
+        'currency'           => 'currency',
+        'subtotal'           => 'subtotal',
+        'tax'                => 'total_tax',
+        'fees_total'         => 'total_fees',
+        'discount'           => 'total_discount',
+        'total'              => 'total',
+        'discount_code'      => 'discount_code',
+        'disable_taxes'      => 'disable_taxes',
+        'due_date'           => 'due_date',
+        'completed_date'     => 'completed_date',
+        'company'            => 'company',
+        'vat_number'         => 'vat_number',
+        'vat_rate'           => 'vat_rate',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new invoice in the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 */
-	public function create( &$invoice ) {
-		$invoice->set_version( WPINV_VERSION );
-		$invoice->set_date_created( current_time('mysql') );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_invoice_data',
-				array(
-					'post_date'     => $invoice->get_date_created( 'edit' ),
-					'post_type'     => $invoice->get_post_type( 'edit' ),
-					'post_status'   => $this->get_post_status( $invoice ),
-					'ping_status'   => 'closed',
-					'post_author'   => $invoice->get_user_id( 'edit' ),
-					'post_title'    => $invoice->get_title( 'edit' ),
-					'post_excerpt'  => $invoice->get_description( 'edit' ),
-					'post_parent'   => $invoice->get_parent_id( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-
-			// Update the new id and regenerate a title.
-			$invoice->set_id( $id );
-
-			$invoice->maybe_set_number();
-
-			wp_update_post(
-				array(
-					'ID'         => $invoice->get_id(),
-					'post_title' => $invoice->get_number( 'edit' ),
-					'post_name'  => $invoice->get_path( 'edit' )
-				)
-			);
-
-			// Save special fields and items.
-			$this->save_special_fields( $invoice );
-			$this->save_items( $invoice );
-
-			// Update meta data.
-			$this->update_post_meta( $invoice );
-			$invoice->save_meta_data();
-
-			// Apply changes.
-			$invoice->apply_changes();
-			$this->clear_caches( $invoice );
-
-			// Fires after a new invoice is created.
-			do_action( 'getpaid_new_invoice', $invoice );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$invoice->last_error = $id->get_error_message();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read an invoice from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 *
-	 */
-	public function read( &$invoice ) {
-
-		$invoice->set_defaults();
-		$invoice_object = get_post( $invoice->get_id() );
-
-		if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
-			$invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
-			$invoice->set_id( 0 );
-			return false;
-		}
-
-		$invoice->set_props(
-			array(
-				'date_created'  => 0 < $invoice_object->post_date ? $invoice_object->post_date : null,
-				'date_modified' => 0 < $invoice_object->post_modified ? $invoice_object->post_modified : null,
-				'status'        => $invoice_object->post_status,
-				'author'        => $invoice_object->post_author,
-				'description'   => $invoice_object->post_excerpt,
-				'parent_id'     => $invoice_object->post_parent,
-				'name'          => $invoice_object->post_title,
-				'path'          => $invoice_object->post_name,
-				'post_type'     => $invoice_object->post_type,
-			)
-		);
-
-		$invoice->set_type( $invoice_object->post_type );
-
-		$this->read_object_data( $invoice, $invoice_object );
-		$this->add_special_fields( $invoice );
-		$this->add_items( $invoice );
-		$invoice->read_meta_data();
-		$invoice->set_object_read( true );
-		do_action( 'getpaid_read_invoice', $invoice );
-
-	}
-
-	/**
-	 * Method to update an invoice in the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 */
-	public function update( &$invoice ) {
-		$invoice->save_meta_data();
-		$invoice->set_version( WPINV_VERSION );
-
-		if ( null === $invoice->get_date_created( 'edit' ) ) {
-			$invoice->set_date_created(  current_time('mysql') );
-		}
-
-		// Ensure both the key and number are set.
-		$invoice->get_path();
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $invoice->get_id() );
-
-		$changes = $invoice->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'         => $invoice->get_date_created( 'edit' ),
-				'post_date_gmt'     => $invoice->get_date_created_gmt( 'edit' ),
-				'post_status'       => $invoice->get_status( 'edit' ),
-				'post_title'        => $invoice->get_name( 'edit' ),
-				'post_author'       => $invoice->get_user_id( 'edit' ),
-				'post_modified'     => $invoice->get_date_modified( 'edit' ),
-				'post_excerpt'      => $invoice->get_description( 'edit' ),
-				'post_parent'       => $invoice->get_parent_id( 'edit' ),
-				'post_name'         => $invoice->get_path( 'edit' ),
-				'post_type'         => $invoice->get_post_type( 'edit' ),
-			);
-
-			/**
-			 * When updating this object, to prevent infinite loops, use $wpdb
-			 * to update data, since wp_update_post spawns more calls to the
-			 * save_post action.
-			 *
-			 * This ensures hooks are fired by either WP itself (admin screen save),
-			 * or an update purely from CRUD.
-			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
-				clean_post_cache( $invoice->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
-			}
-			$invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-
-		// Update meta data.
-		$this->update_post_meta( $invoice );
-
-		// Save special fields and items.
-		$this->save_special_fields( $invoice );
-		$this->save_items( $invoice );
-
-		// Apply the changes.
-		$invoice->apply_changes();
-
-		// Clear caches.
-		$this->clear_caches( $invoice );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $invoice->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_invoice', $invoice );
-		} else {
-			do_action( 'getpaid_update_invoice', $invoice );
-		}
-
-	}
-
-	/*
+    /**
+     * Method to create a new invoice in the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     */
+    public function create( &$invoice ) {
+        $invoice->set_version( WPINV_VERSION );
+        $invoice->set_date_created( current_time('mysql') );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_invoice_data',
+                array(
+                    'post_date'     => $invoice->get_date_created( 'edit' ),
+                    'post_type'     => $invoice->get_post_type( 'edit' ),
+                    'post_status'   => $this->get_post_status( $invoice ),
+                    'ping_status'   => 'closed',
+                    'post_author'   => $invoice->get_user_id( 'edit' ),
+                    'post_title'    => $invoice->get_title( 'edit' ),
+                    'post_excerpt'  => $invoice->get_description( 'edit' ),
+                    'post_parent'   => $invoice->get_parent_id( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+
+            // Update the new id and regenerate a title.
+            $invoice->set_id( $id );
+
+            $invoice->maybe_set_number();
+
+            wp_update_post(
+                array(
+                    'ID'         => $invoice->get_id(),
+                    'post_title' => $invoice->get_number( 'edit' ),
+                    'post_name'  => $invoice->get_path( 'edit' )
+                )
+            );
+
+            // Save special fields and items.
+            $this->save_special_fields( $invoice );
+            $this->save_items( $invoice );
+
+            // Update meta data.
+            $this->update_post_meta( $invoice );
+            $invoice->save_meta_data();
+
+            // Apply changes.
+            $invoice->apply_changes();
+            $this->clear_caches( $invoice );
+
+            // Fires after a new invoice is created.
+            do_action( 'getpaid_new_invoice', $invoice );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $invoice->last_error = $id->get_error_message();
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read an invoice from the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     *
+     */
+    public function read( &$invoice ) {
+
+        $invoice->set_defaults();
+        $invoice_object = get_post( $invoice->get_id() );
+
+        if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
+            $invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
+            $invoice->set_id( 0 );
+            return false;
+        }
+
+        $invoice->set_props(
+            array(
+                'date_created'  => 0 < $invoice_object->post_date ? $invoice_object->post_date : null,
+                'date_modified' => 0 < $invoice_object->post_modified ? $invoice_object->post_modified : null,
+                'status'        => $invoice_object->post_status,
+                'author'        => $invoice_object->post_author,
+                'description'   => $invoice_object->post_excerpt,
+                'parent_id'     => $invoice_object->post_parent,
+                'name'          => $invoice_object->post_title,
+                'path'          => $invoice_object->post_name,
+                'post_type'     => $invoice_object->post_type,
+            )
+        );
+
+        $invoice->set_type( $invoice_object->post_type );
+
+        $this->read_object_data( $invoice, $invoice_object );
+        $this->add_special_fields( $invoice );
+        $this->add_items( $invoice );
+        $invoice->read_meta_data();
+        $invoice->set_object_read( true );
+        do_action( 'getpaid_read_invoice', $invoice );
+
+    }
+
+    /**
+     * Method to update an invoice in the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     */
+    public function update( &$invoice ) {
+        $invoice->save_meta_data();
+        $invoice->set_version( WPINV_VERSION );
+
+        if ( null === $invoice->get_date_created( 'edit' ) ) {
+            $invoice->set_date_created(  current_time('mysql') );
+        }
+
+        // Ensure both the key and number are set.
+        $invoice->get_path();
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $invoice->get_id() );
+
+        $changes = $invoice->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'         => $invoice->get_date_created( 'edit' ),
+                'post_date_gmt'     => $invoice->get_date_created_gmt( 'edit' ),
+                'post_status'       => $invoice->get_status( 'edit' ),
+                'post_title'        => $invoice->get_name( 'edit' ),
+                'post_author'       => $invoice->get_user_id( 'edit' ),
+                'post_modified'     => $invoice->get_date_modified( 'edit' ),
+                'post_excerpt'      => $invoice->get_description( 'edit' ),
+                'post_parent'       => $invoice->get_parent_id( 'edit' ),
+                'post_name'         => $invoice->get_path( 'edit' ),
+                'post_type'         => $invoice->get_post_type( 'edit' ),
+            );
+
+            /**
+             * When updating this object, to prevent infinite loops, use $wpdb
+             * to update data, since wp_update_post spawns more calls to the
+             * save_post action.
+             *
+             * This ensures hooks are fired by either WP itself (admin screen save),
+             * or an update purely from CRUD.
+             */
+            if ( doing_action( 'save_post' ) ) {
+                $GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
+                clean_post_cache( $invoice->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
+            }
+            $invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+
+        // Update meta data.
+        $this->update_post_meta( $invoice );
+
+        // Save special fields and items.
+        $this->save_special_fields( $invoice );
+        $this->save_items( $invoice );
+
+        // Apply the changes.
+        $invoice->apply_changes();
+
+        // Clear caches.
+        $this->clear_caches( $invoice );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $invoice->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_invoice', $invoice );
+        } else {
+            do_action( 'getpaid_update_invoice', $invoice );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
+    /**
      * Retrieves special fields and adds to the invoice.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function add_special_fields( &$invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// Maybe retrieve from the cache.
-		$data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+        // Maybe retrieve from the cache.
+        $data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
 
-		// If not found, retrieve from the db.
-		if ( false === $data ) {
-			$table =  $wpdb->prefix . 'getpaid_invoices';
+        // If not found, retrieve from the db.
+        if ( false === $data ) {
+            $table =  $wpdb->prefix . 'getpaid_invoices';
 
-			$data  = $wpdb->get_row(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
-				ARRAY_A
-			);
+            $data  = $wpdb->get_row(
+                $wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
+                ARRAY_A
+            );
 
-			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
+            // Update the cache with our data
+            wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
 
-		}
+        }
 
-		// Abort if the data does not exist.
-		if ( empty( $data ) ) {
-			$invoice->set_object_read( true );
-			$invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
-			return;
-		}
+        // Abort if the data does not exist.
+        if ( empty( $data ) ) {
+            $invoice->set_object_read( true );
+            $invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
+            return;
+        }
 
-		$props = array();
+        $props = array();
 
-		foreach ( $this->database_fields_to_props as $db_field => $prop ) {
+        foreach ( $this->database_fields_to_props as $db_field => $prop ) {
 			
-			if ( $db_field == 'post_id' ) {
-				continue;
-			}
-
-			$props[ $prop ] = $data[ $db_field ];
-		}
-
-		$invoice->set_props( $props );
-
-	}
-
-	/**
-	 * Gets a list of special fields that need updated based on change state
-	 * or if they are present in the database or not.
-	 *
-	 * @param  WPInv_Invoice $invoice       The Invoice object.
-	 * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
-	 */
-	protected function get_special_fields_to_update( $invoice ) {
-		$fields_to_update = array();
-		$changed_props   = $invoice->get_changes();
-
-		// Props should be updated if they are a part of the $changed array or don't exist yet.
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			if ( array_key_exists( $prop, $changed_props ) ) {
-				$fields_to_update[ $database_field ] = $prop;
-			}
-		}
-
-		return $fields_to_update;
-	}
-
-	/**
-	 * Helper method that updates all the database fields for an invoice based on it's settings in the WPInv_Invoice class.
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @since 1.0.19
-	 */
-	protected function update_special_fields( &$invoice ) {
-		global $wpdb;
-
-		$updated_props    = array();
-		$fields_to_update = $this->get_special_fields_to_update( $invoice );
-
-		foreach ( $fields_to_update as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? ( int ) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
-		}
-
-		if ( ! empty( $updated_props ) ) {
-
-			$table = $wpdb->prefix . 'getpaid_invoices';
-			$wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
-			wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-			do_action( "getpaid_invoice_update_database_fields", $invoice, $updated_props );
-
-		}
-
-	}
-
-	/**
-	 * Helper method that inserts special fields to the database.
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @since 1.0.19
-	 */
-	protected function insert_special_fields( &$invoice ) {
-		global $wpdb;
-
-		$updated_props   = array();
-
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? ( int ) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
-		}
-
-		$table = $wpdb->prefix . 'getpaid_invoices';
-		$wpdb->insert( $table, $updated_props );
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-		do_action( "getpaid_invoice_insert_database_fields", $invoice, $updated_props );
-
-	}
-
-	/**
+            if ( $db_field == 'post_id' ) {
+                continue;
+            }
+
+            $props[ $prop ] = $data[ $db_field ];
+        }
+
+        $invoice->set_props( $props );
+
+    }
+
+    /**
+     * Gets a list of special fields that need updated based on change state
+     * or if they are present in the database or not.
+     *
+     * @param  WPInv_Invoice $invoice       The Invoice object.
+     * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
+     */
+    protected function get_special_fields_to_update( $invoice ) {
+        $fields_to_update = array();
+        $changed_props   = $invoice->get_changes();
+
+        // Props should be updated if they are a part of the $changed array or don't exist yet.
+        foreach ( $this->database_fields_to_props as $database_field => $prop ) {
+            if ( array_key_exists( $prop, $changed_props ) ) {
+                $fields_to_update[ $database_field ] = $prop;
+            }
+        }
+
+        return $fields_to_update;
+    }
+
+    /**
+     * Helper method that updates all the database fields for an invoice based on it's settings in the WPInv_Invoice class.
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @since 1.0.19
+     */
+    protected function update_special_fields( &$invoice ) {
+        global $wpdb;
+
+        $updated_props    = array();
+        $fields_to_update = $this->get_special_fields_to_update( $invoice );
+
+        foreach ( $fields_to_update as $database_field => $prop ) {
+            $value = $invoice->{"get_$prop"}( 'edit' );
+            $value = is_string( $value ) ? wp_slash( $value ) : $value;
+            $value = is_bool( $value ) ? ( int ) $value : $value;
+            $updated_props[ $database_field ] = maybe_serialize( $value );
+        }
+
+        if ( ! empty( $updated_props ) ) {
+
+            $table = $wpdb->prefix . 'getpaid_invoices';
+            $wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
+            wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+            do_action( "getpaid_invoice_update_database_fields", $invoice, $updated_props );
+
+        }
+
+    }
+
+    /**
+     * Helper method that inserts special fields to the database.
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @since 1.0.19
+     */
+    protected function insert_special_fields( &$invoice ) {
+        global $wpdb;
+
+        $updated_props   = array();
+
+        foreach ( $this->database_fields_to_props as $database_field => $prop ) {
+            $value = $invoice->{"get_$prop"}( 'edit' );
+            $value = is_string( $value ) ? wp_slash( $value ) : $value;
+            $value = is_bool( $value ) ? ( int ) $value : $value;
+            $updated_props[ $database_field ] = maybe_serialize( $value );
+        }
+
+        $table = $wpdb->prefix . 'getpaid_invoices';
+        $wpdb->insert( $table, $updated_props );
+        wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+        do_action( "getpaid_invoice_insert_database_fields", $invoice, $updated_props );
+
+    }
+
+    /**
      * Saves all special fields.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function save_special_fields( & $invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// The invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-		$id    = (int) $invoice->get_id();
-		$invoice->maybe_set_key();
+        // The invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+        $id    = (int) $invoice->get_id();
+        $invoice->maybe_set_key();
 
-		if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
+        if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
 
-			$this->update_special_fields( $invoice );
+            $this->update_special_fields( $invoice );
 
-		} else {
+        } else {
 
-			$this->insert_special_fields( $invoice );
+            $this->insert_special_fields( $invoice );
 
-		}
+        }
 
-	}
+    }
 
-	/**
+    /**
      * Set's up cart details.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function add_items( &$invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// Maybe retrieve from the cache.
-		$items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+        // Maybe retrieve from the cache.
+        $items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
 
-		// If not found, retrieve from the db.
-		if ( false === $items ) {
-			$table =  $wpdb->prefix . 'getpaid_invoice_items';
+        // If not found, retrieve from the db.
+        if ( false === $items ) {
+            $table =  $wpdb->prefix . 'getpaid_invoice_items';
 
-			$items = $wpdb->get_results(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
-			);
+            $items = $wpdb->get_results(
+                $wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
+            );
 
-			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
+            // Update the cache with our data
+            wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
 
-		}
+        }
 
-		// Abort if no items found.
+        // Abort if no items found.
         if ( empty( $items ) ) {
             return;
-		}
-
-		$_items = array();
-		foreach ( $items as $item_data ) {
-			$item = new GetPaid_Form_Item( $item_data->item_id );
-
-			// Set item data.
-			$item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
-			$item->item_discount = wpinv_sanitize_amount( $item_data->discount );
-			$item->set_name( $item_data->item_name );
-			$item->set_description( $item_data->item_description );
-			$item->set_price( $item_data->item_price );
-			$item->set_quantity( $item_data->quantity );
-			$item->set_item_meta( $item_data->meta );
-			$_items[] = $item;
-		}
-
-		$invoice->set_items( $_items );
-	}
-
-	/**
+        }
+
+        $_items = array();
+        foreach ( $items as $item_data ) {
+            $item = new GetPaid_Form_Item( $item_data->item_id );
+
+            // Set item data.
+            $item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
+            $item->item_discount = wpinv_sanitize_amount( $item_data->discount );
+            $item->set_name( $item_data->item_name );
+            $item->set_description( $item_data->item_description );
+            $item->set_price( $item_data->item_price );
+            $item->set_quantity( $item_data->quantity );
+            $item->set_item_meta( $item_data->meta );
+            $_items[] = $item;
+        }
+
+        $invoice->set_items( $_items );
+    }
+
+    /**
      * Saves cart details.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function save_items( $invoice ) {
 
-		// Delete previously existing items.
-		$this->delete_items( $invoice );
+        // Delete previously existing items.
+        $this->delete_items( $invoice );
 
-		$table   =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+        $table   =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
 
-		foreach ( $invoice->get_cart_details() as $item_data ) {
-			$item_data = array_map( 'maybe_serialize', $item_data );
-			$GLOBALS['wpdb']->insert( $table, $item_data );
-		}
+        foreach ( $invoice->get_cart_details() as $item_data ) {
+            $item_data = array_map( 'maybe_serialize', $item_data );
+            $GLOBALS['wpdb']->insert( $table, $item_data );
+        }
 
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
-		do_action( "getpaid_invoice_save_items", $invoice );
+        wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+        do_action( "getpaid_invoice_save_items", $invoice );
 
-	}
+    }
 
-	/**
+    /**
      * Deletes an invoice's cart details from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function delete_items( $invoice ) {
-		$table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
-	}
+        $table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+        return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    }
 
-	/**
+    /**
      * Deletes an invoice's special fields from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function delete_special_fields( $invoice ) {
-		$table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
-	}
+        $table =  $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
+        return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    }
 	
-	/**
-	 * Get the status to save to the post object.
-	 *
-	 *
-	 * @since 1.0.19
-	 * @param  WPInv_Invoice $object GetPaid_Data object.
-	 * @return string
-	 */
-	protected function get_post_status( $object ) {
-		$object_status = $object->get_status( 'edit' );
-
-		if ( ! $object_status ) {
-			$object_status = $object->get_default_status();
-		}
-
-		return $object_status;
-	}
+    /**
+     * Get the status to save to the post object.
+     *
+     *
+     * @since 1.0.19
+     * @param  WPInv_Invoice $object GetPaid_Data object.
+     * @return string
+     */
+    protected function get_post_status( $object ) {
+        $object_status = $object->get_status( 'edit' );
+
+        if ( ! $object_status ) {
+            $object_status = $object->get_default_status();
+        }
+
+        return $object_status;
+    }
 
 }

includes/admin/class-wpinv-customers-table.php

Indentation +351 added lines, -351 removed lines

@@ -9,7 +9,7 @@ 
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -21,354 +21,354 @@ 
  */
 class WPInv_Customers_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 10;
-
-	/**
-	 * @var int Number of items
-	 * @since 1.0.19
-	 */
-	public $total = 0;
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular' => 'id',
-			'plural'   => 'ids',
-			'ajax'     => false,
-		) );
-
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'name';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $item
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $item, $column_name ) {
-		$value = sanitize_text_field( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
-	}
-
-	/**
-	 * Displays the country column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_country( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
-		}
-		return sanitize_text_field( $country );
-	}
-
-	/**
-	 * Displays the state column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_state( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		$state   = $user->_wpinv_state;
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
-		}
-
-		return sanitize_text_field( $state );
-	}
-
-	/**
-	 * Displays the signup column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_signup( $user ) {
-		return getpaid_format_date_value( $user->user_registered );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_total( $user ) {
-
-		$args = array(
-			'data'             => array(
-
-				'total'        => array(
-					'type'     => 'invoice_data',
-					'function' => 'SUM',
-					'name'     => 'total_sales',
-				)
-
-			),
-			'where'            => array(
-
-				'author'       => array(
-					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
-					'key'      => 'posts.post_author',
-					'operator' => '=',
-				),
-
-			),
-			'query_type'     => 'get_var',
-			'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
-		);
-
-		return wpinv_price( (float) GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
-
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_invoices( $user ) {
-
-		$args = array(
-			'data'             => array(
-
-				'ID'           => array(
-					'type'     => 'post_data',
-					'function' => 'COUNT',
-					'name'     => 'count',
-					'distinct' => true,
-				),
-
-			),
-			'where'            => array(
-
-				'author'       => array(
-					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
-					'key'      => 'posts.post_author',
-					'operator' => '=',
-				),
-
-			),
-			'query_type'     => 'get_var',
-			'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
-		);
-
-		return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
-
-	}
-
-	/**
-	 * Generates content for a single row of the table
-	 * @since 1.0.19
-	 *
-	 * @param int $item The user id.
-	 */
-	public function single_row( $item ) {
-		$item = get_user_by( 'id', $item );
-
-		if ( empty( $item ) ) {
-			return;
-		}
-
-		echo '<tr>';
-		$this->single_row_columns( $item );
-		echo '</tr>';
-	}
-
-	/**
-	 * Displays the customers name
-	 *
-	 * @param  WP_User $customer customer.
-	 * @return string
-	 */
-	public function column_name( $customer ) {
-
-		// Customer view URL.
-		$view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
-		$row_actions = $this->row_actions(
-			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
-			)
-		);
-
-		// Get user's address.
-		$address = wpinv_get_user_address( $customer->ID );
-
-		// Customer email address.
-		$email       = sanitize_email( $customer->user_email );
-
-		// Customer's avatar.
-		$avatar = esc_url( get_avatar_url( $email ) );
-		$avatar = "<img src='$avatar' height='32' width='32'/>";
-
-		// Customer's name.
-		$name   = sanitize_text_field( "{$address['first_name']} {$address['last_name']}" );
-
-		if ( ! empty( $name ) ) {
-			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
-		}
-
-		$email = "<div class='row-title'><a href='$view_url'>$email</a></div>";
-
-		return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
-
-	}
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @since 1.0.19
-	 * @return array $columns Array of all the list table columns
-	 */
-	public function get_columns() {
-
-		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total'    => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', 'invoicing' ),
-		);
-		return apply_filters( 'wpinv_customers_table_columns', $columns );
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Returns bulk actions.
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 *  Prepares the display query
-	 */
-	public function prepare_query() {
-		global $wpdb;
-
-		$post_types = '';
-
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$post_types .= $wpdb->prepare( "post_type=%s OR ", $post_type );
-		}
-
-		$post_types = rtrim( $post_types, ' OR' );
-
-		// Maybe search.
-		if ( ! empty( $_POST['s'] ) ) {
-			$users = get_users(
-				array(
-					'search'         => '*' . sanitize_text_field( urldecode( $_POST['s'] ) ) . '*',
-					'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
-					'fields'         => 'ID',
-				)
-			);
-
-			$users      = implode( ', ', $users );
-			$post_types = "($post_types) AND ( post_author IN ( $users ) )";
-		}
-
-		// Users with invoices.
-    	$customers = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types LIMIT %d,%d",
-				$this->get_paged() * 10 - 10,
-				$this->per_page
-			)
-		);
-
-		$this->items = $customers;
-		$this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function prepare_items() {
-		$columns               = $this->get_columns();
-		$hidden                = array(); // No hidden columns
-		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->prepare_query();
-
-		$this->set_pagination_args(
-			array(
-			'total_items' => $this->total,
-			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->total / $this->per_page )
-			)
-		);
-
-	}
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 10;
+
+    /**
+     * @var int Number of items
+     * @since 1.0.19
+     */
+    public $total = 0;
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular' => 'id',
+            'plural'   => 'ids',
+            'ajax'     => false,
+        ) );
+
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'name';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $item
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $item, $column_name ) {
+        $value = sanitize_text_field( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
+        return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
+    }
+
+    /**
+     * Displays the country column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_country( $user ) {
+        $country = wpinv_sanitize_country( $user->_wpinv_country );
+        if ( $country ) {
+            $country = wpinv_country_name( $country );
+        }
+        return sanitize_text_field( $country );
+    }
+
+    /**
+     * Displays the state column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_state( $user ) {
+        $country = wpinv_sanitize_country( $user->_wpinv_country );
+        $state   = $user->_wpinv_state;
+        if ( $state ) {
+            $state = wpinv_state_name( $state, $country );
+        }
+
+        return sanitize_text_field( $state );
+    }
+
+    /**
+     * Displays the signup column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_signup( $user ) {
+        return getpaid_format_date_value( $user->user_registered );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_total( $user ) {
+
+        $args = array(
+            'data'             => array(
+
+                'total'        => array(
+                    'type'     => 'invoice_data',
+                    'function' => 'SUM',
+                    'name'     => 'total_sales',
+                )
+
+            ),
+            'where'            => array(
+
+                'author'       => array(
+                    'type'     => 'post_data',
+                    'value'    => absint( $user->ID ),
+                    'key'      => 'posts.post_author',
+                    'operator' => '=',
+                ),
+
+            ),
+            'query_type'     => 'get_var',
+            'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
+        );
+
+        return wpinv_price( (float) GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_invoices( $user ) {
+
+        $args = array(
+            'data'             => array(
+
+                'ID'           => array(
+                    'type'     => 'post_data',
+                    'function' => 'COUNT',
+                    'name'     => 'count',
+                    'distinct' => true,
+                ),
+
+            ),
+            'where'            => array(
+
+                'author'       => array(
+                    'type'     => 'post_data',
+                    'value'    => absint( $user->ID ),
+                    'key'      => 'posts.post_author',
+                    'operator' => '=',
+                ),
+
+            ),
+            'query_type'     => 'get_var',
+            'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
+        );
+
+        return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+
+    }
+
+    /**
+     * Generates content for a single row of the table
+     * @since 1.0.19
+     *
+     * @param int $item The user id.
+     */
+    public function single_row( $item ) {
+        $item = get_user_by( 'id', $item );
+
+        if ( empty( $item ) ) {
+            return;
+        }
+
+        echo '<tr>';
+        $this->single_row_columns( $item );
+        echo '</tr>';
+    }
+
+    /**
+     * Displays the customers name
+     *
+     * @param  WP_User $customer customer.
+     * @return string
+     */
+    public function column_name( $customer ) {
+
+        // Customer view URL.
+        $view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
+        $row_actions = $this->row_actions(
+            array(
+                'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+            )
+        );
+
+        // Get user's address.
+        $address = wpinv_get_user_address( $customer->ID );
+
+        // Customer email address.
+        $email       = sanitize_email( $customer->user_email );
+
+        // Customer's avatar.
+        $avatar = esc_url( get_avatar_url( $email ) );
+        $avatar = "<img src='$avatar' height='32' width='32'/>";
+
+        // Customer's name.
+        $name   = sanitize_text_field( "{$address['first_name']} {$address['last_name']}" );
+
+        if ( ! empty( $name ) ) {
+            $name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
+        }
+
+        $email = "<div class='row-title'><a href='$view_url'>$email</a></div>";
+
+        return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
+
+    }
+
+    /**
+     * Retrieve the table columns
+     *
+     * @since 1.0.19
+     * @return array $columns Array of all the list table columns
+     */
+    public function get_columns() {
+
+        $columns = array(
+            'name'     => __( 'Name', 'invoicing' ),
+            'country'  => __( 'Country', 'invoicing' ),
+            'state'    => __( 'State', 'invoicing' ),
+            'city'     => __( 'City', 'invoicing' ),
+            'zip'      => __( 'ZIP', 'invoicing' ),
+            'address'  => __( 'Address', 'invoicing' ),
+            'phone'    => __( 'Phone', 'invoicing' ),
+            'company'  => __( 'Company', 'invoicing' ),
+            'invoices' => __( 'Invoices', 'invoicing' ),
+            'total'    => __( 'Total Spend', 'invoicing' ),
+            'signup'   => __( 'Date created', 'invoicing' ),
+        );
+        return apply_filters( 'wpinv_customers_table_columns', $columns );
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Returns bulk actions.
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     *  Prepares the display query
+     */
+    public function prepare_query() {
+        global $wpdb;
+
+        $post_types = '';
+
+        foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
+            $post_types .= $wpdb->prepare( "post_type=%s OR ", $post_type );
+        }
+
+        $post_types = rtrim( $post_types, ' OR' );
+
+        // Maybe search.
+        if ( ! empty( $_POST['s'] ) ) {
+            $users = get_users(
+                array(
+                    'search'         => '*' . sanitize_text_field( urldecode( $_POST['s'] ) ) . '*',
+                    'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
+                    'fields'         => 'ID',
+                )
+            );
+
+            $users      = implode( ', ', $users );
+            $post_types = "($post_types) AND ( post_author IN ( $users ) )";
+        }
+
+        // Users with invoices.
+        $customers = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types LIMIT %d,%d",
+                $this->get_paged() * 10 - 10,
+                $this->per_page
+            )
+        );
+
+        $this->items = $customers;
+        $this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function prepare_items() {
+        $columns               = $this->get_columns();
+        $hidden                = array(); // No hidden columns
+        $sortable              = $this->get_sortable_columns();
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+        $this->prepare_query();
+
+        $this->set_pagination_args(
+            array(
+            'total_items' => $this->total,
+            'per_page'    => $this->per_page,
+            'total_pages' => ceil( $this->total / $this->per_page )
+            )
+        );
+
+    }
 }

includes/admin/register-settings.php

Indentation +324 added lines, -324 removed lines

@@ -196,11 +196,11 @@ 
     $cb      = "wpinv_{$option['type']}_callback";
     $section = "wpinv_settings_{$tab}_$section";
 
-	if ( isset( $option['desc'] ) && ! empty( $option['help-tip'] ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ! empty( $option['help-tip'] ) ) {
+        $tip   = wpinv_clean( $option['desc'] );
+        $name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
+        unset( $option['desc'] );
+    }
 
     // Loop through all tabs.
     add_settings_field(
@@ -227,8 +227,8 @@ 
             'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
             'onchange'    => isset( $option['onchange'] )   ? $option['onchange']     : '',
             'custom'      => isset( $option['custom'] )     ? $option['custom']       : '',
-			'class'       => isset( $option['class'] )     ? $option['class']         : '',
-			'style'       => isset( $option['style'] )     ? $option['style']         : '',
+            'class'       => isset( $option['class'] )     ? $option['class']         : '',
+            'style'       => isset( $option['style'] )     ? $option['style']         : '',
             'cols'        => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
             'rows'        => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
@@ -242,7 +242,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+    return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
 }
 
 /**
@@ -261,8 +261,8 @@ 
  */
 function wpinv_settings_sanitize( $input = array() ) {
 
-	$wpinv_options = wpinv_get_options();
-	$raw_referrer  = wp_get_raw_referer();
+    $wpinv_options = wpinv_get_options();
+    $raw_referrer  = wp_get_raw_referer();
 
     if ( empty( $raw_referrer ) ) {
         return $input;
@@ -270,9 +270,9 @@ 
 
     wp_parse_str( $raw_referrer, $referrer );
 
-	if ( empty( $referrer['tab'] ) ) {
+    if ( empty( $referrer['tab'] ) ) {
         return $input;
-	}
+    }
 
     $settings = wpinv_get_registered_settings();
     $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
@@ -294,10 +294,10 @@ 
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
 
-		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+        // Key specific filter.
+        $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
@@ -353,14 +353,14 @@ 
 
     foreach ( $new_rates as $rate ) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
-		$tax_rates[]     = $rate;
+        $rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
+        $rate['name']    = sanitize_text_field( $rate['name'] );
+        $rate['state']   = sanitize_text_field( $rate['state'] );
+        $rate['country'] = sanitize_text_field( $rate['country'] );
+        $rate['global']  = empty( $rate['state'] );
+        $tax_rates[]     = $rate;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rates', $tax_rates );
 
@@ -378,11 +378,11 @@ 
     $tabs['general']  = __( 'General', 'invoicing' );
     $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
     $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['emails']   = __( 'Emails', 'invoicing' );
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
-	}
+    if ( count( getpaid_get_integration_settings() ) > 0 ) {
+        $tabs['integrations'] = __( 'Integrations', 'invoicing' );
+    }
 
     $tabs['privacy']  = __( 'Privacy', 'invoicing' );
     $tabs['misc']     = __( 'Misc', 'invoicing' );
@@ -420,14 +420,14 @@ 
         ) ),
         'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
             'main'  => __( 'Tax Settings', 'invoicing' ),
-			'rates' => __( 'Tax Rates', 'invoicing' ),
-			'vat'   => __( 'EU VAT Settings', 'invoicing' )
+            'rates' => __( 'Tax Rates', 'invoicing' ),
+            'vat'   => __( 'EU VAT Settings', 'invoicing' )
         ) ),
         'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
             'main' => __( 'Email Settings', 'invoicing' ),
-		) ),
+        ) ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+        'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
 
         'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
             'main' => __( 'Privacy policy', 'invoicing' ),
@@ -447,51 +447,51 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if( $default_label !== NULL && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+    if ( !empty( $args['desc'] ) ) {
         echo $args['desc'];
     }
 }
 
 function wpinv_hidden_callback( $args ) {
-	global $wpinv_options;
-
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    global $wpinv_options;
+
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    } elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -499,12 +499,12 @@ 
  */
 function wpinv_checkbox_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    $id  = esc_attr( $args['id'] );
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
-	?>
+    getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+    ?>
 		<fieldset>
 			<label>
 				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox">
@@ -516,77 +516,77 @@ 
 
 function wpinv_multicheck_callback( $args ) {
 	
-	global $wpinv_options;
+    global $wpinv_options;
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+    if ( ! empty( $args['options'] ) ) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : $std;
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
         foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( in_array( $sanitize_key, $value ) ) { 
-				$enabled = $sanitize_key;
-			} else { 
-				$enabled = NULL; 
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . $args['desc'] . '</p>';
-	}
+            $sanitize_key = wpinv_sanitize_key( $key );
+            if ( in_array( $sanitize_key, $value ) ) { 
+                $enabled = $sanitize_key;
+            } else { 
+                $enabled = NULL; 
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . $args['desc'] . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = NULL;
-			}
-
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
-
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-						$content_dir = WP_CONTENT_DIR;
-
-						if ( function_exists( 'wp_normalize_path' ) ) {
-							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
-						}
-
-						$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo $option . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if( isset( $wpinv_options[$args['id']][$key] ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = NULL;
+            }
+
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                    echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                    $card = strtolower( str_replace( ' ', '', $option ) );
+
+                    if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                        $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                        $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                        $content_dir = WP_CONTENT_DIR;
+
+                        if ( function_exists( 'wp_normalize_path' ) ) {
+                            // Replaces backslashes with forward slashes for Windows systems
+                            $image = wp_normalize_path( $image );
+                            $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                        $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                    echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo $option . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 /**
@@ -594,9 +594,9 @@ 
  */
 function wpinv_radio_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	?>
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    ?>
 		<fieldset>
 			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
 				<?php foreach( $args['options'] as $key => $option ) : ?>
@@ -610,7 +610,7 @@ 
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+    getpaid_settings_description_callback( $args );
 }
 
 /**
@@ -618,10 +618,10 @@ 
  */
 function getpaid_settings_description_callback( $args ) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = wp_kses_post( $args['desc'] );
-		echo "<p class='description'>$description</p>";
-	}
+    if ( ! empty( $args['desc'] ) ) {
+        $description = wp_kses_post( $args['desc'] );
+        echo "<p class='description'>$description</p>";
+    }
 
 }
 
@@ -630,7 +630,7 @@ 
  */
 function wpinv_gateways_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -641,24 +641,24 @@ 
 }
 
 function wpinv_gateway_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+    echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    foreach ( $args['options'] as $key => $option ) :
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             $selected = selected( $key, $args['selected'], false );
         } else {
             $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 /**
@@ -669,29 +669,29 @@ 
  */
 function wpinv_settings_attrs_helper( $args ) {
 
-	$value        = isset( $args['std'] ) ? $args['std'] : '';
-	$id           = esc_attr( $args['id'] );
-	$placeholder  = esc_attr( $args['placeholder'] );
+    $value        = isset( $args['std'] ) ? $args['std'] : '';
+    $id           = esc_attr( $args['id'] );
+    $placeholder  = esc_attr( $args['placeholder'] );
 
-	if ( ! empty( $args['faux'] ) ) {
-		$args['readonly'] = true;
-		$name             = '';
-	} else {
-		$value  = wpinv_get_option( $args['id'], $value );
-		$name   = "wpinv_settings[$id]";
-	}
+    if ( ! empty( $args['faux'] ) ) {
+        $args['readonly'] = true;
+        $name             = '';
+    } else {
+        $value  = wpinv_get_option( $args['id'], $value );
+        $name   = "wpinv_settings[$id]";
+    }
 
-	$value    = is_scalar( $value ) ? esc_attr( $value ) : '';
-	$class    = esc_attr( $args['class'] );
-	$style    = esc_attr( $args['style'] );
-	$readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
+    $value    = is_scalar( $value ) ? esc_attr( $value ) : '';
+    $class    = esc_attr( $args['class'] );
+    $style    = esc_attr( $args['style'] );
+    $readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
 
-	$onchange = '';
+    $onchange = '';
     if ( ! empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
-	}
+    }
 
-	return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
+    return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
 }
 
 /**
@@ -699,11 +699,11 @@ 
  */
 function wpinv_text_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="text" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -717,14 +717,14 @@ 
  */
 function wpinv_number_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
-	$max  = intval( $args['max'] );
-	$min  = intval( $args['min'] );
-	$step = floatval( $args['step'] );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
+    $max  = intval( $args['max'] );
+    $min  = intval( $args['min'] );
+    $step = floatval( $args['step'] );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="number" step="<?php echo $step; ?>" max="<?php echo $max; ?>" min="<?php echo $min; ?>" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -734,48 +734,48 @@ 
 }
 
 function wpinv_textarea_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_password_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_missing_callback($args) {
-	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    printf(
+        __( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 /**
@@ -783,13 +783,13 @@ 
  */
 function wpinv_select_callback( $args ) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr   = wpinv_settings_attrs_helper( $args );
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
+    $desc   = wp_kses_post( $args['desc'] );
+    $desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr   = wpinv_settings_attrs_helper( $args );
+    $value  = isset( $args['std'] ) ? $args['std'] : '';
+    $value  = wpinv_get_option( $args['id'], $value );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<select <?php echo $attr; ?>>
 				<?php foreach ( $args['options'] as $option => $name ) : ?>
@@ -803,123 +803,123 @@ 
 }
 
 function wpinv_color_select_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wpinv_options, $wp_version;
+    global $wpinv_options, $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+        if( empty( $args['allow_blank'] ) && empty( $value ) ) {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	$html = '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
-		$html .= ob_get_clean();
-	} else {
-		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    $html = '<div class="getpaid-settings-editor-input">';
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        ob_start();
+        wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+        $html .= ob_get_clean();
+    } else {
+        $html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_upload_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[$args['id']];
-	} else {
-		$value = isset($args['std']) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[$args['id']];
+    } else {
+        $value = isset($args['std']) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+    $default = isset( $args['std'] ) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -927,7 +927,7 @@ 
  */
 function wpinv_tax_rates_callback() {
 	
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -942,17 +942,17 @@ 
  * Displays a tax rate' edit row.
  */
 function wpinv_tax_rate_callback( $tax_rate, $key, $echo = true ) {
-	ob_start();
+    ob_start();
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+    $key                      = sanitize_key( $key );
+    $tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
+    include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
 
-	if ( $echo ) {
-		echo ob_get_clean();
-	} else {
-		return ob_get_clean(); 
-	}
+    if ( $echo ) {
+        echo ob_get_clean();
+    } else {
+        return ob_get_clean(); 
+    }
 
 }
 
@@ -980,14 +980,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -997,14 +997,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -1014,14 +1014,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 
@@ -1032,14 +1032,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
                 </td>
             </tr>
 
@@ -1053,19 +1053,19 @@ 
 
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_raw_html_callback( $args ) {
-	echo $args['desc'];
+    echo $args['desc'];
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 
@@ -1099,15 +1099,15 @@ 
  */
 function wpinv_get_merge_tags_help_text( $subscription = false ) {
 
-	$url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
-	$link = sprintf(
-		'<strong><a href="%s" target="_blank">%s</a></strong>',
-		$url,
-		esc_html__( 'View available merge tags.', 'wpinv-quotes' )
-	);
+    $url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
+    $link = sprintf(
+        '<strong><a href="%s" target="_blank">%s</a></strong>',
+        $url,
+        esc_html__( 'View available merge tags.', 'wpinv-quotes' )
+    );
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+    $description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
 
-	return "$description $link";
+    return "$description $link";
 
 }

includes/admin/class-getpaid-admin.php

Indentation +417 added lines, -417 removed lines

@@ -14,77 +14,77 @@ 
 class GetPaid_Admin {
 
     /**
-	 * Local path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_path;
-
-	/**
-	 * Web path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_url;
+     * Local path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_path;
+
+    /**
+     * Web path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_url;
 	
-	/**
-	 * Reports components.
-	 *
-	 * @var GetPaid_Reports
-	 */
+    /**
+     * Reports components.
+     *
+     * @var GetPaid_Reports
+     */
     public $reports;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct(){
+     * Class constructor.
+     */
+    public function __construct(){
 
         $this->admin_path  = plugin_dir_path( __FILE__ );
-		$this->admin_url   = plugins_url( '/', __FILE__ );
-		$this->reports     = new GetPaid_Reports();
+        $this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->reports     = new GetPaid_Reports();
 
         if ( is_admin() ) {
-			$this->init_admin_hooks();
+            $this->init_admin_hooks();
         }
 
     }
 
     /**
-	 * Init action and filter hooks
-	 *
-	 */
-	private function init_admin_hooks() {
+     * Init action and filter hooks
+     *
+     */
+    private function init_admin_hooks() {
         add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
         add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
         add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
         add_action( 'admin_init', array( $this, 'activation_redirect') );
         add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
+        add_action( 'admin_notices', array( $this, 'show_notices' ) );
+        add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
         add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
-		add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
-		add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
+        add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
+        add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
+        add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
+        add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
+        do_action( 'getpaid_init_admin_hooks', $this );
 
     }
 
     /**
-	 * Register admin scripts
-	 *
-	 */
-	public function enqeue_scripts() {
+     * Register admin scripts
+     *
+     */
+    public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
-		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
+        $page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
@@ -105,54 +105,54 @@ 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+        if ( 'wpi_payment_form' == $page && $editing ) {
             $this->load_payment_form_scripts();
         }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
-		}
+        if ( $page == 'wpinv-subscriptions' ) {
+            wp_enqueue_script( 'postbox' );
+        }
 
     }
 
     /**
-	 * Returns admin js translations.
-	 *
-	 */
-	protected function get_admin_i18() {
+     * Returns admin js translations.
+     *
+     */
+    protected function get_admin_i18() {
         global $post;
 
-		$date_range = array(
-			'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days'
-		);
+        $date_range = array(
+            'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days'
+        );
 
-		if ( $date_range['period'] == 'custom' ) {
+        if ( $date_range['period'] == 'custom' ) {
 			
-			if ( isset( $_GET['from'] ) ) {
-				$date_range[ 'after' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
-			}
+            if ( isset( $_GET['from'] ) ) {
+                $date_range[ 'after' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
+            }
 
-			if ( isset( $_GET['to'] ) ) {
-				$date_range[ 'before' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
-			}
+            if ( isset( $_GET['to'] ) ) {
+                $date_range[ 'before' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
+            }
 
-		}
+        }
 
         $i18n = array(
             'ajax_url'                  => admin_url( 'admin-ajax.php' ),
             'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-			'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-			'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
-			'rest_root'                 => esc_url_raw( rest_url() ),
-			'date_range'                => $date_range,
+            'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
+            'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
+            'rest_root'                 => esc_url_raw( rest_url() ),
+            'date_range'                => $date_range,
             'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
             'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
             'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
             'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
-			'currency_symbol'           => wpinv_currency_symbol(),
-			'currency'                  => wpinv_get_currency(),
+            'currency_symbol'           => wpinv_currency_symbol(),
+            'currency'                  => wpinv_get_currency(),
             'currency_pos'              => wpinv_currency_position(),
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
@@ -172,118 +172,118 @@ 
             'item_description'          => __( 'Item Description', 'invoicing' ),
             'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
             'discount_description'      => __( 'Discount Description', 'invoicing' ),
-			'searching'                 => __( 'Searching', 'invoicing' ),
-			'loading'                   => __( 'Loading...', 'invoicing' ),
-			'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
-			'search_items'              => __( 'Enter item name', 'invoicing' ),
+            'searching'                 => __( 'Searching', 'invoicing' ),
+            'loading'                   => __( 'Loading...', 'invoicing' ),
+            'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
+            'search_items'              => __( 'Enter item name', 'invoicing' ),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$invoice              = new WPInv_Invoice( $post );
-			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
-			);
+            $invoice              = new WPInv_Invoice( $post );
+            $i18n['save_invoice'] = sprintf(
+                __( 'Save %s', 'invoicing' ),
+                ucfirst( $invoice->get_invoice_quote_type() )
+            );
 
-			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
-			);
+            $i18n['invoice_description'] = sprintf(
+                __( '%s Description', 'invoicing' ),
+                ucfirst( $invoice->get_invoice_quote_type() )
+            );
 
-		}
-		return $i18n;
-	}
+        }
+        return $i18n;
+    }
 
-	/**
-	 * Change the admin footer text on GetPaid admin pages.
-	 *
-	 * @since  2.0.0
-	 * @param  string $footer_text
-	 * @return string
-	 */
-	public function admin_footer_text( $footer_text ) {
-		global $current_screen;
+    /**
+     * Change the admin footer text on GetPaid admin pages.
+     *
+     * @since  2.0.0
+     * @param  string $footer_text
+     * @return string
+     */
+    public function admin_footer_text( $footer_text ) {
+        global $current_screen;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
         if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) {
 
-			// Change the footer text
-			if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
-
-				$rating_url  = esc_url(
-					wp_nonce_url(
-						admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
-						'getpaid-nonce',
-						'getpaid-nonce'
-						)
-				);
-
-				$footer_text = sprintf(
-					/* translators: %s: five stars */
-					__( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
-					"<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
-				);
-
-			} else {
-
-				$footer_text = sprintf(
-					/* translators: %s: GetPaid */
-					__( 'Thank you for using %s!', 'invoicing' ),
-					"<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
-				);
-
-			}
-
-		}
-
-		return $footer_text;
-	}
-
-	/**
-	 * Redirects to wp.org to rate the plugin.
-	 *
-	 * @since  2.0.0
-	 */
-	public function redirect_to_wordpress_rating_page() {
-		update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
-		wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
-		exit;
-	}
+            // Change the footer text
+            if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
+
+                $rating_url  = esc_url(
+                    wp_nonce_url(
+                        admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                        )
+                );
+
+                $footer_text = sprintf(
+                    /* translators: %s: five stars */
+                    __( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
+                    "<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
+                );
+
+            } else {
+
+                $footer_text = sprintf(
+                    /* translators: %s: GetPaid */
+                    __( 'Thank you for using %s!', 'invoicing' ),
+                    "<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
+                );
+
+            }
+
+        }
+
+        return $footer_text;
+    }
 
     /**
-	 * Loads payment form js.
-	 *
-	 */
-	protected function load_payment_form_scripts() {
+     * Redirects to wp.org to rate the plugin.
+     *
+     * @since  2.0.0
+     */
+    public function redirect_to_wordpress_rating_page() {
+        update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
+        wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
+        exit;
+    }
+
+    /**
+     * Loads payment form js.
+     *
+     */
+    protected function load_payment_form_scripts() {
         global $post;
 
         wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
+        wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
+        wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
 
-		wp_localize_script(
+        wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
-				'currency'      => wpinv_currency_symbol(),
-				'position'      => wpinv_currency_position(),
-				'decimals'      => (int) wpinv_decimals(),
-				'thousands_sep' => wpinv_thousands_separator(),
-				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
-				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
+                'elements'      => wpinv_get_data( 'payment-form-elements' ),
+                'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+                'currency'      => wpinv_currency_symbol(),
+                'position'      => wpinv_currency_position(),
+                'decimals'      => (int) wpinv_decimals(),
+                'thousands_sep' => wpinv_thousands_separator(),
+                'decimals_sep'  => wpinv_decimal_separator(),
+                'form_items'    => gepaid_get_form_items( $post->ID ),
+                'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
@@ -292,20 +292,20 @@ 
     }
 
     /**
-	 * Add our classes to admin pages.
+     * Add our classes to admin pages.
      *
      * @param string $classes
      * @return string
-	 *
-	 */
+     *
+     */
     public function admin_body_class( $classes ) {
-		global $pagenow, $post, $current_screen;
+        global $pagenow, $post, $current_screen;
 
 
         $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         if ( false !== stripos( $page, 'wpi' ) ) {
@@ -314,59 +314,59 @@ 
 
         if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
             $classes .= ' wpinv-cpt wpinv';
-		}
+        }
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+        if ( getpaid_is_invoice_post_type( $page ) ) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
-		return $classes;
+        return $classes;
     }
 
     /**
-	 * Maybe show the AyeCode Connect Notice.
-	 */
-	public function init_ayecode_connect_helper(){
+     * Maybe show the AyeCode Connect Notice.
+     */
+    public function init_ayecode_connect_helper(){
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
+                'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
+                'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
+                'connect_button'    => __("Connect Site","invoicing"),
+                'connecting_button'    => __("Connecting...","invoicing"),
+                'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
+                'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
             ),
             array( 'wpi-addons' )
         );
 
     }
 
-	/**
-	 * Redirect users to settings on activation.
-	 *
-	 * @return void
-	 */
-	public function activation_redirect() {
+    /**
+     * Redirect users to settings on activation.
+     *
+     * @return void
+     */
+    public function activation_redirect() {
 
-		$redirected = get_option( 'wpinv_redirected_to_settings' );
+        $redirected = get_option( 'wpinv_redirected_to_settings' );
 
-		if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
-			return;
-		}
+        if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
+            return;
+        }
 
-		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-			return;
-		}
+        // Bail if activating from network, or bulk
+        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+            return;
+        }
 
-	    update_option( 'wpinv_redirected_to_settings', 1 );
+        update_option( 'wpinv_redirected_to_settings', 1 );
 
         wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
         exit;
 
-	}
+    }
 
     /**
      * Fires an admin action after verifying that a user can fire them.
@@ -380,304 +380,304 @@ 
 
     }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
+        $sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not send the invoice to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not send the invoice to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Resets tax rates.
-	 * 
+     * 
      */
     public function admin_reset_tax_rates() {
 
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Resets admin pages.
-	 * 
+     * 
      */
     public function admin_create_missing_pages() {
-		$installer = new GetPaid_Installer();
-		$installer->create_pages();
-		$this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
-	}
-
-	/**
+        $installer = new GetPaid_Installer();
+        $installer->create_pages();
+        $this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
+    }
+
+    /**
      * Creates an missing admin tables.
-	 * 
+     * 
      */
     public function admin_create_missing_tables() {
-		global $wpdb;
-		$installer = new GetPaid_Installer();
+        global $wpdb;
+        $installer = new GetPaid_Installer();
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'" ) != $wpdb->prefix . 'wpinv_subscriptions' ) {
-			$installer->create_subscriptions_table();
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'" ) != $wpdb->prefix . 'wpinv_subscriptions' ) {
+            $installer->create_subscriptions_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
-			}
-		}
+            if ( $wpdb->last_error !== '' ) {
+                $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+            }
+        }
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) != $wpdb->prefix . 'getpaid_invoices' ) {
-			$installer->create_invoices_table();
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) != $wpdb->prefix . 'getpaid_invoices' ) {
+            $installer->create_invoices_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
-			}
-		}
+            if ( $wpdb->last_error !== '' ) {
+                $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+            }
+        }
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'" ) != $wpdb->prefix . 'getpaid_invoice_items' ) {
-			$installer->create_invoice_items_table();
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'" ) != $wpdb->prefix . 'getpaid_invoice_items' ) {
+            $installer->create_invoice_items_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
-			}
-		}
+            if ( $wpdb->last_error !== '' ) {
+                $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+            }
+        }
 
-		if ( ! $this->has_notices() ) {
-			$this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
-		}
+        if ( ! $this->has_notices() ) {
+            $this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Migrates old invoices to the new database tables.
-	 * 
+     * 
      */
     public function admin_migrate_old_invoices() {
 
-		// Migrate the invoices.
-		$installer = new GetPaid_Installer();
-		$installer->migrate_old_invoices();
+        // Migrate the invoices.
+        $installer = new GetPaid_Installer();
+        $installer->migrate_old_invoices();
 
-		// Show an admin message.
-		$this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
+        // Show an admin message.
+        $this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
 
-		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        // Redirect the admin.
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Recalculates discounts.
-	 * 
+     * 
      */
     public function admin_recalculate_discounts() {
-		global $wpdb;
+        global $wpdb;
 
-		// Fetch all invoices that have discount codes.
-		$table    = $wpdb->prefix . 'getpaid_invoices';
-		$invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
+        // Fetch all invoices that have discount codes.
+        $table    = $wpdb->prefix . 'getpaid_invoices';
+        $invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			$invoice = new WPInv_Invoice( $invoice );
+            $invoice = new WPInv_Invoice( $invoice );
 
-			if ( ! $invoice->exists() ) {
-				continue;
-			}
+            if ( ! $invoice->exists() ) {
+                continue;
+            }
 
-			// Abort if the discount does not exist or does not apply here.
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( ! $discount->exists() ) {
-				continue;
-			}
+            // Abort if the discount does not exist or does not apply here.
+            $discount = new WPInv_Discount( $invoice->get_discount_code() );
+            if ( ! $discount->exists() ) {
+                continue;
+            }
 
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-			$invoice->recalculate_total();
+            $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            $invoice->recalculate_total();
 
-			if ( $invoice->get_total_discount() > 0 ) {
-				$invoice->save();
-			}
+            if ( $invoice->get_total_discount() > 0 ) {
+                $invoice->save();
+            }
 
-		}
+        }
 
-		// Show an admin message.
-		$this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
+        // Show an admin message.
+        $this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
 
-		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        // Redirect the admin.
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
     /**
-	 * Returns an array of admin notices.
-	 *
-	 * @since       1.0.19
+     * Returns an array of admin notices.
+     *
+     * @since       1.0.19
      * @return array
-	 */
-	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
+     */
+    public function get_notices() {
+        $notices = get_option( 'wpinv_admin_notices' );
         return is_array( $notices ) ? $notices : array();
-	}
+    }
 
-	/**
-	 * Checks if we have any admin notices.
-	 *
-	 * @since       2.0.4
+    /**
+     * Checks if we have any admin notices.
+     *
+     * @since       2.0.4
      * @return array
-	 */
-	public function has_notices() {
-		return count( $this->get_notices() ) > 0;
-	}
-
-	/**
-	 * Clears all admin notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
-	}
-
-	/**
-	 * Saves a new admin notice
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function save_notice( $type, $message ) {
-		$notices = $this->get_notices();
-
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
-		}
-
-		$notices[ $type ][] = $message;
-
-		update_option( 'wpinv_admin_notices', $notices );
-	}
-
-	/**
-	 * Displays a success notice
-	 *
-	 * @param       string $msg The message to qeue.
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
-	}
-
-	/**
-	 * Displays a error notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
-	}
-
-	/**
-	 * Displays a warning notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
-	}
-
-	/**
-	 * Displays a info notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
-	}
-
-	/**
-	 * Show notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_notices() {
+     */
+    public function has_notices() {
+        return count( $this->get_notices() ) > 0;
+    }
+
+    /**
+     * Clears all admin notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function clear_notices() {
+        delete_option( 'wpinv_admin_notices' );
+    }
+
+    /**
+     * Saves a new admin notice
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function save_notice( $type, $message ) {
+        $notices = $this->get_notices();
+
+        if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
+            $notices[ $type ] = array();
+        }
+
+        $notices[ $type ][] = $message;
+
+        update_option( 'wpinv_admin_notices', $notices );
+    }
+
+    /**
+     * Displays a success notice
+     *
+     * @param       string $msg The message to qeue.
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_success( $msg ) {
+        $this->save_notice( 'success', $msg );
+    }
+
+    /**
+     * Displays a error notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_error( $msg ) {
+        $this->save_notice( 'error', $msg );
+    }
+
+    /**
+     * Displays a warning notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_warning( $msg ) {
+        $this->save_notice( 'warning', $msg );
+    }
+
+    /**
+     * Displays a info notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_info( $msg ) {
+        $this->save_notice( 'info', $msg );
+    }
+
+    /**
+     * Show notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_notices() {
 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+        foreach ( $notices as $type => $messages ) {
 
-			if ( ! is_array( $messages ) ) {
-				continue;
-			}
+            if ( ! is_array( $messages ) ) {
+                continue;
+            }
 
             $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
+            foreach ( $messages as $message ) {
                 $message = wp_kses_post( $message );
-				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
+                echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
+            }
+
+        }
+
+        foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
+
+            if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
+                $url     = esc_url(
+                    wp_nonce_url(
+                        add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                );
+                $message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
+                $message2 = __( 'Generate Pages', 'invoicing' );
+                echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
+                break;
             }
 
         }
 
-		foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
-
-			if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
-				$url     = esc_url(
-					wp_nonce_url(
-						add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				);
-				$message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
-				$message2 = __( 'Generate Pages', 'invoicing' );
-				echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
-				break;
-			}
-
-		}
-
-	}
+    }
 
 }

includes/admin/class-getpaid-installer.php

Indentation +363 added lines, -363 removed lines

@@ -20,214 +20,214 @@ 
  */
 class GetPaid_Installer {
 
-	/**
-	 * Upgrades the install.
-	 *
-	 * @param string $upgrade_from The current invoicing version.
-	 */
-	public function upgrade_db( $upgrade_from ) {
-
-		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
-
-		// Setup the invoice Custom Post Type.
-		GetPaid_Post_Types::register_post_types();
-
-		// Clear the permalinks
-		flush_rewrite_rules();
-
-		// Maybe create new/missing pages.
-		$this->create_pages();
-
-		// Maybe re(add) admin capabilities.
-		$this->add_capabilities();
-
-		// Maybe create the default payment form.
-		wpinv_get_default_payment_form();
-
-		// Create any missing database tables.
-		$method = "upgrade_from_$upgrade_from";
-
-		if ( method_exists( $this, $method ) ) {
-			$this->$method();
-		}
-
-	}
-
-	/**
-	 * Do a fresh install.
-	 *
-	 */
-	public function upgrade_from_0() {
-		$this->create_subscriptions_table();
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-
-		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-	}
-
-	/**
-	 * Upgrade to 0.0.5
-	 *
-	 */
-	public function upgrade_from_004() {
-		global $wpdb;
-
-		// Invoices.
-		$results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-
-			// Clean post cache
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->ID );
-			}
-
-		}
-
-		// Item meta key changes
-		$query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-		$results = $wpdb->get_results( $query );
-
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-			$wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-			$wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
-
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->post_id );
-			}
-
-		}
-
-		$this->upgrade_from_102();
-	}
-
-	/**
-	 * Upgrade to 1.0.3
-	 *
-	 */
-	public function upgrade_from_102() {
-		$this->create_subscriptions_table();
-		$this->upgrade_from_118();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_118() {
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-		$this->migrate_old_invoices();
-	}
-
-	/**
-	 * Upgrade to version 2.0.8.
-	 *
-	 */
-	public function upgrade_from_207() {
-		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
-	}
-
-	/**
-	 * Give administrators the capability to manage GetPaid.
-	 *
-	 */
-	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
-	}
-
-	/**
-	 * Re-create GetPaid pages.
-	 *
-	 */
-	public function create_pages() {
-
-		$pages = apply_filters(
-			'wpinv_create_pages',
-			array(
-
-				// Checkout page.
-				'checkout_page' => array(
-					'name'      => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'     => _x( 'Checkout', 'Page title', 'invoicing' ),
-					'content'   => '
+    /**
+     * Upgrades the install.
+     *
+     * @param string $upgrade_from The current invoicing version.
+     */
+    public function upgrade_db( $upgrade_from ) {
+
+        // Save the current invoicing version.
+        update_option( 'wpinv_version', WPINV_VERSION );
+
+        // Setup the invoice Custom Post Type.
+        GetPaid_Post_Types::register_post_types();
+
+        // Clear the permalinks
+        flush_rewrite_rules();
+
+        // Maybe create new/missing pages.
+        $this->create_pages();
+
+        // Maybe re(add) admin capabilities.
+        $this->add_capabilities();
+
+        // Maybe create the default payment form.
+        wpinv_get_default_payment_form();
+
+        // Create any missing database tables.
+        $method = "upgrade_from_$upgrade_from";
+
+        if ( method_exists( $this, $method ) ) {
+            $this->$method();
+        }
+
+    }
+
+    /**
+     * Do a fresh install.
+     *
+     */
+    public function upgrade_from_0() {
+        $this->create_subscriptions_table();
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+
+        // Save default tax rates.
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+    }
+
+    /**
+     * Upgrade to 0.0.5
+     *
+     */
+    public function upgrade_from_004() {
+        global $wpdb;
+
+        // Invoices.
+        $results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+        if ( ! empty( $results ) ) {
+            $wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+
+            // Clean post cache
+            foreach ( $results as $row ) {
+                clean_post_cache( $row->ID );
+            }
+
+        }
+
+        // Item meta key changes
+        $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
+        $results = $wpdb->get_results( $query );
+
+        if ( ! empty( $results ) ) {
+            $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
+            $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
+            $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+
+            foreach ( $results as $row ) {
+                clean_post_cache( $row->post_id );
+            }
+
+        }
+
+        $this->upgrade_from_102();
+    }
+
+    /**
+     * Upgrade to 1.0.3
+     *
+     */
+    public function upgrade_from_102() {
+        $this->create_subscriptions_table();
+        $this->upgrade_from_118();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_118() {
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+        $this->migrate_old_invoices();
+    }
+
+    /**
+     * Upgrade to version 2.0.8.
+     *
+     */
+    public function upgrade_from_207() {
+        global $wpdb;
+        $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
+    }
+
+    /**
+     * Give administrators the capability to manage GetPaid.
+     *
+     */
+    public function add_capabilities() {
+        $GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+    }
+
+    /**
+     * Re-create GetPaid pages.
+     *
+     */
+    public function create_pages() {
+
+        $pages = apply_filters(
+            'wpinv_create_pages',
+            array(
+
+                // Checkout page.
+                'checkout_page' => array(
+                    'name'      => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
+                    'title'     => _x( 'Checkout', 'Page title', 'invoicing' ),
+                    'content'   => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
 						<!-- /wp:shortcode -->
 					',
-					'parent'    => '',
-				),
-
-				// Invoice history page.
-				'invoice_history_page' => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'    => '',
+                ),
+
+                // Invoice history page.
+                'invoice_history_page' => array(
+                    'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
-
-				// Success page content.
-				'success_page' => array(
-					'name'     => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'    => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
-					'content'  => '
+                    'parent'  => '',
+                ),
+
+                // Success page content.
+                'success_page' => array(
+                    'name'     => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
+                    'title'    => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+                    'content'  => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
 					<!-- /wp:shortcode -->
 				',
-					'parent'   => 'gp-checkout',
-				),
-
-				// Failure page content.
-				'failure_page' => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
-					'parent'  => 'gp-checkout',
-				),
-
-				// Subscriptions history page.
-				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'   => 'gp-checkout',
+                ),
+
+                // Failure page content.
+                'failure_page' => array(
+                    'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
+                    'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Subscriptions history page.
+                'invoice_subscription_page' => array(
+                    'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
 					<!-- /wp:shortcode -->
 				',
-					'parent' => '',
-				),
+                    'parent' => '',
+                ),
 
-			)
-		);
+            )
+        );
 
-		foreach ( $pages as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
-		}
+        foreach ( $pages as $key => $page ) {
+            wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+        }
 
-	}
+    }
 
-	/**
-	 * Create subscriptions table.
-	 *
-	 */
-	public function create_subscriptions_table() {
+    /**
+     * Create subscriptions table.
+     *
+     */
+    public function create_subscriptions_table() {
 
-		global $wpdb;
+        global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
 			id bigint(20) unsigned NOT NULL auto_increment,
 			customer_id bigint(20) NOT NULL,
 			frequency int(11) NOT NULL DEFAULT '1',
@@ -250,22 +250,22 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoices table.
-	 *
-	 */
-	public function create_invoices_table() {
-		global $wpdb;
+    /**
+     * Create invoices table.
+     *
+     */
+    public function create_invoices_table() {
+        global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
 			post_id BIGINT(20) NOT NULL,
             `number` VARCHAR(100),
             `key` VARCHAR(100),
@@ -301,22 +301,22 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoice items table.
-	 *
-	 */
-	public function create_invoice_items_table() {
-		global $wpdb;
+    /**
+     * Create invoice items table.
+     *
+     */
+    public function create_invoice_items_table() {
+        global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
 			ID BIGINT(20) NOT NULL AUTO_INCREMENT,
             post_id BIGINT(20) NOT NULL,
             item_id BIGINT(20) NOT NULL,
@@ -338,159 +338,159 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public function migrate_old_invoices() {
-		global $wpdb;
-
-		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
-		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
-		$invoices            = array_unique(
-			get_posts(
-				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
-					'posts_per_page' => -1,
-					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
-					'exclude'        => (array) $migrated,
-				)
-			)
-		);
-
-		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
-			return;
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
-
-		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
-
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
-
-			if ( empty( $invoice->ID ) ) {
-				return;
-			}
-
-			$fields = array (
-				'post_id'        => $invoice->ID,
-				'number'         => $invoice->get_number(),
-				'key'            => $invoice->get_key(),
-				'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
-				'mode'           => $invoice->mode,
-				'user_ip'        => $invoice->get_ip(),
-				'first_name'     => $invoice->get_first_name(),
-				'last_name'      => $invoice->get_last_name(),
-				'address'        => $invoice->get_address(),
-				'city'           => $invoice->city,
-				'state'          => $invoice->state,
-				'country'        => $invoice->country,
-				'zip'            => $invoice->zip,
-				'adddress_confirmed' => (int) $invoice->adddress_confirmed,
-				'gateway'        => $invoice->get_gateway(),
-				'transaction_id' => $invoice->get_transaction_id(),
-				'currency'       => $invoice->get_currency(),
-				'subtotal'       => $invoice->get_subtotal(),
-				'tax'            => $invoice->get_tax(),
-				'fees_total'     => $invoice->get_fees_total(),
-				'total'          => $invoice->get_total(),
-				'discount'       => $invoice->get_discount(),
-				'discount_code'  => $invoice->get_discount_code(),
-				'disable_taxes'  => $invoice->disable_taxes,
-				'due_date'       => $invoice->get_due_date(),
-				'completed_date' => $invoice->get_completed_date(),
-				'company'        => $invoice->company,
-				'vat_number'     => $invoice->vat_number,
-				'vat_rate'       => $invoice->vat_rate,
-				'custom_meta'    => $invoice->payment_meta
-			);
-
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
-					$val = '';
-				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
-			}
-
-			$fields = implode( ', ', $fields );
-			$invoice_rows[] = "($fields)";
-
-			$item_rows    = array();
-			$item_columns = array();
-			foreach ( $invoice->get_cart_details() as $details ) {
-				$fields = array(
-					'post_id'          => $invoice->ID,
-					'item_id'          => $details['id'],
-					'item_name'        => $details['name'],
-					'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
-					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
-					'tax'              => $details['tax'],
-					'item_price'       => $details['item_price'],
-					'custom_price'     => $details['custom_price'],
-					'quantity'         => $details['quantity'],
-					'discount'         => $details['discount'],
-					'subtotal'         => $details['subtotal'],
-					'price'            => $details['price'],
-					'meta'             => $details['meta'],
-					'fees'             => $details['fees'],
-				);
-
-				$item_columns = array_keys ( $fields );
-
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
-						$val = '';
-					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
-				}
-
-				$fields = implode( ', ', $fields );
-				$item_rows[] = "($fields)";
-			}
-
-			$item_rows    = implode( ', ', $item_rows );
-			$item_columns = implode( ', ', $item_columns );
-			$wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
-		}
-
-		if ( empty( $invoice_rows ) ) {
-			return;
-		}
-
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public static function rename_gateways_label() {
-		global $wpdb;
-
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
-
-			$wpdb->update(
-				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
-				'%s',
-				'%s'
-			);
-
-		}
-	}
+        dbDelta( $sql );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public function migrate_old_invoices() {
+        global $wpdb;
+
+        $invoices_table      = $wpdb->prefix . 'getpaid_invoices';
+        $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
+        $migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+        $invoices            = array_unique(
+            get_posts(
+                array(
+                    'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                    'posts_per_page' => -1,
+                    'fields'         => 'ids',
+                    'post_status'    => array_keys( get_post_stati() ),
+                    'exclude'        => (array) $migrated,
+                )
+            )
+        );
+
+        // Abort if we do not have any invoices.
+        if ( empty( $invoices ) ) {
+            return;
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
+
+        $invoice_rows = array();
+        foreach ( $invoices as $invoice ) {
+
+            $invoice = new WPInv_Legacy_Invoice( $invoice );
+
+            if ( empty( $invoice->ID ) ) {
+                return;
+            }
+
+            $fields = array (
+                'post_id'        => $invoice->ID,
+                'number'         => $invoice->get_number(),
+                'key'            => $invoice->get_key(),
+                'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
+                'mode'           => $invoice->mode,
+                'user_ip'        => $invoice->get_ip(),
+                'first_name'     => $invoice->get_first_name(),
+                'last_name'      => $invoice->get_last_name(),
+                'address'        => $invoice->get_address(),
+                'city'           => $invoice->city,
+                'state'          => $invoice->state,
+                'country'        => $invoice->country,
+                'zip'            => $invoice->zip,
+                'adddress_confirmed' => (int) $invoice->adddress_confirmed,
+                'gateway'        => $invoice->get_gateway(),
+                'transaction_id' => $invoice->get_transaction_id(),
+                'currency'       => $invoice->get_currency(),
+                'subtotal'       => $invoice->get_subtotal(),
+                'tax'            => $invoice->get_tax(),
+                'fees_total'     => $invoice->get_fees_total(),
+                'total'          => $invoice->get_total(),
+                'discount'       => $invoice->get_discount(),
+                'discount_code'  => $invoice->get_discount_code(),
+                'disable_taxes'  => $invoice->disable_taxes,
+                'due_date'       => $invoice->get_due_date(),
+                'completed_date' => $invoice->get_completed_date(),
+                'company'        => $invoice->company,
+                'vat_number'     => $invoice->vat_number,
+                'vat_rate'       => $invoice->vat_rate,
+                'custom_meta'    => $invoice->payment_meta
+            );
+
+            foreach ( $fields as $key => $val ) {
+                if ( is_null( $val ) ) {
+                    $val = '';
+                }
+                $val = maybe_serialize( $val );
+                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            }
+
+            $fields = implode( ', ', $fields );
+            $invoice_rows[] = "($fields)";
+
+            $item_rows    = array();
+            $item_columns = array();
+            foreach ( $invoice->get_cart_details() as $details ) {
+                $fields = array(
+                    'post_id'          => $invoice->ID,
+                    'item_id'          => $details['id'],
+                    'item_name'        => $details['name'],
+                    'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+                    'vat_rate'         => $details['vat_rate'],
+                    'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                    'tax'              => $details['tax'],
+                    'item_price'       => $details['item_price'],
+                    'custom_price'     => $details['custom_price'],
+                    'quantity'         => $details['quantity'],
+                    'discount'         => $details['discount'],
+                    'subtotal'         => $details['subtotal'],
+                    'price'            => $details['price'],
+                    'meta'             => $details['meta'],
+                    'fees'             => $details['fees'],
+                );
+
+                $item_columns = array_keys ( $fields );
+
+                foreach ( $fields as $key => $val ) {
+                    if ( is_null( $val ) ) {
+                        $val = '';
+                    }
+                    $val = maybe_serialize( $val );
+                    $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                }
+
+                $fields = implode( ', ', $fields );
+                $item_rows[] = "($fields)";
+            }
+
+            $item_rows    = implode( ', ', $item_rows );
+            $item_columns = implode( ', ', $item_columns );
+            $wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+        }
+
+        if ( empty( $invoice_rows ) ) {
+            return;
+        }
+
+        $invoice_rows = implode( ', ', $invoice_rows );
+        $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public static function rename_gateways_label() {
+        global $wpdb;
+
+        foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+
+            $wpdb->update(
+                $wpdb->prefix . 'getpaid_invoices',
+                array( 'gateway' => $gateway ),
+                array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+                '%s',
+                '%s'
+            );
+
+        }
+    }
 
 }

includes/class-wpinv.php

Indentation +500 added lines, -500 removed lines

@@ -14,543 +14,543 @@
  */
 class WPInv_Plugin {
 
-	/**
-	 * GetPaid version.
-	 *
-	 * @var string
-	 */
-	public $version;
-
-	/**
-	 * Data container.
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Form elements instance.
-	 *
-	 * @var WPInv_Payment_Form_Elements
-	 */
-	public $form_elements;
-
-	/**
-	 * @param array An array of payment gateways.
-	 */
-	public $gateways;
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-		$this->define_constants();
-		$this->includes();
-		$this->init_hooks();
-		$this->set_properties();
-	}
-
-	/**
-	 * Sets a custom data property.
-	 * 
-	 * @param string $prop The prop to set.
-	 * @param mixed $value The value to retrieve.
-	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
-	}
-
-	/**
-	 * Gets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @return mixed The value.
-	 */
-	public function get( $prop ) {
-
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Define class properties.
-	 */
-	public function set_properties() {
-
-		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
-		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
-
-		// Init other objects.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
-
-	}
-
-	 /**
-	 * Define plugin constants.
-	 */
-	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
-		$this->version = WPINV_VERSION;
-	}
-
-	/**
-	 * Hook into actions and filters.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function init_hooks() {
-		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
-
-		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
-
-	}
-
-	public function plugins_loaded() {
-		/* Internationalize the text strings used. */
-		$this->load_textdomain();
-
-		do_action( 'wpinv_loaded' );
-
-		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
-			wpinv_oxygen_fix_conflict();
-		}
-	}
-
-	/**
-	 * Load the translation of the plugin.
-	 *
-	 * @since 1.0
-	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
-		}
-
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
-
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
-
-		/**
-		 * Define language constants.
-		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
-	}
-
-	/**
-	 * Include required core files used in admin and on the frontend.
-	 */
-	public function includes() {
-
-		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
-
-		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
-
-		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
-
-		// Register autoloader.
-		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			GetPaid_Post_Types_Admin::init();
-
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
-			// load the user class only on the users.php page
-			global $pagenow;
-			if($pagenow=='users.php'){
-				new WPInv_Admin_Users();
-			}
-		}
-
-		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
-		}
-
-	}
-
-	/**
-	 * Class autoloader
-	 *
-	 * @param       string $class_name The name of the class to load.
-	 * @access      public
-	 * @since       1.0.19
-	 * @return      void
-	 */
-	public function autoload( $class_name ) {
-
-		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
-
-		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
-			return;
-		}
-
-		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
-
-		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
-
-		// And an array of possible locations in order of importance.
-		$locations = array(
-			"$plugin_path/includes",
-			"$plugin_path/includes/data-stores",
-			"$plugin_path/includes/gateways",
-			"$plugin_path/includes/payments",
-			"$plugin_path/includes/geolocation",
-			"$plugin_path/includes/reports",
-			"$plugin_path/includes/api",
-			"$plugin_path/includes/admin",
-			"$plugin_path/includes/admin/meta-boxes",
-		);
-
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
-				break;
-			}
-
-		}
-
-	}
-
-	/**
-	 * Inits hooks etc.
-	 */
-	public function init() {
-
-		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
-
-		// Maybe upgrade.
-		$this->maybe_upgrade_database();
-
-		// Load default gateways.
-		$gateways = apply_filters(
-			'getpaid_default_gateways',
-			array(
-				'manual'        => 'GetPaid_Manual_Gateway',
-				'paypal'        => 'GetPaid_Paypal_Gateway',
-				'worldpay'      => 'GetPaid_Worldpay_Gateway',
-				'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
-				'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
-			)
-		);
-
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
-		}
-
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
-			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
-		}
-
-		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
-
-	}
-
-	/**
-	 * Checks if this is an IPN request and processes it.
-	 */
-	public function maybe_process_ipn() {
-
-		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
-			return;
-		}
-
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
-
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
-		exit;
-
-	}
-
-	public function enqueue_scripts() {
-
-		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
-
-		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
-		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
-
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ),  $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
-	}
-
-	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
-		}
-	}
-
-	/**
+    /**
+     * GetPaid version.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Data container.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Form elements instance.
+     *
+     * @var WPInv_Payment_Form_Elements
+     */
+    public $form_elements;
+
+    /**
+     * @param array An array of payment gateways.
+     */
+    public $gateways;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+        $this->define_constants();
+        $this->includes();
+        $this->init_hooks();
+        $this->set_properties();
+    }
+
+    /**
+     * Sets a custom data property.
+     * 
+     * @param string $prop The prop to set.
+     * @param mixed $value The value to retrieve.
+     */
+    public function set( $prop, $value ) {
+        $this->data[ $prop ] = $value;
+    }
+
+    /**
+     * Gets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @return mixed The value.
+     */
+    public function get( $prop ) {
+
+        if ( isset( $this->data[ $prop ] ) ) {
+            return $this->data[ $prop ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Define class properties.
+     */
+    public function set_properties() {
+
+        // Sessions.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+        $GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
+
+        // Init other objects.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $this->set( 'notes', new WPInv_Notes() );
+        $this->set( 'api', new WPInv_API() );
+        $this->set( 'post_types', new GetPaid_Post_Types() );
+        $this->set( 'template', new GetPaid_Template() );
+        $this->set( 'admin', new GetPaid_Admin() );
+        $this->set( 'subscriptions', new WPInv_Subscriptions() );
+        $this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
+        $this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
+        $this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
+        $this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+        $this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+
+    }
+
+        /**
+         * Define plugin constants.
+         */
+    public function define_constants() {
+        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
+        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        $this->version = WPINV_VERSION;
+    }
+
+    /**
+     * Hook into actions and filters.
+     *
+     * @since 1.0.19
+     */
+    protected function init_hooks() {
+        /* Internationalize the text strings used. */
+        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+
+        // Init the plugin after WordPress inits.
+        add_action( 'init', array( $this, 'init' ), 1 );
+        add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
+        add_action( 'init', array( $this, 'wpinv_actions' ) );
+        add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
+        add_action( 'wp_footer', array( $this, 'wp_footer' ) );
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
+        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+
+        // Fires after registering actions.
+        do_action( 'wpinv_actions', $this );
+        do_action( 'getpaid_actions', $this );
+
+    }
+
+    public function plugins_loaded() {
+        /* Internationalize the text strings used. */
+        $this->load_textdomain();
+
+        do_action( 'wpinv_loaded' );
+
+        // Fix oxygen page builder conflict
+        if ( function_exists( 'ct_css_output' ) ) {
+            wpinv_oxygen_fix_conflict();
+        }
+    }
+
+    /**
+     * Load the translation of the plugin.
+     *
+     * @since 1.0
+     */
+    public function load_textdomain( $locale = NULL ) {
+        if ( empty( $locale ) ) {
+            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+        }
+
+        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+
+        unload_textdomain( 'invoicing' );
+        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
+        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+
+        /**
+         * Define language constants.
+         */
+        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+    }
+
+    /**
+     * Include required core files used in admin and on the frontend.
+     */
+    public function includes() {
+
+        // Start with the settings.
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+
+        // Packages/libraries.
+        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
+        require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+
+        // Load functions.
+        require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/user-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+
+        // Register autoloader.
+        try {
+            spl_autoload_register( array( $this, 'autoload' ), true );
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
+
+        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            GetPaid_Post_Types_Admin::init();
+
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+            // load the user class only on the users.php page
+            global $pagenow;
+            if($pagenow=='users.php'){
+                new WPInv_Admin_Users();
+            }
+        }
+
+        // Register cli commands
+        if ( defined( 'WP_CLI' ) && WP_CLI ) {
+            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
+            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        }
+
+    }
+
+    /**
+     * Class autoloader
+     *
+     * @param       string $class_name The name of the class to load.
+     * @access      public
+     * @since       1.0.19
+     * @return      void
+     */
+    public function autoload( $class_name ) {
+
+        // Normalize the class name...
+        $class_name  = strtolower( $class_name );
+
+        // ... and make sure it is our class.
+        if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+            return;
+        }
+
+        // Next, prepare the file name from the class.
+        $file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+
+        // Base path of the classes.
+        $plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+
+        // And an array of possible locations in order of importance.
+        $locations = array(
+            "$plugin_path/includes",
+            "$plugin_path/includes/data-stores",
+            "$plugin_path/includes/gateways",
+            "$plugin_path/includes/payments",
+            "$plugin_path/includes/geolocation",
+            "$plugin_path/includes/reports",
+            "$plugin_path/includes/api",
+            "$plugin_path/includes/admin",
+            "$plugin_path/includes/admin/meta-boxes",
+        );
+
+        foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+
+            if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
+                include trailingslashit( $location ) . $file_name;
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * Inits hooks etc.
+     */
+    public function init() {
+
+        // Fires before getpaid inits.
+        do_action( 'before_getpaid_init', $this );
+
+        // Maybe upgrade.
+        $this->maybe_upgrade_database();
+
+        // Load default gateways.
+        $gateways = apply_filters(
+            'getpaid_default_gateways',
+            array(
+                'manual'        => 'GetPaid_Manual_Gateway',
+                'paypal'        => 'GetPaid_Paypal_Gateway',
+                'worldpay'      => 'GetPaid_Worldpay_Gateway',
+                'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
+                'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
+            )
+        );
+
+        foreach ( $gateways as $id => $class ) {
+            $this->gateways[ $id ] = new $class();
+        }
+
+        if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+            GetPaid_Installer::rename_gateways_label();
+            update_option( 'wpinv_renamed_gateways', 'yes' );
+        }
+
+        // Fires after getpaid inits.
+        do_action( 'getpaid_init', $this );
+
+    }
+
+    /**
+     * Checks if this is an IPN request and processes it.
+     */
+    public function maybe_process_ipn() {
+
+        // Ensure that this is an IPN request.
+        if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+            return;
+        }
+
+        $gateway = wpinv_clean( $_GET['wpi-gateway'] );
+
+        do_action( 'wpinv_verify_payment_ipn', $gateway );
+        do_action( "wpinv_verify_{$gateway}_ipn" );
+        exit;
+
+    }
+
+    public function enqueue_scripts() {
+
+        // Fires before adding scripts.
+        do_action( 'getpaid_enqueue_scripts' );
+
+        $localize                         = array();
+        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['UseTaxes']             = wpinv_use_taxes();
+        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
+        $localize['loading']              = __( 'Loading...', 'invoicing' );
+        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+
+        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
+        wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ),  $version, true );
+        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+    }
+
+    public function wpinv_actions() {
+        if ( isset( $_REQUEST['wpi_action'] ) ) {
+            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        }
+    }
+
+    /**
      * Fires an action after verifying that a user can fire them.
-	 *
-	 * Note: If the action is on an invoice, subscription etc, esure that the
-	 * current user owns the invoice/subscription.
+     *
+     * Note: If the action is on an invoice, subscription etc, esure that the
+     * current user owns the invoice/subscription.
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+        if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
-			}
+            $key  = sanitize_key( $_REQUEST['getpaid-action'] );
+            $data = wp_unslash( $_REQUEST );
+            if ( is_user_logged_in() ) {
+                do_action( "getpaid_authenticated_action_$key", $data );
+            }
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+            do_action( "getpaid_unauthenticated_action_$key", $data );
 
-		}
+        }
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
-		}
-
-		return $wp_query;
-	}
-
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-
-		// Currently, UX Builder does not work particulaly well with SuperDuper.
-		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
-			return;
-		}
-
-		$widgets = apply_filters(
-			'getpaid_widget_classes',
-			array(
-				'WPInv_Checkout_Widget',
-				'WPInv_History_Widget',
-				'WPInv_Receipt_Widget',
-				'WPInv_Subscriptions_Widget',
-				'WPInv_Buy_Item_Widget',
-				'WPInv_Messages_Widget',
-				'WPInv_GetPaid_Widget'
-			)
-		);
-
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
-		}
+    public function pre_get_posts( $wp_query ) {
+
+        if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+        }
+
+        return $wp_query;
+    }
+
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+
+        // Currently, UX Builder does not work particulaly well with SuperDuper.
+        // So we disable our widgets when editing a page with UX Builder.
+        if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+            return;
+        }
+
+        $widgets = apply_filters(
+            'getpaid_widget_classes',
+            array(
+                'WPInv_Checkout_Widget',
+                'WPInv_History_Widget',
+                'WPInv_Receipt_Widget',
+                'WPInv_Subscriptions_Widget',
+                'WPInv_Buy_Item_Widget',
+                'WPInv_Messages_Widget',
+                'WPInv_GetPaid_Widget'
+            )
+        );
+
+        foreach ( $widgets as $widget ) {
+            register_widget( $widget );
+        }
 		
-	}
+    }
 
-	/**
-	 * Upgrades the database.
-	 *
-	 * @since 2.0.2
-	 */
-	public function maybe_upgrade_database() {
+    /**
+     * Upgrades the database.
+     *
+     * @since 2.0.2
+     */
+    public function maybe_upgrade_database() {
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+        $wpi_version = get_option( 'wpinv_version', 0 );
 
-		if ( $wpi_version == WPINV_VERSION ) {
-			return;
-		}
+        if ( $wpi_version == WPINV_VERSION ) {
+            return;
+        }
 
-		$installer = new GetPaid_Installer();
+        $installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
-		}
+        if ( empty( $wpi_version ) ) {
+            return $installer->upgrade_db( 0 );
+        }
 
-		$upgrades  = array(
-			'0.0.5' => '004',
-			'1.0.3' => '102',
-			'2.0.0' => '118',
-			'2.0.8' => '207',
-		);
+        $upgrades  = array(
+            '0.0.5' => '004',
+            '1.0.3' => '102',
+            '2.0.0' => '118',
+            '2.0.8' => '207',
+        );
 
-		foreach ( $upgrades as $key => $method ) {
+        foreach ( $upgrades as $key => $method ) {
 
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
-			}
+            if ( version_compare( $wpi_version, $key, '<' ) ) {
+                return $installer->upgrade_db( $method );
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Flushes the permalinks if needed.
-	 *
-	 * @since 2.0.8
-	 */
-	public function maybe_flush_permalinks() {
+    /**
+     * Flushes the permalinks if needed.
+     *
+     * @since 2.0.8
+     */
+    public function maybe_flush_permalinks() {
 
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
+        $flush = get_option( 'wpinv_flush_permalinks', 0 );
 
-		if ( ! empty( $flush ) ) {
-			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
-		}
+        if ( ! empty( $flush ) ) {
+            flush_rewrite_rules();
+            delete_option( 'wpinv_flush_permalinks' );
+        }
 
-	}
+    }
 
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param int[] $excluded_posts_ids
-	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param int[] $excluded_posts_ids
+     */
+    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
 
-		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
-			$excluded_posts_ids = array();
-		}
+        // Ensure that we have an array.
+        if ( ! is_array( $excluded_posts_ids ) ) {
+            $excluded_posts_ids = array();
+        }
 
-		// Prepare our pages.
-		$our_pages = array();
+        // Prepare our pages.
+        $our_pages = array();
 
-		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+        // Checkout page.
+        $our_pages[] = wpinv_get_option( 'checkout_page', false );
 
-		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+        // Success page.
+        $our_pages[] = wpinv_get_option( 'success_page', false );
 
-		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+        // Failure page.
+        $our_pages[] = wpinv_get_option( 'failure_page', false );
 
-		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+        // History page.
+        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
 
-		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+        // Subscriptions page.
+        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
 
-		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+        $excluded_posts_ids = $excluded_posts_ids + $our_pages;
+        return array_unique( $excluded_posts_ids );
 
-	}
+    }
 
-	/**
-	 * Displays additional footer code.
-	 * 
-	 * @since 2.0.0
-	 */
-	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
-	}
+    /**
+     * Displays additional footer code.
+     * 
+     * @since 2.0.0
+     */
+    public function wp_footer() {
+        wpinv_get_template( 'frontend-footer.php' );
+    }
 
-	/**
-	 * Displays additional header code.
-	 * 
-	 * @since 2.0.0
-	 */
-	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
-	}
+    /**
+     * Displays additional header code.
+     * 
+     * @since 2.0.0
+     */
+    public function wp_head() {
+        wpinv_get_template( 'frontend-head.php' );
+    }
 
 }