AyeCode / invoicing

templates/invoice/company-address.php

Spacing +15 added lines, -15 removed lines

@@ -7,17 +7,17 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the company name.
-$company_name = wpinv_get_option( 'vat_company_name' );
+$company_name = wpinv_get_option('vat_company_name');
 
-if ( empty( $company_name ) ) {
+if (empty($company_name)) {
     $company_name = wpinv_get_business_name();
 }
 
 // Prepare the VAT number.
-$vat_number = wpinv_get_option( 'vat_number' );
+$vat_number = wpinv_get_option('vat_number');
 
 ?>
     <div class="getpaid-company-address form-group">
@@ -25,36 +25,36 @@ 
         <div class="row">
 
             <div class="invoice-company-address-label col-2">
-                <strong><?php esc_html_e( 'From:', 'invoicing' ); ?></strong>
+                <strong><?php esc_html_e('From:', 'invoicing'); ?></strong>
             </div>
 
             <div class="invoice-company-address-value col-10">
 
-                <?php do_action( 'getpaid_company_address_top' ); ?>
+                <?php do_action('getpaid_company_address_top'); ?>
 
                 <div class="name">
-                    <a target="_blank" class="text-dark" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
-                        <?php echo esc_html( $company_name ); ?>
+                    <a target="_blank" class="text-dark" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
+                        <?php echo esc_html($company_name); ?>
                     </a>
                 </div>
 
-                <?php if ( $address = wpinv_get_business_address() ) { ?>
-                    <?php echo wp_kses_post( $address ); ?>
+                <?php if ($address = wpinv_get_business_address()) { ?>
+                    <?php echo wp_kses_post($address); ?>
                 <?php } ?>
 
-                <?php if ( $email_from = wpinv_mail_get_from_address() ) { ?>
+                <?php if ($email_from = wpinv_mail_get_from_address()) { ?>
                     <div class="email_from">
-                        <?php echo wp_sprintf( __( 'Email: %s', 'invoicing' ), sanitize_email( $email_from ) ); ?>
+                        <?php echo wp_sprintf(__('Email: %s', 'invoicing'), sanitize_email($email_from)); ?>
                     </div>
                 <?php } ?>
 
-                <?php if ( ! empty( $vat_number ) ) { ?>
+                <?php if (!empty($vat_number)) { ?>
                     <div class="email_from">
-                        <?php echo wp_sprintf( __( 'VAT Number: %s', 'invoicing' ), esc_html( $vat_number ) ); ?>
+                        <?php echo wp_sprintf(__('VAT Number: %s', 'invoicing'), esc_html($vat_number)); ?>
                     </div>
                 <?php } ?>
 
-                <?php do_action( 'getpaid_company_address_bottom' ); ?>
+                <?php do_action('getpaid_company_address_bottom'); ?>
 
             </div>
 

templates/invoice/header-left-actions.php

Spacing +8 added lines, -8 removed lines

@@ -8,25 +8,25 @@
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
         <div class="getpaid-header-left-actions">
 
-            <?php if ( $invoice->is_type( 'invoice' ) && $invoice->needs_payment() && ! $invoice->is_held() ) : ?>
-                <a class="btn btn-sm btn-primary m-1 d-inline-block invoice-action-pay" href="<?php echo esc_url( $invoice->get_checkout_payment_url() ); ?>">
-                    <?php esc_html_e( 'Pay For Invoice', 'invoicing' ); ?>
+            <?php if ($invoice->is_type('invoice') && $invoice->needs_payment() && !$invoice->is_held()) : ?>
+                <a class="btn btn-sm btn-primary m-1 d-inline-block invoice-action-pay" href="<?php echo esc_url($invoice->get_checkout_payment_url()); ?>">
+                    <?php esc_html_e('Pay For Invoice', 'invoicing'); ?>
                 </a>
             <?php endif; ?>
 
-            <?php if ( $invoice->is_type( 'invoice' ) && $invoice->is_paid() ) : ?>
-                <a class="btn btn-sm btn-info m-1 d-inline-block invoice-action-receipt" href="<?php echo esc_url( $invoice->get_receipt_url() ); ?>">
-                    <?php esc_html_e( 'View Receipt', 'invoicing' ); ?>
+            <?php if ($invoice->is_type('invoice') && $invoice->is_paid()) : ?>
+                <a class="btn btn-sm btn-info m-1 d-inline-block invoice-action-receipt" href="<?php echo esc_url($invoice->get_receipt_url()); ?>">
+                    <?php esc_html_e('View Receipt', 'invoicing'); ?>
                 </a>
             <?php endif; ?>
 
-            <?php do_action( 'wpinv_invoice_display_left_actions', $invoice ); ?>
+            <?php do_action('wpinv_invoice_display_left_actions', $invoice); ?>
 
         </div>
 

templates/subscriptions/subscriptions-table-row.php

Indentation +28 added lines, -28 removed lines

@@ -13,42 +13,42 @@
 
 foreach ( array_keys( $widget->get_subscriptions_table_columns() ) as $column ) :
 
-	$class = sanitize_html_class( $column );
-	echo "<td class='getpaid-subscriptions-table-column-" . esc_attr( $class ) . "'>";
+    $class = sanitize_html_class( $column );
+    echo "<td class='getpaid-subscriptions-table-column-" . esc_attr( $class ) . "'>";
 
-		do_action( "getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription );
+        do_action( "getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription );
 
-		switch ( $column ) :
+        switch ( $column ) :
 
-		case 'subscription':
-			$subscription_id = (int) $subscription->get_id();
-			$url             = esc_url( $subscription->get_view_url() );
-			$id_label        = sprintf(
-				esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
-				(int) $subscription->get_id()
-			);
-			echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
-			break;
+        case 'subscription':
+            $subscription_id = (int) $subscription->get_id();
+            $url             = esc_url( $subscription->get_view_url() );
+            $id_label        = sprintf(
+                esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
+                (int) $subscription->get_id()
+            );
+            echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
+            break;
 
-		case 'status':
-			echo esc_html( $subscription->get_status_label() );
-			break;
+        case 'status':
+            echo esc_html( $subscription->get_status_label() );
+            break;
 
-		case 'renewal-date':
-			$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
-			echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
-			break;
+        case 'renewal-date':
+            $renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
+            echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
+            break;
 
-		case '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( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
-			break;
+        case '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( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
+            break;
 
-		endswitch;
+        endswitch;
 
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+        do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
 
-	echo '</td>';
+    echo '</td>';
 
 endforeach;

Switch Indentation +32 added lines, -32 removed lines

@@ -20,35 +20,35 @@
 
 		switch ( $column ) :
 
-		case 'subscription':
-			$subscription_id = (int) $subscription->get_id();
-			$url             = esc_url( $subscription->get_view_url() );
-			$id_label        = sprintf(
-				esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
-				(int) $subscription->get_id()
-			);
-			echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
-			break;
-
-		case 'status':
-			echo esc_html( $subscription->get_status_label() );
-			break;
-
-		case 'renewal-date':
-			$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
-			echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
-			break;
-
-		case '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( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
-			break;
-
-		endswitch;
-
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
-
-	echo '</td>';
-
-endforeach;
+		    case 'subscription':
+			    $subscription_id = (int) $subscription->get_id();
+			    $url             = esc_url( $subscription->get_view_url() );
+			    $id_label        = sprintf(
+				    esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
+				    (int) $subscription->get_id()
+			    );
+			    echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
+			    break;
+
+		    case 'status':
+			    echo esc_html( $subscription->get_status_label() );
+			    break;
+
+		    case 'renewal-date':
+			    $renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
+			    echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
+			    break;
+
+		    case '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( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
+			    break;
+
+		    endswitch;
+
+		    do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+
+	    echo '</td>';
+
+    endforeach;

Spacing +16 added lines, -16 removed lines

@@ -9,45 +9,45 @@
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-foreach ( array_keys( $widget->get_subscriptions_table_columns() ) as $column ) :
+foreach (array_keys($widget->get_subscriptions_table_columns()) as $column) :
 
-	$class = sanitize_html_class( $column );
-	echo "<td class='getpaid-subscriptions-table-column-" . esc_attr( $class ) . "'>";
+	$class = sanitize_html_class($column);
+	echo "<td class='getpaid-subscriptions-table-column-" . esc_attr($class) . "'>";
 
-		do_action( "getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription );
+		do_action("getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription);
 
-		switch ( $column ) :
+		switch ($column) :
 
 		case 'subscription':
 			$subscription_id = (int) $subscription->get_id();
-			$url             = esc_url( $subscription->get_view_url() );
+			$url             = esc_url($subscription->get_view_url());
 			$id_label        = sprintf(
-				esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
+				esc_attr_x('#%s', 'subscription id', 'invoicing'),
 				(int) $subscription->get_id()
 			);
-			echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
+			echo wp_kses_post($widget->add_row_actions("<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription));
 			break;
 
 		case 'status':
-			echo esc_html( $subscription->get_status_label() );
+			echo esc_html($subscription->get_status_label());
 			break;
 
 		case 'renewal-date':
-			$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
-			echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
+			$renewal = getpaid_format_date_value($subscription->get_next_renewal_date());
+			echo $subscription->is_active() ? esc_html($renewal) : '&mdash;';
 			break;
 
 		case '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( "<span>$amount</span> / <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("<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>");
 			break;
 
 		endswitch;
 
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+		do_action("getpaid_subscriptions_frontend_subscription_table_$column", $subscription);
 
 	echo '</td>';
 

templates/subscriptions/subscription-details.php

Indentation +46 added lines, -46 removed lines

@@ -46,62 +46,62 @@ 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+                        switch ( $key ) {
 
-						case 'status':
-							echo esc_html( $subscription->get_status_label() );
-							break;
+                        case 'status':
+                            echo esc_html( $subscription->get_status_label() );
+                            break;
 
-						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-							break;
+                        case 'start_date':
+                            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() ) );
-							break;
+                        case 'expiry_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() ) );
+                        case 'initial_amount':
+                            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() )
-								);
-								echo '</small>';
+                                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() )
+                                );
+                                echo '</small>';
 
-							}
+                            }
 
-							break;
+                            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>" ) );
-							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>" ) );
+                            break;
 
-						case 'item':
-							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 ) );
-								}
+                        case 'item':
+                            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 ) );
+                                }
 
