AyeCode / invoicing

templates/invoice-history.php

Indentation +73 added lines, -73 removed lines

@@ -42,92 +42,92 @@ 
 					<tr class="wpinv-item wpinv-item-<?php echo esc_attr( $invoice->get_status() ); ?>">
 						<?php
 
-							foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
+                            foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
 
-							$column_id = sanitize_html_class( $column_id );
-							$class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
+                            $column_id = sanitize_html_class( $column_id );
+                            $class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
 
-							echo "<td class='" . esc_attr( $column_id . ' ' . $class ) . "'>";
-							switch ( $column_id ) {
+                            echo "<td class='" . esc_attr( $column_id . ' ' . $class ) . "'>";
+                            switch ( $column_id ) {
 
-								case 'invoice-number':
-									echo wp_kses_post( wpinv_invoice_link( $invoice ) );
-									break;
+                                case 'invoice-number':
+                                    echo wp_kses_post( wpinv_invoice_link( $invoice ) );
+                                    break;
 
-								case 'created-date':
-									echo esc_html( getpaid_format_date_value( $invoice->get_date_created() ) );
-									break;
+                                case 'created-date':
+                                    echo esc_html( getpaid_format_date_value( $invoice->get_date_created() ) );
+                                    break;
 
-								case 'payment-date':
-									if ( $invoice->needs_payment() ) {
-										echo '&mdash;';
-										} else {
-										echo esc_html( getpaid_format_date_value( $invoice->get_date_completed() ) );
-										}
+                                case 'payment-date':
+                                    if ( $invoice->needs_payment() ) {
+                                        echo '&mdash;';
+                                        } else {
+                                        echo esc_html( getpaid_format_date_value( $invoice->get_date_completed() ) );
+                                        }
 
-									break;
+                                    break;
 
-								case 'invoice-status':
-									echo wp_kses_post( $invoice->get_status_label_html() );
+                                case 'invoice-status':
+                                    echo wp_kses_post( $invoice->get_status_label_html() );
 
-									break;
+                                    break;
 
-								case 'invoice-total':
-									wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                                case 'invoice-total':
+                                    wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
 
-									break;
+                                    break;
 
-								case 'invoice-actions':
-									$actions = array(
+                                case 'invoice-actions':
+                                    $actions = array(
 
-										'pay'   => array(
-											'url'   => $invoice->get_checkout_payment_url(),
-											'name'  => __( 'Pay Now', 'invoicing' ),
-											'class' => 'btn-success',
-										),
+                                        'pay'   => array(
+                                            'url'   => $invoice->get_checkout_payment_url(),
+                                            'name'  => __( 'Pay Now', 'invoicing' ),
+                                            'class' => 'btn-success',
+                                        ),
 
-										'print' => array(
-											'url'   => $invoice->get_view_url(),
-											'name'  => __( 'View', 'invoicing' ),
-											'class' => 'btn-secondary',
-											'attrs' => 'target="_blank"',
-										),
-									);
+                                        'print' => array(
+                                            'url'   => $invoice->get_view_url(),
+                                            'name'  => __( 'View', 'invoicing' ),
+                                            'class' => 'btn-secondary',
+                                            'attrs' => 'target="_blank"',
+                                        ),
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-										}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                        }
 
-									if ( $invoice->needs_payment() ) {
-										$actions['delete'] = array(
-											'url'   => getpaid_get_authenticated_action_url( 'delete_invoice', add_query_arg( 'invoice_id', $invoice->get_id() ) ),
-											'name'  => __( 'Delete', 'invoicing' ),
-											'class' => 'btn-danger',
-										);
-										}
+                                    if ( $invoice->needs_payment() ) {
+                                        $actions['delete'] = array(
+                                            'url'   => getpaid_get_authenticated_action_url( 'delete_invoice', add_query_arg( 'invoice_id', $invoice->get_id() ) ),
+                                            'name'  => __( 'Delete', 'invoicing' ),
+                                            'class' => 'btn-danger',
+                                        );
+                                        }
 
-									$actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
+                                    $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
 
-									foreach ( $actions as $key => $action ) {
-										$class = ! empty( $action['class'] ) ? sanitize_html_class( $action['class'] ) : '';
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . esc_attr( $class . ' ' . sanitize_html_class( $key ) ) . '" ' . ( ! empty( $action['attrs'] ) ? esc_html( $action['attrs'] ) : '' ) . '>' . esc_attr( $action['name'] ) . '</a>';
-										}
+                                    foreach ( $actions as $key => $action ) {
+                                        $class = ! empty( $action['class'] ) ? sanitize_html_class( $action['class'] ) : '';
+                                        echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . esc_attr( $class . ' ' . sanitize_html_class( $key ) ) . '" ' . ( ! empty( $action['attrs'] ) ? esc_html( $action['attrs'] ) : '' ) . '>' . esc_attr( $action['name'] ) . '</a>';
+                                        }
 
-									break;
+                                    break;
 
-								default:
-									do_action( "wpinv_user_invoices_column_$column_id", $invoice );
-									break;
+                                default:
+                                    do_action( "wpinv_user_invoices_column_$column_id", $invoice );
+                                    break;
 
 
-								}
+                                }
 
-							do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
+                            do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
 
-							echo '</td>';
+                            echo '</td>';
 
-							endforeach;
-						?>
+                            endforeach;
+                        ?>
 					</tr>
 
 				<?php endforeach; ?>
