AyeCode / invoicing

templates/payment-forms-admin/edit/number.php

Spacing +10 added lines, -10 removed lines

@@ -7,49 +7,49 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Field Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Field Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Placeholder text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Placeholder text', 'invoicing'); ?></span>
         <input v-model='active_form_element.placeholder' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php _e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php _e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_edit'" v-model='active_form_element.required' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e( 'Is this field required?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e('Is this field required?', 'invoicing'); ?></label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_add_meta'" v-model='active_form_element.add_meta' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e( 'Show this field in receipts and emails?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e('Show this field in receipts and emails?', 'invoicing'); ?></label>
 </div>
 
 <hr class='featurette-divider mt-4'>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Email Merge Tag', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Email Merge Tag', 'invoicing'); ?></span>
         <input :value='active_form_element.label | formatMergeTag' class='form-control bg-white' type="text" readonly onclick="this.select()" />
-        <span class="form-text text-muted"><?php esc_html_e( 'You can use this merge tag in notification emails', 'invoicing' ); ?></span>
+        <span class="form-text text-muted"><?php esc_html_e('You can use this merge tag in notification emails', 'invoicing'); ?></span>
     </label>
 </div>
 

templates/payment-forms-admin/edit/textarea.php

Spacing +10 added lines, -10 removed lines

@@ -7,49 +7,49 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Field Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Field Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Placeholder text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Placeholder text', 'invoicing'); ?></span>
         <input v-model='active_form_element.placeholder' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php _e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php _e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_edit'" v-model='active_form_element.required' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e( 'Is this field required?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e('Is this field required?', 'invoicing'); ?></label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_add_meta'" v-model='active_form_element.add_meta' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e( 'Show this field in receipts and emails?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e('Show this field in receipts and emails?', 'invoicing'); ?></label>
 </div>
 
 <hr class='featurette-divider mt-4'>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Email Merge Tag', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Email Merge Tag', 'invoicing'); ?></span>
         <input :value='active_form_element.label | formatMergeTag' class='form-control bg-white' type="text" readonly onclick="this.select()" />
-        <span class="form-text text-muted"><?php esc_html_e( 'You can use this merge tag in notification emails', 'invoicing' ); ?></span>
+        <span class="form-text text-muted"><?php esc_html_e('You can use this merge tag in notification emails', 'invoicing'); ?></span>
     </label>
 </div>
 

templates/payment-forms-admin/edit/text.php

Spacing +10 added lines, -10 removed lines

@@ -7,49 +7,49 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Field Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Field Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Placeholder text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Placeholder text', 'invoicing'); ?></span>
         <input v-model='active_form_element.placeholder' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php _e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php _e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_edit'" v-model='active_form_element.required' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e( 'Is this field required?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e('Is this field required?', 'invoicing'); ?></label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_add_meta'" v-model='active_form_element.add_meta' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e( 'Show this field in receipts and emails?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e('Show this field in receipts and emails?', 'invoicing'); ?></label>
 </div>
 
 <hr class='featurette-divider mt-4'>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Email Merge Tag', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Email Merge Tag', 'invoicing'); ?></span>
         <input :value='active_form_element.label | formatMergeTag' class='form-control bg-white' type="text" readonly onclick="this.select()" />
-        <span class="form-text text-muted"><?php esc_html_e( 'You can use this merge tag in notification emails', 'invoicing' ); ?></span>
+        <span class="form-text text-muted"><?php esc_html_e('You can use this merge tag in notification emails', 'invoicing'); ?></span>
     </label>
 </div>
 

includes/admin/wpinv-admin-functions.php

Spacing +63 added lines, -63 removed lines