-							break;
+                            break;
 
-						case 'payments':
-							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+                        case 'payments':
+                            $max_activations = (int) $subscription->get_bill_times();
+                            echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
 
-							break;
+                            break;
 
-						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+                        }
+                        do_action( "getpaid_render_single_subscription_column_$key", $subscription );
 
-					?>
+                    ?>
 				</td>
 
 			</tr>
@@ -128,17 +128,17 @@ 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
-		printf(
+        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' )
         );
-		}
+        }
 
-		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>
 </span>

Switch Indentation +48 added lines, -48 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * Template that prints a single subscription's details
  *
@@ -9,19 +9,19 @@ 
  * @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();
+    // 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 );
 
-?>
+    ?>
 
 <style>
 	.entry-header,
@@ -46,59 +46,59 @@ 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						    switch ( $key ) {
 
-						case 'status':
-							echo esc_html( $subscription->get_status_label() );
-							break;
+						        case 'status':
+							        echo esc_html( $subscription->get_status_label() );
+							        break;
 
-						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-							break;
+						        case 'start_date':
+							        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() ) );
-							break;
+						        case 'expiry_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() ) );
+						        case 'initial_amount':
+							        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() )
-								);
-								echo '</small>';
+								        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() )
+								        );
+								        echo '</small>';
 
