AyeCode / invoicing

templates/emails/fee-item.php

Spacing +21 added lines, -21 removed lines

@@ -10,67 +10,67 @@ 
  * @var array $columns
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
-<?php do_action( 'getpaid_before_email_fee_item', $invoice, $fee ); ?>
+<?php do_action('getpaid_before_email_fee_item', $invoice, $fee); ?>
 
 <tr class="wpinv_cart_item item-fee">
 
-    <?php foreach ( array_keys( $columns ) as $column ) : ?>
+    <?php foreach (array_keys($columns) as $column) : ?>
 
-        <td class="<?php echo 'name' == $column ? 'text-left' : 'text-right'; ?> wpinv_cart_item_<?php echo esc_attr( $column ); ?>">
+        <td class="<?php echo 'name' == $column ? 'text-left' : 'text-right'; ?> wpinv_cart_item_<?php echo esc_attr($column); ?>">
             
             <?php
 
                 // Fires before printing a fee item column.
-                do_action( "getpaid_email_fee_item_before_$column", $fee, $invoice );
+                do_action("getpaid_email_fee_item_before_$column", $fee, $invoice);
 
                 // Item name.
-                if ( 'name' == $column ) {
+                if ('name' == $column) {
 
 				// Display the name.
-				echo '<div class="wpinv_email_cart_item_title">' . esc_html( $fee['name'] ) . '</div>';
+				echo '<div class="wpinv_email_cart_item_title">' . esc_html($fee['name']) . '</div>';
 
 				// And an optional description.
-				$description = empty( $fee['description'] ) ? esc_html__( 'Fee', 'invoicing' ) : esc_html( $fee['description'] );
-				echo wp_kses_post( "<p class='small'>$description</p>" );
+				$description = empty($fee['description']) ? esc_html__('Fee', 'invoicing') : esc_html($fee['description']);
+				echo wp_kses_post("<p class='small'>$description</p>");
 
                 }
 
                 // Item price.
-                if ( 'price' == $column ) {
+                if ('price' == $column) {
 
 				// Display the item price (or recurring price if this is a renewal invoice)
-				if ( $invoice->is_recurring() && $invoice->is_renewal() ) {
-					wpinv_the_price( $fee['recurring_fee'], $invoice->get_currency() );
+				if ($invoice->is_recurring() && $invoice->is_renewal()) {
+					wpinv_the_price($fee['recurring_fee'], $invoice->get_currency());
                     } else {
-                        wpinv_the_price( $fee['initial_fee'], $invoice->get_currency() );
+                        wpinv_the_price($fee['initial_fee'], $invoice->get_currency());
                     }
 }
 
                 // Item quantity.
-                if ( 'quantity' == $column ) {
+                if ('quantity' == $column) {
 				echo '&mdash;';
                 }
 
                 // Item tax.
-                if ( 'tax_rate' == $column ) {
+                if ('tax_rate' == $column) {
 				echo '&mdash;';
                 }
 
                 // Item sub total.
-                if ( 'subtotal' == $column ) {
-				if ( $invoice->is_recurring() && $invoice->is_renewal() ) {
-					wpinv_the_price( $fee['recurring_fee'], $invoice->get_currency() );
+                if ('subtotal' == $column) {
+				if ($invoice->is_recurring() && $invoice->is_renewal()) {
+					wpinv_the_price($fee['recurring_fee'], $invoice->get_currency());
                 } else {
-                    wpinv_the_price( $fee['initial_fee'], $invoice->get_currency() );
+                    wpinv_the_price($fee['initial_fee'], $invoice->get_currency());
                 }
                 }
 
                 // Fires when printing a line item column.
-                do_action( "getpaid_email_fee_item_$column", $fee, $invoice );
+                do_action("getpaid_email_fee_item_$column", $fee, $invoice);
 
             ?>
 
@@ -80,4 +80,4 @@ 
 
 </tr>
 
-<?php do_action( 'getpaid_after_email_fee_item', $invoice, $fee ); ?>
+<?php do_action('getpaid_after_email_fee_item', $invoice, $fee); ?>

includes/admin/subscriptions.php

Spacing +203 added lines, -203 removed lines

@@ -3,7 +3,7 @@ 
  * Contains functions that display the subscriptions admin page.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Render the Subscriptions page
@@ -17,23 +17,23 @@ 
 	?>
 
 	<div class="wrap">
-		<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+		<h1><?php echo esc_html(get_admin_page_title()); ?></h1>
 		<div class="bsui">
 
 			<?php
 
 				// Verify user permissions.
-				if ( ! wpinv_current_user_can_manage_invoicing() ) {
+				if (!wpinv_current_user_can_manage_invoicing()) {
 
 				aui()->alert(
                     array(
 						'type'    => 'danger',
-						'content' => __( 'You are not permitted to view this page.', 'invoicing' ),
+						'content' => __('You are not permitted to view this page.', 'invoicing'),
 					),
 					true
                 );
 
-				} elseif ( ! empty( $_GET['id'] ) && is_numeric( $_GET['id'] ) ) {
+				} elseif (!empty($_GET['id']) && is_numeric($_GET['id'])) {
 
 				// Display a single subscription.
 				wpinv_recurring_subscription_details();
@@ -67,7 +67,7 @@ 
 	<?php $subscribers_table->views(); ?>
 	<form id="subscribers-filter" class="bsui" method="get">
 		<input type="hidden" name="page" value="wpinv-subscriptions" />
-		<?php $subscribers_table->search_box( __( 'Search Subscriptions', 'invoicing' ), 'getpaid-search-subscriptions' ); ?>
+		<?php $subscribers_table->search_box(__('Search Subscriptions', 'invoicing'), 'getpaid-search-subscriptions'); ?>
 		<?php $subscribers_table->display(); ?>
 	</form>
 	<?php
@@ -83,13 +83,13 @@ 
 function wpinv_recurring_subscription_details() {
 
 	// Fetch the subscription.
-	$sub = new WPInv_Subscription( (int) $_GET['id'] );
-	if ( ! $sub->exists() ) {
+	$sub = new WPInv_Subscription((int) $_GET['id']);
+	if (!$sub->exists()) {
 
 		aui()->alert(
 			array(
 				'type'    => 'danger',
-				'content' => __( 'Subscription not found.', 'invoicing' ),
+				'content' => __('Subscription not found.', 'invoicing'),
 			),
 			true
 		);
@@ -98,32 +98,32 @@ 
 	}
 
 	// Use metaboxes to display the subscription details.
-	add_meta_box( 'getpaid_admin_subscription_details_metabox', __( 'Subscription Details', 'invoicing' ), 'getpaid_admin_subscription_details_metabox', get_current_screen(), 'normal', 'high' );
-	add_meta_box( 'getpaid_admin_subscription_update_metabox', __( 'Change Status', 'invoicing' ), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side' );
+	add_meta_box('getpaid_admin_subscription_details_metabox', __('Subscription Details', 'invoicing'), 'getpaid_admin_subscription_details_metabox', get_current_screen(), 'normal', 'high');
+	add_meta_box('getpaid_admin_subscription_update_metabox', __('Change Status', 'invoicing'), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side');
 
 	$subscription_id     = $sub->get_id();
-	$subscription_groups = getpaid_get_invoice_subscription_groups( $sub->get_parent_invoice_id() );
-	$subscription_group  = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
+	$subscription_groups = getpaid_get_invoice_subscription_groups($sub->get_parent_invoice_id());
+	$subscription_group  = wp_list_filter($subscription_groups, compact('subscription_id'));
 
-	if ( 1 < count( $subscription_groups ) ) {
-		add_meta_box( 'getpaid_admin_subscription_related_subscriptions_metabox', __( 'Related Subscriptions', 'invoicing' ), 'getpaid_admin_subscription_related_subscriptions_metabox', get_current_screen(), 'advanced' );
+	if (1 < count($subscription_groups)) {
+		add_meta_box('getpaid_admin_subscription_related_subscriptions_metabox', __('Related Subscriptions', 'invoicing'), 'getpaid_admin_subscription_related_subscriptions_metabox', get_current_screen(), 'advanced');
 	}
 
-	if ( ! empty( $subscription_group ) ) {
-		add_meta_box( 'getpaid_admin_subscription_item_details_metabox', __( 'Subscription Items', 'invoicing' ), 'getpaid_admin_subscription_item_details_metabox', get_current_screen(), 'normal', 'low' );
+	if (!empty($subscription_group)) {
+		add_meta_box('getpaid_admin_subscription_item_details_metabox', __('Subscription Items', 'invoicing'), 'getpaid_admin_subscription_item_details_metabox', get_current_screen(), 'normal', 'low');
 	}
 
-	add_meta_box( 'getpaid_admin_subscription_invoice_details_metabox', __( 'Related Invoices', 'invoicing' ), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced' );
+	add_meta_box('getpaid_admin_subscription_invoice_details_metabox', __('Related Invoices', 'invoicing'), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced');
 
-	do_action( 'getpaid_admin_single_subscription_register_metabox', $sub );
+	do_action('getpaid_admin_single_subscription_register_metabox', $sub);
 
 	?>
 
-		<form method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $sub->get_id() ) ) ); ?>">
+		<form method="post" action="<?php echo esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($sub->get_id()))); ?>">
 
-			<?php wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' ); ?>
-			<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-			<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+			<?php wp_nonce_field('getpaid-nonce', 'getpaid-nonce'); ?>
+			<?php wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false); ?>
+			<?php wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false); ?>
 			<input type="hidden" name="getpaid-admin-action" value="update_single_subscription" />
 			<input type="hidden" name="subscription_id" value="<?php echo (int) $sub->get_id(); ?>" />
 
@@ -131,12 +131,12 @@ 
 				<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 
 					<div id="postbox-container-1" class="postbox-container">
-						<?php do_meta_boxes( get_current_screen(), 'side', $sub ); ?>
+						<?php do_meta_boxes(get_current_screen(), 'side', $sub); ?>
 					</div>
 
 					<div id="postbox-container-2" class="postbox-container">
-						<?php do_meta_boxes( get_current_screen(), 'normal', $sub ); ?>
-						<?php do_meta_boxes( get_current_screen(), 'advanced', $sub ); ?>
+						<?php do_meta_boxes(get_current_screen(), 'normal', $sub); ?>
+						<?php do_meta_boxes(get_current_screen(), 'advanced', $sub); ?>
 					</div>
 
 				</div>
@@ -155,43 +155,43 @@ 
  *
  * @param WPInv_Subscription $sub
  */
-function getpaid_admin_subscription_details_metabox( $sub ) {
+function getpaid_admin_subscription_details_metabox($sub) {
 
 	// Subscription items.
-	$subscription_group = getpaid_get_invoice_subscription_group( $sub->get_parent_invoice_id(), $sub->get_id() );
-	$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+	$subscription_group = getpaid_get_invoice_subscription_group($sub->get_parent_invoice_id(), $sub->get_id());
+	$items_count        = empty($subscription_group) ? 1 : count($subscription_group['items']);
 
 	// Prepare subscription detail columns.
 	$fields = apply_filters(
 		'getpaid_subscription_admin_page_fields',
 		array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'customer'     => __( 'Customer', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'start_date'   => __( 'Start Date', 'invoicing' ),
-			'renews_on'    => __( 'Next Payment', 'invoicing' ),
-			'renewals'     => __( 'Payments', 'invoicing' ),
-			'item'         => _n( 'Item', 'Items', $items_count, 'invoicing' ),
-			'gateway'      => __( 'Payment Method', 'invoicing' ),
-			'profile_id'   => __( 'Profile ID', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
+			'subscription' => __('Subscription', 'invoicing'),
+			'customer'     => __('Customer', 'invoicing'),
+			'amount'       => __('Amount', 'invoicing'),
+			'start_date'   => __('Start Date', 'invoicing'),
+			'renews_on'    => __('Next Payment', 'invoicing'),
+			'renewals'     => __('Payments', 'invoicing'),
+			'item'         => _n('Item', 'Items', $items_count, 'invoicing'),
+			'gateway'      => __('Payment Method', 'invoicing'),
+			'profile_id'   => __('Profile ID', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
 		)
 	);
 
-	if ( ! $sub->is_active() ) {
+	if (!$sub->is_active()) {
 
-		if ( isset( $fields['renews_on'] ) ) {
-			unset( $fields['renews_on'] );
+		if (isset($fields['renews_on'])) {
+			unset($fields['renews_on']);
 		}
 
-		if ( isset( $fields['gateway'] ) ) {
-			unset( $fields['gateway'] );
+		if (isset($fields['gateway'])) {
+			unset($fields['gateway']);
 		}
 }
 
 	$profile_id = $sub->get_profile_id();
-	if ( empty( $profile_id ) && isset( $fields['profile_id'] ) ) {
-		unset( $fields['profile_id'] );
+	if (empty($profile_id) && isset($fields['profile_id'])) {
+		unset($fields['profile_id']);
 	}
 
 	?>
@@ -199,16 +199,16 @@ 
 		<table class="table table-borderless" style="font-size: 14px;">
 			<tbody>
 
-				<?php foreach ( $fields as $key => $label ) : ?>
+				<?php foreach ($fields as $key => $label) : ?>
 
-					<tr class="getpaid-subscription-meta-<?php echo esc_attr( $key ); ?>">
+					<tr class="getpaid-subscription-meta-<?php echo esc_attr($key); ?>">
 
 						<th class="w-25" style="font-weight: 500;">
-							<?php echo esc_html( $label ); ?>
+							<?php echo esc_html($label); ?>
 						</th>
 
 						<td class="w-75 text-muted">
-							<?php do_action( 'getpaid_subscription_admin_display_' . sanitize_key( $key ), $sub, $subscription_group ); ?>
+							<?php do_action('getpaid_subscription_admin_display_' . sanitize_key($key), $sub, $subscription_group); ?>
 						</td>
 
 					</tr>
@@ -226,135 +226,135 @@ 
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_customer( $subscription ) {
+function getpaid_admin_subscription_metabox_display_customer($subscription) {
 
-	$username = __( '(Missing User)', 'invoicing' );
+	$username = __('(Missing User)', 'invoicing');
 
-	$user = get_userdata( $subscription->get_customer_id() );
-	if ( $user ) {
+	$user = get_userdata($subscription->get_customer_id());
+	if ($user) {
 
 		$username = sprintf(
 			'<a href="user-edit.php?user_id=%s">%s</a>',
-			absint( $user->ID ),
-			! empty( $user->display_name ) ? esc_html( $user->display_name ) : sanitize_email( $user->user_email )
+			absint($user->ID),
+			!empty($user->display_name) ? esc_html($user->display_name) : sanitize_email($user->user_email)
 		);
 
 	}
 
-	echo wp_kses_post( $username );
+	echo wp_kses_post($username);
 }
-add_action( 'getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer' );
+add_action('getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer');
 
 /**
  * Displays the subscription amount.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_amount( $subscription ) {
-	$amount    = getpaid_get_formatted_subscription_amount( $subscription );
-	echo wp_kses_post( "<span>$amount</span>" );
+function getpaid_admin_subscription_metabox_display_amount($subscription) {
+	$amount = getpaid_get_formatted_subscription_amount($subscription);
+	echo wp_kses_post("<span>$amount</span>");
 }
-add_action( 'getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount' );
+add_action('getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount');
 
 /**
  * Displays the subscription id.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_id( $subscription ) {
+function getpaid_admin_subscription_metabox_display_id($subscription) {
 
 	printf(
 		'<a href="%s">#%s</a>',
-		esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $subscription->get_id() ) ) ),
-		absint( $subscription->get_id() )
+		esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($subscription->get_id()))),
+		absint($subscription->get_id())
 	);
 
 }
-add_action( 'getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id' );
+add_action('getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id');
 
 /**
  * Displays the subscription renewal date.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_start_date( $subscription ) {
-	echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+function getpaid_admin_subscription_metabox_display_start_date($subscription) {
+	echo esc_html(getpaid_format_date_value($subscription->get_date_created()));
 }
-add_action( 'getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date' );
+add_action('getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date');
 
 /**
  * Displays the subscription renewal date.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_renews_on( $subscription ) {
-	echo esc_html( getpaid_format_date_value( $subscription->get_expiration() ) );
+function getpaid_admin_subscription_metabox_display_renews_on($subscription) {
+	echo esc_html(getpaid_format_date_value($subscription->get_expiration()));
 }
-add_action( 'getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on' );
+add_action('getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on');
 
 /**
  * Displays the subscription renewal count.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_renewals( $subscription ) {
+function getpaid_admin_subscription_metabox_display_renewals($subscription) {
 	$max_bills = $subscription->get_bill_times();
-	echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
+	echo ((int) $subscription->get_times_billed()) . ' / ' . (empty($max_bills) ? '&infin;' : (int) $max_bills);
 }
-add_action( 'getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals' );
+add_action('getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals');
 /**
  * Displays the subscription item.
  *
  * @param WPInv_Subscription $subscription
  * @param false|array $subscription_group
  */
-function getpaid_admin_subscription_metabox_display_item( $subscription, $subscription_group = false ) {
+function getpaid_admin_subscription_metabox_display_item($subscription, $subscription_group = false) {
 
-	if ( empty( $subscription_group ) ) {
-		echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+	if (empty($subscription_group)) {
+		echo wp_kses_post(WPInv_Subscriptions_List_Table::generate_item_markup($subscription->get_product_id()));
 		return;
 	}
 
-	$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-	echo wp_kses_post( implode( ' | ', $markup ) );
+	$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+	echo wp_kses_post(implode(' | ', $markup));
 
 }
-add_action( 'getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item', 10, 2 );
+add_action('getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item', 10, 2);
 
 /**
  * Displays the subscription gateway.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_gateway( $subscription ) {
+function getpaid_admin_subscription_metabox_display_gateway($subscription) {
 
 	$gateway = $subscription->get_gateway();
 
-	if ( ! empty( $gateway ) ) {
-		echo esc_html( wpinv_get_gateway_admin_label( $gateway ) );
+	if (!empty($gateway)) {
+		echo esc_html(wpinv_get_gateway_admin_label($gateway));
 	} else {
 		echo '&mdash;';
 	}
 
 }
-add_action( 'getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway' );
+add_action('getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway');
 
 /**
  * Displays the subscription status.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_status( $subscription ) {
-	echo wp_kses_post( $subscription->get_status_label_html() );
+function getpaid_admin_subscription_metabox_display_status($subscription) {
+	echo wp_kses_post($subscription->get_status_label_html());
 }
-add_action( 'getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status' );
+add_action('getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status');
 
 /**
  * Displays the subscription profile id.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_profile_id( $subscription ) {
+function getpaid_admin_subscription_metabox_display_profile_id($subscription) {
 
 	$profile_id = $subscription->get_profile_id();
 
@@ -363,30 +363,30 @@ 
 			'type'              => 'text',
 			'id'                => 'wpinv_subscription_profile_id',
 			'name'              => 'wpinv_subscription_profile_id',
-			'label'             => __( 'Profile Id', 'invoicing' ),
+			'label'             => __('Profile Id', 'invoicing'),
 			'label_type'        => 'hidden',
-			'placeholder'       => __( 'Profile Id', 'invoicing' ),
-			'value'             => esc_attr( $profile_id ),
+			'placeholder'       => __('Profile Id', 'invoicing'),
+			'value'             => esc_attr($profile_id),
 			'input_group_right' => '',
 			'no_wrap'           => true,
 		),
 		true
 	);
 
-	$url = apply_filters( 'getpaid_remote_subscription_profile_url', '', $subscription );
-	if ( ! empty( $url ) ) {
-		echo '&nbsp;<a href="' . esc_url_raw( $url ) . '" title="' . esc_attr__( 'View in Gateway', 'invoicing' ) . '" target="_blank"><i class="fas fa-external-link-alt fa-xs fa-fw align-top"></i></a>';
+	$url = apply_filters('getpaid_remote_subscription_profile_url', '', $subscription);
+	if (!empty($url)) {
+		echo '&nbsp;<a href="' . esc_url_raw($url) . '" title="' . esc_attr__('View in Gateway', 'invoicing') . '" target="_blank"><i class="fas fa-external-link-alt fa-xs fa-fw align-top"></i></a>';
 	}
 
 }
-add_action( 'getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id' );
+add_action('getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id');
 
 /**
  * Displays the subscriptions update metabox.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_update_metabox( $subscription ) {
+function getpaid_admin_subscription_update_metabox($subscription) {
 
 	?>
 	<div class="mt-3">
@@ -399,10 +399,10 @@ 
 					'id'        => 'subscription_status_update_select',
 					'required'  => true,
 					'no_wrap'   => false,
-					'label'     => __( 'Subscription Status', 'invoicing' ),
-					'help_text' => __( 'Updating the status will trigger related actions and hooks', 'invoicing' ),
+					'label'     => __('Subscription Status', 'invoicing'),
+					'help_text' => __('Updating the status will trigger related actions and hooks', 'invoicing'),
 					'select2'   => true,
-					'value'     => $subscription->get_status( 'edit' ),
+					'value'     => $subscription->get_status('edit'),
 				),
 				true
 			);
@@ -411,14 +411,14 @@ 
 		<div class="mt-2 px-3 py-2 bg-light border-top" style="margin: -12px;">
 
 		<?php
-			submit_button( __( 'Update', 'invoicing' ), 'primary', 'submit', false );
+			submit_button(__('Update', 'invoicing'), 'primary', 'submit', false);
 
-			$url    = wp_nonce_url( add_query_arg( 'getpaid-admin-action', 'subscription_manual_renew' ), 'getpaid-nonce', 'getpaid-nonce' );
-			$anchor = __( 'Renew Subscription', 'invoicing' );
-			$title  = esc_attr__( 'Are you sure you want to extend the subscription and generate a new invoice that will be automatically marked as paid?', 'invoicing' );
+			$url    = wp_nonce_url(add_query_arg('getpaid-admin-action', 'subscription_manual_renew'), 'getpaid-nonce', 'getpaid-nonce');
+			$anchor = __('Renew Subscription', 'invoicing');
+			$title  = esc_attr__('Are you sure you want to extend the subscription and generate a new invoice that will be automatically marked as paid?', 'invoicing');
 
-			if ( $subscription->is_active() ) {
-			echo "<a href='" . esc_url( $url ) . "' class='float-right text-muted' onclick='return confirm(\"" . esc_attr( $title ) . "\")'>" . esc_html( $anchor ) . "</a>";
+			if ($subscription->is_active()) {
+			echo "<a href='" . esc_url($url) . "' class='float-right text-muted' onclick='return confirm(\"" . esc_attr($title) . "\")'>" . esc_html($anchor) . "</a>";
 			}
 
 	echo '</div></div>';
@@ -430,44 +430,44 @@ 
  * @param WPInv_Subscription $subscription
  * @param bool $strict Whether or not to skip invoices of sibling subscriptions
  */
-function getpaid_admin_subscription_invoice_details_metabox( $subscription, $strict = true ) {
+function getpaid_admin_subscription_invoice_details_metabox($subscription, $strict = true) {
 
 	$columns = apply_filters(
 		'getpaid_subscription_related_invoices_columns',
 		array(
-			'invoice'      => __( 'Invoice', 'invoicing' ),
-			'relationship' => __( 'Relationship', 'invoicing' ),
-			'date'         => __( 'Date', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-			'total'        => __( 'Total', 'invoicing' ),
+			'invoice'      => __('Invoice', 'invoicing'),
+			'relationship' => __('Relationship', 'invoicing'),
+			'date'         => __('Date', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
+			'total'        => __('Total', 'invoicing'),
 		),
 		$subscription
 	);
 
 	// Prepare the invoices.
-	$payments = $subscription->get_child_payments( ! is_admin() );
+	$payments = $subscription->get_child_payments(!is_admin());
 	$parent   = $subscription->get_parent_invoice();
 
-	if ( $parent->exists() ) {
-		$payments = array_merge( array( $parent ), $payments );
+	if ($parent->exists()) {
+		$payments = array_merge(array($parent), $payments);
 	}
 
 	$table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
+	if (!is_admin()) {
 		$table_class = 'table table-bordered';
 	}
 
 	?>
 		<div class="m-0" style="overflow: auto;">
 
-			<table class="<?php echo esc_attr( $table_class ); ?>">
+			<table class="<?php echo esc_attr($table_class); ?>">
 
 				<thead>
 					<tr>
 						<?php
-							foreach ( $columns as $key => $label ) {
-							echo "<th class='subscription-invoice-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
+							foreach ($columns as $key => $label) {
+							echo "<th class='subscription-invoice-field-" . esc_attr($key) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html($label) . "</th>";
 							}
 						?>
 					</tr>
@@ -475,71 +475,71 @@ 
 
 				<tbody>
 
-					<?php if ( empty( $payments ) ) : ?>
+					<?php if (empty($payments)) : ?>
 						<tr>
-							<td colspan="<?php echo count( $columns ); ?>" class="p-2 text-left text-muted">
-								<?php esc_html_e( 'This subscription has no invoices.', 'invoicing' ); ?>
+							<td colspan="<?php echo count($columns); ?>" class="p-2 text-left text-muted">
+								<?php esc_html_e('This subscription has no invoices.', 'invoicing'); ?>
 							</td>
 						</tr>
 					<?php endif; ?>
 
 					<?php
 
-						foreach ( $payments as $payment ) :
+						foreach ($payments as $payment) :
 
 						// Ensure that we have an invoice.
-						$payment = new WPInv_Invoice( $payment );
+						$payment = new WPInv_Invoice($payment);
 
 						// Abort if the invoice is invalid...
-						if ( ! $payment->exists() ) {
+						if (!$payment->exists()) {
 							continue;
 							}
 
 						// ... or belongs to a different subscription.
-						if ( $strict && $payment->is_renewal() && $payment->get_subscription_id() && $payment->get_subscription_id() != $subscription->get_id() ) {
+						if ($strict && $payment->is_renewal() && $payment->get_subscription_id() && $payment->get_subscription_id() != $subscription->get_id()) {
 							continue;
 							}
 
 						echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+						foreach (array_keys($columns) as $key) {
 
 							echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+								switch ($key) {
 
 								case 'total':
 										echo '<strong>';
-										wpinv_the_price( $payment->get_total(), $payment->get_currency() );
+										wpinv_the_price($payment->get_total(), $payment->get_currency());
 										echo '</strong>';
 									break;
 
 								case 'relationship':
-										echo $payment->is_renewal() ? esc_html__( 'Renewal Invoice', 'invoicing' ) : esc_html__( 'Initial Invoice', 'invoicing' );
+										echo $payment->is_renewal() ? esc_html__('Renewal Invoice', 'invoicing') : esc_html__('Initial Invoice', 'invoicing');
 									break;
 
 								case 'date':
-									echo esc_html( getpaid_format_date_value( $payment->get_date_created() ) );
+									echo esc_html(getpaid_format_date_value($payment->get_date_created()));
 									break;
 
 								case 'status':
 										$status = $payment->get_status_nicename();
-										if ( is_admin() ) {
+										if (is_admin()) {
 										$status = $payment->get_status_label_html();
 										}
 
-										echo wp_kses_post( $status );
+										echo wp_kses_post($status);
 									break;
 
 								case 'invoice':
-										$link    = esc_url( get_edit_post_link( $payment->get_id() ) );
+										$link = esc_url(get_edit_post_link($payment->get_id()));
 
-										if ( ! is_admin() ) {
-										$link = esc_url( $payment->get_view_url() );
+										if (!is_admin()) {
+										$link = esc_url($payment->get_view_url());
 										}
 
-										$invoice = esc_html( $payment->get_number() );
-										echo wp_kses_post( "<a href='$link'>$invoice</a>" );
+										$invoice = esc_html($payment->get_number());
+										echo wp_kses_post("<a href='$link'>$invoice</a>");
 									break;
 										}
 
@@ -566,12 +566,12 @@ 
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_item_details_metabox( $subscription ) {
+function getpaid_admin_subscription_item_details_metabox($subscription) {
 
 	// Fetch the subscription group.
-	$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_payment_id(), $subscription->get_id() );
+	$subscription_group = getpaid_get_invoice_subscription_group($subscription->get_parent_payment_id(), $subscription->get_id());
 
-	if ( empty( $subscription_group ) || empty( $subscription_group['items'] ) ) {
+	if (empty($subscription_group) || empty($subscription_group['items'])) {
 		return;
 	}
 
@@ -579,12 +579,12 @@ 
 	$columns = apply_filters(
 		'getpaid_subscription_item_details_columns',
 		array(
-			'item_name' => __( 'Item', 'invoicing' ),
-			'price'     => __( 'Price', 'invoicing' ),
-			'tax'       => __( 'Tax', 'invoicing' ),
-			'discount'  => __( 'Discount', 'invoicing' ),
+			'item_name' => __('Item', 'invoicing'),
+			'price'     => __('Price', 'invoicing'),
+			'tax'       => __('Tax', 'invoicing'),
+			'discount'  => __('Discount', 'invoicing'),
 			//'initial'      => __( 'Initial Amount', 'invoicing' ),
-			'recurring' => __( 'Subtotal', 'invoicing' ),
+			'recurring' => __('Subtotal', 'invoicing'),
 		),
 		$subscription
 	);
@@ -593,27 +593,27 @@ 
 
 	$invoice = $subscription->get_parent_invoice();
 
-	if ( ( ! wpinv_use_taxes() || ! $invoice->is_taxable() ) && isset( $columns['tax'] ) ) {
-		unset( $columns['tax'] );
+	if ((!wpinv_use_taxes() || !$invoice->is_taxable()) && isset($columns['tax'])) {
+		unset($columns['tax']);
 	}
 
 	$table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
+	if (!is_admin()) {
 		$table_class = 'table table-bordered';
 	}
 
 	?>
 		<div class="m-0" style="overflow: auto;">
 
-			<table class="<?php echo esc_attr( $table_class ); ?>">
+			<table class="<?php echo esc_attr($table_class); ?>">
 
 				<thead>
 					<tr>
 						<?php
 
-							foreach ( $columns as $key => $label ) {
-							echo "<th class='subscription-item-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
+							foreach ($columns as $key => $label) {
+							echo "<th class='subscription-item-field-" . esc_attr($key) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html($label) . "</th>";
 							}
 						?>
 					</tr>
@@ -623,48 +623,48 @@ 
 
 					<?php
 
-						foreach ( $subscription_group['items'] as $subscription_group_item ) :
+						foreach ($subscription_group['items'] as $subscription_group_item) :
 
 						echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+						foreach (array_keys($columns) as $key) {
 
 							$class = 'text-left';
 
 							echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+								switch ($key) {
 
 								case 'item_name':
-										$item_name = get_the_title( $subscription_group_item['item_id'] );
-										$item_name = empty( $item_name ) ? $subscription_group_item['item_name'] : $item_name;
+										$item_name = get_the_title($subscription_group_item['item_id']);
+										$item_name = empty($item_name) ? $subscription_group_item['item_name'] : $item_name;
 
-										if ( $invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity'] ) {
-										echo esc_html( $item_name );
+										if ($invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity']) {
+										echo esc_html($item_name);
 										} else {
-										printf( '%1$s x %2$d', esc_html( $item_name ), (float) $subscription_group_item['quantity'] );
+										printf('%1$s x %2$d', esc_html($item_name), (float) $subscription_group_item['quantity']);
 											}
 
 									break;
 
 								case 'price':
-									wpinv_the_price( $subscription_group_item['item_price'], $invoice->get_currency() );
+									wpinv_the_price($subscription_group_item['item_price'], $invoice->get_currency());
 									break;
 
 								case 'tax':
-									wpinv_the_price( $subscription_group_item['tax'], $invoice->get_currency() );
+									wpinv_the_price($subscription_group_item['tax'], $invoice->get_currency());
 									break;
 
 								case 'discount':
-									wpinv_the_price( $subscription_group_item['discount'], $invoice->get_currency() );
+									wpinv_the_price($subscription_group_item['discount'], $invoice->get_currency());
 									break;
 
 								case 'initial':
-									wpinv_the_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() );
+									wpinv_the_price($subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency());
 									break;
 
 								case 'recurring':
-										echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() ) . '</strong>' );
+										echo wp_kses_post('<strong>' . wpinv_price($subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency()) . '</strong>');
 									break;
 
 										}
@@ -677,24 +677,24 @@ 
 
 						endforeach;
 
-						foreach ( $subscription_group['fees'] as $subscription_group_fee ) :
+						foreach ($subscription_group['fees'] as $subscription_group_fee) :
 
 						echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+						foreach (array_keys($columns) as $key) {
 
 							$class = 'text-left';
 
 							echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+								switch ($key) {
 
 								case 'item_name':
-										echo esc_html( $subscription_group_fee['name'] );
+										echo esc_html($subscription_group_fee['name']);
 									break;
 
 								case 'price':
-									wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
+									wpinv_the_price($subscription_group_fee['initial_fee'], $invoice->get_currency());
 									break;
 
 								case 'tax':
@@ -706,11 +706,11 @@ 
 									break;
 
 								case 'initial':
-									wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
+									wpinv_the_price($subscription_group_fee['initial_fee'], $invoice->get_currency());
 									break;
 
 								case 'recurring':
-										echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_fee['recurring_fee'], $invoice->get_currency() ) . '</strong>' );
+										echo wp_kses_post('<strong>' . wpinv_price($subscription_group_fee['recurring_fee'], $invoice->get_currency()) . '</strong>');
 									break;
 
 										}
@@ -739,12 +739,12 @@ 
  * @param WPInv_Subscription $subscription
  * @param bool $skip_current
  */
-function getpaid_admin_subscription_related_subscriptions_metabox( $subscription, $skip_current = true ) {
+function getpaid_admin_subscription_related_subscriptions_metabox($subscription, $skip_current = true) {
 
 	// Fetch the subscription groups.
-	$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_payment_id() );
+	$subscription_groups = getpaid_get_invoice_subscription_groups($subscription->get_parent_payment_id());
 
-	if ( empty( $subscription_groups ) ) {
+	if (empty($subscription_groups)) {
 		return;
 	}
 
@@ -752,37 +752,37 @@ 
 	$columns = apply_filters(
 		'getpaid_subscription_related_subscriptions_columns',
 		array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'start_date'   => __( 'Start Date', 'invoicing' ),
-			'renewal_date' => __( 'Next Payment', 'invoicing' ),
-			'renewals'     => __( 'Payments', 'invoicing' ),
-			'item'         => __( 'Items', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
+			'subscription' => __('Subscription', 'invoicing'),
+			'start_date'   => __('Start Date', 'invoicing'),
+			'renewal_date' => __('Next Payment', 'invoicing'),
+			'renewals'     => __('Payments', 'invoicing'),
+			'item'         => __('Items', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
 		),
 		$subscription
 	);
 
-	if ( $subscription->get_status() == 'pending' ) {
-		unset( $columns['start_date'], $columns['renewal_date'] );
+	if ($subscription->get_status() == 'pending') {
+		unset($columns['start_date'], $columns['renewal_date']);
 	}
 
 	$table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
+	if (!is_admin()) {
 		$table_class = 'table table-bordered';
 	}
 
 	?>
 		<div class="m-0" style="overflow: auto;">
 
-			<table class="<?php echo esc_attr( $table_class ); ?>">
+			<table class="<?php echo esc_attr($table_class); ?>">
 
 				<thead>
 					<tr>
 						<?php
 
-							foreach ( $columns as $key => $label ) {
-							echo "<th class='related-subscription-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
+							foreach ($columns as $key => $label) {
+							echo "<th class='related-subscription-field-" . esc_attr($key) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html($label) . "</th>";
 							}
 						?>
 					</tr>
@@ -792,62 +792,62 @@ 
 
 					<?php
 
-						foreach ( $subscription_groups as $subscription_group ) :
+						foreach ($subscription_groups as $subscription_group) :
 
 						// Do not list current subscription.
-						if ( $skip_current && (int) $subscription_group['subscription_id'] === $subscription->get_id() ) {
+						if ($skip_current && (int) $subscription_group['subscription_id'] === $subscription->get_id()) {
 							continue;
 							}
 
 						// Ensure the subscription exists.
-						$_suscription = new WPInv_Subscription( $subscription_group['subscription_id'] );
+						$_suscription = new WPInv_Subscription($subscription_group['subscription_id']);
 
-						if ( ! $_suscription->exists() ) {
+						if (!$_suscription->exists()) {
 							continue;
 							}
 
 						echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+						foreach (array_keys($columns) as $key) {
 
 							$class = 'text-left';
 
 							echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+								switch ($key) {
 
 								case 'status':
-										echo wp_kses_post( $_suscription->get_status_label_html() );
+										echo wp_kses_post($_suscription->get_status_label_html());
 									break;
 
 								case 'item':
-											$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-											echo wp_kses_post( implode( ' | ', $markup ) );
+											$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+											echo wp_kses_post(implode(' | ', $markup));
 									break;
 
 								case 'renewals':
 									$max_bills = $_suscription->get_bill_times();
-									echo ( (int) $_suscription->get_times_billed() ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
+									echo ((int) $_suscription->get_times_billed()) . ' / ' . (empty($max_bills) ? '&infin;' : (int) $max_bills);
 									break;
 
 								case 'renewal_date':
-										echo $_suscription->is_active() ? esc_html( getpaid_format_date_value( $_suscription->get_expiration() ) ) : '&mdash;';
+										echo $_suscription->is_active() ? esc_html(getpaid_format_date_value($_suscription->get_expiration())) : '&mdash;';
 									break;
 
 								case 'start_date':
-										echo 'pending' == $_suscription->get_status() ? '&mdash;' : esc_html( getpaid_format_date_value( $_suscription->get_date_created() ) );
+										echo 'pending' == $_suscription->get_status() ? '&mdash;' : esc_html(getpaid_format_date_value($_suscription->get_date_created()));
 									break;
 
 								case 'subscription':
-										$url = is_admin() ? admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $_suscription->get_id() ) ) : $_suscription->get_view_url();
+										$url = is_admin() ? admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($_suscription->get_id())) : $_suscription->get_view_url();
 										printf(
                                             '%1$s#%2$s%3$s',
-                                            '<a href="' . esc_url( $url ) . '">',
-                                            '<strong>' . intval( $_suscription->get_id() ) . '</strong>',
+                                            '<a href="' . esc_url($url) . '">',
+                                            '<strong>' . intval($_suscription->get_id()) . '</strong>',
 											'</a>'
                                         );
 
-											echo wp_kses_post( WPInv_Subscriptions_List_Table::column_amount( $_suscription ) );
+											echo wp_kses_post(WPInv_Subscriptions_List_Table::column_amount($_suscription));
 									break;
 
 										}

includes/reports/class-getpaid-reports-report.php

Spacing +77 added lines, -77 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report Class.
@@ -23,26 +23,26 @@ 
 	 */
 	public function __construct() {
 
-		$this->views        = array(
+		$this->views = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
+				'label' => __('Items', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Items',
 			),
 
 			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
+				'label' => __('Payment Methods', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Gateways',
 			),
 
 			'discounts' => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
+				'label' => __('Discount Codes', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Discounts',
 			),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
+		$this->views = apply_filters('wpinv_report_views', $this->views);
 
 	}
 
@@ -53,8 +53,8 @@ 
 	public function get_range() {
 		$valid_ranges = $this->get_periods();
 
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
+		if (isset($_GET['date_range']) && array_key_exists($_GET['date_range'], $valid_ranges)) {
+			return sanitize_key($_GET['date_range']);
 		}
 
 		return '7_days';
@@ -68,22 +68,22 @@ 
 	public function get_periods() {
 
 		$periods = array(
-			'today'        => __( 'Today', 'invoicing' ),
-			'yesterday'    => __( 'Yesterday', 'invoicing' ),
-			'week'         => __( 'This week', 'invoicing' ),
-			'last_week'    => __( 'Last week', 'invoicing' ),
-			'7_days'       => __( 'Last 7 days', 'invoicing' ),
-			'month'        => __( 'This month', 'invoicing' ),
-			'last_month'   => __( 'Last month', 'invoicing' ),
-			'30_days'      => __( 'Last 30 days', 'invoicing' ),
-			'quarter'      => __( 'This Quarter', 'invoicing' ),
-			'last_quarter' => __( 'Last Quarter', 'invoicing' ),
-			'year'         => __( 'This year', 'invoicing' ),
-			'last_year'    => __( 'Last Year', 'invoicing' ),
-			'custom'       => __( 'Custom Date Range', 'invoicing' ),
+			'today'        => __('Today', 'invoicing'),
+			'yesterday'    => __('Yesterday', 'invoicing'),
+			'week'         => __('This week', 'invoicing'),
+			'last_week'    => __('Last week', 'invoicing'),
+			'7_days'       => __('Last 7 days', 'invoicing'),
+			'month'        => __('This month', 'invoicing'),
+			'last_month'   => __('Last month', 'invoicing'),
+			'30_days'      => __('Last 30 days', 'invoicing'),
+			'quarter'      => __('This Quarter', 'invoicing'),
+			'last_quarter' => __('Last Quarter', 'invoicing'),
+			'year'         => __('This year', 'invoicing'),
+			'last_year'    => __('Last Year', 'invoicing'),
+			'custom'       => __('Custom Date Range', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
@@ -96,21 +96,21 @@ 
 		?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
-				<?php getpaid_hidden_field( 'page', isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : 'wpinv-reports' ); ?>
-				<?php getpaid_hidden_field( 'tab', 'reports' ); ?>
+				<?php getpaid_hidden_field('page', isset($_GET['page']) ? sanitize_text_field($_GET['page']) : 'wpinv-reports'); ?>
+				<?php getpaid_hidden_field('tab', 'reports'); ?>
 				<select name='date_range'>
-					<?php foreach ( $this->get_periods() as $key => $label ) : ?>
-						<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $range ); ?>><?php echo esc_html( $label ); ?></option>
+					<?php foreach ($this->get_periods() as $key => $label) : ?>
+						<option value="<?php echo esc_attr($key); ?>" <?php selected($key, $range); ?>><?php echo esc_html($label); ?></option>
 					<?php endforeach; ?>
 				</select>
 				<span class="getpaid-date-range-picker <?php echo 'custom' == $range ? '' : 'd-none'; ?>">
 					<input type="text" name="from" class="getpaid-from align-middle" />
-						<?php esc_html_e( 'to', 'invoicing' ); ?>
+						<?php esc_html_e('to', 'invoicing'); ?>
 					<input type="text" name="to" class="getpaid-to align-middle" />
 				</span>
 				<button type="submit" class="button button-primary">
 					<i class="fa fa-chevron-right fa-lg"></i>
-					<span class="screen-reader-text"><?php esc_html_e( 'View Reports', 'invoicing' ); ?></span>
+					<span class="screen-reader-text"><?php esc_html_e('View Reports', 'invoicing'); ?></span>
 				</button>
 			</form>
 
@@ -159,17 +159,17 @@ 
 
 				<div class="col-12 col-md-4">
 					<div class="row getpaid-report-cards">
-						<?php foreach ( $this->get_cards() as $key => $card ) : ?>
+						<?php foreach ($this->get_cards() as $key => $card) : ?>
 							<div class="col-12 mb-4">
 
-								<!-- <?php echo esc_html( $card['label'] ); ?> Card -->
-								<div class="card p-0 m-0 shadow-none <?php echo esc_attr( $key ); ?>">
+								<!-- <?php echo esc_html($card['label']); ?> Card -->
+								<div class="card p-0 m-0 shadow-none <?php echo esc_attr($key); ?>">
 
 									<div class="card-body">
 
 										<p class="getpaid-current text-uppercase small mb-2">
-											<strong><?php echo esc_html( $card['label'] ); ?></strong>
-											<span title="<?php echo esc_attr( $card['description'] ); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
+											<strong><?php echo esc_html($card['label']); ?></strong>
+											<span title="<?php echo esc_attr($card['description']); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
 										</p>
 										<h5 class="font-weight-bold mb-0">
 											<span class="getpaid-report-card-value">
@@ -180,7 +180,7 @@ 
 
 										<hr>
 
-										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php esc_html_e( 'Previous Period', 'invoicing' ); ?></strong></p>
+										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php esc_html_e('Previous Period', 'invoicing'); ?></strong></p>
 										<h5 class="getpaid-report-card-previous-value font-weight-bold text-muted mb-0">
 											<span class="spinner is-active float-none"></span>
 										</h5>
@@ -188,7 +188,7 @@ 
 									</div>
 
 								</div>
-								<!-- <?php echo esc_html( $card['label'] ); ?> Card -->
+								<!-- <?php echo esc_html($card['label']); ?> Card -->
 
 							</div>
 						<?php endforeach; ?>
@@ -213,15 +213,15 @@ 
 
 		?>
 
-			<?php foreach ( $graphs as $key => $graph ) : ?>
+			<?php foreach ($graphs as $key => $graph) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0 single-report-card" style="max-width:100%">
 							<div class="card-header">
-								<strong><?php echo esc_html( $graph ); ?></strong>
+								<strong><?php echo esc_html($graph); ?></strong>
 							</div>
 							<div class="card-body">
-								<canvas id="getpaid-chartjs-<?php echo esc_attr( $key ); ?>"></canvas>
+								<canvas id="getpaid-chartjs-<?php echo esc_attr($key); ?>"></canvas>
 							</div>
 						</div>
 					</div>
@@ -236,14 +236,14 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $graph, $file_type ) {
+	public function get_download_url($graph, $file_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'download_graph',
-					'file_type'            => urlencode( $file_type ),
-					'graph'                => urlencode( $graph ),
+					'file_type'            => urlencode($file_type),
+					'graph'                => urlencode($graph),
 				)
 			),
 			'getpaid-nonce',
@@ -260,27 +260,27 @@ 
 
 		?>
 
-			<?php foreach ( $this->views as $key => $view ) : ?>
+			<?php foreach ($this->views as $key => $view) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
 							<div class="card-header">
 								<div class="row">
-									<div class="<?php echo empty( $view['disable-downloads'] ) ? 'col-9' : 'col-12'; ?>">
-										<strong><?php echo esc_html( $view['label'] ); ?></strong>
+									<div class="<?php echo empty($view['disable-downloads']) ? 'col-9' : 'col-12'; ?>">
+										<strong><?php echo esc_html($view['label']); ?></strong>
 									</div>
-									<div class="<?php echo empty( $view['disable-downloads'] ) ? 'col-3' : 'd-none'; ?>">
-										<a title="<?php esc_attr_e( 'Download JSON', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'json' ) ); ?>">
+									<div class="<?php echo empty($view['disable-downloads']) ? 'col-3' : 'd-none'; ?>">
+										<a title="<?php esc_attr_e('Download JSON', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'json')); ?>">
 											<i class="fa fa-download text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php esc_html_e( 'Download JSON', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php esc_html_e('Download JSON', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download CSV', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'csv' ) ); ?>">
+										<a title="<?php esc_attr_e('Download CSV', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'csv')); ?>">
 											<i class="fa fa-file-csv text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php esc_html_e( 'Download CSV', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php esc_html_e('Download CSV', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download XML', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'xml' ) ); ?>">
+										<a title="<?php esc_attr_e('Download XML', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'xml')); ?>">
 											<i class="fa fa-file-code text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php esc_html_e( 'Download XML', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php esc_html_e('Download XML', 'invoicing'); ?></span>
 										</a>
 									</div>
 								</div>
@@ -299,7 +299,7 @@ 
 
 		<?php
 
-		do_action( 'getpaid_reports_display_right', $this );
+		do_action('getpaid_reports_display_right', $this);
 	}
 
 	/**
@@ -310,56 +310,56 @@ 
 
 		$cards = array(
 			'total_sales'         => array(
-				'description' => __( 'Gross sales in the period.', 'invoicing' ),
-				'label'       => __( 'Gross Revenue', 'invoicing' ),
+				'description' => __('Gross sales in the period.', 'invoicing'),
+				'label'       => __('Gross Revenue', 'invoicing'),
 			),
 			'net_sales'           => array(
-				'description' => __( 'Net sales in the period.', 'invoicing' ),
-				'label'       => __( 'Net Revenue', 'invoicing' ),
+				'description' => __('Net sales in the period.', 'invoicing'),
+				'label'       => __('Net Revenue', 'invoicing'),
 			),
 			'average_sales'       => array(
-				'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Net Sales', 'invoicing' ),
+				'description' => __('Average net daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Net Sales', 'invoicing'),
 			),
 			'average_total_sales' => array(
-				'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
+				'description' => __('Average gross daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Gross Sales', 'invoicing'),
 			),
 			'total_invoices'      => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
+				'description' => __('Number of paid invoices.', 'invoicing'),
+				'label'       => __('Paid Invoices', 'invoicing'),
 			),
 			'total_items'         => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
+				'description' => __('Number of items purchased.', 'invoicing'),
+				'label'       => __('Purchased Items', 'invoicing'),
 			),
 			'refunded_items'      => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
+				'description' => __('Number of items refunded.', 'invoicing'),
+				'label'       => __('Refunded Items', 'invoicing'),
 			),
 			'total_tax'           => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
+				'description' => __('Total charged for taxes.', 'invoicing'),
+				'label'       => __('Tax', 'invoicing'),
 			),
 			'total_refunded_tax'  => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
+				'description' => __('Total refunded for taxes.', 'invoicing'),
+				'label'       => __('Refunded Tax', 'invoicing'),
 			),
 			'total_fees'          => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
+				'description' => __('Total fees charged.', 'invoicing'),
+				'label'       => __('Fees', 'invoicing'),
 			),
 			'total_refunds'       => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
+				'description' => __('Total of refunded invoices.', 'invoicing'),
+				'label'       => __('Refunded', 'invoicing'),
 			),
 			'total_discount'      => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
+				'description' => __('Total of discounts used.', 'invoicing'),
+				'label'       => __('Discounted', 'invoicing'),
 			),
 		);
 
-		return apply_filters( 'wpinv_report_cards', $cards );
+		return apply_filters('wpinv_report_cards', $cards);
 	}
 
 

includes/class-getpaid-tax.php

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/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>

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

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>
 

templates/payment-forms/embed.php

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/gateways/class-getpaid-manual-gateway.php

Spacing +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Manual Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups' );
+    protected $supports = array('subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups');
 
     /**
 	 * Payment method order.
@@ -39,10 +39,10 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title        = __( 'Test Gateway', 'invoicing' );
-        $this->method_title = __( 'Test Gateway', 'invoicing' );
+        $this->title        = __('Test Gateway', 'invoicing');
+        $this->method_title = __('Test Gateway', 'invoicing');
 
-        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
     }
 
     /**
@@ -54,32 +54,32 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Mark it as paid.
         $invoice->mark_paid();
 
         // (Maybe) activate subscriptions.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( ! empty( $subscriptions ) ) {
-            $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+        if (!empty($subscriptions)) {
+            $subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-            foreach ( $subscriptions as $subscription ) {
-                if ( $subscription->exists() ) {
-                    $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-                    $expiry   = date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+            foreach ($subscriptions as $subscription) {
+                if ($subscription->exists()) {
+                    $duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+                    $expiry   = date('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-                    $subscription->set_next_renewal_date( $expiry );
-                    $subscription->set_date_created( current_time( 'mysql' ) );
-                    $subscription->set_profile_id( $invoice->generate_key( 'manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id() ) );
+                    $subscription->set_next_renewal_date($expiry);
+                    $subscription->set_date_created(current_time('mysql'));
+                    $subscription->set_profile_id($invoice->generate_key('manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id()));
                     $subscription->activate();
                 }
             }
 }
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -89,10 +89,10 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
 
             // Renew the subscription.
             $subscription->add_payment(
@@ -115,10 +115,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();

templates/subscriptions/subscription-details.php

Spacing +40 added lines, -40 removed lines

@@ -9,58 +9,58 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+do_action('getpaid_single_subscription_before_notices', $subscription);
 
 // Display errors and notices.
 wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+$subscription_groups = getpaid_get_invoice_subscription_groups($subscription->get_parent_invoice_id());
+$subscription_group  = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+do_action('getpaid_before_single_subscription', $subscription, $subscription_groups);
 
 ?>
 
-<h2 class="mb-1 h4"><?php esc_html_e( 'Subscription Details', 'invoicing' ); ?></h2>
+<h2 class="mb-1 h4"><?php esc_html_e('Subscription Details', 'invoicing'); ?></h2>
 <table class="table table-bordered">
 	<tbody>
 
-		<?php foreach ( $widget->get_single_subscription_columns( $subscription ) as $key => $label ) : ?>
+		<?php foreach ($widget->get_single_subscription_columns($subscription) as $key => $label) : ?>
 
-			<tr class="getpaid-subscription-meta-<?php echo esc_attr( $key ); ?>">
+			<tr class="getpaid-subscription-meta-<?php echo esc_attr($key); ?>">
 
 				<th class="font-weight-bold" style="width: 35%">
-					<?php echo esc_html( $label ); ?>
+					<?php echo esc_html($label); ?>
 				</th>
 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						switch ($key) {
 
 						case 'status':
-							echo esc_html( $subscription->get_status_label() );
+							echo esc_html($subscription->get_status_label());
 							break;
 
 						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+							echo esc_html(getpaid_format_date_value($subscription->get_date_created()));
 							break;
 
 						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+							echo esc_html(getpaid_format_date_value($subscription->get_next_renewal_date()));
 							break;
 
 						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+							echo wp_kses_post(wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency()));
 
-							if ( $subscription->has_trial_period() ) {
+							if ($subscription->has_trial_period()) {
 
 								echo "<small class='text-muted'>&nbsp;";
 								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
+									esc_html_x('( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing'),
+									esc_html($subscription->get_trial_period())
 								);
 								echo '</small>';
 
@@ -69,29 +69,29 @@ 
 							break;
 
 						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+							$frequency = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
+							$amount    = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency());
+							echo wp_kses_post(strtolower("<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>"));
 							break;
 
 						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+							if (empty($subscription_group)) {
+								echo wp_kses_post(WPInv_Subscriptions_List_Table::generate_item_markup($subscription->get_product_id()));
 								} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
+								$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+								echo wp_kses_post(implode(' | ', $markup));
 								}
 
 							break;
 
 						case 'payments':
 							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+							echo ((int) $subscription->get_times_billed()) . ' / ' . (empty($max_activations) ? '&infin;' : (int) $max_activations);
 
 							break;
 
 						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+						do_action("getpaid_render_single_subscription_column_$key", $subscription);
 
 					?>
 				</td>
@@ -103,34 +103,34 @@ 
 	</tbody>
 </table>
 
-<?php if ( ! empty( $subscription_group ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Subscription Items', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_item_details_metabox( $subscription ); ?>
+<?php if (!empty($subscription_group)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Subscription Items', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_item_details_metabox($subscription); ?>
 <?php endif; ?>
 
-<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Invoices', 'invoicing' ); ?></h2>
+<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Invoices', 'invoicing'); ?></h2>
 
-<?php echo wp_kses_post( getpaid_admin_subscription_invoice_details_metabox( $subscription ) ); ?>
+<?php echo wp_kses_post(getpaid_admin_subscription_invoice_details_metabox($subscription)); ?>
 
-<?php if ( 1 < count( $subscription_groups ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Subscriptions', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_related_subscriptions_metabox( $subscription ); ?>
+<?php if (1 < count($subscription_groups)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Subscriptions', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_related_subscriptions_metabox($subscription); ?>
 <?php endif; ?>
 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
+		if ($subscription->can_cancel()) {
 		printf(
             '<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
-            esc_url( $subscription->get_cancel_url() ),
-            esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
-            esc_html__( 'Cancel Subscription', 'invoicing' )
+            esc_url($subscription->get_cancel_url()),
+            esc_attr__('Are you sure you want to cancel this subscription?', 'invoicing'),
+            esc_html__('Cancel Subscription', 'invoicing')
         );
 		}
 
-		do_action( 'getpaid-single-subscription-page-actions', $subscription );
+		do_action('getpaid-single-subscription-page-actions', $subscription);
 	?>
 
-	<a href="<?php echo esc_url( getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) ); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e( 'Go Back', 'invoicing' ); ?></a>
+	<a href="<?php echo esc_url(getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')))); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e('Go Back', 'invoicing'); ?></a>
 </span>