AyeCode / invoicing

vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php

Indentation +18 added lines, -18 removed lines

@@ -7,40 +7,40 @@
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.1.65";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    global $ayecode_ui_version,$ayecode_ui_file_key;
+    $this_version = "0.1.65";
+    if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
+        $ayecode_ui_version = $this_version ;
+        $ayecode_ui_file_key = wp_hash( __FILE__ );
+    }
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
-	}
+    global $ayecode_ui_file_key;
+    if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
+        include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
+        include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+    }
 },1);
 
 /**
  * Add the function that calls the class.
  */
 if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
-			return false;
-		}
-		return AUI::instance();
-	}
+    function aui(){
+        if(!class_exists("AUI",false)){
+            return false;
+        }
+        return AUI::instance();
+    }
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -6,39 +6,39 @@
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
-add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
+add_action('after_setup_theme', function() {
+	global $ayecode_ui_version, $ayecode_ui_file_key;
 	$this_version = "0.1.65";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
+	if (empty($ayecode_ui_version) || version_compare($this_version, $ayecode_ui_version, '>')) {
+		$ayecode_ui_version = $this_version;
+		$ayecode_ui_file_key = wp_hash(__FILE__);
 	}
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
-add_action('after_setup_theme', function () {
+add_action('after_setup_theme', function() {
 	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+	if ($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash(__FILE__)) {
+		include_once(dirname(__FILE__) . '/includes/class-aui.php');
+		include_once(dirname(__FILE__) . '/includes/ayecode-ui-settings.php');
 	}
 },1);
 
 /**
  * Add the function that calls the class.
  */
-if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
+if (!function_exists('aui')) {
+	function aui() {
+		if (!class_exists("AUI", false)) {
 			return false;
 		}
 		return AUI::instance();

vendor/composer/InstalledVersions.php

Indentation +60 added lines, -60 removed lines

@@ -12,8 +12,8 @@ 
 class InstalledVersions
 {
 private static $installed = array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
@@ -21,96 +21,96 @@ 
     ),
     'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     'name' => 'ayecode/invoicing',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     'ayecode/ayecode-connect-helper' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     ),
     'ayecode/wp-ayecode-ui' => 
     array (
-      'pretty_version' => '0.1.65',
-      'version' => '0.1.65.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '55b3420e600331a0a12976c361e7d55be952b898',
+        'pretty_version' => '0.1.65',
+        'version' => '0.1.65.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '55b3420e600331a0a12976c361e7d55be952b898',
     ),
     'ayecode/wp-deactivation-survey' => 
     array (
-      'pretty_version' => '1.0.4',
-      'version' => '1.0.4.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
+        'pretty_version' => '1.0.4',
+        'version' => '1.0.4.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
     ),
     'ayecode/wp-font-awesome-settings' => 
     array (
-      'pretty_version' => '1.0.13',
-      'version' => '1.0.13.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
+        'pretty_version' => '1.0.13',
+        'version' => '1.0.13.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
     array (
-      'pretty_version' => '1.0.29',
-      'version' => '1.0.29.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '18f3da558aec750cfeaa582f72619fbf8867677a',
+        'pretty_version' => '1.0.29',
+        'version' => '1.0.29.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '18f3da558aec750cfeaa582f72619fbf8867677a',
     ),
     'composer/installers' => 
     array (
-      'pretty_version' => 'v1.12.0',
-      'version' => '1.12.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
+        'pretty_version' => 'v1.12.0',
+        'version' => '1.12.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
     array (
-      'pretty_version' => 'v1.6.0',
-      'version' => '1.6.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
+        'pretty_version' => 'v1.6.0',
+        'version' => '1.6.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
     ),
     'shama/baton' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
+    ),
     ),
-  ),
 );
 
 

Spacing +24 added lines, -24 removed lines

@@ -11,102 +11,102 @@
 
 class InstalledVersions
 {
-private static $installed = array (
+private static $installed = array(
   'root' => 
-  array (
+  array(
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
-    array (
+    array(
     ),
     'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     'name' => 'ayecode/invoicing',
   ),
   'versions' => 
-  array (
+  array(
     'ayecode/ayecode-connect-helper' => 
-    array (
+    array(
       'pretty_version' => '1.0.3',
       'version' => '1.0.3.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
-    array (
+    array(
       'pretty_version' => 'dev-master',
       'version' => 'dev-master',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     ),
     'ayecode/wp-ayecode-ui' => 
-    array (
+    array(
       'pretty_version' => '0.1.65',
       'version' => '0.1.65.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '55b3420e600331a0a12976c361e7d55be952b898',
     ),
     'ayecode/wp-deactivation-survey' => 
-    array (
+    array(
       'pretty_version' => '1.0.4',
       'version' => '1.0.4.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
     ),
     'ayecode/wp-font-awesome-settings' => 
-    array (
+    array(
       'pretty_version' => '1.0.13',
       'version' => '1.0.13.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
-    array (
+    array(
       'pretty_version' => '1.0.29',
       'version' => '1.0.29.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '18f3da558aec750cfeaa582f72619fbf8867677a',
     ),
     'composer/installers' => 
-    array (
+    array(
       'pretty_version' => 'v1.12.0',
       'version' => '1.12.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
-    array (
+    array(
       'pretty_version' => 'v1.6.0',
       'version' => '1.6.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),
     'shama/baton' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),

vendor/composer/installed.php

Indentation +60 added lines, -60 removed lines

@@ -1,6 +1,6 @@ 
 <?php return array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
@@ -8,94 +8,94 @@ 
     ),
     'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     'name' => 'ayecode/invoicing',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     'ayecode/ayecode-connect-helper' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     ),
     'ayecode/wp-ayecode-ui' => 
     array (
-      'pretty_version' => '0.1.65',
-      'version' => '0.1.65.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '55b3420e600331a0a12976c361e7d55be952b898',
+        'pretty_version' => '0.1.65',
+        'version' => '0.1.65.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '55b3420e600331a0a12976c361e7d55be952b898',
     ),
     'ayecode/wp-deactivation-survey' => 
     array (
-      'pretty_version' => '1.0.4',
-      'version' => '1.0.4.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
+        'pretty_version' => '1.0.4',
+        'version' => '1.0.4.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
     ),
     'ayecode/wp-font-awesome-settings' => 
     array (
-      'pretty_version' => '1.0.13',
-      'version' => '1.0.13.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
+        'pretty_version' => '1.0.13',
+        'version' => '1.0.13.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
     array (
-      'pretty_version' => '1.0.29',
-      'version' => '1.0.29.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '18f3da558aec750cfeaa582f72619fbf8867677a',
+        'pretty_version' => '1.0.29',
+        'version' => '1.0.29.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '18f3da558aec750cfeaa582f72619fbf8867677a',
     ),
     'composer/installers' => 
     array (
-      'pretty_version' => 'v1.12.0',
-      'version' => '1.12.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
+        'pretty_version' => 'v1.12.0',
+        'version' => '1.12.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
     array (
-      'pretty_version' => 'v1.6.0',
-      'version' => '1.6.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
+        'pretty_version' => 'v1.6.0',
+        'version' => '1.6.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
     ),
     'shama/baton' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
+    ),
     ),
-  ),
 );

Spacing +24 added lines, -24 removed lines

@@ -1,99 +1,99 @@
-<?php return array (
+<?php return array(
   'root' => 
-  array (
+  array(
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
-    array (
+    array(
     ),
     'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     'name' => 'ayecode/invoicing',
   ),
   'versions' => 
-  array (
+  array(
     'ayecode/ayecode-connect-helper' => 
-    array (
+    array(
       'pretty_version' => '1.0.3',
       'version' => '1.0.3.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
-    array (
+    array(
       'pretty_version' => 'dev-master',
       'version' => 'dev-master',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'da0522a682b6afa9f09baaf1c048b651a2f367b6',
     ),
     'ayecode/wp-ayecode-ui' => 
-    array (
+    array(
       'pretty_version' => '0.1.65',
       'version' => '0.1.65.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '55b3420e600331a0a12976c361e7d55be952b898',
     ),
     'ayecode/wp-deactivation-survey' => 
-    array (
+    array(
       'pretty_version' => '1.0.4',
       'version' => '1.0.4.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
     ),
     'ayecode/wp-font-awesome-settings' => 
-    array (
+    array(
       'pretty_version' => '1.0.13',
       'version' => '1.0.13.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
-    array (
+    array(
       'pretty_version' => '1.0.29',
       'version' => '1.0.29.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '18f3da558aec750cfeaa582f72619fbf8867677a',
     ),
     'composer/installers' => 
-    array (
+    array(
       'pretty_version' => 'v1.12.0',
       'version' => '1.12.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
-    array (
+    array(
       'pretty_version' => 'v1.6.0',
       'version' => '1.6.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),
     'shama/baton' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),

templates/payment-forms/cart.php

Spacing +17 added lines, -17 removed lines

@@ -7,34 +7,34 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Cart table columns.
 $columns = array(
-    'name'     => __( 'Item', 'invoicing' ),
-    'price'    => __( 'Price', 'invoicing' ),
-    'quantity' => __( 'Qty', 'invoicing' ),
-    'subtotal' => __( 'Subtotal', 'invoicing' ),
+    'name'     => __('Item', 'invoicing'),
+    'price'    => __('Price', 'invoicing'),
+    'quantity' => __('Qty', 'invoicing'),
+    'subtotal' => __('Subtotal', 'invoicing'),
 );
 
-if ( ! empty( $form->invoice ) ) {
-    $columns = getpaid_invoice_item_columns( $form->invoice );
+if (!empty($form->invoice)) {
+    $columns = getpaid_invoice_item_columns($form->invoice);
 }
 
-if ( isset( $columns['tax_rate'] ) ) {
-    unset( $columns['tax_rate'] );
+if (isset($columns['tax_rate'])) {
+    unset($columns['tax_rate']);
 }
 
-$columns = apply_filters( 'getpaid_payment_form_cart_table_columns', $columns, $form );
+$columns = apply_filters('getpaid_payment_form_cart_table_columns', $columns, $form);
 
 ?>
     <div class="getpaid-payment-form-items-cart border form-group">
 
         <div class="getpaid-payment-form-items-cart-header font-weight-bold bg-light border-bottom py-2 px-3">
             <div class="form-row">
-                <?php foreach ( $columns as $key => $label ) : ?>
-                    <div class="<?php echo 'name' == $key ? 'col-6' : 'col' ?> <?php echo ( in_array( $key, array( 'subtotal', 'quantity', 'tax_rate' ) ) ) ? 'd-none d-sm-block' : '' ?> getpaid-form-cart-item-<?php echo sanitize_html_class( $key ); ?>">
-                        <span><?php echo esc_html( $label ); ?></span>
+                <?php foreach ($columns as $key => $label) : ?>
+                    <div class="<?php echo 'name' == $key ? 'col-6' : 'col' ?> <?php echo (in_array($key, array('subtotal', 'quantity', 'tax_rate'))) ? 'd-none d-sm-block' : '' ?> getpaid-form-cart-item-<?php echo sanitize_html_class($key); ?>">
+                        <span><?php echo esc_html($label); ?></span>
                     </div>
                 <?php endforeach; ?>
             </div>
@@ -43,16 +43,16 @@ 
         <?php
 
             // Display the item totals.
-            foreach ( $form->get_items() as $item ) {
-                wpinv_get_template( 'payment-forms/cart-item.php', compact( 'form', 'item', 'columns' ) );
+            foreach ($form->get_items() as $item) {
+                wpinv_get_template('payment-forms/cart-item.php', compact('form', 'item', 'columns'));
             }
 
             // Display the cart totals.
-            wpinv_get_template( 'payment-forms/cart-totals.php', compact( 'form' ) );
+            wpinv_get_template('payment-forms/cart-totals.php', compact('form'));
 
         ?>
     </div>
 
 <?php 
 
-do_action( 'getpaid_after_payment_form_cart', $form );
+do_action('getpaid_after_payment_form_cart', $form);

templates/payment-forms/elements/items.php

Spacing +13 added lines, -13 removed lines

@@ -7,44 +7,44 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( empty( $form->get_items() ) ) {
+if (empty($form->get_items())) {
     return;
 }
 
-if ( ! empty( $GLOBALS['getpaid_force_checkbox'] ) ) {
+if (!empty($GLOBALS['getpaid_force_checkbox'])) {
     $items_type = 'checkbox';
 }
 
-if ( empty( $items_type ) ) {
+if (empty($items_type)) {
     $items_type = 'total';
 }
 
-do_action( 'getpaid_before_payment_form_items', $form );
+do_action('getpaid_before_payment_form_items', $form);
 
-switch( $items_type ) {
+switch ($items_type) {
     case 'radio':
-        wpinv_get_template( 'payment-forms/variations/radio.php', compact( 'form', 'items_type' ) );
+        wpinv_get_template('payment-forms/variations/radio.php', compact('form', 'items_type'));
         break;
     case 'checkbox':
-        wpinv_get_template( 'payment-forms/variations/checkbox.php', compact( 'form', 'items_type' ) );
+        wpinv_get_template('payment-forms/variations/checkbox.php', compact('form', 'items_type'));
         break;
     case 'select':
-        wpinv_get_template( 'payment-forms/variations/select.php', compact( 'form', 'items_type' ) );
+        wpinv_get_template('payment-forms/variations/select.php', compact('form', 'items_type'));
         break;
 }
 
-do_action( 'getpaid_before_payment_form_cart', $form );
+do_action('getpaid_before_payment_form_cart', $form);
 
 // Display the cart totals.
-if ( ! empty( $hide_cart ) ) {
+if (!empty($hide_cart)) {
     echo '<div class="d-none">';
 }
 
 // Display the cart totals.
-wpinv_get_template( 'payment-forms/cart.php', compact( 'form', 'items_type' ) );
+wpinv_get_template('payment-forms/cart.php', compact('form', 'items_type'));
 
-if ( ! empty( $hide_cart ) ) {
+if (!empty($hide_cart)) {
     echo '</div>';
 }

includes/class-getpaid-subscription-notification-emails.php

Indentation +257 added lines, -257 removed lines

@@ -13,300 +13,300 @@
 class GetPaid_Subscription_Notification_Emails {
 
     /**
-	 * The array of subscription email actions.
-	 *
-	 * @param array
-	 */
-	public $subscription_actions;
+     * The array of subscription email actions.
+     *
+     * @param array
+     */
+    public $subscription_actions;
 
     /**
-	 * Class constructor
+     * Class constructor
      *
-	 */
-	public function __construct() {
-
-		$this->subscription_actions = apply_filters(
-			'getpaid_notification_email_subscription_triggers',
-			array(
-				'getpaid_subscription_trialling' => 'subscription_trial',
-				'getpaid_subscription_cancelled' => 'subscription_cancelled',
-				'getpaid_subscription_expired'   => 'subscription_expired',
-				'getpaid_subscription_completed' => 'subscription_complete',
-				'getpaid_daily_maintenance'      => 'renewal_reminder',
-			)
-		);
-
-		$this->init_hooks();
+     */
+    public function __construct() {
+
+        $this->subscription_actions = apply_filters(
+            'getpaid_notification_email_subscription_triggers',
+            array(
+                'getpaid_subscription_trialling' => 'subscription_trial',
+                'getpaid_subscription_cancelled' => 'subscription_cancelled',
+                'getpaid_subscription_expired'   => 'subscription_expired',
+                'getpaid_subscription_completed' => 'subscription_complete',
+                'getpaid_daily_maintenance'      => 'renewal_reminder',
+            )
+        );
+
+        $this->init_hooks();
 
     }
 
     /**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
-
-			$email = new GetPaid_Notification_Email( $email_type );
-
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
-
-		}
-
-	}
-
-	/**
-	 * Filters subscription merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			$merge_tags = array_merge(
-				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates subscription merge tags.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 * @return array
-	 */
-	public function get_subscription_merge_tags( $subscription ) {
-
-		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
-			return array();
-		}
-
-		$invoice    = $subscription->get_parent_invoice();
-		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
-			'{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
-			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
-		);
-
-	}
-
-	/**
-	 * Checks if we should send a notification for a subscription.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return bool
-	 */
-	public function should_send_notification( $invoice ) {
-		return 0 != $invoice->get_id();
-	}
-
-	/**
-	 * Returns notification recipients.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
-
-		$cc = $invoice->get_email_cc();
-
-		if ( ! empty( $cc ) ) {
-			$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-			$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-		}
-
-		return $recipients;
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
-
-		// Abort in case the parent invoice does not exist.
-		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
-			return;
-		}
-
-		if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
-			return;
-		}
-
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
-
-		$recipients  = $this->get_recipients( $invoice );
-		$mailer      = new GetPaid_Notification_Email_Sender();
-		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
-		$attachments = $email->get_attachments();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$subject,
-			$content,
-			$attachments
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
-				$content,
-				$attachments
-			);
-		}
-
-		if ( $result ) {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Successfully sent %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Failed sending %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);	
-		}
-
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
-
-	}
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
+        foreach ( $this->subscription_actions as $hook => $email_type ) {
+
+            $email = new GetPaid_Notification_Email( $email_type );
+
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $email_type ) ) {
+                add_action( $hook, array( $this, $email_type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+
+        }
+
+    }
 
     /**
-	 * Sends a new trial notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_trial( $subscription ) {
+     * Filters subscription merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function subscription_merge_tags( $merge_tags, $object ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            $merge_tags = array_merge(
+                $merge_tags,
+                $this->get_subscription_merge_tags( $object )
+            );
+        }
 
-	}
+        return $merge_tags;
 
-	/**
-	 * Sends a cancelled subscription notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_cancelled( $subscription ) {
+    }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+    /**
+     * Generates subscription merge tags.
+     *
+     * @param WPInv_Subscription $subscription
+     * @return array
+     */
+    public function get_subscription_merge_tags( $subscription ) {
+
+        // Abort if it does not exist.
+        if ( ! $subscription->get_id() ) {
+            return array();
+        }
+
+        $invoice    = $subscription->get_parent_invoice();
+        return array(
+            '{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
+            '{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
+            '{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
+            '{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
+            '{subscription_id}'               => absint( $subscription->get_id() ),
+            '{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
+            '{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
+            '{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+            '{subscription_bill_times}'       => $subscription->get_bill_times(),
+            '{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+        );
 
-	}
+    }
 
-	/**
-	 * Sends a subscription expired notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_expired( $subscription ) {
+    /**
+     * Checks if we should send a notification for a subscription.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return bool
+     */
+    public function should_send_notification( $invoice ) {
+        return 0 != $invoice->get_id();
+    }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+    /**
+     * Returns notification recipients.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_recipients( $invoice ) {
+        $recipients = array( $invoice->get_email() );
 
-	}
+        $cc = $invoice->get_email_cc();
 
-	/**
-	 * Sends a completed subscription notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_complete( $subscription ) {
+        if ( ! empty( $cc ) ) {
+            $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+            $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+        }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+        return $recipients;
+    }
 
-	}
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Subscription $subscription
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+
+        // Abort in case the parent invoice does not exist.
+        $invoice = $subscription->get_parent_invoice();
+        if ( ! $this->should_send_notification( $invoice ) ) {
+            return;
+        }
+
+        if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
+            return;
+        }
+
+        do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+
+        $recipients  = $this->get_recipients( $invoice );
+        $mailer      = new GetPaid_Notification_Email_Sender();
+        $merge_tags  = $email->get_merge_tags();
+        $content     = $email->get_content( $merge_tags, $extra_args );
+        $subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+        $attachments = $email->get_attachments();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $subject,
+            $content,
+            $attachments
+        );
+
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+                $content,
+                $attachments
+            );
+        }
+
+        if ( $result ) {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Successfully sent %s notification email to %s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Failed sending %s notification email to %s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );	
+        }
+
+        do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
 
-	/**
-	 * Sends a subscription renewal reminder notification.
-	 *
-	 */
-	public function renewal_reminder() {
+    }
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+    /**
+     * Sends a new trial notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_trial( $subscription ) {
 
-		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
 
-		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
-			return;
-		}
+    }
 
-		// Fetch matching subscriptions.
+    /**
+     * Sends a cancelled subscription notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_cancelled( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a subscription expired notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_expired( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a completed subscription notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_complete( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a subscription renewal reminder notification.
+     *
+     */
+    public function renewal_reminder() {
+
+        $email = new GetPaid_Notification_Email( __FUNCTION__ );
+
+        // Fetch reminder days.
+        $reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+
+        // Abort if non is set.
+        if ( empty( $reminder_days ) ) {
+            return;
+        }
+
+        // Fetch matching subscriptions.
         $args  = array(
             'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active',
+            'count_total'        => false,
+            'status'             => 'trialling active',
             'date_expires_query' => array(
-				'relation'  => 'OR'
+                'relation'  => 'OR'
             ),
-		);
+        );
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
+        foreach ( $reminder_days as $days ) {
+            $date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
 
-			$args['date_expires_query'][] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $args['date_expires_query'][] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
 
         foreach ( $subscriptions as $subscription ) {
 
-			// Skip packages.
-			if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
-				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
-			}
+            // Skip packages.
+            if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
+                $email->object = $subscription;
+                $this->send_email( $subscription, $email, __FUNCTION__ );
+            }
 
-		}
+        }
 
-	}
+    }
 
 }

Spacing +69 added lines, -69 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles subscription notificaiton emails.
@@ -45,21 +45,21 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
+		add_filter('getpaid_get_email_merge_tags', array($this, 'subscription_merge_tags'), 10, 2);
+		foreach ($this->subscription_actions as $hook => $email_type) {
 
-			$email = new GetPaid_Notification_Email( $email_type );
+			$email = new GetPaid_Notification_Email($email_type);
 
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
+			if (method_exists($this, $email_type)) {
+				add_action($hook, array($this, $email_type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+			do_action('getpaid_subscription_notification_email_register_hook', $email_type, $hook);
 
 		}
 
@@ -71,12 +71,12 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
+	public function subscription_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			$merge_tags = array_merge(
 				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
+				$this->get_subscription_merge_tags($object)
 			);
 		}
 
@@ -90,25 +90,25 @@ 
 	 * @param WPInv_Subscription $subscription
 	 * @return array
 	 */
-	public function get_subscription_merge_tags( $subscription ) {
+	public function get_subscription_merge_tags($subscription) {
 
 		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
+		if (!$subscription->get_id()) {
 			return array();
 		}
 
-		$invoice    = $subscription->get_parent_invoice();
+		$invoice = $subscription->get_parent_invoice();
 		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
-			'{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+			'{subscription_renewal_date}'     => getpaid_format_date_value($subscription->get_next_renewal_date(), __('Never', 'invoicing')),
+			'{subscription_created}'          => getpaid_format_date_value($subscription->get_date_created()),
+			'{subscription_status}'           => sanitize_text_field($subscription->get_status_label()),
+			'{subscription_profile_id}'       => sanitize_text_field($subscription->get_profile_id()),
+			'{subscription_id}'               => absint($subscription->get_id()),
+			'{subscription_recurring_amount}' => sanitize_text_field(wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency())),
+			'{subscription_initial_amount}'   => sanitize_text_field(wpinv_price($subscription->get_initial_amount(), $invoice->get_currency())),
+			'{subscription_recurring_period}' => getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), ''),
 			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+			'{subscription_url}'              => esc_url($subscription->get_view_url()),
 		);
 
 	}
@@ -119,7 +119,7 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return bool
 	 */
-	public function should_send_notification( $invoice ) {
+	public function should_send_notification($invoice) {
 		return 0 != $invoice->get_id();
 	}
 
@@ -129,14 +129,14 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
+	public function get_recipients($invoice) {
+		$recipients = array($invoice->get_email());
 
 		$cc = $invoice->get_email_cc();
 
-		if ( ! empty( $cc ) ) {
-			$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-			$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+		if (!empty($cc)) {
+			$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+			$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 		}
 
 		return $recipients;
@@ -150,63 +150,63 @@ 
 	 * @param string $type
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+	public function send_email($subscription, $email, $type, $extra_args = array()) {
 
 		// Abort in case the parent invoice does not exist.
 		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
+		if (!$this->should_send_notification($invoice)) {
 			return;
 		}
 
-		if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
+		if (apply_filters('getpaid_skip_subscription_email', false, $type, $subscription)) {
 			return;
 		}
 
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_before_send_subscription_notification', $type, $subscription, $email);
 
-		$recipients  = $this->get_recipients( $invoice );
+		$recipients  = $this->get_recipients($invoice);
 		$mailer      = new GetPaid_Notification_Email_Sender();
 		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+		$content     = $email->get_content($merge_tags, $extra_args);
+		$subject     = $email->add_merge_tags($email->get_subject(), $merge_tags);
 		$attachments = $email->get_attachments();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+			apply_filters('getpaid_subscription_email_recipients', wpinv_parse_list($recipients), $email),
 			$subject,
 			$content,
 			$attachments
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+				$subject . __(' - ADMIN BCC COPY', 'invoicing'),
 				$content,
 				$attachments
 			);
 		}
 
-		if ( $result ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Successfully sent %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Successfully sent %s notification email to %s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Failed sending %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Failed sending %s notification email to %s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);	
 		}
 
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_after_send_subscription_notification', $type, $subscription, $email);
 
 	}
 
@@ -215,10 +215,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_trial( $subscription ) {
+	public function subscription_trial($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -227,10 +227,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_cancelled( $subscription ) {
+	public function subscription_cancelled($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -239,10 +239,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_expired( $subscription ) {
+	public function subscription_expired($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -251,10 +251,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_complete( $subscription ) {
+	public function subscription_complete($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -264,18 +264,18 @@ 
 	 */
 	public function renewal_reminder() {
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Fetch matching subscriptions.
-        $args  = array(
+        $args = array(
             'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
@@ -284,8 +284,8 @@ 
             ),
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("+$days days", current_time('timestamp'))));
 
 			$args['date_expires_query'][] = array(
 				'year'  => $date['year'],
@@ -295,14 +295,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions as $subscription ) {
+        foreach ($subscriptions as $subscription) {
 
 			// Skip packages.
-			if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
+			if (apply_filters('getpaid_send_subscription_renewal_reminder_email', true)) {
 				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
+            	$this->send_email($subscription, $email, __FUNCTION__);
 			}
 
 		}

includes/data/email-settings.php

Spacing +228 added lines, -228 removed lines

@@ -8,24 +8,24 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the due date reminder options.
 $overdue_days_options       = array();
-$overdue_days_options['0']  = __( 'On the Due Date', 'invoicing' );
-$overdue_days_options['1']  = __( '1 day after Due Date', 'invoicing' );
+$overdue_days_options['0']  = __('On the Due Date', 'invoicing');
+$overdue_days_options['1']  = __('1 day after Due Date', 'invoicing');
 
-for ( $i = 2; $i <= 10; $i++ ) {
-    $overdue_days_options["$i"] = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+for ($i = 2; $i <= 10; $i++) {
+    $overdue_days_options["$i"] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
 }
 
 // Prepare up coming renewal reminder options.
 $renewal_days_options       = array();
-$renewal_days_options['0']  = __( 'On the renewal date', 'invoicing' );
-$renewal_days_options['1']  = __( '1 day before the renewal date', 'invoicing' );
+$renewal_days_options['0']  = __('On the renewal date', 'invoicing');
+$renewal_days_options['1']  = __('1 day before the renewal date', 'invoicing');
 
-for ( $i = 2; $i <= 10; $i++ ) {
-    $renewal_days_options["$i"]   = wp_sprintf( __( '%d days before the renewal date', 'invoicing' ), $i );
+for ($i = 2; $i <= 10; $i++) {
+    $renewal_days_options["$i"] = wp_sprintf(__('%d days before the renewal date', 'invoicing'), $i);
 }
 
 // Default, built-in gateways
@@ -34,45 +34,45 @@ 
 
         'email_new_invoice_header' => array(
             'id'       => 'email_new_invoice_header',
-            'name'     => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to the site admin whenever there is a new invoice.', 'invoicing' ),
+            'name'     => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to the site admin whenever there is a new invoice.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_new_invoice_active' => array(
             'id'       => 'email_new_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_new_invoice_subject' => array(
             'id'       => 'email_new_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing' ),
+            'std'      => __('[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_new_invoice_heading' => array(
             'id'       => 'email_new_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'New invoice', 'invoicing' ),
+            'std'      => __('New invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_new_invoice_body' => array(
             'id'       => 'email_new_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -82,53 +82,53 @@ 
 
         'email_cancelled_invoice_header' => array(
             'id'       => 'email_cancelled_invoice_header',
-            'name'     => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers whenever invoices are cancelled.', 'invoicing' ),
+            'name'     => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers whenever invoices are cancelled.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_cancelled_invoice_active' => array(
             'id'       => 'email_cancelled_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_cancelled_invoice_admin_bcc' => array(
             'id'       => 'email_cancelled_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_cancelled_invoice_subject' => array(
             'id'       => 'email_cancelled_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_cancelled_invoice_heading' => array(
             'id'       => 'email_cancelled_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Cancelled', 'invoicing' ),
+            'std'      => __('Invoice Cancelled', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_cancelled_invoice_body' => array(
             'id'       => 'email_cancelled_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -139,45 +139,45 @@ 
 
         'email_failed_invoice_header' => array(
             'id'       => 'email_failed_invoice_header',
-            'name'     => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing' ),
+            'name'     => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_failed_invoice_active' => array(
             'id'       => 'email_failed_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_failed_invoice_subject' => array(
             'id'       => 'email_failed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_failed_invoice_heading' => array(
             'id'       => 'email_failed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Payment Failed', 'invoicing' ),
+            'std'      => __('Invoice Payment Failed', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_failed_invoice_body' => array(
             'id'       => 'email_failed_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -187,53 +187,53 @@ 
 
         'email_onhold_invoice_header' => array(
             'id'       => 'email_onhold_invoice_header',
-            'name'     => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers whenever their invoices are held.', 'invoicing' ),
+            'name'     => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers whenever their invoices are held.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_onhold_invoice_active' => array(
             'id'       => 'email_onhold_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_onhold_invoice_admin_bcc' => array(
             'id'       => 'email_onhold_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_onhold_invoice_subject' => array(
             'id'       => 'email_onhold_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice is on hold', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice is on hold', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_onhold_invoice_heading' => array(
             'id'       => 'email_onhold_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice is on hold', 'invoicing' ),
+            'std'      => __('Your invoice is on hold', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_onhold_invoice_body' => array(
             'id'       => 'email_onhold_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -244,53 +244,53 @@ 
 
         'email_processing_invoice_header' => array(
             'id'       => 'email_processing_invoice_header',
-            'name'     => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to users whenever payments for their invoices are processing.', 'invoicing' ),
+            'name'     => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to users whenever payments for their invoices are processing.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_processing_invoice_active' => array(
             'id'       => 'email_processing_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_processing_invoice_admin_bcc' => array(
             'id'       => 'email_processing_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_processing_invoice_subject' => array(
             'id'       => 'email_processing_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your payment is being processed', 'invoicing' ),
+            'std'      => __('[{site_title}] Your payment is being processed', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_processing_invoice_heading' => array(
             'id'       => 'email_processing_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your payment is being processed', 'invoicing' ),
+            'std'      => __('Your payment is being processed', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_processing_invoice_body' => array(
             'id'       => 'email_processing_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -301,61 +301,61 @@ 
 
         'email_completed_invoice_header' => array(
             'id'       => 'email_completed_invoice_header',
-            'name'     => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers when their invoices are marked as paid.', 'invoicing' ),
+            'name'     => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers when their invoices are marked as paid.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_completed_invoice_active' => array(
             'id'       => 'email_completed_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_completed_invoice_renewal_active' => array(
             'id'       => 'email_completed_invoice_renewal_active',
-            'name'     => __( 'Enable renewal notification', 'invoicing' ),
-            'desc'     => __( 'Should this email be sent for renewals too?', 'invoicing' ),
+            'name'     => __('Enable renewal notification', 'invoicing'),
+            'desc'     => __('Should this email be sent for renewals too?', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_completed_invoice_admin_bcc' => array(
             'id'       => 'email_completed_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1,
         ),
 
         'email_completed_invoice_subject' => array(
             'id'       => 'email_completed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_completed_invoice_heading' => array(
             'id'       => 'email_completed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been paid', 'invoicing' ),
+            'std'      => __('Your invoice has been paid', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_completed_invoice_body' => array(
             'id'       => 'email_completed_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -366,53 +366,53 @@ 
 
         'email_refunded_invoice_header' => array(
             'id'       => 'email_refunded_invoice_header',
-            'name'     => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to users when their invoices are marked as refunded.', 'invoicing' ),
+            'name'     => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to users when their invoices are marked as refunded.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_refunded_invoice_active' => array(
             'id'       => 'email_refunded_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_refunded_invoice_admin_bcc' => array(
             'id'       => 'email_refunded_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_refunded_invoice_subject' => array(
             'id'       => 'email_refunded_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_refunded_invoice_heading' => array(
             'id'       => 'email_refunded_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been refunded', 'invoicing' ),
+            'std'      => __('Your invoice has been refunded', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_refunded_invoice_body' => array(
             'id'       => 'email_refunded_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -423,53 +423,53 @@ 
 
         'email_user_invoice_header' => array(
             'id'       => 'email_user_invoice_header',
-            'name'     => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers containing their invoice information and payment links.', 'invoicing' ),
+            'name'     => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers containing their invoice information and payment links.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_user_invoice_active' => array(
             'id'       => 'email_user_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_user_invoice_admin_bcc' => array(
             'id'       => 'email_user_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_user_invoice_subject' => array(
             'id'       => 'email_user_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_invoice_heading' => array(
             'id'       => 'email_user_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+            'std'      => __('Your invoice {invoice_number} details', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_invoice_body' => array(
             'id'       => 'email_user_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -479,53 +479,53 @@ 
 
         'email_user_note_header' => array(
             'id'       => 'email_user_note_header',
-            'name'     => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent when you add a customer note to an invoice/quote.', 'invoicing' ),
+            'name'     => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent when you add a customer note to an invoice/quote.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_user_note_active' => array(
             'id'       => 'email_user_note_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_user_note_admin_bcc' => array(
             'id'       => 'email_user_note_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_user_note_subject' => array(
             'id'       => 'email_user_note_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_note_heading' => array(
             'id'       => 'email_user_note_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'A note has been added to your {invoice_label}', 'invoicing' ),
+            'std'      => __('A note has been added to your {invoice_label}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_note_body' => array(
             'id'       => 'email_user_note_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -535,63 +535,63 @@ 
 
         'email_overdue_header' => array(
             'id'       => 'email_overdue_header',
-            'name'     => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing' ),
+            'name'     => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+            'desc'     => __('Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_overdue_active' => array(
             'id'       => 'email_overdue_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_overdue_admin_bcc' => array(
             'id'       => 'email_overdue_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_overdue_days' => array(
             'id'       => 'email_overdue_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like payment reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1' ),
+            'std'      => array('1'),
             'type'     => 'multicheck',
             'options'  => $overdue_days_options,
         ),
 
         'email_overdue_subject' => array(
             'id'       => 'email_overdue_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Payment Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Payment Reminder', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_overdue_heading' => array(
             'id'       => 'email_overdue_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Payment reminder for your invoice', 'invoicing' ),
+            'std'      => __('Payment reminder for your invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_overdue_body' => array(
             'id'       => 'email_overdue_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -602,63 +602,63 @@ 
 
         'email_renewal_reminder_header' => array(
             'id'       => 'email_renewal_reminder_header',
-            'name'     => '<h3>' . __( 'Renewal Reminder', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers whenever their subscription is about to renew.', 'invoicing' ),
+            'name'     => '<h3>' . __('Renewal Reminder', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers whenever their subscription is about to renew.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_renewal_reminder_active' => array(
             'id'       => 'email_renewal_reminder_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_renewal_reminder_admin_bcc' => array(
             'id'       => 'email_renewal_reminder_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_renewal_reminder_days' => array(
             'id'       => 'email_renewal_reminder_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like renewal reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like renewal reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1', '5', '10' ),
+            'std'      => array('1', '5', '10'),
             'type'     => 'multicheck',
             'options'  => $renewal_days_options,
         ),
 
         'email_renewal_reminder_subject' => array(
             'id'       => 'email_renewal_reminder_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Renewal Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Renewal Reminder', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_renewal_reminder_heading' => array(
             'id'       => 'email_renewal_reminder_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Upcoming renewal reminder', 'invoicing' ),
+            'std'      => __('Upcoming renewal reminder', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_renewal_reminder_body' => array(
             'id'       => 'email_renewal_reminder_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -669,53 +669,53 @@ 
 
         'email_subscription_trial_header' => array(
             'id'       => 'email_subscription_trial_header',
-            'name'     => '<h3>' . __( 'Trial Started', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent when a customer starts a subscription trial.', 'invoicing' ),
+            'name'     => '<h3>' . __('Trial Started', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent when a customer starts a subscription trial.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_subscription_trial_active' => array(
             'id'       => 'email_subscription_trial_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_subscription_trial_admin_bcc' => array(
             'id'       => 'email_subscription_trial_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_subscription_trial_subject' => array(
             'id'       => 'email_subscription_trial_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription trial email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription trial email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Trial Started', 'invoicing' ),
+            'std'      => __('[{site_title}] Trial Started', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_trial_heading' => array(
             'id'       => 'email_subscription_trial_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Trial Started', 'invoicing' ),
+            'std'      => __('Trial Started', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_trial_body' => array(
             'id'       => 'email_subscription_trial_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -725,53 +725,53 @@ 
 
         'email_subscription_cancelled_header' => array(
             'id'       => 'email_subscription_cancelled_header',
-            'name'     => '<h3>' . __( 'Subscription Cancelled', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent when a customer cancels their subscription.', 'invoicing' ),
+            'name'     => '<h3>' . __('Subscription Cancelled', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent when a customer cancels their subscription.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_subscription_cancelled_active' => array(
             'id'       => 'email_subscription_cancelled_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_cancelled_admin_bcc' => array(
             'id'       => 'email_subscription_cancelled_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_cancelled_subject' => array(
             'id'       => 'email_subscription_cancelled_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription cancelled email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription cancelled email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Cancelled', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_cancelled_heading' => array(
             'id'       => 'email_subscription_cancelled_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Cancelled', 'invoicing' ),
+            'std'      => __('Subscription Cancelled', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_cancelled_body' => array(
             'id'       => 'email_subscription_cancelled_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -781,53 +781,53 @@ 
 
         'email_subscription_expired_header' => array(
             'id'       => 'email_subscription_expired_header',
-            'name'     => '<h3>' . __( 'Subscription Expired', 'invoicing' ) . '</h3>',
-            'desc'     => __( "These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing' ),
+            'name'     => '<h3>' . __('Subscription Expired', 'invoicing') . '</h3>',
+            'desc'     => __("These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_subscription_expired_active' => array(
             'id'       => 'email_subscription_expired_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_expired_admin_bcc' => array(
             'id'       => 'email_subscription_expired_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_expired_subject' => array(
             'id'       => 'email_subscription_expired_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription expired email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription expired email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Expired', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Expired', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_expired_heading' => array(
             'id'       => 'email_subscription_expired_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'type'     => 'text',
-            'std'      => __( 'Subscription Expired', 'invoicing' ),
+            'std'      => __('Subscription Expired', 'invoicing'),
             'help-tip' => true,
             'size'     => 'large'
         ),
 
         'email_subscription_expired_body' => array(
             'id'       => 'email_subscription_expired_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -837,53 +837,53 @@ 
 
         'email_subscription_complete_header' => array(
             'id'     => 'email_subscription_complete_header',
-            'name'   => '<h3>' . __( 'Subscription Complete', 'invoicing' ) . '</h3>',
-            'desc'   => __( 'These emails are sent when a customer completes their subscription.', 'invoicing' ),
+            'name'   => '<h3>' . __('Subscription Complete', 'invoicing') . '</h3>',
+            'desc'   => __('These emails are sent when a customer completes their subscription.', 'invoicing'),
             'type'   => 'header',
         ),
 
         'email_subscription_complete_active' => array(
             'id'      => 'email_subscription_complete_active',
-            'name'    => __( 'Enable/Disable', 'invoicing' ),
-            'desc'    => __( 'Enable this email notification', 'invoicing' ),
+            'name'    => __('Enable/Disable', 'invoicing'),
+            'desc'    => __('Enable this email notification', 'invoicing'),
             'type'    => 'checkbox',
             'std'     => 1
         ),
 
         'email_subscription_complete_admin_bcc' => array(
             'id'      => 'email_subscription_complete_admin_bcc',
-            'name'    => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'    => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'    => __('Enable Admin BCC', 'invoicing'),
+            'desc'    => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'    => 'checkbox',
             'std'     => 1
         ),
 
         'email_subscription_complete_subject' => array(
             'id'       => 'email_subscription_complete_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription complete email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription complete email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Complete', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Complete', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_complete_heading' => array(
             'id'       => 'email_subscription_complete_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Complete', 'invoicing' ),
+            'std'      => __('Subscription Complete', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_complete_body' => array(
             'id'       => 'email_subscription_complete_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),

includes/class-getpaid-notification-email.php

Indentation +56 added lines, -56 removed lines

@@ -13,36 +13,36 @@ 
 class GetPaid_Notification_Email {
 
     /**
-	 * Contains the type of this notification email.
-	 *
-	 * @var string
-	 */
+     * Contains the type of this notification email.
+     *
+     * @var string
+     */
     public $id;
 
     /**
-	 * Contains any object to use in filters.
-	 *
-	 * @var false|WPInv_Invoice|WPInv_Item|WPInv_Subscription
-	 */
+     * Contains any object to use in filters.
+     *
+     * @var false|WPInv_Invoice|WPInv_Item|WPInv_Subscription
+     */
     public $object;
 
     /**
-	 * Class constructor.
-	 *
+     * Class constructor.
+     *
      * @param string $id Email Type.
      * @param mixed $object Optional. Associated object.
-	 */
-	public function __construct( $id, $object = false ) {
+     */
+    public function __construct( $id, $object = false ) {
         $this->id     = $id;
         $this->object = $object;
     }
 
     /**
-	 * Retrieves an option
-	 *
+     * Retrieves an option
+     *
      * @return mixed
-	 */
-	public function get_option( $key ) {
+     */
+    public function get_option( $key ) {
 
         $key   = "email_{$this->id}_$key";
         $value = wpinv_get_option( $key, null );
@@ -60,80 +60,80 @@ 
     }
 
     /**
-	 * Retrieves the email body.
-	 *
+     * Retrieves the email body.
+     *
      * @return string
-	 */
-	public function get_body() {
+     */
+    public function get_body() {
         $body = $this->get_option( 'body' );
         return apply_filters( 'getpaid_get_email_body', $body, $this->id, $this->object );
     }
 
     /**
-	 * Retrieves the email subject.
-	 *
+     * Retrieves the email subject.
+     *
      * @return string
-	 */
-	public function get_subject() {
+     */
+    public function get_subject() {
         $subject = $this->get_option( 'subject' );
         return apply_filters( 'getpaid_get_email_subject', $subject, $this->id, $this->object );
     }
 
     /**
-	 * Retrieves the email heading.
-	 *
+     * Retrieves the email heading.
+     *
      * @return string
-	 */
-	public function get_heading() {
+     */
+    public function get_heading() {
         $heading = $this->get_option( 'heading' );
         return apply_filters( 'getpaid_get_email_heading', $heading, $this->id, $this->object );
     }
 
     /**
-	 * Checks if an email is active.
-	 *
+     * Checks if an email is active.
+     *
      * @return bool
-	 */
-	public function is_active() {
+     */
+    public function is_active() {
         $is_active = ! empty( $this->get_option( 'active' ) );
         return apply_filters( 'getpaid_email_type_is_active', $is_active, $this->id, $this->object );
     }
 
     /**
-	 * Checks if the site's admin should receive email notifications.
-	 *
+     * Checks if the site's admin should receive email notifications.
+     *
      * @return bool
-	 */
-	public function include_admin_bcc() {
+     */
+    public function include_admin_bcc() {
         $include_admin_bcc = ! empty( $this->get_option( 'admin_bcc' ) );
         return apply_filters( 'getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object );
     }
 
     /**
-	 * Checks whether this email should be sent to the customer or admin.
-	 *
+     * Checks whether this email should be sent to the customer or admin.
+     *
      * @return bool
-	 */
-	public function is_admin_email() {
+     */
+    public function is_admin_email() {
         $is_admin_email = in_array( $this->id, array( 'new_invoice', 'failed_invoice' ) );
         return apply_filters( 'getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object );
     }
 
     /**
-	 * Returns email attachments.
-	 *
+     * Returns email attachments.
+     *
      * @return array
-	 */
-	public function get_attachments() {
+     */
+    public function get_attachments() {
         return apply_filters( 'getpaid_get_email_attachments', array(), $this->id, $this->object );
     }
 
     /**
-	 * Returns an array of merge tags.
-	 *
+     * Returns an array of merge tags.
+     *
      * @return array
-	 */
-	public function get_merge_tags() {
+     */
+    public function get_merge_tags() {
 
         $merge_tags = array(
             '{site_title}' => wpinv_get_blogname(),
@@ -144,13 +144,13 @@ 
     }
 
     /**
-	 * Adds merge tags to a text.
-	 *
+     * Adds merge tags to a text.
+     *
      * @param string string $text
      * @param array $merge_tags
      * @return string
-	 */
-	public function add_merge_tags( $text, $merge_tags = array() ) {
+     */
+    public function add_merge_tags( $text, $merge_tags = array() ) {
 
         foreach ( $merge_tags as $key => $value ) {
             $text = str_replace( $key, $value, $text );
@@ -160,13 +160,13 @@ 
     }
 
     /**
-	 * Returns the email content
-	 *
+     * Returns the email content
+     *
      * @param array $merge_tags
      * @param array $extra_args Extra template args
      * @return string
-	 */
-	public function get_content( $merge_tags = array(), $extra_args = array() ) {
+     */
+    public function get_content( $merge_tags = array(), $extra_args = array() ) {
 
         $content = wpinv_get_template_html(
             "emails/wpinv-email-{$this->id}.php",

Spacing +30 added lines, -30 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Represents a single email type.
@@ -32,7 +32,7 @@ 
      * @param string $id Email Type.
      * @param mixed $object Optional. Associated object.
 	 */
-	public function __construct( $id, $object = false ) {
+	public function __construct($id, $object = false) {
         $this->id     = $id;
         $this->object = $object;
     }
@@ -42,18 +42,18 @@ 
 	 *
      * @return mixed
 	 */
-	public function get_option( $key ) {
+	public function get_option($key) {
 
         $key   = "email_{$this->id}_$key";
-        $value = wpinv_get_option( $key, null );
-        if ( is_null( $value ) ) {
+        $value = wpinv_get_option($key, null);
+        if (is_null($value)) {
             $options = wpinv_get_emails();
 
-            if ( ! isset( $options[ $this->id ] ) || ! isset( $options[ $this->id ][ $key ] ) ) {
+            if (!isset($options[$this->id]) || !isset($options[$this->id][$key])) {
                 return '';
             }
 
-            $value = isset( $options[ $this->id ][ $key ]['std'] ) ? $options[ $this->id ][ $key ]['std'] : '';
+            $value = isset($options[$this->id][$key]['std']) ? $options[$this->id][$key]['std'] : '';
         }
 
         return $value;
@@ -65,8 +65,8 @@ 
      * @return string
 	 */
 	public function get_body() {
-        $body = $this->get_option( 'body' );
-        return apply_filters( 'getpaid_get_email_body', $body, $this->id, $this->object );
+        $body = $this->get_option('body');
+        return apply_filters('getpaid_get_email_body', $body, $this->id, $this->object);
     }
 
     /**
@@ -75,8 +75,8 @@ 
      * @return string
 	 */
 	public function get_subject() {
-        $subject = $this->get_option( 'subject' );
-        return apply_filters( 'getpaid_get_email_subject', $subject, $this->id, $this->object );
+        $subject = $this->get_option('subject');
+        return apply_filters('getpaid_get_email_subject', $subject, $this->id, $this->object);
     }
 
     /**
@@ -85,8 +85,8 @@ 
      * @return string
 	 */
 	public function get_heading() {
-        $heading = $this->get_option( 'heading' );
-        return apply_filters( 'getpaid_get_email_heading', $heading, $this->id, $this->object );
+        $heading = $this->get_option('heading');
+        return apply_filters('getpaid_get_email_heading', $heading, $this->id, $this->object);
     }
 
     /**
@@ -95,8 +95,8 @@ 
      * @return bool
 	 */
 	public function is_active() {
-        $is_active = ! empty( $this->get_option( 'active' ) );
-        return apply_filters( 'getpaid_email_type_is_active', $is_active, $this->id, $this->object );
+        $is_active = !empty($this->get_option('active'));
+        return apply_filters('getpaid_email_type_is_active', $is_active, $this->id, $this->object);
     }
 
     /**
@@ -105,8 +105,8 @@ 
      * @return bool
 	 */
 	public function include_admin_bcc() {
-        $include_admin_bcc = ! empty( $this->get_option( 'admin_bcc' ) );
-        return apply_filters( 'getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object );
+        $include_admin_bcc = !empty($this->get_option('admin_bcc'));
+        return apply_filters('getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object);
     }
 
     /**
@@ -115,8 +115,8 @@ 
      * @return bool
 	 */
 	public function is_admin_email() {
-        $is_admin_email = in_array( $this->id, array( 'new_invoice', 'failed_invoice' ) );
-        return apply_filters( 'getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object );
+        $is_admin_email = in_array($this->id, array('new_invoice', 'failed_invoice'));
+        return apply_filters('getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object);
     }
 
     /**
@@ -125,7 +125,7 @@ 
      * @return array
 	 */
 	public function get_attachments() {
-        return apply_filters( 'getpaid_get_email_attachments', array(), $this->id, $this->object );
+        return apply_filters('getpaid_get_email_attachments', array(), $this->id, $this->object);
     }
 
     /**
@@ -137,10 +137,10 @@ 
 
         $merge_tags = array(
             '{site_title}' => wpinv_get_blogname(),
-            '{date}'       => getpaid_format_date_value( current_time( 'mysql' ) ),
+            '{date}'       => getpaid_format_date_value(current_time('mysql')),
         );
 
-        return apply_filters( 'getpaid_get_email_merge_tags', $merge_tags, $this->object, $this->id );
+        return apply_filters('getpaid_get_email_merge_tags', $merge_tags, $this->object, $this->id);
     }
 
     /**
@@ -150,13 +150,13 @@ 
      * @param array $merge_tags
      * @return string
 	 */
-	public function add_merge_tags( $text, $merge_tags = array() ) {
+	public function add_merge_tags($text, $merge_tags = array()) {
 
-        foreach ( $merge_tags as $key => $value ) {
-            $text = str_replace( $key, $value, $text );
+        foreach ($merge_tags as $key => $value) {
+            $text = str_replace($key, $value, $text);
         }
 
-        return wptexturize( $text );
+        return wptexturize($text);
     }
 
     /**
@@ -166,7 +166,7 @@ 
      * @param array $extra_args Extra template args
      * @return string
 	 */
-	public function get_content( $merge_tags = array(), $extra_args = array() ) {
+	public function get_content($merge_tags = array(), $extra_args = array()) {
 
         $content = wpinv_get_template_html(
             "emails/wpinv-email-{$this->id}.php",
@@ -176,15 +176,15 @@ 
                     'invoice'       => $this->object, // Backwards compat.
                     'object'        => $this->object,
                     'email_type'    => $this->id,
-                    'email_heading' => $this->add_merge_tags( $this->get_heading(), $merge_tags ),
+                    'email_heading' => $this->add_merge_tags($this->get_heading(), $merge_tags),
                     'sent_to_admin' => $this->is_admin_email(),
                     'plain_text'    => false,
-                    'message_body'  => wpautop( $this->add_merge_tags( $this->get_body(), $merge_tags ) ),
+                    'message_body'  => wpautop($this->add_merge_tags($this->get_body(), $merge_tags)),
                 )
             )
         );
 
-        return wpinv_email_style_body( $content );
+        return wpinv_email_style_body($content);
     }
 
 }

includes/class-getpaid-invoice-notification-emails.php

Indentation +454 added lines, -454 removed lines

@@ -12,491 +12,491 @@
  */
 class GetPaid_Invoice_Notification_Emails {
 
-	/**
-	 * The array of invoice email actions.
-	 *
-	 * @param array
-	 */
-	public $invoice_actions;
-
-	/**
-	 * Class constructor
-	 *
-	 */
-	public function __construct() {
-
-		$this->invoice_actions = apply_filters(
-			'getpaid_notification_email_invoice_triggers',
-			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
-				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
-				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
-				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
-				'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
-				'getpaid_invoice_status_publish'        => 'completed_invoice',
-				'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
-				'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
-				'getpaid_new_customer_note'             => 'user_note',
-				'getpaid_daily_maintenance'             => 'overdue',
-			)
-		);
-
-		$this->init_hooks();
-
-	}
-
-	/**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
-
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
-		}
-	}
-
-	/**
-	 * Registers an email hook for an invoice action.
-	 * 
-	 * @param string $hook
-	 * @param string|array $email_type
-	 */
-	public function init_email_type_hook( $hook, $email_type ) {
-
-		$email_type = wpinv_parse_list( $email_type );
-
-		foreach ( $email_type as $type ) {
-
-			$email = new GetPaid_Notification_Email( $type );
-
-			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
-		}
-
-	}
-
-	/**
-	 * Filters invoice merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
-			);
-		}
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates invoice merge tags.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_invoice_merge_tags( $invoice ) {
-
-		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
-			return array();
-		}
-
-		$merge_tags = array(
-			'{name}'                => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'           => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'          => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'           => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'               => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'      => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'    => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'       => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'        => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'    => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}'=> esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'        => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'    => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'       => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'       => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}' => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'   => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'              => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
-		);
-
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
-
-		if ( is_array( $payment_form_data ) ) {
-
-			foreach ( $payment_form_data as $label => $value ) {
-
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
-
-				if ( is_scalar ( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
-				}
-
-			}
-
-		}
-
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param string|array $recipients
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
-
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
-
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
-			return;
-		}
-
-		$mailer     = new GetPaid_Notification_Email_Sender();
-		$merge_tags = $email->get_merge_tags();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
-			$email->get_attachments()
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
-				$email->get_attachments()
-			);
-		}
-
-		if ( $result ) {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Successfully sent %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Failed sending %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);	
-		}
-
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
-
-		return $result;
-	}
-
-	/**
-	 * Also send emails to any cc users.
-	 *
-	 * @param array $recipients
-	 * @param GetPaid_Notification_Email $email
-	 */
-	public function filter_email_recipients( $recipients, $email ) {
-
-		if ( ! $email->is_admin_email() ) {
-			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
-
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-			}
-
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
-			}
-
-		}
-
-		return $recipients;
-
-	}
-
-	/**
-	 * Sends a new invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function new_invoice( $invoice ) {
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a cancelled invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function cancelled_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-	}
-
-	/**
-	 * Sends a failed invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function failed_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is put on hold.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function onhold_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+    /**
+     * The array of invoice email actions.
+     *
+     * @param array
+     */
+    public $invoice_actions;
+
+    /**
+     * Class constructor
+     *
+     */
+    public function __construct() {
+
+        $this->invoice_actions = apply_filters(
+            'getpaid_notification_email_invoice_triggers',
+            array(
+                'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+                'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
+                'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
+                'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
+                'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
+                'getpaid_invoice_status_publish'        => 'completed_invoice',
+                'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
+                'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
+                'getpaid_new_customer_note'             => 'user_note',
+                'getpaid_daily_maintenance'             => 'overdue',
+            )
+        );
+
+        $this->init_hooks();
+
+    }
+
+    /**
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
+        add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+
+        foreach ( $this->invoice_actions as $hook => $email_type ) {
+            $this->init_email_type_hook( $hook, $email_type );
+        }
+    }
+
+    /**
+     * Registers an email hook for an invoice action.
+     * 
+     * @param string $hook
+     * @param string|array $email_type
+     */
+    public function init_email_type_hook( $hook, $email_type ) {
+
+        $email_type = wpinv_parse_list( $email_type );
+
+        foreach ( $email_type as $type ) {
+
+            $email = new GetPaid_Notification_Email( $type );
+
+            // Abort if it is not active.
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $type ) ) {
+                add_action( $hook, array( $this, $type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+        }
+
+    }
+
+    /**
+     * Filters invoice merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function invoice_merge_tags( $merge_tags, $object ) {
+
+        if ( is_a( $object, 'WPInv_Invoice' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object )
+            );
+        }
+
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object->get_parent_payment() )
+            );
+        }
+
+        return $merge_tags;
+
+    }
+
+    /**
+     * Generates invoice merge tags.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_invoice_merge_tags( $invoice ) {
+
+        // Abort if it does not exist.
+        if ( ! $invoice->get_id() ) {
+            return array();
+        }
+
+        $merge_tags = array(
+            '{name}'                => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{full_name}'           => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{first_name}'          => sanitize_text_field( $invoice->get_first_name() ),
+            '{last_name}'           => sanitize_text_field( $invoice->get_last_name() ),
+            '{email}'               => sanitize_email( $invoice->get_email() ),
+            '{invoice_number}'      => sanitize_text_field( $invoice->get_number() ),
+            '{invoice_currency}'    => sanitize_text_field( $invoice->get_currency() ),
+            '{invoice_total}'       => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
+            '{invoice_link}'        => esc_url( $invoice->get_view_url() ),
+            '{invoice_pay_link}'    => esc_url( $invoice->get_checkout_payment_url() ),
+            '{invoice_receipt_link}'=> esc_url( $invoice->get_receipt_url() ),
+            '{invoice_date}'        => getpaid_format_date_value( $invoice->get_date_created() ),
+            '{invoice_due_date}'    => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
+            '{invoice_quote}'       => sanitize_text_field( strtolower( $invoice->get_label() ) ),
+            '{invoice_label}'       => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
+            '{invoice_description}' => wp_kses_post( $invoice->get_description() ),
+            '{subscription_name}'   => wp_kses_post( $invoice->get_subscription_name() ),
+            '{is_was}'              => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+        );
+
+        $payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+
+        if ( is_array( $payment_form_data ) ) {
+
+            foreach ( $payment_form_data as $label => $value ) {
+
+                $label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
+                $value = is_array( $value ) ? implode( ', ', $value ) : $value;
+
+                if ( is_scalar ( $value ) ) {
+                    $merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+                }
+
+            }
+
+        }
+
+        return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+    }
+
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param string|array $recipients
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
+
+        do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+
+        $skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
+        if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+            return;
+        }
+
+        $mailer     = new GetPaid_Notification_Email_Sender();
+        $merge_tags = $email->get_merge_tags();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $email->add_merge_tags( $email->get_subject(), $merge_tags ),
+            $email->get_content( $merge_tags, $extra_args ),
+            $email->get_attachments()
+        );
+
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
+                $email->get_content( $merge_tags ),
+                $email->get_attachments()
+            );
+        }
+
+        if ( $result ) {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Successfully sent %s notification email to %s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Failed sending %s notification email to %s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );	
+        }
+
+        do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+
+        return $result;
+    }
+
+    /**
+     * Also send emails to any cc users.
+     *
+     * @param array $recipients
+     * @param GetPaid_Notification_Email $email
+     */
+    public function filter_email_recipients( $recipients, $email ) {
+
+        if ( ! $email->is_admin_email() ) {
+            $cc   = $email->object->get_email_cc();
+            $cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+
+            if ( ! empty( $cc ) ) {
+                $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+            }
+
+            if ( ! empty( $cc_2 ) ) {
+                $cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+            }
+
+        }
+
+        return $recipients;
+
+    }
+
+    /**
+     * Sends a new invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function new_invoice( $invoice ) {
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a cancelled invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function cancelled_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+    }
+
+    /**
+     * Sends a failed invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function failed_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is put on hold.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function onhold_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
+    }
 
-	/**
-	 * Sends a notification whenever an invoice is marked as processing payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function processing_invoice( $invoice ) {
+    /**
+     * Sends a notification whenever an invoice is marked as processing payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function processing_invoice( $invoice ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is paid.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function completed_invoice( $invoice ) {
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is paid.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function completed_invoice( $invoice ) {
 
-		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
-			return;
-		}
+        // (Maybe) abort if it is a renewal invoice.
+        if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+            return;
+        }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
+    }
 
-	/**
-	 * Sends a notification whenever an invoice is refunded.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function refunded_invoice( $invoice ) {
+    /**
+     * Sends a notification whenever an invoice is refunded.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function refunded_invoice( $invoice ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
+    }
 
-	/**
-	 * Notifies a user about new invoices
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param bool $force
-	 */
-	public function user_invoice( $invoice, $force = false ) {
+    /**
+     * Notifies a user about new invoices
+     *
+     * @param WPInv_Invoice $invoice
+     * @param bool $force
+     */
+    public function user_invoice( $invoice, $force = false ) {
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
-			return;
-		}
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
-			return;
-		}
+        if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+            return;
+        }
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+            return;
+        }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
-
-	/**
-	 * Checks if an invoice is a payment form invoice.
-	 *
-	 * @param int $invoice
-	 * @return bool
-	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' == get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' == get_post_meta( $invoice, 'wpinv_created_via', true ) );
-		return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
-	}
+    }
+
+    /**
+     * Checks if an invoice is a payment form invoice.
+     *
+     * @param int $invoice
+     * @return bool
+     */
+    public function is_payment_form_invoice( $invoice ) {
+        $is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' == get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' == get_post_meta( $invoice, 'wpinv_created_via', true ) );
+        return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+    }
 
-	/**
-	 * Notifies admin about new invoice notes
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $note
-	 */
-	public function user_note( $invoice, $note ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
+    /**
+     * Notifies admin about new invoice notes
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $note
+     */
+    public function user_note( $invoice, $note ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
-
-	}
-
-	/**
-	 * (Force) Sends overdue notices.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
-	}
-
-	/**
-	 * Sends overdue notices.
-	 *
-	 * @TODO: Create an invoices query class.
-	 */
-	public function overdue() {
-		global $wpdb;
-
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
-
-		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
-
-		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
-			return;
-		}
-
-		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
-
-		// Invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-
-		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
-			"SELECT posts.ID FROM $wpdb->posts as posts
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+
+    }
+
+    /**
+     * (Force) Sends overdue notices.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function force_send_overdue_notice( $invoice ) {
+        $email = new GetPaid_Notification_Email( 'overdue', $invoice );
+        return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+    }
+
+    /**
+     * Sends overdue notices.
+     *
+     * @TODO: Create an invoices query class.
+     */
+    public function overdue() {
+        global $wpdb;
+
+        $email = new GetPaid_Notification_Email( __FUNCTION__ );
+
+        // Fetch reminder days.
+        $reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+
+        // Abort if non is set.
+        if ( empty( $reminder_days ) ) {
+            return;
+        }
+
+        // Retrieve date query.
+        $date_query = $this->get_date_query( $reminder_days );
+
+        // Invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+
+        // Fetch invoices.
+        $invoices  = $wpdb->get_col(
+            "SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query");
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
-				$email->object = $invoice;
+            // Only send this email for invoices created via the admin page.
+            if ( ! $this->is_payment_form_invoice( $invoice ) ) {
+                $invoice       = new WPInv_Invoice( $invoice );
+                $email->object = $invoice;
 
-				if ( $invoice->needs_payment() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
-				}
+                if ( $invoice->needs_payment() ) {
+                    $this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+                }
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Calculates the date query for an invoices query
-	 *
-	 * @param array $reminder_days
-	 * @return string
-	 */
-	public function get_date_query( $reminder_days ) {
+    /**
+     * Calculates the date query for an invoices query
+     *
+     * @param array $reminder_days
+     * @return string
+     */
+    public function get_date_query( $reminder_days ) {
 
-		$date_query = array(
-			'relation'  => 'OR'
-		);
+        $date_query = array(
+            'relation'  => 'OR'
+        );
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+        foreach ( $reminder_days as $days ) {
+            $date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
 
-			$date_query[] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $date_query[] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+        $date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
 
-		return $date_query->get_sql();
+        return $date_query->get_sql();
 
-	}
+    }
 
 }

Spacing +125 added lines, -125 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles invoice notificaiton emails.
@@ -28,7 +28,7 @@ 
 		$this->invoice_actions = apply_filters(
 			'getpaid_notification_email_invoice_triggers',
 			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+				'getpaid_new_invoice'                   => array('new_invoice', 'user_invoice'),
 				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
 				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
 				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
@@ -50,11 +50,11 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+		add_filter('getpaid_get_email_merge_tags', array($this, 'invoice_merge_tags'), 10, 2);
+		add_filter('getpaid_invoice_email_recipients', array($this, 'filter_email_recipients'), 10, 2);
 
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
+		foreach ($this->invoice_actions as $hook => $email_type) {
+			$this->init_email_type_hook($hook, $email_type);
 		}
 	}
 
@@ -64,25 +64,25 @@ 
 	 * @param string $hook
 	 * @param string|array $email_type
 	 */
-	public function init_email_type_hook( $hook, $email_type ) {
+	public function init_email_type_hook($hook, $email_type) {
 
-		$email_type = wpinv_parse_list( $email_type );
+		$email_type = wpinv_parse_list($email_type);
 
-		foreach ( $email_type as $type ) {
+		foreach ($email_type as $type) {
 
-			$email = new GetPaid_Notification_Email( $type );
+			$email = new GetPaid_Notification_Email($type);
 
 			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
+			if (method_exists($this, $type)) {
+				add_action($hook, array($this, $type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+			do_action('getpaid_invoice_init_email_type_hook', $type, $hook);
 		}
 
 	}
@@ -93,19 +93,19 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
+	public function invoice_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
+		if (is_a($object, 'WPInv_Invoice')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
+				$this->get_invoice_merge_tags($object)
 			);
 		}
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
+				$this->get_invoice_merge_tags($object->get_parent_payment())
 			);
 		}
 
@@ -119,52 +119,52 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_invoice_merge_tags( $invoice ) {
+	public function get_invoice_merge_tags($invoice) {
 
 		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
+		if (!$invoice->get_id()) {
 			return array();
 		}
 
 		$merge_tags = array(
-			'{name}'                => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'           => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'          => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'           => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'               => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'      => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'    => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'       => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'        => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'    => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}'=> esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'        => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'    => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'       => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'       => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}' => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'   => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'              => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+			'{name}'                => sanitize_text_field($invoice->get_user_full_name()),
+			'{full_name}'           => sanitize_text_field($invoice->get_user_full_name()),
+			'{first_name}'          => sanitize_text_field($invoice->get_first_name()),
+			'{last_name}'           => sanitize_text_field($invoice->get_last_name()),
+			'{email}'               => sanitize_email($invoice->get_email()),
+			'{invoice_number}'      => sanitize_text_field($invoice->get_number()),
+			'{invoice_currency}'    => sanitize_text_field($invoice->get_currency()),
+			'{invoice_total}'       => sanitize_text_field(wpinv_price($invoice->get_total(), $invoice->get_currency())),
+			'{invoice_link}'        => esc_url($invoice->get_view_url()),
+			'{invoice_pay_link}'    => esc_url($invoice->get_checkout_payment_url()),
+			'{invoice_receipt_link}'=> esc_url($invoice->get_receipt_url()),
+			'{invoice_date}'        => getpaid_format_date_value($invoice->get_date_created()),
+			'{invoice_due_date}'    => getpaid_format_date_value($invoice->get_due_date(), __('on receipt', 'invoicing')),
+			'{invoice_quote}'       => sanitize_text_field(strtolower($invoice->get_label())),
+			'{invoice_label}'       => sanitize_text_field(ucfirst($invoice->get_label())),
+			'{invoice_description}' => wp_kses_post($invoice->get_description()),
+			'{subscription_name}'   => wp_kses_post($invoice->get_subscription_name()),
+			'{is_was}'              => strtotime($invoice->get_due_date()) < current_time('timestamp') ? __('was', 'invoicing') : __('is', 'invoicing'),
 		);
 
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+		$payment_form_data = $invoice->get_meta('payment_form_data', true);
 
-		if ( is_array( $payment_form_data ) ) {
+		if (is_array($payment_form_data)) {
 
-			foreach ( $payment_form_data as $label => $value ) {
+			foreach ($payment_form_data as $label => $value) {
 
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
+				$label = preg_replace('/[^a-z0-9]+/', '_', strtolower($label));
+				$value = is_array($value) ? implode(', ', $value) : $value;
 
-				if ( is_scalar ( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+				if (is_scalar($value)) {
+					$merge_tags["{{$label}}"] = wp_kses_post($value);
 				}
 
 			}
 
 		}
 
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+		return apply_filters('getpaid_invoice_email_merge_tags', $merge_tags, $invoice);
 	}
 
 	/**
@@ -176,12 +176,12 @@ 
 	 * @param string|array $recipients
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
+	public function send_email($invoice, $email, $type, $recipients, $extra_args = array()) {
 
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_before_send_invoice_notification', $type, $invoice, $email);
 
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+		$skip = $invoice->is_free() && wpinv_get_option('skip_email_free_invoice');
+		if (apply_filters('getpaid_skip_invoice_email', $skip, $type, $invoice)) {
 			return;
 		}
 
@@ -189,41 +189,41 @@ 
 		$merge_tags = $email->get_merge_tags();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
+			apply_filters('getpaid_invoice_email_recipients', wpinv_parse_list($recipients), $email),
+			$email->add_merge_tags($email->get_subject(), $merge_tags),
+			$email->get_content($merge_tags, $extra_args),
 			$email->get_attachments()
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
+				$email->add_merge_tags($email->get_subject() . __(' - ADMIN BCC COPY', 'invoicing'), $merge_tags),
+				$email->get_content($merge_tags),
 				$email->get_attachments()
 			);
 		}
 
-		if ( $result ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Successfully sent %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Successfully sent %s notification email to %s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Failed sending %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Failed sending %s notification email to %s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);	
 		}
 
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_after_send_invoice_notification', $type, $invoice, $email);
 
 		return $result;
 	}
@@ -234,20 +234,20 @@ 
 	 * @param array $recipients
 	 * @param GetPaid_Notification_Email $email
 	 */
-	public function filter_email_recipients( $recipients, $email ) {
+	public function filter_email_recipients($recipients, $email) {
 
-		if ( ! $email->is_admin_email() ) {
+		if (!$email->is_admin_email()) {
 			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+			$cc_2 = get_user_meta($email->object->get_user_id(), '_wpinv_email_cc', true);
 
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+			if (!empty($cc)) {
+				$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 			}
 
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+			if (!empty($cc_2)) {
+				$cc_2 = array_map('sanitize_email', wpinv_parse_list($cc_2));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc_2)));
 			}
 
 		}
@@ -261,17 +261,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function new_invoice( $invoice ) {
+	public function new_invoice($invoice) {
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+		if (!$invoice->is_type('invoice') || $invoice->is_paid() || $this->is_payment_form_invoice($invoice->get_id())) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -280,12 +280,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function cancelled_invoice( $invoice ) {
+	public function cancelled_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 	}
 
 	/**
@@ -293,12 +293,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function failed_invoice( $invoice ) {
+	public function failed_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -307,12 +307,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function onhold_invoice( $invoice ) {
+	public function onhold_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -321,12 +321,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function processing_invoice( $invoice ) {
+	public function processing_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -335,17 +335,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function completed_invoice( $invoice ) {
+	public function completed_invoice($invoice) {
 
 		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+		if ($invoice->is_renewal() && !wpinv_get_option('email_completed_invoice_renewal_active', false)) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -354,12 +354,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function refunded_invoice( $invoice ) {
+	public function refunded_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -369,21 +369,21 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param bool $force
 	 */
-	public function user_invoice( $invoice, $force = false ) {
+	public function user_invoice($invoice, $force = false) {
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+		if (!$force && !empty($GLOBALS['wpinv_skip_invoice_notification'])) {
 			return;
 		}
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+		if (!$invoice->is_type('invoice') || (empty($force) && $invoice->is_paid()) || (empty($force) && $this->is_payment_form_invoice($invoice->get_id()))) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -393,9 +393,9 @@ 
 	 * @param int $invoice
 	 * @return bool
 	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' == get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' == get_post_meta( $invoice, 'wpinv_created_via', true ) );
-		return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+	public function is_payment_form_invoice($invoice) {
+		$is_payment_form_invoice = empty($_GET['getpaid-admin-action']) && ('payment_form' == get_post_meta($invoice, 'wpinv_created_via', true) || 'geodirectory' == get_post_meta($invoice, 'wpinv_created_via', true));
+		return apply_filters('getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice);
 	}
 
 	/**
@@ -404,12 +404,12 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $note
 	 */
-	public function user_note( $invoice, $note ) {
+	public function user_note($invoice, $note) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient, array('customer_note' => $note));
 
 	}
 
@@ -418,9 +418,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+	public function force_send_overdue_notice($invoice) {
+		$email = new GetPaid_Notification_Email('overdue', $invoice);
+		return $this->send_email($invoice, $email, 'overdue', $invoice->get_email());
 	}
 
 	/**
@@ -431,37 +431,37 @@ 
 	public function overdue() {
 		global $wpdb;
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
+		$date_query = $this->get_date_query($reminder_days);
 
 		// Invoices table.
 		$table = $wpdb->prefix . 'getpaid_invoices';
 
 		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
+		$invoices = $wpdb->get_col(
 			"SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query");
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
 			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
+			if (!$this->is_payment_form_invoice($invoice)) {
+				$invoice       = new WPInv_Invoice($invoice);
 				$email->object = $invoice;
 
-				if ( $invoice->needs_payment() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+				if ($invoice->needs_payment()) {
+					$this->send_email($invoice, $email, __FUNCTION__, $invoice->get_email());
 				}
 
 			}
@@ -476,14 +476,14 @@ 
 	 * @param array $reminder_days
 	 * @return string
 	 */
-	public function get_date_query( $reminder_days ) {
+	public function get_date_query($reminder_days) {
 
 		$date_query = array(
 			'relation'  => 'OR'
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("-$days days", current_time('timestamp'))));
 
 			$date_query[] = array(
 				'year'  => $date['year'],
@@ -493,7 +493,7 @@ 
 
 		}
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+		$date_query = new WP_Date_Query($date_query, 'invoices.due_date');
 
 		return $date_query->get_sql();