-							}
+							        }
 
-							break;
+							        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>" ) );
-							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>" ) );
+							        break;
 
-						case 'item':
-							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 ) );
-								}
+						        case 'item':
+							        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 ) );
+								        }
 
-							break;
+							        break;
 
-						case 'payments':
-							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+						        case 'payments':
+							        $max_activations = (int) $subscription->get_bill_times();
+							        echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
 
-							break;
+							        break;
 
-						}
+						    }
 						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
 
 					?>

Spacing +40 added lines, -40 removed lines

@@ -9,17 +9,17 @@ 
  * @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);
 
 ?>
 
@@ -31,44 +31,44 @@ 
 
 </style>
 
-<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 sanitize_html_class( $key ); ?>">
+			<tr class="getpaid-subscription-meta-<?php echo sanitize_html_class($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>';
 
@@ -77,29 +77,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>
@@ -111,34 +111,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>

includes/admin/views/wizard-thank-you.php

Spacing +16 added lines, -16 removed lines

@@ -4,68 +4,68 @@
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">
 	<div class="text-center card-body">
-		<h1 class="h3"><?php esc_html_e( 'Awesome, you are ready to Get Paid', 'invoicing' ); ?></h1>
+		<h1 class="h3"><?php esc_html_e('Awesome, you are ready to Get Paid', 'invoicing'); ?></h1>
 
 		<div class="geodirectory-message geodirectory-tracker">