@@ -141,18 +141,18 @@ 
 	<?php if ( 1 < $invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-
-			echo wp_kses_post(
-				paginate_links(
-					array(
-						'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-						'format' => '?paged=%#%',
-						'total'  => $invoices->max_num_pages,
-					)
-				)
+            $big = 999999;
+
+            echo wp_kses_post(
+                paginate_links(
+                    array(
+                        'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                        'format' => '?paged=%#%',
+                        'total'  => $invoices->max_num_pages,
+                    )
+                )
             );
-			?>
+            ?>
 		</div>
 	<?php endif; ?>
 

Spacing +37 added lines, -37 removed lines

@@ -7,13 +7,13 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Current page.
-$current_page   = empty( $_GET['page'] ) ? 1 : absint( $_GET['page'] );
+$current_page = empty($_GET['page']) ? 1 : absint($_GET['page']);
 
 // Fires before displaying user invoices.
-do_action( 'wpinv_before_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type );
+do_action('wpinv_before_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type);
 
 wpinv_print_errors();
 
@@ -21,15 +21,15 @@ 
 
 
 	<div class="table-responsive">
-		<table class="table table-bordered table-hover getpaid-user-invoices <?php echo esc_attr( $post_type ); ?>">
+		<table class="table table-bordered table-hover getpaid-user-invoices <?php echo esc_attr($post_type); ?>">
 
 
 			<thead>
 				<tr>
 
-					<?php foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) : ?>
-						<th class="<?php echo esc_attr( $column_id ); ?> <?php echo ( ! empty( $column_name['class'] ) ? sanitize_html_class( $column_name['class'] ) : ''); ?> border-bottom-0">
-							<span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span>
+					<?php foreach (wpinv_get_user_invoices_columns($post_type) as $column_id => $column_name) : ?>
+						<th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? sanitize_html_class($column_name['class']) : ''); ?> border-bottom-0">
+							<span class="nobr"><?php echo esc_html($column_name['title']); ?></span>
 						</th>
 					<?php endforeach; ?>
 
@@ -39,43 +39,43 @@ 
 
 
 			<tbody>
-				<?php foreach ( $invoices->invoices as $invoice ) : ?>
+				<?php foreach ($invoices->invoices as $invoice) : ?>
 
-					<tr class="wpinv-item wpinv-item-<?php echo esc_attr( $invoice->get_status() ); ?>">
+					<tr class="wpinv-item wpinv-item-<?php echo esc_attr($invoice->get_status()); ?>">
 						<?php
 
-							foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
+							foreach (wpinv_get_user_invoices_columns($post_type) as $column_id => $column_name) :
 
-							$column_id = sanitize_html_class( $column_id );
-							$class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
+							$column_id = sanitize_html_class($column_id);
+							$class     = empty($column_name['class']) ? '' : sanitize_html_class($column_name['class']);
 
-							echo "<td class='" . esc_attr( $column_id . ' ' . $class ) . "'>";
-							switch ( $column_id ) {
+							echo "<td class='" . esc_attr($column_id . ' ' . $class) . "'>";
+							switch ($column_id) {
 
 								case 'invoice-number':
-									echo wp_kses_post( wpinv_invoice_link( $invoice ) );
+									echo wp_kses_post(wpinv_invoice_link($invoice));
 									break;
 
 								case 'created-date':
-									echo esc_html( getpaid_format_date_value( $invoice->get_date_created() ) );
+									echo esc_html(getpaid_format_date_value($invoice->get_date_created()));
 									break;
 
 								case 'payment-date':
-									if ( $invoice->needs_payment() ) {
+									if ($invoice->needs_payment()) {
 										echo '&mdash;';
 										} else {
-										echo esc_html( getpaid_format_date_value( $invoice->get_date_completed() ) );
+										echo esc_html(getpaid_format_date_value($invoice->get_date_completed()));
 										}
 
 									break;
 
 								case 'invoice-status':
-									echo wp_kses_post( $invoice->get_status_label_html() );
+									echo wp_kses_post($invoice->get_status_label_html());
 
 									break;
 
 								case 'invoice-total':
-									wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+									wpinv_the_price($invoice->get_total(), $invoice->get_currency());
 
 									break;
 
@@ -84,47 +84,47 @@ 
 
 										'pay'   => array(
 											'url'   => $invoice->get_checkout_payment_url(),
-											'name'  => __( 'Pay Now', 'invoicing' ),
+											'name'  => __('Pay Now', 'invoicing'),
 											'class' => 'btn-success',
 										),
 
 										'print' => array(
 											'url'   => $invoice->get_view_url(),
-											'name'  => __( 'View', 'invoicing' ),
+											'name'  => __('View', 'invoicing'),
 											'class' => 'btn-secondary',
 											'attrs' => 'target="_blank"',
 										),
 									);
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
+									if (!$invoice->needs_payment()) {
+										unset($actions['pay']);
 										}
 
-									if ( $invoice->needs_payment() ) {
+									if ($invoice->needs_payment()) {
 										$actions['delete'] = array(
-											'url'   => getpaid_get_authenticated_action_url( 'delete_invoice', add_query_arg( 'invoice_id', $invoice->get_id() ) ),
-											'name'  => __( 'Delete', 'invoicing' ),
+											'url'   => getpaid_get_authenticated_action_url('delete_invoice', add_query_arg('invoice_id', $invoice->get_id())),
+											'name'  => __('Delete', 'invoicing'),
 											'class' => 'btn-danger',
 										);
 										}
 
-									$actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
+									$actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice, $post_type);
 
-									foreach ( $actions as $key => $action ) {
-										$class = ! empty( $action['class'] ) ? sanitize_html_class( $action['class'] ) : '';
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . esc_attr( $class . ' ' . sanitize_html_class( $key ) ) . '" ' . ( ! empty( $action['attrs'] ) ? esc_html( $action['attrs'] ) : '' ) . '>' . esc_attr( $action['name'] ) . '</a>';
+									foreach ($actions as $key => $action) {
+										$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
+										echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm btn-block ' . esc_attr($class . ' ' . sanitize_html_class($key)) . '" ' . (!empty($action['attrs']) ? esc_html($action['attrs']) : '') . '>' . esc_attr($action['name']) . '</a>';
 										}
 
 									break;
 
 								default:
-									do_action( "wpinv_user_invoices_column_$column_id", $invoice );
+									do_action("wpinv_user_invoices_column_$column_id", $invoice);
 									break;
 
 
 								}
 
-							do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
+							do_action("wpinv_user_invoices_column_after_$column_id", $invoice);
 
 							echo '</td>';
 
@@ -138,9 +138,9 @@ 
 		</table>
 	</div>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $invoices->max_num_pages ) : ?>
+	<?php if (1 < $invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
@@ -148,7 +148,7 @@ 
 			echo wp_kses_post(
 				paginate_links(
 					array(
-						'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+						'base'   => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 						'format' => '?paged=%#%',
 						'total'  => $invoices->max_num_pages,
 					)
@@ -158,4 +158,4 @@ 
 		</div>
 	<?php endif; ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type ); ?>
+<?php do_action('wpinv_after_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type); ?>

templates/emails/invoice-details.php

Spacing +13 added lines, -13 removed lines

@@ -8,45 +8,45 @@ 
  * @var WPInv_Invoice $invoice
  * @var array $columns
  */
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$meta_data = getpaid_get_invoice_meta( $invoice );
+$meta_data = getpaid_get_invoice_meta($invoice);
 
-if ( isset( $meta_data['status'] ) ) {
+if (isset($meta_data['status'])) {
     $meta_data['status']['value'] = $invoice->get_status_nicename();
 }
 
-do_action( 'wpinv_email_before_invoice_details', $invoice, $sent_to_admin );
+do_action('wpinv_email_before_invoice_details', $invoice, $sent_to_admin);
 
 ?>
 
 <div id="wpinv-email-details">
 
     <h3 class="invoice-details-title">
-        <?php echo sprintf( esc_html__( '%s Details', 'invoicing' ), esc_html( ucfirst( $invoice->get_invoice_quote_type() ) ) ); ?>
+        <?php echo sprintf(esc_html__('%s Details', 'invoicing'), esc_html(ucfirst($invoice->get_invoice_quote_type()))); ?>
     </h3>
 
     <table class="table table-bordered table-sm">
 
-        <?php foreach ( $meta_data as $key => $data ) : ?>
+        <?php foreach ($meta_data as $key => $data) : ?>
 
-            <?php if ( ! empty( $data['value'] ) ) : ?>
+            <?php if (!empty($data['value'])) : ?>
 
-                <?php do_action( "getpaid_before_email_details_$key", $invoice, $data ); ?>
+                <?php do_action("getpaid_before_email_details_$key", $invoice, $data); ?>
 
-                <tr class="getpaid-email-details-<?php echo esc_attr( $key ); ?>">
+                <tr class="getpaid-email-details-<?php echo esc_attr($key); ?>">
 
                     <td class="getpaid-lable-td">
-                        <?php echo esc_html( $data['label'] ); ?>
+                        <?php echo esc_html($data['label']); ?>
                     </td>
 
                     <td class="getpaid-value-td">
-                        <span class="getpaid-invoice-meta-<?php echo esc_attr( $key ); ?>-value"><?php echo wp_kses_post( $data['value'] ); ?></span>
+                        <span class="getpaid-invoice-meta-<?php echo esc_attr($key); ?>-value"><?php echo wp_kses_post($data['value']); ?></span>
                     </td>
 
                 </tr>
 
-                <?php do_action( "getpaid_after_email_details_$key", $invoice, $data ); ?>
+                <?php do_action("getpaid_after_email_details_$key", $invoice, $data); ?>
 
             <?php endif; ?>
 
@@ -56,4 +56,4 @@ 
 
 </div>
 
-<?php do_action( 'wpinv_email_after_invoice_details', $invoice, $sent_to_admin ); ?>
+<?php do_action('wpinv_email_after_invoice_details', $invoice, $sent_to_admin); ?>

templates/invoice/line-item.php

Indentation +62 added lines, -62 removed lines

@@ -26,90 +26,90 @@
 
 				<?php
 
-					// Fires before printing a line item column.
-					do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
+                    // Fires before printing a line item column.
+                    do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
 
-					// Item name.
-					if ( 'name' === $column ) {
+                    // Item name.
+                    if ( 'name' === $column ) {
 
-						$has_featured_image = has_post_thumbnail( $item->get_id() );
+                        $has_featured_image = has_post_thumbnail( $item->get_id() );
 
-						if ( $has_featured_image ) {
-							echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
-							echo '<div class="getpaid-form-item-image-container mr-2">';
-							echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
-							echo '</div>';
-							echo '<div class="getpaid-form-item-name-container">';
-						}
+                        if ( $has_featured_image ) {
+                            echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
+                            echo '<div class="getpaid-form-item-image-container mr-2">';
+                            echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
+                            echo '</div>';
+                            echo '<div class="getpaid-form-item-name-container">';
+                        }
 
-						// Display the name.
-						echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
+                        // Display the name.
+                        echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
 
-						// And an optional description.
-						$description = $item->get_description();
+                        // And an optional description.
+                        $description = $item->get_description();
 
-						if ( ! empty( $description ) ) {
-							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
-						}
+                        if ( ! empty( $description ) ) {
+                            echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+                        }
 
-						// Fires before printing the line item actions.
-						do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
+                        // Fires before printing the line item actions.
+                        do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
 
-						$actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
+                        $actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
 
-						if ( ! empty( $actions ) ) {
+                        if ( ! empty( $actions ) ) {
 
-							$sanitized  = array();
-							foreach ( $actions as $key => $item_action ) {
-								$key         = sanitize_html_class( $key );
-								$item_action = wp_kses_post( $item_action );
-								$sanitized[] = "<span class='$key'>$item_action</span>";
-							}
+                            $sanitized  = array();
+                            foreach ( $actions as $key => $item_action ) {
+                                $key         = sanitize_html_class( $key );
+                                $item_action = wp_kses_post( $item_action );
+                                $sanitized[] = "<span class='$key'>$item_action</span>";
+                            }
 
-							echo "<small class='form-text getpaid-line-item-actions'>";
-							echo wp_kses_post( implode( ' | ', $sanitized ) );
-							echo '</small>';
+                            echo "<small class='form-text getpaid-line-item-actions'>";
+                            echo wp_kses_post( implode( ' | ', $sanitized ) );
+                            echo '</small>';
 
-						}
+                        }
 
-						if ( $has_featured_image ) {
-							echo '</div>';
-							echo '</div>';
-						}
-					}
+                        if ( $has_featured_image ) {
+                            echo '</div>';
+                            echo '</div>';
+                        }
+                    }
 
-					// Item price.
-					if ( 'price' === $column ) {
+                    // Item price.
+                    if ( 'price' === $column ) {
 
-					// Display the item price (or recurring price if this is a renewal invoice)
-					$price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
-					wpinv_the_price( $price, $invoice->get_currency() );
+                    // Display the item price (or recurring price if this is a renewal invoice)
+                    $price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
+                    wpinv_the_price( $price, $invoice->get_currency() );
 
-					}
+                    }
 
-					// Tax rate.
-					if ( 'tax_rate' === $column ) {
-					echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
-					}
+                    // Tax rate.
+                    if ( 'tax_rate' === $column ) {
+                    echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+                    }
 
-					// Item quantity.
-					if ( 'quantity' === $column ) {
-					echo (float) $item->get_quantity();
-					}
+                    // Item quantity.
+                    if ( 'quantity' === $column ) {
+                    echo (float) $item->get_quantity();
+                    }
 
-					// Item sub total.
-					if ( 'subtotal' === $column ) {
-					$subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
-					wpinv_the_price( $subtotal, $invoice->get_currency() );
-					}
+                    // Item sub total.
+                    if ( 'subtotal' === $column ) {
+                    $subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
+                    wpinv_the_price( $subtotal, $invoice->get_currency() );
+                    }
 
-					// Fires when printing a line item column.
-					do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
+                    // Fires when printing a line item column.
+                    do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
 
-					// Fires after printing a line item column.
-					do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
+                    // Fires after printing a line item column.
+                    do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
 
-				?>
+                ?>
 
 			</div>
 

Spacing +31 added lines, -31 removed lines

@@ -10,104 +10,104 @@
  * @var array $columns
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_before_invoice_line_item', $invoice, $item );
+do_action('getpaid_before_invoice_line_item', $invoice, $item);
 
 ?>
 
-<div class='getpaid-invoice-item item-<?php echo (int) $item->get_id(); ?> item-type-<?php echo esc_attr( $item->get_type() ); ?> border-bottom'>
+<div class='getpaid-invoice-item item-<?php echo (int) $item->get_id(); ?> item-type-<?php echo esc_attr($item->get_type()); ?> border-bottom'>
 
 	<div class="form-row row align-items-center">
 
-		<?php foreach ( array_keys( $columns ) as $column ) : ?>
+		<?php foreach (array_keys($columns) as $column) : ?>
 
-			<div class="<?php echo 'name' === $column ? 'col-12 col-sm-6' : 'col-12 col-sm'; ?> getpaid-invoice-item-<?php echo esc_attr( $column ); ?>">
+			<div class="<?php echo 'name' === $column ? 'col-12 col-sm-6' : 'col-12 col-sm'; ?> getpaid-invoice-item-<?php echo esc_attr($column); ?>">
 
 				<?php
 
 					// Fires before printing a line item column.
-					do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
+					do_action("getpaid_invoice_line_item_before_$column", $item, $invoice);
 
 					// Item name.
-					if ( 'name' === $column ) {
+					if ('name' === $column) {
 
-						$has_featured_image = has_post_thumbnail( $item->get_id() );
+						$has_featured_image = has_post_thumbnail($item->get_id());
 
-						if ( $has_featured_image ) {
+						if ($has_featured_image) {
 							echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
 							echo '<div class="getpaid-form-item-image-container mr-2">';
-							echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
+							echo get_the_post_thumbnail($item->get_id(), 'thumbnail', array('class' => 'getpaid-form-item-image mb-0'));
 							echo '</div>';
 							echo '<div class="getpaid-form-item-name-container">';
 						}
 
 						// Display the name.
-						echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
+						echo '<div class="mb-1">' . esc_html($item->get_name()) . '</div>';
 
 						// And an optional description.
 						$description = $item->get_description();
 
-						if ( ! empty( $description ) ) {
-							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+						if (!empty($description)) {
+							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post($description) . '</small>';
 						}
 
 						// Fires before printing the line item actions.
-						do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
+						do_action('getpaid_before_invoice_line_item_actions', $item, $invoice);
 
-						$actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
+						$actions = apply_filters('getpaid-invoice-page-line-item-actions', array(), $item, $invoice);
 
-						if ( ! empty( $actions ) ) {
+						if (!empty($actions)) {
 
-							$sanitized  = array();
-							foreach ( $actions as $key => $item_action ) {
-								$key         = sanitize_html_class( $key );
-								$item_action = wp_kses_post( $item_action );
+							$sanitized = array();
+							foreach ($actions as $key => $item_action) {
+								$key         = sanitize_html_class($key);
+								$item_action = wp_kses_post($item_action);
 								$sanitized[] = "<span class='$key'>$item_action</span>";
 							}
 
 							echo "<small class='form-text getpaid-line-item-actions'>";
-							echo wp_kses_post( implode( ' | ', $sanitized ) );
+							echo wp_kses_post(implode(' | ', $sanitized));
 							echo '</small>';
 
 						}
 
-						if ( $has_featured_image ) {
+						if ($has_featured_image) {
 							echo '</div>';
 							echo '</div>';
 						}
 					}
 
 					// Item price.
-					if ( 'price' === $column ) {
+					if ('price' === $column) {
 
 					// Display the item price (or recurring price if this is a renewal invoice)
 					$price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
-					wpinv_the_price( $price, $invoice->get_currency() );
+					wpinv_the_price($price, $invoice->get_currency());
 
 					}
 
 					// Tax rate.
-					if ( 'tax_rate' === $column ) {
-					echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+					if ('tax_rate' === $column) {
+					echo floatval(round(getpaid_get_invoice_tax_rate($invoice, $item), 2)) . '%';
 					}
 
 					// Item quantity.
-					if ( 'quantity' === $column ) {
+					if ('quantity' === $column) {
 					echo (float) $item->get_quantity();
 					}
 
 					// Item sub total.
-					if ( 'subtotal' === $column ) {
+					if ('subtotal' === $column) {
 					$subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
-					wpinv_the_price( $subtotal, $invoice->get_currency() );
+					wpinv_the_price($subtotal, $invoice->get_currency());
 					}
 
 					// Fires when printing a line item column.
-					do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
+					do_action("getpaid_invoice_line_item_$column", $item, $invoice);
 
 					// Fires after printing a line item column.
-					do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
+					do_action("getpaid_invoice_line_item_after_$column", $item, $invoice);
 
 				?>
 

includes/class-getpaid-tax.php

Indentation +192 added lines, -192 removed lines

@@ -13,199 +13,199 @@
  */
 class GetPaid_Tax {
 
-	/**
-	 * Calculates tax for a line item.
-	 *
-	 * @param  float   $price              The price to calc tax on.
-	 * @param  array   $rates              The rates to apply.
-	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
-	 * @return array                       Array of tax name => tax amount.
-	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
-
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
-		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
-		}
-
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
-
-	}
-
-	/**
-	 * Calc tax from inclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
-
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Calc tax from exclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		foreach ( $tax_rates as $name => $rate ) {
-
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
-
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Get's an array of all tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rates() {
-
-		$rates = get_option( 'wpinv_tax_rates', array() );
-
-		return apply_filters(
-			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of default tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_default_tax_rates() {
-
-		return apply_filters(
-			'getpaid_get_default_tax_rates',
-			array(
-				array(
-					'country' => wpinv_get_default_country(),
-					'state'   => wpinv_get_default_state(),
-					'global'  => true,
-					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Base Tax', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Get's an array of all tax rules.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rules() {
-
-		$rules = get_option(
-			'wpinv_tax_rules',
-			array(
-				array(
-					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-				array(
-					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-        	)
-		);
-
-		return apply_filters(
-			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of tax rates for a given address.
-	 *
-	 * @param string $country
-	 * @param string $state
-	 * @return array
-	 */
-	public static function get_address_tax_rates( $country, $state ) {
-
-		$all_tax_rates  = self::get_all_tax_rates();
-		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
-		);
-
-		foreach ( $matching_rates as $i => $rate ) {
-
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
-			}
+    /**
+     * Calculates tax for a line item.
+     *
+     * @param  float   $price              The price to calc tax on.
+     * @param  array   $rates              The rates to apply.
+     * @param  boolean $price_includes_tax Whether the passed price has taxes included.
+     * @return array                       Array of tax name => tax amount.
+     */
+    public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+
+        if ( $price_includes_tax ) {
+            $taxes = self::calc_inclusive_tax( $price, $rates );
+        } else {
+            $taxes = self::calc_exclusive_tax( $price, $rates );
+        }
+
+        return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+
+    }
+
+    /**
+     * Calc tax from inclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_inclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        // Add tax rates.
+        $tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+
+        foreach ( $tax_rates as $name => $rate ) {
+            $the_rate       = ( $rate / 100 ) / $tax_rate;
+            $net_price      = $price - ( $the_rate * $price );
+            $tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
+            $taxes[ $name ] = $tax_amount;
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Calc tax from exclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_exclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        foreach ( $tax_rates as $name => $rate ) {
+
+            $tax_amount     = $price * ( $rate / 100 );
+            $taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Get's an array of all tax rates.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rates() {
+
+        $rates = get_option( 'wpinv_tax_rates', array() );
+
+        return apply_filters(
+            'getpaid_get_all_tax_rates',
+            array_filter( wpinv_parse_list( $rates ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of default tax rates.
+     *
+     * @return array
+     */
+    public static function get_default_tax_rates() {
+
+        return apply_filters(
+            'getpaid_get_default_tax_rates',
+            array(
+                array(
+                    'country' => wpinv_get_default_country(),
+                    'state'   => wpinv_get_default_state(),
+                    'global'  => true,
+                    'rate'    => wpinv_get_default_tax_rate(),
+                    'name'    => __( 'Base Tax', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Get's an array of all tax rules.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rules() {
+
+        $rules = get_option(
+            'wpinv_tax_rules',
+            array(
+                array(
+                    'key'               => 'physical',
+                    'label'             => __( 'Physical Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+                array(
+                    'key'               => 'digital',
+                    'label'             => __( 'Digital Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+            )
+        );
+
+        return apply_filters(
+            'getpaid_tax_rules',
+            array_filter( array_values( wpinv_parse_list( $rules ) ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of tax rates for a given address.
+     *
+     * @param string $country
+     * @param string $state
+     * @return array
+     */
+    public static function get_address_tax_rates( $country, $state ) {
+
+        $all_tax_rates  = self::get_all_tax_rates();
+        $matching_rates = array_merge(
+            wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
+            wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+        );
+
+        foreach ( $matching_rates as $i => $rate ) {
+
+            $states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
+            if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
+                unset( $matching_rates[ $i ] );
+            }
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
-
-	}
-
-	/**
-	 * Sums a set of taxes to form a single total. Result is rounded to precision.
-	 *
-	 * @param  array $taxes Array of taxes.
-	 * @return float
-	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
-	}
-
-	/**
-	 * Round to precision.
-	 *
-	 * Filter example: to return rounding to .5 cents you'd use:
-	 *
-	 * function euro_5cent_rounding( $in ) {
-	 *      return round( $in / 5, 2 ) * 5;
-	 * }
-	 * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
-	 *
-	 * @param float|int $in Value to round.
-	 * @return float
-	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
-	}
+        return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+
+    }
+
+    /**
+     * Sums a set of taxes to form a single total. Result is rounded to precision.
+     *
+     * @param  array $taxes Array of taxes.
+     * @return float
+     */
+    public static function get_tax_total( $taxes ) {
+        return self::round( array_sum( $taxes ) );
+    }
+
+    /**
+     * Round to precision.
+     *
+     * Filter example: to return rounding to .5 cents you'd use:
+     *
+     * function euro_5cent_rounding( $in ) {
+     *      return round( $in / 5, 2 ) * 5;
+     * }
+     * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
+     *
+     * @param float|int $in Value to round.
+     * @return float
+     */
+    public static function round( $in ) {
+        return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Class GetPaid_Tax
@@ -21,15 +21,15 @@ 
 	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
 	 * @return array                       Array of tax name => tax amount.
 	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+	public static function calc_tax($price, $rates, $price_includes_tax = false) {
 
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
+		if ($price_includes_tax) {
+			$taxes = self::calc_inclusive_tax($price, $rates);
 		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
+			$taxes = self::calc_exclusive_tax($price, $rates);
 		}
 
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+		return apply_filters('getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax);
 
 	}
 
@@ -40,22 +40,22 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
+	public static function calc_inclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
 		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+		$tax_rate  = 1 + (array_sum($tax_rates) / 100);
 
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
+		foreach ($tax_rates as $name => $rate) {
+			$the_rate       = ($rate / 100) / $tax_rate;
+			$net_price      = $price - ($the_rate * $price);
+			$tax_amount     = apply_filters('getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price);
+			$taxes[$name] = $tax_amount;
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -67,19 +67,19 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
+	public static function calc_exclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
-		foreach ( $tax_rates as $name => $rate ) {
+		foreach ($tax_rates as $name => $rate) {
 
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+			$tax_amount     = $price * ($rate / 100);
+			$taxes[$name] = apply_filters('getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price);
 
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -91,11 +91,11 @@ 
 	 */
 	public static function get_all_tax_rates() {
 
-		$rates = get_option( 'wpinv_tax_rates', array() );
+		$rates = get_option('wpinv_tax_rates', array());
 
 		return apply_filters(
 			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
+			array_filter(wpinv_parse_list($rates))
 		);
 
 	}
@@ -115,7 +115,7 @@ 
 					'state'   => wpinv_get_default_state(),
 					'global'  => true,
 					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Base Tax', 'invoicing' ),
+					'name'    => __('Base Tax', 'invoicing'),
 				),
 			)
 		);
@@ -134,22 +134,22 @@ 
 			array(
 				array(
 					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Physical Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
 				array(
 					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Digital Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
         	)
 		);
 
 		return apply_filters(
 			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
+			array_filter(array_values(wpinv_parse_list($rules)))
 		);
 
 	}
@@ -161,23 +161,23 @@ 
 	 * @param string $state
 	 * @return array
 	 */
-	public static function get_address_tax_rates( $country, $state ) {
+	public static function get_address_tax_rates($country, $state) {
 
 		$all_tax_rates  = self::get_all_tax_rates();
 		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+			wp_list_filter($all_tax_rates, array('country' => $country)),
+			wp_list_filter($all_tax_rates, array('country' => ''))
 		);
 
-		foreach ( $matching_rates as $i => $rate ) {
+		foreach ($matching_rates as $i => $rate) {
 
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
+			$states = array_filter(wpinv_clean(explode(',', strtolower($rate['state']))));
+			if (empty($rate['global']) && !in_array(strtolower($state), $states)) {
+				unset($matching_rates[$i]);
 			}
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+		return apply_filters('getpaid_get_address_tax_rates', $matching_rates, $country, $state);
 
 	}
 
@@ -187,8 +187,8 @@ 
 	 * @param  array $taxes Array of taxes.
 	 * @return float
 	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
+	public static function get_tax_total($taxes) {
+		return self::round(array_sum($taxes));
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 * @param float|int $in Value to round.
 	 * @return float
 	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+	public static function round($in) {
+		return apply_filters('getpaid_tax_round', round($in, 4), $in);
 	}
 
 }

includes/admin/views/html-tax-rules-edit.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 
 $dummy_rule = array(
     'key'               => 'TAX_RULE_KEY',
-	'label'             => __( 'New Tax Rule', 'invoicing' ),
-	'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+    'label'             => __( 'New Tax Rule', 'invoicing' ),
+    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
     'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
 );
 

Spacing +16 added lines, -16 removed lines

@@ -4,40 +4,40 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $dummy_rule = array(
     'key'               => 'TAX_RULE_KEY',
-	'label'             => __( 'New Tax Rule', 'invoicing' ),
-	'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+	'label'             => __('New Tax Rule', 'invoicing'),
+	'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+    'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 );
 
-wp_nonce_field( 'wpinv_tax_rules', 'wpinv_tax_rules_nonce' );
+wp_nonce_field('wpinv_tax_rules', 'wpinv_tax_rules_nonce');
 
 ?>
 <div class="table-responsive">
     <table id="wpinv-tax-rules" class="widefat fixed table">
-        <caption><?php echo esc_html_e( 'You can use this section to create or edit your tax rules', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('You can use this section to create or edit your tax rules', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Unique Key', 'invoicing' ); ?>
+                    <?php esc_html_e('Unique Key', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Label', 'invoicing' ); ?>
+                    <?php esc_html_e('Label', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Calculate tax based on', 'invoicing' ); ?>
+                    <?php esc_html_e('Calculate tax based on', 'invoicing'); ?>
                 </th>
 
                 <!-- <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Same country rule', 'invoicing' ); ?>
-                    <?php getpaid_get_help_tip( __( 'What should happen if a customer is from the same country as your business?.', 'invoicing' ), 'position-static', true ); ?>
+                    <?php esc_html_e('Same country rule', 'invoicing'); ?>
+                    <?php getpaid_get_help_tip(__('What should happen if a customer is from the same country as your business?.', 'invoicing'), 'position-static', true); ?>
                 </th> -->
 
                 <th scope="col" class="border-bottom border-top" style="width:32px">&nbsp;</th>
@@ -46,8 +46,8 @@ 
         </thead>
 
         <tbody>
-            <?php foreach ( GetPaid_Tax::get_all_tax_rules() as $tax_rule ) : ?>
-                <?php include plugin_dir_path( __FILE__ ) . 'html-tax-rule-edit.php'; ?>
+            <?php foreach (GetPaid_Tax::get_all_tax_rules() as $tax_rule) : ?>
+                <?php include plugin_dir_path(__FILE__) . 'html-tax-rule-edit.php'; ?>
             <?php endforeach; ?>
         </tbody>
 
@@ -55,8 +55,8 @@ 
             <tr class="table-light">
                 <td colspan="4" class="border-top">
 
-                    <button type="button" class="button button-secondary wpinv_add_tax_rule" aria-label="<?php esc_attr_e( 'Add Tax Rule', 'invoicing' ); ?>">
-                        <span><?php esc_html_e( 'Add Tax Rule', 'invoicing' ); ?></span>
+                    <button type="button" class="button button-secondary wpinv_add_tax_rule" aria-label="<?php esc_attr_e('Add Tax Rule', 'invoicing'); ?>">
+                        <span><?php esc_html_e('Add Tax Rule', 'invoicing'); ?></span>
                     </button>
 
                 </td>
@@ -67,6 +67,6 @@ 
 
 <script type="text/html" id="tmpl-wpinv-tax-rule-row">
     <?php $tax_rule = $dummy_rule; ?>
-    <?php include plugin_dir_path( __FILE__ ) . 'html-tax-rule-edit.php'; ?>
+    <?php include plugin_dir_path(__FILE__) . 'html-tax-rule-edit.php'; ?>
 </script>
 

includes/admin/views/wizard-gateways.php

Spacing +18 added lines, -18 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -12,24 +12,24 @@ 
 
     <form method="post" class="text-center card-body">
         <div class="gp-wizard-payments">
-            <h2 class="gd-settings-title h3 "><?php esc_html_e( 'Gateway Setup', 'invoicing' ); ?></h2>
-            <p><?php esc_html_e( 'Below are a few gateways that can be setup in a few seconds.', 'invoicing' ); ?>
+            <h2 class="gd-settings-title h3 "><?php esc_html_e('Gateway Setup', 'invoicing'); ?></h2>
+            <p><?php esc_html_e('Below are a few gateways that can be setup in a few seconds.', 'invoicing'); ?>
                 <br>
-                <?php esc_html_e( 'We have 20+ Gateways that can be setup later.', 'invoicing' ); ?>
+                <?php esc_html_e('We have 20+ Gateways that can be setup later.', 'invoicing'); ?>
             </p>
 
             <ul class="list-group">
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg' ); ?>" class="ml-n2" alt="Stripe"></span>
-				    <?php if ( false === wpinv_get_option( 'stripe_live_connect_account_id' ) ) : ?>
+				    <span class="mr-auto"><img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg'); ?>" class="ml-n2" alt="Stripe"></span>
+				    <?php if (false === wpinv_get_option('stripe_live_connect_account_id')) : ?>
                         <a href="<?php
-                        echo esc_url( wp_nonce_url(
+                        echo esc_url(wp_nonce_url(
                             add_query_arg(
                                 array(
                                     'getpaid-admin-action' => 'connect_gateway',
                                     'plugin'               => 'stripe',
-                                    'redirect'             => urlencode( add_query_arg( 'step', 'payments' ) ),
+                                    'redirect'             => urlencode(add_query_arg('step', 'payments')),
                                 ),
                                 admin_url()
                             ),
@@ -37,31 +37,31 @@ 
                             'getpaid-nonce'
                         ));
                         ?>"
-                        class="btn btn-sm btn-outline-primary"><?php esc_html_e( 'Connect', 'invoicing' ); ?></a>
+                        class="btn btn-sm btn-outline-primary"><?php esc_html_e('Connect', 'invoicing'); ?></a>
                     <?php else : ?>
-                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' ); ?></span>
+                        <span class="btn btn-sm btn-success"><?php esc_html_e('Connected', 'invoicing'); ?></span>
                     <?php endif; ?>
 				</li>
 
 				<li class="list-group-item">
                     <div class="d-flex justify-content-between align-items-center">
                         <span class="mr-auto">
-                            <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp' ); ?>" class="" alt="PayPal" height="25">
+                            <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp'); ?>" class="" alt="PayPal" height="25">
                         </span>
                         <a
                             href="#"
                             onclick="jQuery('.getpaid-setup-paypal-input').toggleClass('d-none'); return false;"
-                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php esc_html_e( 'Set-up', 'invoicing' ); ?></a>
+                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php esc_html_e('Set-up', 'invoicing'); ?></a>
                     </div>
                     <div class="mt-4 getpaid-setup-paypal-input d-none">
-                        <input type="text" placeholder="<?php esc_attr_e( 'PayPal Email', 'invoicing' ); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr( wpinv_get_option( 'paypal_email' ) ); ?>">
+                        <input type="text" placeholder="<?php esc_attr_e('PayPal Email', 'invoicing'); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr(wpinv_get_option('paypal_email')); ?>">
                     </div>
                 </li>
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><?php esc_html_e( 'Test Gateway', 'invoicing' ); ?></span>
+				    <span class="mr-auto"><?php esc_html_e('Test Gateway', 'invoicing'); ?></span>
 					<div class="custom-control custom-switch">
-						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked( wpinv_is_gateway_active( 'manual' ) ); ?>>
+						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked(wpinv_is_gateway_active('manual')); ?>>
 						<label class="custom-control-label" for="enable-manual-gateway"></label>
 					</div>
 				</li>
@@ -70,10 +70,10 @@ 
         </div>
 
         <p class="gp-setup-actions step text-center mt-4">
-			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" />
+			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e('Continue', 'invoicing'); ?>" />
 		</p>
         
-        <?php getpaid_hidden_field( 'save_step', 1 ); ?>
-        <?php wp_nonce_field( 'getpaid-setup-wizard', 'getpaid-setup-wizard' ); ?>
+        <?php getpaid_hidden_field('save_step', 1); ?>
+        <?php wp_nonce_field('getpaid-setup-wizard', 'getpaid-setup-wizard'); ?>
     </form>
 </div>

Braces +5 added lines, -2 removed lines

@@ -38,8 +38,11 @@
                         ));
                         ?>"
                         class="btn btn-sm btn-outline-primary"><?php esc_html_e( 'Connect', 'invoicing' ); ?></a>
-                    <?php else : ?>
-                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' ); ?></span>
+                    <?php else {
+    : ?>
+                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' );
+}
+?></span>
                     <?php endif; ?>
 				</li>
 

templates/payment-forms/embed.php

Indentation +39 added lines, -39 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 
-	// Is the request set up correctly?
-	if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
-		return aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'No payment form or item selected', 'invoicing' ),
-			)
-		);
-		wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
-	}
-
-	// Payment form or button?
-	if ( ! empty( $_GET['form'] ) ) {
-
-		$shortcode = sprintf(
-			'[getpaid form=%s]',
-			(int) $_GET['form']
-		);
-
-	} else {
-
-		$shortcode = sprintf(
-			'[getpaid item=%s]',
-			esc_attr( urldecode( $_GET['item'] ) )
-		);
-
-	}
+    // Is the request set up correctly?
+    if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+        return aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'No payment form or item selected', 'invoicing' ),
+            )
+        );
+        wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
+    }
+
+    // Payment form or button?
+    if ( ! empty( $_GET['form'] ) ) {
+
+        $shortcode = sprintf(
+            '[getpaid form=%s]',
+            (int) $_GET['form']
+        );
+
+    } else {
+
+        $shortcode = sprintf(
+            '[getpaid item=%s]',
+            esc_attr( urldecode( $_GET['item'] ) )
+        );
+
+    }
 
 ?>
 
@@ -44,13 +44,13 @@ 
 
         <title><?php echo esc_html( get_bloginfo( 'name' ) ); ?></title>
 		<?php
-			wp_enqueue_scripts();
-			wp_print_styles();
-			wp_print_head_scripts();
-			wp_custom_css_cb();
-			wpinv_get_template( 'frontend-head.php' );
-			wp_site_icon();
-		?>
+            wp_enqueue_scripts();
+            wp_print_styles();
+            wp_print_head_scripts();
+            wp_custom_css_cb();
+            wpinv_get_template( 'frontend-head.php' );
+            wp_site_icon();
+        ?>
 
 		<style type="text/css">
 			.body{ 
@@ -84,11 +84,11 @@ 
 	<body class="body page-template-default page">
 		<div id="getpaid-form-embed" class="container my-5 page type-page status-publish hentry post post-content">
 			<?php
-				do_action( 'getpaid_payment_form_embed_top' );
-				echo do_shortcode( $shortcode );
-				do_action( 'getpaid_payment_form_embed_bottom' );
-				wpinv_get_template( 'frontend-footer.php' );
-			?>
+                do_action( 'getpaid_payment_form_embed_top' );
+                echo do_shortcode( $shortcode );
+                do_action( 'getpaid_payment_form_embed_bottom' );
+                wpinv_get_template( 'frontend-footer.php' );
+            ?>
 		</div>
 		<?php wp_footer(); ?>
 	</body>

Spacing +12 added lines, -12 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 
 	// Is the request set up correctly?
-	if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+	if (empty($_GET['form']) && empty($_GET['item'])) {
 		return aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'No payment form or item selected', 'invoicing' ),
+				'content' => __('No payment form or item selected', 'invoicing'),
 			)
 		);
-		wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
+		wp_die(esc_html__('No payment form or item selected', 'invoicing'), 400);
 	}
 
 	// Payment form or button?
-	if ( ! empty( $_GET['form'] ) ) {
+	if (!empty($_GET['form'])) {
 
 		$shortcode = sprintf(
 			'[getpaid form=%s]',
@@ -23,7 +23,7 @@ 
 
 		$shortcode = sprintf(
 			'[getpaid item=%s]',
-			esc_attr( urldecode( $_GET['item'] ) )
+			esc_attr(urldecode($_GET['item']))
 		);
 
 	}
@@ -35,20 +35,20 @@ 
 
 	<head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title><?php echo esc_html( get_bloginfo( 'name' ) ); ?></title>
+        <title><?php echo esc_html(get_bloginfo('name')); ?></title>
 		<?php
 			wp_enqueue_scripts();
 			wp_print_styles();
 			wp_print_head_scripts();
 			wp_custom_css_cb();
-			wpinv_get_template( 'frontend-head.php' );
+			wpinv_get_template('frontend-head.php');
 			wp_site_icon();
 		?>
 
@@ -84,10 +84,10 @@ 
 	<body class="body page-template-default page">
 		<div id="getpaid-form-embed" class="container my-5 page type-page status-publish hentry post post-content">
 			<?php
-				do_action( 'getpaid_payment_form_embed_top' );
-				echo do_shortcode( $shortcode );
-				do_action( 'getpaid_payment_form_embed_bottom' );
-				wpinv_get_template( 'frontend-footer.php' );
+				do_action('getpaid_payment_form_embed_top');
+				echo do_shortcode($shortcode);
+				do_action('getpaid_payment_form_embed_bottom');
+				wpinv_get_template('frontend-footer.php');
 			?>
 		</div>
 		<?php wp_footer(); ?>

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

Indentation +269 added lines, -269 removed lines

@@ -13,311 +13,311 @@
 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() ) {
-
-		if ( empty( $subscription ) ) {
-			return;
-		}
-
-		if ( is_array( $subscription ) ) {
-			$subscription = current( $subscription );
-		}
-
-		if ( ! $subscription instanceof WPInv_Subscription ) {
-			return;
-		}
-
-		// 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 %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Failed sending %1$s notification email to %2$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() ) {
+
+        if ( empty( $subscription ) ) {
+            return;
+        }
+
+        if ( is_array( $subscription ) ) {
+            $subscription = current( $subscription );
+        }
+
+        if ( ! $subscription instanceof WPInv_Subscription ) {
+            return;
+        }
+
+        // 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 %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Failed sending %1$s notification email to %2$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->get_results() 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 +73 added lines, -73 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,75 +150,75 @@ 
 	 * @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()) {
 
-		if ( empty( $subscription ) ) {
+		if (empty($subscription)) {
 			return;
 		}
 
-		if ( is_array( $subscription ) ) {
-			$subscription = current( $subscription );
+		if (is_array($subscription)) {
+			$subscription = current($subscription);
 		}
 
-		if ( ! $subscription instanceof WPInv_Subscription ) {
+		if (!$subscription instanceof WPInv_Subscription) {
 			return;
 		}
 
 		// 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 %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Successfully sent %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Failed sending %1$s notification email to %2$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);
 
 	}
 
@@ -227,10 +227,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__);
 
 	}
 
@@ -239,10 +239,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__);
 
 	}
 
@@ -251,10 +251,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__);
 
 	}
 
@@ -263,10 +263,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__);
 
 	}
 
@@ -276,18 +276,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',
@@ -296,8 +296,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'],
@@ -307,14 +307,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions->get_results() as $subscription ) {
+        foreach ($subscriptions->get_results() 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__);
 			}
 		}
 

templates/invoice/invoice-meta.php

Spacing +17 added lines, -17 removed lines

@@ -7,50 +7,50 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$class = ! is_singular( 'page' ) ? 'px-1' : '';
+$class = !is_singular('page') ? 'px-1' : '';
 ?>
 
-        <?php do_action( 'getpaid_before_invoice_meta', $invoice ); ?>
+        <?php do_action('getpaid_before_invoice_meta', $invoice); ?>
         <div class="getpaid-invoice-meta-data">
 
-            <?php do_action( 'getpaid_before_invoice_meta_table', $invoice ); ?>
+            <?php do_action('getpaid_before_invoice_meta_table', $invoice); ?>
             <table class="table table-bordered">
                 <tbody>
 
-                    <?php do_action( 'getpaid_before_invoice_meta_rows', $invoice ); ?>
-                    <?php foreach ( $meta as $key => $data ) : ?>
+                    <?php do_action('getpaid_before_invoice_meta_rows', $invoice); ?>
+                    <?php foreach ($meta as $key => $data) : ?>
 
-                        <?php if ( ! empty( $data['value'] ) ) : ?>
+                        <?php if (!empty($data['value'])) : ?>
 
-                            <?php do_action( "getpaid_before_invoice_meta_$key", $invoice, $data ); ?>
+                            <?php do_action("getpaid_before_invoice_meta_$key", $invoice, $data); ?>
 
-                            <tr class="getpaid-invoice-meta-<?php echo esc_attr( $key ); ?>">
+                            <tr class="getpaid-invoice-meta-<?php echo esc_attr($key); ?>">
 
-                                <th class="<?php echo esc_attr( $class ); ?> font-weight-bold" style="width: 40%">
-                                    <?php echo esc_html( $data['label'] ); ?>
+                                <th class="<?php echo esc_attr($class); ?> font-weight-bold" style="width: 40%">
+                                    <?php echo esc_html($data['label']); ?>
                                 </th>
 
-                                <td class="<?php echo esc_attr( $class ); ?> <?php echo 'invoice_total' === $key ? 'font-weight-bold' : 'font-weight-normal'; ?> text-break" style="width: 60%">
-                                    <span class="getpaid-invoice-meta-<?php echo esc_attr( $key ); ?>-value"><?php echo wp_kses_post( $data['value'] ); ?></span>
+                                <td class="<?php echo esc_attr($class); ?> <?php echo 'invoice_total' === $key ? 'font-weight-bold' : 'font-weight-normal'; ?> text-break" style="width: 60%">
+                                    <span class="getpaid-invoice-meta-<?php echo esc_attr($key); ?>-value"><?php echo wp_kses_post($data['value']); ?></span>
                                 </td>
 
                             </tr>
 
-                            <?php do_action( "getpaid_after_invoice_meta_$key", $invoice, $data ); ?>
+                            <?php do_action("getpaid_after_invoice_meta_$key", $invoice, $data); ?>
 
                         <?php endif; ?>
 
                     <?php endforeach; ?>
-                    <?php do_action( 'getpaid_after_invoice_meta_rows', $invoice ); ?>
+                    <?php do_action('getpaid_after_invoice_meta_rows', $invoice); ?>
 
                 </tbody>
             </table>
-            <?php do_action( 'getpaid_after_invoice_meta_table', $invoice ); ?>
+            <?php do_action('getpaid_after_invoice_meta_table', $invoice); ?>
 
 
         </div>
-        <?php do_action( 'getpaid_after_invoice_meta', $invoice ); ?>
+        <?php do_action('getpaid_after_invoice_meta', $invoice); ?>
 
 <?php