@@ -7,65 +7,65 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
-add_filter( 'bulk_actions-edit-wpi_item', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
+add_filter('bulk_actions-edit-wpi_item', 'wpinv_bulk_actions');
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
-        return (int)$id;
-    } else if ( get_the_ID() ) {
+    if (isset($id) && !empty($id)) {
+        return (int) $id;
+    } else if (get_the_ID()) {
         return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
+    } else if (isset($post->ID) && !empty($post->ID)) {
         return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
         return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
         return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
         return (int) $_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-add_action( 'admin_init', 'wpinv_show_test_payment_gateway_notice' );
-function wpinv_show_test_payment_gateway_notice(){
-    add_action( 'admin_notices', 'wpinv_test_payment_gateway_messages' );
+add_action('admin_init', 'wpinv_show_test_payment_gateway_notice');
+function wpinv_show_test_payment_gateway_notice() {
+    add_action('admin_notices', 'wpinv_test_payment_gateway_messages');
 }
 
-function wpinv_test_payment_gateway_messages(){
+function wpinv_test_payment_gateway_messages() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $name = array(); $test_gateways = '';
     if ($gateways) {
@@ -76,9 +76,9 @@ 
         }
         $test_gateways = implode(', ', $name);
     }
-    if(isset($test_gateways) && !empty($test_gateways) && wpinv_current_user_can_manage_invoicing()){
+    if (isset($test_gateways) && !empty($test_gateways) && wpinv_current_user_can_manage_invoicing()) {
         $link = admin_url('admin.php?page=wpinv-settings&tab=gateways');
-        $notice = wp_sprintf( __('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link );
+        $notice = wp_sprintf(__('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link);
         ?>
         <div class="notice notice-warning is-dismissible">
             <p><?php echo $notice; ?></p>
@@ -95,29 +95,29 @@ 
     global $wpdb;
 
     // Only do this on our settings page.
-    if ( empty( $_GET[ 'page' ] ) || 'wpinv-settings' !== $_GET[ 'page' ] ) {
+    if (empty($_GET['page']) || 'wpinv-settings' !== $_GET['page']) {
         return;
     }
 
     // Check tables.
-    $tables             = array(
+    $tables = array(
         "{$wpdb->prefix}wpinv_subscriptions",
         "{$wpdb->prefix}getpaid_invoices",
         "{$wpdb->prefix}getpaid_invoice_items",
     );
 
-    foreach ( $tables as $table ) {
-        if ( $table != $wpdb->get_var( "SHOW TABLES LIKE '$table'" ) ) {
+    foreach ($tables as $table) {
+        if ($table != $wpdb->get_var("SHOW TABLES LIKE '$table'")) {
 
-            $url     = esc_url(
+            $url = esc_url(
                 wp_nonce_url(
-                    add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                    add_query_arg('getpaid-admin-action', 'create_missing_tables'),
                     'getpaid-nonce',
                     'getpaid-nonce'
                 )
             );
-            $message  = __( 'Some GetPaid database tables are missing. To use GetPaid without any issues, click on the button below to create the missing tables.', 'invoicing' );
-            $message2 = __( 'Create Tables', 'invoicing' );
+            $message  = __('Some GetPaid database tables are missing. To use GetPaid without any issues, click on the button below to create the missing tables.', 'invoicing');
+            $message2 = __('Create Tables', 'invoicing');
             echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
             break;
 
@@ -125,7 +125,7 @@ 
     }
 
 }
-add_action( 'admin_notices', 'wpinv_check_for_missing_tables' );
+add_action('admin_notices', 'wpinv_check_for_missing_tables');
 
 add_action('admin_init', 'wpinv_admin_search_by_invoice');
 
@@ -135,7 +135,7 @@ 
 function wpinv_admin_search_by_invoice() {
     global $typenow;
 
-    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote' ) {
+    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote') {
         add_filter('posts_search', 'wpinv_posts_search_example_type', 10, 2);
     }
 }
@@ -150,9 +150,9 @@ 
     global $wpdb;
 
     if ($query->is_main_query() && !empty($query->query['s'])) {
-        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql( $query->query['s'] ) . "%' )";
-        if ( ! empty( $search ) ) {
-            $search = preg_replace( '/^ AND /', '', $search );
+        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql($query->query['s']) . "%' )";
+        if (!empty($search)) {
+            $search = preg_replace('/^ AND /', '', $search);
             $search = " AND ( {$search} OR ( {$conditions_str} ) )";
         } else {
             $search = " AND ( {$conditions_str} )";
@@ -165,17 +165,17 @@ 
 /**
  * Resets invoice counts.
  */
-function wpinv_reset_invoice_count(){
-    if ( ! empty( $_GET['reset_invoice_count'] ) && isset( $_GET['_nonce'] ) && wp_verify_nonce( $_GET['_nonce'], 'reset_invoice_count' ) ) {
+function wpinv_reset_invoice_count() {
+    if (!empty($_GET['reset_invoice_count']) && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
         wpinv_update_option('invoice_sequence_start', 1);
         delete_option('wpinv_last_invoice_number');
-        getpaid_admin()->show_success( __( 'Invoice number sequence reset successfully.', 'invoicing' ) );
-        $url = remove_query_arg( array('reset_invoice_count', '_nonce') );
+        getpaid_admin()->show_success(__('Invoice number sequence reset successfully.', 'invoicing'));
+        $url = remove_query_arg(array('reset_invoice_count', '_nonce'));
         wp_redirect($url);
         exit();
     }
 }
-add_action( 'admin_init', 'wpinv_reset_invoice_count' );
+add_action('admin_init', 'wpinv_reset_invoice_count');
 
 /**
  * Displays line items on the invoice edit page.
@@ -184,29 +184,29 @@ 
  * @param array $columns
  * @return string
  */
-function wpinv_admin_get_line_items( $invoice, $columns ) {
+function wpinv_admin_get_line_items($invoice, $columns) {
 
     ob_start();
 
-    do_action( 'getpaid_admin_before_line_items', $invoice );
+    do_action('getpaid_admin_before_line_items', $invoice);
 
     $count = 0;
-    foreach ( $invoice->get_items() as $item ) {
+    foreach ($invoice->get_items() as $item) {
 
-        $item_price     = wpinv_price( $item->get_price(), $invoice->get_currency() );
+        $item_price     = wpinv_price($item->get_price(), $invoice->get_currency());
         $quantity       = (int) $item->get_quantity();
-        $item_subtotal  = wpinv_price( $item->get_sub_total(), $invoice->get_currency() );
-        $summary        = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
+        $item_subtotal  = wpinv_price($item->get_sub_total(), $invoice->get_currency());
+        $summary        = apply_filters('getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice);
         $item_tax       = $item->item_tax;
-        $tax_rate       = wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2, true ) . '%';;
-        $tax_rate       = empty( $tax_rate ) ? ' <span class="tax-rate">(' . $tax_rate . '%)</span>' : '';
+        $tax_rate       = wpinv_round_amount(getpaid_get_invoice_tax_rate($invoice, $item), 2, true) . '%'; ;
+        $tax_rate       = empty($tax_rate) ? ' <span class="tax-rate">(' . $tax_rate . '%)</span>' : '';
         $line_item_tax  = $item_tax . $tax_rate;
-        $line_item      = '<tr class="item item-' . ( ($count % 2 == 0) ? 'even' : 'odd' ) . '" data-item-id="' . esc_attr( $item->get_id() ) . '">';
+        $line_item      = '<tr class="item item-' . (($count % 2 == 0) ? 'even' : 'odd') . '" data-item-id="' . esc_attr($item->get_id()) . '">';
         $line_item     .= '<td class="id">' . (int) $item->get_id() . '</td>';
-        $line_item     .= '<td class="title"><a href="' . get_edit_post_link( $item->get_id() ) . '" target="_blank">' . $item->get_name() . '</a>';
+        $line_item     .= '<td class="title"><a href="' . get_edit_post_link($item->get_id()) . '" target="_blank">' . $item->get_name() . '</a>';
 
-        if ( $summary !== '' ) {
-            $line_item .= '<span class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</span>';
+        if ($summary !== '') {
+            $line_item .= '<span class="meta">' . wpautop(wp_kses_post($summary)) . '</span>';
         }
 
         $line_item .= '</td>';
@@ -214,23 +214,23 @@ 
         $line_item .= '<td class="qty" data-quantity="' . $quantity . '">&nbsp;&times;&nbsp;' . $quantity . '</td>';
         $line_item .= '<td class="total">' . $item_subtotal . '</td>';
 
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
             $line_item .= '<td class="tax">' . $line_item_tax . '</td>';
         }
 
         $line_item .= '<td class="action">';
-        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+        if (!$invoice->is_paid() && !$invoice->is_refunded()) {
             $line_item .= '<i class="fa fa-remove wpinv-item-remove"></i>';
         }
         $line_item .= '</td>';
         $line_item .= '</tr>';
 
-        echo apply_filters( 'getpaid_admin_line_item', $line_item, $item, $invoice );
+        echo apply_filters('getpaid_admin_line_item', $line_item, $item, $invoice);
 
         $count++;
     }
 
-    do_action( 'getpaid_admin_after_line_items', $invoice );
+    do_action('getpaid_admin_after_line_items', $invoice);
 
     return ob_get_clean();
 }

includes/payments/class-getpaid-payment-form-submission-fees.php

Spacing +26 added lines, -26 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission fees class
@@ -29,10 +29,10 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Process any existing invoice fees.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->fees = $submission->get_invoice()->get_fees();
 		}
 
@@ -40,14 +40,14 @@ 
 		$data         = $submission->get_data();
 		$payment_form = $submission->get_payment_form();
 
-		foreach ( $payment_form->get_elements() as $element ) {
+		foreach ($payment_form->get_elements() as $element) {
 
-			if ( 'price_input' == $element['type'] ) {
-				$this->process_price_input( $element, $data, $submission );
+			if ('price_input' == $element['type']) {
+				$this->process_price_input($element, $data, $submission);
 			}
 
-			if ( 'price_select' == $element['type'] ) {
-				$this->process_price_select( $element, $data );
+			if ('price_select' == $element['type']) {
+				$this->process_price_select($element, $data);
 			}
 
 		}
@@ -61,21 +61,21 @@ 
 	 * @param array $data
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_price_input( $element, $data, $submission ) {
+	public function process_price_input($element, $data, $submission) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
-		$minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
+		$amount  = (float) wpinv_sanitize_amount($data[$element['id']]);
+		$minimum = empty($element['minimum']) ? 0 : (float) wpinv_sanitize_amount($element['minimum']);
 
-		if ( $amount < $minimum ) {
-			throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
+		if ($amount < $minimum) {
+			throw new Exception(sprintf(__('The minimum allowed amount is %s', 'invoicing'), getpaid_unstandardize_amount($minimum, $submission->get_currency())));
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $amount,
 			'recurring_fee' => 0,
@@ -89,35 +89,35 @@ 
 	 * @param array $element
 	 * @param array $data
 	 */
-	public function process_price_select( $element, $data ) {
+	public function process_price_select($element, $data) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$options    = getpaid_convert_price_string_to_options( $element['options'] );
-		$selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
+		$options    = getpaid_convert_price_string_to_options($element['options']);
+		$selected   = array_filter(array_map('trim', explode(',', $data[$element['id']])));
 		$total      = 0;
 		$sub_labels = array();
 
-		foreach ( $selected as $price ) {
+		foreach ($selected as $price) {
 
-			if ( ! isset( $options[ $price ] ) ) {
-				throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
+			if (!isset($options[$price])) {
+				throw new Exception(__('You have selected an invalid amount', 'invoicing'));
 			}
 
-			$price = explode( '|', $price );
+			$price = explode('|', $price);
 
 			$sub_labels[] = $price[0];
-			$total += (float) wpinv_sanitize_amount( $price[1] );
+			$total += (float) wpinv_sanitize_amount($price[1]);
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $total,
 			'recurring_fee' => 0,
-			'description'   => implode( ', ', $sub_labels ),
+			'description'   => implode(', ', $sub_labels),
 		);
 
 	}

includes/admin/class-getpaid-admin-setup-wizard.php

Spacing +59 added lines, -59 removed lines

@@ -10,7 +10,7 @@ 
  * @version     2.4.0
  * @info        GetPaid Setup Wizard.
  */
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Admin_Setup_Wizard class.
@@ -44,9 +44,9 @@ 
 	 */
 	public function __construct() {
 
-		if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && wpinv_current_user_can_manage_invoicing() ) {
-			add_action( 'admin_menu', array( $this, 'add_menu' ) );
-			add_action( 'current_screen', array( $this, 'setup_wizard' ) );
+		if (apply_filters('getpaid_enable_setup_wizard', true) && wpinv_current_user_can_manage_invoicing()) {
+			add_action('admin_menu', array($this, 'add_menu'));
+			add_action('current_screen', array($this, 'setup_wizard'));
 		}
 
 	}
@@ -57,7 +57,7 @@ 
 	 * @since 2.4.0
 	 */
 	public function add_menu() {
-		add_dashboard_page( '', '', wpinv_get_capability(), 'gp-setup', '' );
+		add_dashboard_page('', '', wpinv_get_capability(), 'gp-setup', '');
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function setup_wizard() {
 
-		if ( isset( $_GET['page'] ) && 'gp-setup' === $_GET['page'] ) {
+		if (isset($_GET['page']) && 'gp-setup' === $_GET['page']) {
 			$this->setup_globals();
 			$this->maybe_save_current_step();
 			$this->display_wizard();
@@ -94,8 +94,8 @@ 
 	 * @since 2.4.0
 	 */
 	protected function maybe_save_current_step() {
-		if ( ! empty( $_POST['save_step'] ) && is_callable( $this->steps[ $this->step ]['handler'] ) ) {
-			call_user_func( $this->steps[ $this->step ]['handler'], $this );
+		if (!empty($_POST['save_step']) && is_callable($this->steps[$this->step]['handler'])) {
+			call_user_func($this->steps[$this->step]['handler'], $this);
 		}
 	}
 
@@ -110,44 +110,44 @@ 
 		$steps = array(
 
 			'introduction'     => array(
-				'name'    => __( 'Introduction', 'invoicing' ),
-				'view'    => array( $this, 'setup_introduction' ),
+				'name'    => __('Introduction', 'invoicing'),
+				'view'    => array($this, 'setup_introduction'),
 				'handler' => '',
 			),
 
 			'business_details'             => array(
-				'name'    => __( "Business Details", 'invoicing' ),
-				'view'    => array( $this, 'setup_business' ),
+				'name'    => __("Business Details", 'invoicing'),
+				'view'    => array($this, 'setup_business'),
 				'handler' => '',
 			),
 
 			'currency' => array(
-				'name'    => __( 'Currency', 'invoicing' ),
-				'view'    => array( $this, 'setup_currency' ),
+				'name'    => __('Currency', 'invoicing'),
+				'view'    => array($this, 'setup_currency'),
 				'handler' => '',
 			),
 
 			'payments'        => array(
-				'name'    => __( 'Payment Gateways', 'invoicing' ),
-				'view'    => array( $this, 'setup_payments' ),
-				'handler' => array( $this, 'setup_payments_save' ),
+				'name'    => __('Payment Gateways', 'invoicing'),
+				'view'    => array($this, 'setup_payments'),
+				'handler' => array($this, 'setup_payments_save'),
 			),
 
 			'recommend'          => array(
-				'name'    => __( 'Recommend', 'invoicing' ),
-				'view'    => array( $this, 'setup_recommend' ),
+				'name'    => __('Recommend', 'invoicing'),
+				'view'    => array($this, 'setup_recommend'),
 				'handler' => '',
 			),
 
 			'next_steps'       => array(
-				'name'    => __( 'Get Paid', 'invoicing' ),
-				'view'    => array( $this, 'setup_ready' ),
+				'name'    => __('Get Paid', 'invoicing'),
+				'view'    => array($this, 'setup_ready'),
 				'handler' => '',
 			),
 
 		);
 
-		return apply_filters( 'getpaid_setup_wizard_steps', $steps );
+		return apply_filters('getpaid_setup_wizard_steps', $steps);
 
 	}
 
@@ -158,8 +158,8 @@ 
 	 * @return string
 	 */
 	protected function get_current_step() {
-		$step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : '';
-		return ! empty( $step ) && in_array( $step, array_keys( $this->steps ) ) ? $step : current( array_keys( $this->steps ) );
+		$step = isset($_GET['step']) ? sanitize_key($_GET['step']) : '';
+		return !empty($step) && in_array($step, array_keys($this->steps)) ? $step : current(array_keys($this->steps));
 	}
 
 	/**
@@ -172,8 +172,8 @@ 
 
 		$previous = false;
 		$current  = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
-			if ( $current === $step ) {
+		foreach (array_keys($this->steps) as $step) {
+			if ($current === $step) {
 				return $previous;
 			}
 
@@ -193,13 +193,13 @@ 
 
 		$on_current = false;
 		$current    = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
+		foreach (array_keys($this->steps) as $step) {
 
-			if ( $on_current ) {
+			if ($on_current) {
 				return $step;
 			}
 
-			if ( $current === $step ) {
+			if ($current === $step) {
 				return $on_current = true;
 			}
 
@@ -228,8 +228,8 @@ 
 		$steps     = $this->steps;
 		$current   = $this->step;
 		$next_step = $this->next_step;
-		array_shift( $steps );
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-header.php';
+		array_shift($steps);
+		include plugin_dir_path(__FILE__) . 'views/wizard-header.php';
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 		?>
 			<div class="gp-setup-content rowx mw-100 text-center mb-3">
 				<div class="col-12 col-md-5 m-auto">
-					<?php call_user_func( $this->steps[ $this->step ]['view'], $this ); ?>
+					<?php call_user_func($this->steps[$this->step]['view'], $this); ?>
 				</div>
 			</div>
 		<?php
@@ -254,9 +254,9 @@ 
 	 */
 	public function display_footer() {
 
-		if ( isset( $_GET['step'] ) ) {
-			$next_url = esc_url( $this->get_next_step_link() );
-			$label    = $this->step == 'next_steps' ? __( 'Return to the WordPress Dashboard', 'invoicing' ) : __( 'Skip this step', 'invoicing' );
+		if (isset($_GET['step'])) {
+			$next_url = esc_url($this->get_next_step_link());
+			$label    = $this->step == 'next_steps' ? __('Return to the WordPress Dashboard', 'invoicing') : __('Skip this step', 'invoicing');
 
 			echo '<p class="gd-return-to-dashboard-wrap"> <a href="' . $next_url . '" class="gd-return-to-dashboard btn btn-link d-block text-muted">' . $label . '</a></p>';
 		}
@@ -271,7 +271,7 @@ 
 	 */
 	public function setup_introduction() {
 		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-introduction.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-introduction.php';
 	}
 
 	/**
@@ -284,22 +284,22 @@ 
 	 *                      Empty string on failure.
 	 * @since 3.0.0
 	 */
-	public function get_next_step_link( $step = '' ) {
-		if ( ! $step ) {
+	public function get_next_step_link($step = '') {
+		if (!$step) {
 			$step = $this->step;
 		}
 
-		$keys = array_keys( $this->steps );
-		if ( end( $keys ) === $step ) {
+		$keys = array_keys($this->steps);
+		if (end($keys) === $step) {
 			return admin_url();
 		}
 
-		$step_index = array_search( $step, $keys );
-		if ( false === $step_index ) {
+		$step_index = array_search($step, $keys);
+		if (false === $step_index) {
 			return '';
 		}
 
-		return remove_query_arg('settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ));
+		return remove_query_arg('settings-updated', add_query_arg('step', $keys[$step_index + 1]));
 	}
 
 	/**
@@ -312,7 +312,7 @@ 
 		$wizard   = $this;
 		$page     = 'wpinv_settings_general_main';
 		$section  = 'wpinv_settings_general_main';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-settings.php';
 	}
 
 	/**
@@ -325,7 +325,7 @@ 
 		$wizard   = $this;
 		$page     = 'wpinv_settings_general_currency_section';
 		$section  = 'wpinv_settings_general_currency_section';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-settings.php';
 	}
 
 	/**
@@ -336,35 +336,35 @@ 
 	public function setup_recommend() {
 		$next_url            = $this->get_next_step_link();
 		$recommended_plugins = self::get_recommend_wp_plugins();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-plugins.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-plugins.php';
 	}
 
 	/**
 	 * A list of recommended wp.org plugins.
 	 * @return array
 	 */
-	public static function get_recommend_wp_plugins(){
+	public static function get_recommend_wp_plugins() {
 		return array(
 			'ayecode-connect' => array(
 				'file'   => 'ayecode-connect/ayecode-connect.php',
 				'url'    => 'https://wordpress.org/plugins/ayecode-connect/',
 				'slug'   => 'ayecode-connect',
 				'name'   => 'AyeCode Connect',
-				'desc'   => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
+				'desc'   => __('Documentation and Support from within your WordPress admin.', 'geodirectory'),
 			),
 			'invoicing-quotes' => array(
 				'file'   => 'invoicing-quotes/wpinv-quote.php',
 				'url'    => 'https://wordpress.org/plugins/invoicing-quotes/',
 				'slug'   => 'invoicing-quotes',
 				'name'   => 'Customer Quotes',
-				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.','geodirectory'),
+				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.', 'geodirectory'),
 			),
 			'userswp'    => array(
 				'file'   => 'userswp/userswp.php',
 				'url'    => 'https://wordpress.org/plugins/userswp/',
 				'slug'   => 'userswp',
 				'name'   => 'UsersWP',
-				'desc'   => __('Frontend user login and registration as well as slick profile pages.','geodirectory'),
+				'desc'   => __('Frontend user login and registration as well as slick profile pages.', 'geodirectory'),
 			),
 		);
 	}
@@ -376,7 +376,7 @@ 
 	 */
 	public function setup_payments() {
 		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-gateways.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-gateways.php';
 	}
 
 	/**
@@ -387,16 +387,16 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_payments_save() {
-		check_admin_referer( 'getpaid-setup-wizard', 'getpaid-setup-wizard' );
-		wpinv_update_option( 'manual_active', ! empty( $_POST['enable-manual-gateway'] ) );
+		check_admin_referer('getpaid-setup-wizard', 'getpaid-setup-wizard');
+		wpinv_update_option('manual_active', !empty($_POST['enable-manual-gateway']));
 
-		if ( ! empty( $_POST['paypal-email'] ) ) {
-			wpinv_update_option( 'paypal_email', sanitize_email( $_POST['paypal-email'] ) );
-			wpinv_update_option( 'paypal_active', 1 );
-			wpinv_update_option( 'paypal_sandbox', 0 );
+		if (!empty($_POST['paypal-email'])) {
+			wpinv_update_option('paypal_email', sanitize_email($_POST['paypal-email']));
+			wpinv_update_option('paypal_active', 1);
+			wpinv_update_option('paypal_sandbox', 0);
 		}
 
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+		wp_redirect(esc_url_raw($this->get_next_step_link()));
 		exit;
 	}
 
@@ -406,7 +406,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_ready() {
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-thank-you.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-thank-you.php';
 	}
 
 }

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 _e( 'Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing' ); ?></p>
+        <p><?php _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 _e( '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 _e('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 _e( 'Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing' ); ?></p>
+		<p><?php _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 WPINV_PLUGIN_URL . 'assets/images/buy.svg';?>" class="mr-3" alt="...">
+                    <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/buy.svg'; ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e( 'GetPaid via Buy Now Buttons', 'invoicing' );?></h6>
-                        <small><?php _e( 'Sell via buy now buttons anywhere on your site', 'invoicing' );?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Buy Now Buttons', 'invoicing'); ?></h6>
+                        <small><?php _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 WPINV_PLUGIN_URL . 'assets/images/report.svg';?>" class="mr-3" alt="...">
+                    <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/report.svg'; ?>" class="mr-3" alt="...">
                         <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e( 'GetPaid via payment form', 'invoicing' );?></h6>
-                        <small><?php _e( 'Payment forms are conversion-optimized checkout forms', 'invoicing' );?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via payment form', 'invoicing'); ?></h6>
+                        <small><?php _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 WPINV_PLUGIN_URL . 'assets/images/invoices.svg';?>" class="mr-3" alt="...">
+                    <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/invoices.svg'; ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Invoice','invoicing');?></h6>
-                        <small><?php _e('Create and send invoices for just about anything from the WordPress dashboard','invoicing');?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Invoice', 'invoicing'); ?></h6>
+                        <small><?php _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 WPINV_PLUGIN_URL . 'assets/images/payment.svg';?>" class="mr-3" alt="...">
+                    <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/payment.svg'; ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php _e('Affordable payment gateways','invoicing');?></h6>
-                        <small><?php _e('On average our gateways are over 66% cheaper than our competition','invoicing');?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php _e('Affordable payment gateways', 'invoicing'); ?></h6>
+                        <small><?php _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 _e( 'More with Membership!' , 'invoicing' );?></h4>
+		<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php _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 _e( 'PDF Invoices' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Gravity Forms' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Contact form 7' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'AffiliateWP Integration' , 'invoicing' );?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('PDF Invoices', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Gravity Forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Contact form 7', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _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 _e( 'Ninja forms' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Digital Downloads' , 'invoicing' );?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e( 'Wallet' , 'invoicing' );?></li>
+			    	<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Ninja forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Digital Downloads', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php _e('Wallet', 'invoicing'); ?></li>
 				</ul>
 			</div>
 		</div>
 
-		<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php _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 _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/class-getpaid-daily-maintenance.php

Spacing +35 added lines, -35 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Daily maintenance class.
@@ -15,20 +15,20 @@ 
 	/**
 	 * Class constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 
 		// Clear deprecated events.
-		add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
+		add_action('wp', array($this, 'maybe_clear_deprecated_events'));
 
 		// (Maybe) schedule a cron that runs daily.
-		add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
+		add_action('wp', array($this, 'maybe_create_scheduled_event'));
 
 		// Fired everyday at 7 a.m (this might vary for sites with few visitors)
-		add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'check_renewing_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
+		add_action('getpaid_daily_maintenance', array($this, 'log_cron_run'));
+		add_action('getpaid_daily_maintenance', array($this, 'backwards_compat'));
+		add_action('getpaid_daily_maintenance', array($this, 'maybe_expire_subscriptions'));
+		add_action('getpaid_daily_maintenance', array($this, 'check_renewing_subscriptions'));
+		add_action('getpaid_daily_maintenance', array($this, 'maybe_update_geoip_databases'));
 
 	}
 
@@ -38,9 +38,9 @@ 
 	 */
 	public function maybe_create_scheduled_event() {
 
-		if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
-			$timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
-			wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
+		if (!wp_next_scheduled('getpaid_daily_maintenance')) {
+			$timestamp = strtotime('tomorrow 07:00:00', current_time('timestamp'));
+			wp_schedule_event($timestamp, 'daily', 'getpaid_daily_maintenance');
 		}
 
 	}
@@ -51,10 +51,10 @@ 
 	 */
 	public function maybe_clear_deprecated_events() {
 
-		if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
-			update_option( 'wpinv_cleared_old_events', 1 );
+		if (!get_option('wpinv_cleared_old_events')) {
+			wp_clear_scheduled_hook('wpinv_register_schedule_event_twicedaily');
+			wp_clear_scheduled_hook('wpinv_register_schedule_event_daily');
+			update_option('wpinv_cleared_old_events', 1);
 		}
 
 	}
@@ -64,7 +64,7 @@ 
 	 *
 	 */
 	public function backwards_compat() {
-		do_action( 'wpinv_register_schedule_event_daily' );
+		do_action('wpinv_register_schedule_event_daily');
 	}
 
 	/**
@@ -74,29 +74,29 @@ 
 	public function check_renewing_subscriptions() {
 
 		// Fetch subscriptions that expire today.
-		$args  = array(
+		$args = array(
 			'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
 			'date_expires_query' => array(
 				array(
-					'year'          => date( 'Y', current_time( 'timestamp' ) ),
-					'month'         => date( 'n', current_time( 'timestamp' ) ),
-					'day'           => date( 'j', current_time( 'timestamp' ) ),
+					'year'          => date('Y', current_time('timestamp')),
+					'month'         => date('n', current_time('timestamp')),
+					'day'           => date('j', current_time('timestamp')),
 					'compare'       => '=',
 				),
 			),
 		);
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-		foreach ( $subscriptions->get_results() as $subscription ) {
+		foreach ($subscriptions->get_results() as $subscription) {
 
 			/** @var WPInv_Subscription $subscription */
-			if ( $subscription->is_last_renewal() ) {
+			if ($subscription->is_last_renewal()) {
 				$subscription->complete();
 			} else {
-				do_action( 'getpaid_should_renew_subscription', $subscription );
+				do_action('getpaid_should_renew_subscription', $subscription);
 			}
 
 		}
@@ -110,7 +110,7 @@ 
 	public function maybe_expire_subscriptions() {
 
 		// Fetch expired subscriptions (skips those that expire today).
-		$args  = array(
+		$args = array(
 			'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active failing cancelled',
@@ -120,11 +120,11 @@ 
 			),
 		);
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-		foreach ( $subscriptions->get_results() as $subscription ) {
-			if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', false, $subscription ) ) {
-				$subscription->set_status( 'expired' );
+		foreach ($subscriptions->get_results() as $subscription) {
+			if (apply_filters('getpaid_daily_maintenance_should_expire_subscription', false, $subscription)) {
+				$subscription->set_status('expired');
 				$subscription->save();
 			}
 		}
@@ -136,7 +136,7 @@ 
 	 *
 	 */
 	public function log_cron_run() {
-		wpinv_error_log( 'GetPaid Daily Cron', false );
+		wpinv_error_log('GetPaid Daily Cron', false);
 	}
 
 	/**
@@ -144,11 +144,11 @@ 
 	 *
 	 */
 	public function maybe_update_geoip_databases() {
-		$updated = get_transient( 'getpaid_updated_geoip_databases' );
+		$updated = get_transient('getpaid_updated_geoip_databases');
 
-		if ( false === $updated ) {
-			set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
-			do_action( 'getpaid_update_geoip_databases' );
+		if (false === $updated) {
+			set_transient('getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS);
+			do_action('getpaid_update_geoip_databases');
 		}
 
 	}

includes/class-wpinv-addons.php

Spacing +90 added lines, -90 removed lines

@@ -5,7 +5,7 @@ 
  * All Invoicing extensions screen related functions can be found here.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,7 +20,7 @@ 
 	 *
 	 * @return array of tabs.
 	 */
-	public function get_tabs(){
+	public function get_tabs() {
 		$tabs = array(
 			'addons' => __("Addons", "invoicing"),
             'gateways' => __("Payment Gateways", "invoicing"),
@@ -38,28 +38,28 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
+	public function get_section_data($section_id) {
+		$section      = self::get_tab($section_id);
 		$api_url = "https://wpinvoicing.com/edd-api/v2/products/";
 		$section_data = new stdClass();
 
-		if($section_id=='recommended_plugins'){
+		if ($section_id == 'recommended_plugins') {
 			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
 		}
-		elseif ( ! empty( $section ) ) {
-			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
+		elseif (!empty($section)) {
+			if (false === ($section_data = get_transient('wpi_addons_section_' . $section_id))) { //@todo restore after testing
 			//if ( 1==1) {
 
-				$query_args = array( 'category' => $section_id, 'number' => 100);
-				$query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
+				$query_args = array('category' => $section_id, 'number' => 100);
+				$query_args = apply_filters('wpeu_edd_api_query_args', $query_args, $api_url, $section_id);
 
-				$raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
+				$raw_section = wp_safe_remote_get(esc_url_raw(add_query_arg($query_args, $api_url)), array('user-agent' => 'Invoicing Addons Page', 'timeout'     => 15,));
 
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+				if (!is_wp_error($raw_section)) {
+					$section_data = json_decode(wp_remote_retrieve_body($raw_section));
 
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
+					if (!empty($section_data->products)) {
+						set_transient('wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS);
 					}
 				}
 			}
@@ -67,21 +67,21 @@ 
 		}
 
 		$products = isset($section_data->products) ? $section_data->products : array();
-		if ( 'addons' == $section_id ) {
+		if ('addons' == $section_id) {
 
 			$quotes = new stdClass();
 			$quotes->info = new stdClass();
 			$quotes->info->id = '';
 			$quotes->info->slug = 'invoicing-quotes';
-			$quotes->info->title = __( 'Quotes', 'invoicing' );
-			$quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
+			$quotes->info->title = __('Quotes', 'invoicing');
+			$quotes->info->excerpt = __('Create quotes and estimates', 'invoicing');
 			$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
 			$quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
 
 			$products[] = $quotes;
 		}
 		
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+		return apply_filters('wpi_addons_section_data', $products, $section_id);
 	}
 
 	/**
@@ -92,8 +92,8 @@ 
 	 * @param string $theme
 	 * @param string $plugin
 	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+	public function output_button($addon) {
+		$current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -105,14 +105,14 @@ 
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array('supreme-directory','directory-starter');
+		$wp_org_themes = array('supreme-directory', 'directory-starter');
 
 		$button_args = array(
-			'type' => ($current_tab == 'addons' || $current_tab =='gateways') ? 'addons' : $current_tab,
+			'type' => ($current_tab == 'addons' || $current_tab == 'gateways') ? 'addons' : $current_tab,
 			'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
 			'title' => isset($addon->info->title) ? $addon->info->title : '',
-			'button_text' => __('Free','invoicing'),
-			'price_text' => __('Free','invoicing'),
+			'button_text' => __('Free', 'invoicing'),
+			'price_text' => __('Free', 'invoicing'),
 			'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
 			'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
 			'class' => 'button-primary',
@@ -128,83 +128,83 @@ 
 			'update_url' => '',
 		);
 
-		if( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug )){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			$status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
+		if ('invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug)) {
+			include_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); //for plugins_api..
+			$status = install_plugin_install_status(array("slug"=>$button_args['slug'], "version"=>""));
 			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
 			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-		}elseif( ($current_tab == 'addons' || $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+		}elseif (($current_tab == 'addons' || $current_tab == 'gateways') && isset($addon->info->id) && $addon->info->id) {
+			include_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); //for plugins_api..
+			if (!empty($addon->licensing->edd_slug)) {$button_args['slug'] = $addon->licensing->edd_slug; }
 			$status = self::install_plugin_install_status($addon);
 			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-			if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
+			if (isset($status['status'])) {$button_args['install_status'] = $status['status']; }
 			$button_args['update_url'] = "https://wpinvoicing.com";
-		}elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+		}elseif ($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+			if (!empty($addon->licensing->edd_slug)) {$button_args['slug'] = $addon->licensing->edd_slug; }
 			$button_args['installed'] = self::is_theme_installed($addon);
-			if(!in_array($button_args['slug'],$wp_org_themes)){
+			if (!in_array($button_args['slug'], $wp_org_themes)) {
 				$button_args['update_url'] = "https://wpinvoicing.com";
 			}
 		}
 
 		// set price
-		if(isset($addon->pricing) && !empty($addon->pricing)){
-			if(is_object($addon->pricing)){
-				$prices = (Array)$addon->pricing;
+		if (isset($addon->pricing) && !empty($addon->pricing)) {
+			if (is_object($addon->pricing)) {
+				$prices = (Array) $addon->pricing;
 				$button_args['price'] = reset($prices);
-			}elseif(isset($addon->pricing)){
+			}elseif (isset($addon->pricing)) {
 				$button_args['price'] = $addon->pricing;
 			}
 		}
 
 		// set price text
-		if( $button_args['price'] && $button_args['price'] != '0.00' ){
-			$button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
+		if ($button_args['price'] && $button_args['price'] != '0.00') {
+			$button_args['price_text'] = sprintf(__('From: $%d', 'invoicing'), $button_args['price']);
 		}
 
 
 		// set if installed
-		if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
+		if (in_array($button_args['install_status'], array('installed', 'latest_installed', 'update_available', 'newer_installed'))) {
 			$button_args['installed'] = true;
 		}
 
 //		print_r($button_args);
 		// set if active
-		if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
-			if($button_args['type'] != 'themes'){
+		if ($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')) {
+			if ($button_args['type'] != 'themes') {
 				$button_args['active'] = is_plugin_active($button_args['file']);
-			}else{
+			} else {
 				$button_args['active'] = self::is_theme_active($addon);
 			}
 		}
 
 		// set button text and class
-		if($button_args['active']){
-			$button_args['button_text'] = __('Active','invoicing');
+		if ($button_args['active']) {
+			$button_args['button_text'] = __('Active', 'invoicing');
 			$button_args['class'] = ' button-secondary disabled ';
-		}elseif($button_args['installed']){
-			$button_args['button_text'] = __('Activate','invoicing');
+		}elseif ($button_args['installed']) {
+			$button_args['button_text'] = __('Activate', 'invoicing');
 
-			if($button_args['type'] != 'themes'){
-				if ( current_user_can( 'manage_options' ) ) {
-					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
-				}else{
+			if ($button_args['type'] != 'themes') {
+				if (current_user_can('manage_options')) {
+					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $button_args['file']), 'activate-plugin_' . $button_args['file']);
+				} else {
 					$button_args['url'] = '#';
 				}
-			}else{
-				if ( current_user_can( 'switch_themes' ) ) {
+			} else {
+				if (current_user_can('switch_themes')) {
 					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
+				} else {
 					$button_args['url'] = '#';
 				}
 			}
 
-		}else{
-			if($button_args['type'] == 'recommended_plugins'){
-				$button_args['button_text'] = __('Install','invoicing');
-			}else{
-				$button_args['button_text'] = __('Get it','invoicing');
+		} else {
+			if ($button_args['type'] == 'recommended_plugins') {
+				$button_args['button_text'] = __('Install', 'invoicing');
+			} else {
+				$button_args['button_text'] = __('Get it', 'invoicing');
 
 				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 					$button_args['button_text'] = __('Install','invoicing');
@@ -217,45 +217,45 @@ 
 
 		
 		// filter the button arguments
-		$button_args = apply_filters('edd_api_button_args',$button_args);
+		$button_args = apply_filters('edd_api_button_args', $button_args);
 //		print_r($button_args);
 		// set price text
-		if(isset($button_args['price_text'])){
+		if (isset($button_args['price_text'])) {
 			?>
 			<a
 				target="_blank"
 				class="addons-price-text"
-				href="<?php echo esc_url( $button_args['link'] ); ?>">
-				<?php echo esc_html( $button_args['price_text'] ); ?>
+				href="<?php echo esc_url($button_args['link']); ?>">
+				<?php echo esc_html($button_args['price_text']); ?>
 			</a>
 			<?php
 		}
 
 
 		$target = '';
-		if ( ! empty( $button_args['url'] ) ) {
+		if (!empty($button_args['url'])) {
 			$target = strpos($button_args['url'], get_site_url()) !== false ? '' : ' target="_blank" ';
 		}
 
 		?>
 		<a
-			data-licence="<?php echo esc_attr($button_args['license']);?>"
-			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0;?>"
-			data-title="<?php echo esc_attr($button_args['title']);?>"
-			data-type="<?php echo esc_attr($button_args['type']);?>"
-			data-text-error-message="<?php _e('Something went wrong!','invoicing');?>"
-			data-text-activate="<?php _e('Activate','invoicing');?>"
-			data-text-activating="<?php _e('Activating','invoicing');?>"
-			data-text-deactivate="<?php _e('Deactivate','invoicing');?>"
-			data-text-installed="<?php _e('Installed','invoicing');?>"
-			data-text-install="<?php _e('Install','invoicing');?>"
-			data-text-installing="<?php _e('Installing','invoicing');?>"
-			data-text-error="<?php _e('Error','invoicing');?>"
-			<?php if(!empty($button_args['onclick'])){echo " onclick='".$button_args['onclick']."' ";}?>
-			<?php echo $target;?>
-			class="addons-button  <?php echo esc_attr( $button_args['class'] ); ?>"
-			href="<?php echo esc_url( $button_args['url'] ); ?>">
-			<?php echo esc_html( $button_args['button_text'] ); ?>
+			data-licence="<?php echo esc_attr($button_args['license']); ?>"
+			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0; ?>"
+			data-title="<?php echo esc_attr($button_args['title']); ?>"
+			data-type="<?php echo esc_attr($button_args['type']); ?>"
+			data-text-error-message="<?php _e('Something went wrong!', 'invoicing'); ?>"
+			data-text-activate="<?php _e('Activate', 'invoicing'); ?>"
+			data-text-activating="<?php _e('Activating', 'invoicing'); ?>"
+			data-text-deactivate="<?php _e('Deactivate', 'invoicing'); ?>"
+			data-text-installed="<?php _e('Installed', 'invoicing'); ?>"
+			data-text-install="<?php _e('Install', 'invoicing'); ?>"
+			data-text-installing="<?php _e('Installing', 'invoicing'); ?>"
+			data-text-error="<?php _e('Error', 'invoicing'); ?>"
+			<?php if (!empty($button_args['onclick'])) {echo " onclick='" . $button_args['onclick'] . "' "; }?>
+			<?php echo $target; ?>
+			class="addons-button  <?php echo esc_attr($button_args['class']); ?>"
+			href="<?php echo esc_url($button_args['url']); ?>">
+			<?php echo esc_html($button_args['button_text']); ?>
 		</a>
 		<?php
 
@@ -270,36 +270,36 @@ 
 		$tabs            = self::get_tabs();
 		$sections        = self::get_sections();
 		$theme           = wp_get_theme();
-		$section_keys    = array_keys( $sections );
-		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
-		include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
+		$section_keys    = array_keys($sections);
+		$current_section = isset($_GET['section']) ? sanitize_text_field($_GET['section']) : current($section_keys);
+		$current_tab     = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
+		include_once(WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php');
 	}
 
 	/**
 	 * A list of recommended wp.org plugins.
 	 * @return array
 	 */
-	public function get_recommend_wp_plugins(){
+	public function get_recommend_wp_plugins() {
 		$plugins = array(
             'invoicing-quotes' => array(
                 'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
                 'slug'   => 'invoicing-quotes',
 				'name'   => 'Quotes',
 				'thumbnail'  => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
-                'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.','invoicing'),
+                'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing'),
             ),
             'geodirectory' => array(
                 'url'   => 'https://wordpress.org/plugins/geodirectory/',
                 'slug'   => 'geodirectory',
                 'name'   => 'GeoDirectory',
-                'desc'   => __('Turn any WordPress theme into a global business directory portal.','invoicing'),
+                'desc'   => __('Turn any WordPress theme into a global business directory portal.', 'invoicing'),
             ),
             'userswp' => array(
                 'url'   => 'https://wordpress.org/plugins/userswp/',
                 'slug'   => 'userswp',
                 'name'   => 'UsersWP',
-                'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
+                'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.', 'invoicing'),
             ),
 		);