-			<p><?php esc_html_e( 'Thank you for choosing GetPaid!', 'invoicing' ); ?> <i class="far fa-smile-beam"></i></p>
+			<p><?php esc_html_e('Thank you for choosing GetPaid!', 'invoicing'); ?> <i class="far fa-smile-beam"></i></p>
 		</div>
 
 		<div class="gp-setup-next-steps">
 			<div class="gp-setup-next-steps-first mb-4">
 				<div>
-					<h2 class="h3"><i class="fas fa-arrow-down"></i> <?php esc_html_e( 'Watch This', 'invoicing' ); ?> <i class="fas fa-arrow-down"></i></h2>
+					<h2 class="h3"><i class="fas fa-arrow-down"></i> <?php esc_html_e('Watch This', 'invoicing'); ?> <i class="fas fa-arrow-down"></i></h2>
 					<div class="embed-responsive embed-responsive-16by9 mb-4">
 						<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/TXZuPXHjt9E?rel=0" allowfullscreen></iframe>
 					</div>
 				</div>
-				<h2 class="h3"><?php esc_html_e( 'Next steps', 'invoicing' ); ?></h2>
+				<h2 class="h3"><?php esc_html_e('Next steps', 'invoicing'); ?></h2>
 
 				<div class="d-flex justify-content-between">
 					<a
 						class="btn btn-outline-primary btn-sm"
-						href="<?php echo esc_url( admin_url( 'post-new.php?post_type=wpi_item' ) ); ?>">
+						href="<?php echo esc_url(admin_url('post-new.php?post_type=wpi_item')); ?>">
 						<span class="h1 d-block"><i class="fas fa-box-open"></i></span>
-						<?php esc_html_e( 'Create Item', 'invoicing' ); ?>
+						<?php esc_html_e('Create Item', 'invoicing'); ?>
 					</a>
 					<a
 						class="btn btn-outline-primary btn-sm"
-						href="<?php echo esc_url( admin_url( 'post-new.php?post_type=wpi_payment_form' ) ); ?>">
+						href="<?php echo esc_url(admin_url('post-new.php?post_type=wpi_payment_form')); ?>">
 						<span class="h1 d-block"><i class="fas fa-align-justify"></i></span>
-						<?php esc_html_e( 'Create Payment Form', 'invoicing' ); ?>
+						<?php esc_html_e('Create Payment Form', 'invoicing'); ?>
 					</a>
 					<a
 						class="btn btn-outline-primary btn-sm"
-						href="<?php echo esc_url( admin_url( 'post-new.php?post_type=wpi_invoice' ) ); ?>">
+						href="<?php echo esc_url(admin_url('post-new.php?post_type=wpi_invoice')); ?>">
 						<span class="h1 d-block"><i class="fas fa-file-alt"></i></span>
-						<?php esc_html_e( 'Create Invoice', 'invoicing' ); ?>
+						<?php esc_html_e('Create Invoice', 'invoicing'); ?>
 					</a>
 				</div>
 
 
 
-						<h2 class="h3 mt-4"><?php esc_html_e( 'Learn more', 'invoicing' ); ?></h2>
+						<h2 class="h3 mt-4"><?php esc_html_e('Learn more', 'invoicing'); ?></h2>
 				<div class="gp-setup-next-steps-last mt-2 d-flex justify-content-between">
 						<a
 							class="btn btn-outline-primary btn-sm" href="https://docs.wpgetpaid.com/collection/114-getting-started?utm_source=setupwizard&utm_medium=product&utm_content=getting-started&utm_campaign=invoicingplugin"
-							target="_blank"><?php esc_html_e( 'Getting Started', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Getting Started', 'invoicing'); ?></a>
 						<a
 							class="btn btn-outline-primary btn-sm"
 							href="https://docs.wpgetpaid.com/?utm_source=setupwizard&utm_medium=product&utm_content=docs&utm_campaign=invoicingplugin"
-							target="_blank"><?php esc_html_e( 'Documentation', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Documentation', 'invoicing'); ?></a>
 						<a
 							class="btn btn-outline-primary btn-sm"
 							href="https://wpgetpaid.com/support/?utm_source=setupwizard&utm_medium=product&utm_content=docs&utm_campaign=invoicingyplugin"
-							target="_blank"><?php esc_html_e( 'Support', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Support', 'invoicing'); ?></a>
 						<a
 							class="btn btn-outline-primary btn-sm"
 							href="https://demos.ayecode.io/getpaid/?utm_source=setupwizard&utm_medium=product&utm_content=demos&utm_campaign=invoicingyplugin"
-							target="_blank"><?php esc_html_e( 'Demos', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Demos', 'invoicing'); ?></a>
 					</div>
 			</div>
 		</div>

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

Spacing +15 added lines, -15 removed lines

@@ -6,7 +6,7 @@ 
  * @var array $tax_rate
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -18,54 +18,54 @@ 
             $country = aui()->select(
                 array(
                     'options' => array_merge(
-                        array( '' => __( 'All Countries', 'invoicing' ) ),
+                        array('' => __('All Countries', 'invoicing')),
                         wpinv_get_country_list()
                     ),
                     'name'    => "tax_rates[$key][country]",
-                    'id'      => uniqid( 'tax_rate_country' ),
-                    'value'   => esc_html( $tax_rate['country'] ),
-                    'label'   => __( 'Country', 'invoicing' ),
+                    'id'      => uniqid('tax_rate_country'),
+                    'value'   => esc_html($tax_rate['country']),
+                    'label'   => __('Country', 'invoicing'),
                     'class'   => 'wpinv_country',
                     'no_wrap' => true,
                 )
             );
 
-            echo str_replace( 'custom-select', '', $country );
+            echo str_replace('custom-select', '', $country);
         ?>
     </td>
 
     <td class="wpinv_tax_state">
 
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'States', 'invoicing' ); ?></span>
-            <input type="text" placeholder="<?php esc_attr_e( 'Apply to whole country', 'invoicing' ); ?>" name="tax_rates[<?php echo esc_attr( $key ); ?>][state]" value="<?php echo empty( $tax_rate['global'] ) ? esc_attr( $tax_rate['state'] ) : ''; ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('States', 'invoicing'); ?></span>
+            <input type="text" placeholder="<?php esc_attr_e('Apply to whole country', 'invoicing'); ?>" name="tax_rates[<?php echo esc_attr($key); ?>][state]" value="<?php echo empty($tax_rate['global']) ? esc_attr($tax_rate['state']) : ''; ?>"/>
         </label>
 
     </td>
 
     <td class="wpinv_standard_rate">
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'Standard Rate', 'invoicing' ); ?></span>
-            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr( $key ); ?>][rate]" value="<?php echo wpinv_sanitize_amount( $tax_rate['rate'] ); ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('Standard Rate', 'invoicing'); ?></span>
+            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr($key); ?>][rate]" value="<?php echo wpinv_sanitize_amount($tax_rate['rate']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_reduced_rate">
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'Reduced Rate', 'invoicing' ); ?></span>
-            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr( $key ); ?>][reduced_rate]" value="<?php echo wpinv_sanitize_amount( $tax_rate['reduced_rate'] ); ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('Reduced Rate', 'invoicing'); ?></span>
+            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr($key); ?>][reduced_rate]" value="<?php echo wpinv_sanitize_amount($tax_rate['reduced_rate']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_tax_name">
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'Tax Name', 'invoicing' ); ?></span>
-            <input type="text" name="tax_rates[<?php echo esc_attr( $key ); ?>][name]" value="<?php echo esc_attr( $tax_rate['name'] ); ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('Tax Name', 'invoicing'); ?></span>
+            <input type="text" name="tax_rates[<?php echo esc_attr($key); ?>][name]" value="<?php echo esc_attr($tax_rate['name']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_tax_remove">
-        <button type="button" class="close wpinv_remove_tax_rate" aria-label="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>" title="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>">
+        <button type="button" class="close wpinv_remove_tax_rate" aria-label="<?php esc_attr_e('Delete', 'invoicing'); ?>" title="<?php esc_attr_e('Delete', 'invoicing'); ?>">
             <span aria-hidden="true">&times;</span>
         </button>
     </td>

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

Spacing +20 added lines, -20 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $tax_rates  = GetPaid_Tax::get_all_tax_rates();
 $dummy_rate = array(
@@ -13,11 +13,11 @@ 
     'global'       => true,
     'rate'         => wpinv_get_default_tax_rate(),
     'reduced_rate' => 5,
-    'name'         => __( 'VAT', 'invoicing' ),
+    'name'         => __('VAT', 'invoicing'),
 );
 
 $reset_url = wp_nonce_url(
-    add_query_arg( 'getpaid-admin-action', 'reset_tax_rates' ),
+    add_query_arg('getpaid-admin-action', 'reset_tax_rates'),
     'getpaid-nonce',
     'getpaid-nonce'
 );
@@ -25,34 +25,34 @@ 
 ?>
 <div class="table-responsive">
     <table id="wpinv_tax_rates" class="widefat fixed table">
-        <caption><?php echo esc_html_e( 'Enter tax rates for specific regions.', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('Enter tax rates for specific regions.', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Country', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'Optionally limit this tax rate to a specific country.', 'invoicing' ), 'position-static' ); ?>
+                    <?php esc_html_e('Country', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('Optionally limit this tax rate to a specific country.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'State', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'Separate state codes using a comma or leave blank to apply country wide.', 'invoicing' ), 'position-static' ); ?>
+                    <?php esc_html_e('State', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('Separate state codes using a comma or leave blank to apply country wide.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Standard Rate %', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The tax rate (percentage) to charge on items that use the "Standard rate" tax class.', 'invoicing' ), 'position-static' ); ?>
+                    <?php esc_html_e('Standard Rate %', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The tax rate (percentage) to charge on items that use the "Standard rate" tax class.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Reduced Rate %', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The tax rate (percentage) to charge on items that use the "Reduced rate" tax class.', 'invoicing' ), 'position-static' ); ?>
+                    <?php esc_html_e('Reduced Rate %', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The tax rate (percentage) to charge on items that use the "Reduced rate" tax class.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Tax Name', 'invoicing' ); ?>
-                    <?php echo getpaid_get_help_tip( __( 'The name of this tax, e.g VAT.', 'invoicing' ), 'position-static' ); ?>
+                    <?php esc_html_e('Tax Name', 'invoicing'); ?>
+                    <?php echo getpaid_get_help_tip(__('The name of this tax, e.g VAT.', 'invoicing'), 'position-static'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top" style="width:32px">&nbsp;</th>
@@ -61,19 +61,19 @@ 
         </thead>
 
         <tbody>
-            <?php array_walk( $tax_rates, 'wpinv_tax_rate_callback' ); ?>
+            <?php array_walk($tax_rates, 'wpinv_tax_rate_callback'); ?>
         </tbody>
 
         <tfoot>
             <tr class="table-light">
                 <td colspan="6" class="border-top">
 
-                    <button type="button" class="button button-secondary wpinv_add_tax_rate" aria-label="<?php esc_attr_e( 'Add Tax Rate', 'invoicing' ); ?>">
-                        <span><?php esc_html_e( 'Add Tax Rate', 'invoicing' ); ?></span>
+                    <button type="button" class="button button-secondary wpinv_add_tax_rate" aria-label="<?php esc_attr_e('Add Tax Rate', 'invoicing'); ?>">
+                        <span><?php esc_html_e('Add Tax Rate', 'invoicing'); ?></span>
                     </button>
 
-                    <a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary wpinv_reset_tax_rates" aria-label="<?php esc_attr_e( 'Reset Tax Rates', 'invoicing' ); ?>">
-                        <span><?php esc_html_e( 'Reset Tax Rates', 'invoicing' ); ?></span>
+                    <a href="<?php echo esc_url($reset_url); ?>" class="button button-secondary wpinv_reset_tax_rates" aria-label="<?php esc_attr_e('Reset Tax Rates', 'invoicing'); ?>">
+                        <span><?php esc_html_e('Reset Tax Rates', 'invoicing'); ?></span>
                     </a>
                 </td>
             </tr>
@@ -82,6 +82,6 @@ 
 </div>
 
 <script type="text/html" id="tmpl-wpinv-tax-rate-row">
-    <?php echo wpinv_tax_rate_callback( $dummy_rate, 0, false ); ?>
+    <?php echo wpinv_tax_rate_callback($dummy_rate, 0, false); ?>
 </script>
 

includes/admin/views/wizard-introduction.php

Spacing +39 added lines, -39 removed lines

@@ -4,78 +4,78 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">
 
     <h1 class="h4 card-header bg-white border-bottom-0 pt-4 pb-1">
-        <?php esc_html_e( 'Welcome to the GetPaid Setup Wizard!', 'invoicing' ); ?>
+        <?php esc_html_e('Welcome to the GetPaid Setup Wizard!', 'invoicing'); ?>
     </h1>
 
     <div class="card-body text-muted ">
-        <p><?php esc_html_e( 'Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing' ); ?></p>
+        <p><?php esc_html_e('Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing'); ?></p>
         <hr class="mt-4 pt-3 pb-0" />
-        <p class="small"><?php echo wp_kses_post( __( 'This quick setup wizard will help you <b>configure the basic settings</b>. It’s <b>completely optional</b> and shouldn’t take longer than <b>five minutes</b>.', 'invoicing' ) ); ?></p>
+        <p class="small"><?php echo wp_kses_post(__('This quick setup wizard will help you <b>configure the basic settings</b>. It’s <b>completely optional</b> and shouldn’t take longer than <b>five minutes</b>.', 'invoicing')); ?></p>
     </div>
 
     <div class="card-footer mb-0 bg-white gp-setup-actions step border-top-0">
         <a
-            href="<?php echo esc_url( $next_url ); ?>"
-            class="btn btn-primary button-next"><?php esc_html_e( "Let's go!", 'invoicing' ); ?></a>
+            href="<?php echo esc_url($next_url); ?>"
+            class="btn btn-primary button-next"><?php esc_html_e("Let's go!", 'invoicing'); ?></a>
         <a
-            href="<?php echo esc_url( admin_url() ); ?>"
-            class="btn btn-link d-block mt-2 "><?php esc_html_e( 'Not right now', 'invoicing' ); ?></a>
+            href="<?php echo esc_url(admin_url()); ?>"
+            class="btn btn-link d-block mt-2 "><?php esc_html_e('Not right now', 'invoicing'); ?></a>
     </div>
 </div>
 
 <div class="card shadow-sm my-5 overflow-hidden">
     <h1 class="h4 card-header bg-white border-bottom-0  pt-4 pb-1">
-        <?php esc_html_e( 'GetPaid Features & Addons!', 'invoicing' ); ?>
+        <?php esc_html_e('GetPaid Features & Addons!', 'invoicing'); ?>
     </h1>
 
     <div class="card-body text-muted overflow-hidden">
-		<p><?php esc_html_e( 'Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing' ); ?></p>
+		<p><?php esc_html_e('Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing'); ?></p>
 		<hr>
 
 		<div class="row row-cols-2 text-left">
 			<div class="col mt-3">
 				<div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/buy.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/buy.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'GetPaid via Buy Now Buttons', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'Sell via buy now buttons anywhere on your site', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('GetPaid via Buy Now Buttons', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('Sell via buy now buttons anywhere on your site', 'invoicing'); ?></small>
                     </div>
                 </div>
 			</div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/report.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/report.svg'); ?>" class="mr-3" alt="...">
                         <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'GetPaid via payment form', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'Payment forms are conversion-optimized checkout forms', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('GetPaid via payment form', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('Payment forms are conversion-optimized checkout forms', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/invoices.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/invoices.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'GetPaid via Invoice', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'Create and send invoices for just about anything from the WordPress dashboard', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('GetPaid via Invoice', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('Create and send invoices for just about anything from the WordPress dashboard', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/payment.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/payment.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'Affordable payment gateways', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'On average our gateways are over 66% cheaper than our competition', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('Affordable payment gateways', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('On average our gateways are over 66% cheaper than our competition', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
@@ -86,51 +86,51 @@ 
 	<div class="mt-5">
 		<a
             href="https://wpgetpaid.com/features-list/"
-			class="btn btn-primary"><?php esc_html_e( 'View All Features!', 'invoicing' ); ?></a>
+			class="btn btn-primary"><?php esc_html_e('View All Features!', 'invoicing'); ?></a>
 	</div>
 
 	<div class="mt-5 mx-n4 py-4" style="background:#eafaf6;">
-		<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php esc_html_e( 'More with Membership!', 'invoicing' ); ?></h4>
+		<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php esc_html_e('More with Membership!', 'invoicing'); ?></h4>
 		<div class="row row-cols-2 text-left px-5">
 
 			<div class="col">
 				<ul class="list-unstyled">
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'PDF Invoices', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Gravity Forms', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Contact form 7', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'AffiliateWP Integration', 'invoicing' ); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('PDF Invoices', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Gravity Forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Contact form 7', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('AffiliateWP Integration', 'invoicing'); ?></li>
 				</ul>
 			</div>
 
 			<div class="col">
 				<ul class="list-unstyled">
-			    	<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Ninja forms', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Digital Downloads', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Wallet', 'invoicing' ); ?></li>
+			    	<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Ninja forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Digital Downloads', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Wallet', 'invoicing'); ?></li>
 				</ul>
 			</div>
 		</div>
 
-		<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php esc_html_e( 'Membership Starts From', 'invoicing' ); ?></h5>
-		<h1 class="mt-0 font-weight-bold text-dark mb-4 display-3"><?php esc_html_e( '$49', 'invoicing' ); ?></h1>
+		<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php esc_html_e('Membership Starts From', 'invoicing'); ?></h5>
+		<h1 class="mt-0 font-weight-bold text-dark mb-4 display-3"><?php esc_html_e('$49', 'invoicing'); ?></h1>
 
 		<div class="mt-2">
 			<a
                 href="https://wpgetpaid.com/downloads/membership/"
-				class="btn btn-primary"><?php esc_html_e( 'Buy Membership Now!', 'invoicing' ); ?></a>
+				class="btn btn-primary"><?php esc_html_e('Buy Membership Now!', 'invoicing'); ?></a>
 		</div>
 
 	</div>
 
     <div class="card-footer mb-0 bg-white gp-setup-actions step border-top-0">
         <a
-            href="<?php echo esc_url( $next_url ); ?>"
-            class="btn btn-outline-primary button-next"><?php esc_html_e( 'Launch the Setup Wizard!', 'invoicing' ); ?></a>
+            href="<?php echo esc_url($next_url); ?>"
+            class="btn btn-outline-primary button-next"><?php esc_html_e('Launch the Setup Wizard!', 'invoicing'); ?></a>
         <a
             href="https://docs.wpgetpaid.com/"
-            class="btn btn-outline-primary ml-4"><?php esc_html_e( 'Documentation', 'invoicing' ); ?></a>
+            class="btn btn-outline-primary ml-4"><?php esc_html_e('Documentation', 'invoicing'); ?></a>
         <a
-            href="<?php echo esc_url( admin_url() ); ?>"
-            class="btn btn-link d-block mt-2 "><?php esc_html_e( 'Not right now', 'invoicing' ); ?></a>
+            href="<?php echo esc_url(admin_url()); ?>"
+            class="btn btn-link d-block mt-2 "><?php esc_html_e('Not right now', 'invoicing'); ?></a>
     </div>
 </div>

includes/admin/views/wizard-gateways.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -12,17 +12,17 @@ 
 
     <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 wp_nonce_url(
@@ -30,7 +30,7 @@ 
                                 array(
                                     'getpaid-admin-action' => 'connect_gateway',
                                     'plugin'               => 'stripe',
-                                    'redirect'             => urlencode( add_query_arg( 'step', 'payments' ) ),
+                                    'redirect'             => urlencode(add_query_arg('step', 'payments')),
                                 ),
                                 admin_url()
                             ),
@@ -39,31 +39,31 @@ 
                         );
                         ?>
                         "
-                        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>
@@ -72,10 +72,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

@@ -40,8 +40,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>