AyeCode / invoicing

includes/data/email-settings.php

Spacing +243 added lines, -243 removed lines

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

templates/emails/wpinv-email-renewal_reminder.php

Spacing +5 added lines, -5 removed lines

@@ -8,18 +8,18 @@
  * @var WPInv_Subscription $object
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $invoice = $object->get_parent_payment();
 
 // Print the email header.
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
 // Generate the custom message body.
-echo wp_kses_post( $message_body );
+echo wp_kses_post($message_body);
 
 // Print the billing details.
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
 // Print the email footer.
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);

vendor/ayecode/wp-ayecode-ui/includes/inc/bs5-js.php

Indentation +2 added lines, -2 removed lines

@@ -1075,8 +1075,8 @@
     aui_flip_color_scheme_on_scroll();
 
 	<?php
-	// FSE tweaks.
-	if(!empty($_REQUEST['postType']) || !empty($_REQUEST['canvas']) ){ ?>
+    // FSE tweaks.
+    if(!empty($_REQUEST['postType']) || !empty($_REQUEST['canvas']) ){ ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

Spacing +2 added lines, -2 removed lines

@@ -260,7 +260,7 @@ 
     function aui_init_flatpickr(){
         if ( typeof jQuery.fn.flatpickr === "function" && !$aui_doing_init_flatpickr) {
             $aui_doing_init_flatpickr = true;
-			<?php if ( ! empty( $flatpickr_locale ) ) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
+			<?php if (!empty($flatpickr_locale)) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
             jQuery('input[data-aui-init="flatpickr"]:not(.flatpickr-input)').flatpickr();
         }
         $aui_doing_init_flatpickr = false;
@@ -1076,7 +1076,7 @@ 
 
 	<?php
 	// FSE tweaks.
-	if(!empty($_REQUEST['postType']) || !empty($_REQUEST['canvas']) ){ ?>
+	if (!empty($_REQUEST['postType']) || !empty($_REQUEST['canvas'])) { ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

Switch Indentation +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php // @todo eventually we need to convert this to non jQuery ?>
+    <?php // @todo eventually we need to convert this to non jQuery ?>
 <script>
     /**
      * An AUI bootstrap adaptation of GreedyNav.js ( by Luke Jackson ).
@@ -1075,8 +1075,8 @@ 
     aui_flip_color_scheme_on_scroll();
 
 	<?php
-	// FSE tweaks.
-	if(!empty($_REQUEST['postType']) || !empty($_REQUEST['canvas']) ){ ?>
+	    // FSE tweaks.
+	    if(!empty($_REQUEST['postType']) || !empty($_REQUEST['canvas']) ){ ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

vendor/ayecode/wp-ayecode-ui/includes/inc/bs4-js.php

Indentation +2 added lines, -2 removed lines

@@ -962,8 +962,8 @@
     aui_flip_color_scheme_on_scroll();
 
 	<?php
-	// FSE tweaks.
-	if(!empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template' || !empty($_REQUEST['canvas']) ){ ?>
+    // FSE tweaks.
+    if(!empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template' || !empty($_REQUEST['canvas']) ){ ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

Spacing +2 added lines, -2 removed lines

@@ -242,7 +242,7 @@ 
     function aui_init_flatpickr(){
         if ( typeof jQuery.fn.flatpickr === "function" && !$aui_doing_init_flatpickr) {
             $aui_doing_init_flatpickr = true;
-			<?php if ( ! empty( $flatpickr_locale ) ) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
+			<?php if (!empty($flatpickr_locale)) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
             jQuery('input[data-aui-init="flatpickr"]:not(.flatpickr-input)').flatpickr();
         }
         $aui_doing_init_flatpickr = false;
@@ -963,7 +963,7 @@ 
 
 	<?php
 	// FSE tweaks.
-	if(!empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template' || !empty($_REQUEST['canvas']) ){ ?>
+	if (!empty($_REQUEST['postType']) && $_REQUEST['postType'] == 'wp_template' || !empty($_REQUEST['canvas'])) { ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

Switch Indentation +2 added lines, -2 removed lines

@@ -962,8 +962,8 @@
     aui_flip_color_scheme_on_scroll();
 
 	<?php
-	// FSE tweaks.
-	if(!empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template' || !empty($_REQUEST['canvas']) ){ ?>
+	    // FSE tweaks.
+	    if(!empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template' || !empty($_REQUEST['canvas']) ){ ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

templates/subscriptions/subscriptions-table-row.php

Indentation +31 added lines, -31 removed lines

@@ -13,47 +13,47 @@
 
 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()
-			);
+        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( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>" );
-			break;
+            echo wp_kses_post( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>" );
+            break;
 
-		case 'status':
-			echo wp_kses_post( $subscription->get_status_label_html() );
-			break;
+        case 'status':
+            echo wp_kses_post( $subscription->get_status_label_html() );
+            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;
 
-		case 'actions':
-			echo wp_kses_post( $widget->add_row_actions( '', $subscription ) );
-			break;
+        case 'actions':
+            echo wp_kses_post( $widget->add_row_actions( '', $subscription ) );
+            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 +28 added lines, -28 removed lines

@@ -20,40 +20,40 @@
 
 		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()
-			);
+		    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( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>" );
-			break;
+			    echo wp_kses_post( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>" );
+			    break;
 
-		case 'status':
-			echo wp_kses_post( $subscription->get_status_label_html() );
-			break;
+		    case 'status':
+			    echo wp_kses_post( $subscription->get_status_label_html() );
+			    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;
 
-		case 'actions':
-			echo wp_kses_post( $widget->add_row_actions( '', $subscription ) );
-			break;
+		    case 'actions':
+			    echo wp_kses_post( $widget->add_row_actions( '', $subscription ) );
+			    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;
+    endforeach;

Spacing +17 added lines, -17 removed lines

@@ -9,50 +9,50 @@
  * @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( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>" );
+			echo wp_kses_post("<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>");
 			break;
 
 		case 'status':
-			echo wp_kses_post( $subscription->get_status_label_html() );
+			echo wp_kses_post($subscription->get_status_label_html());
 			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;
 
 		case 'actions':
-			echo wp_kses_post( $widget->add_row_actions( '', $subscription ) );
+			echo wp_kses_post($widget->add_row_actions('', $subscription));
 			break;
 
 		endswitch;
 
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+		do_action("getpaid_subscriptions_frontend_subscription_table_$column", $subscription);
 
 	echo '</td>';
 

includes/class-wpinv-invoice.php

Indentation +2763 added lines, -2763 removed lines

@@ -14,31 +14,31 @@ 
 class WPInv_Invoice extends GetPaid_Data {
 
     /**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'invoice';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
+     * This is the name of this object type.
+     *
+     * @var string
+     */
     protected $object_type = 'invoice';
 
     /**
-	 * Item Data array. This is the core item data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'parent_id'              => 0,
-		'customer_id'            => 0,
-		'status'                 => 'wpi-pending',
-		'version'                => '',
-		'date_created'           => null,
+     * Item Data array. This is the core item data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'parent_id'              => 0,
+        'customer_id'            => 0,
+        'status'                 => 'wpi-pending',
+        'version'                => '',
+        'date_created'           => null,
         'date_modified'          => null,
         'due_date'               => null,
         'completed_date'         => null,
@@ -61,17 +61,17 @@ 
         'state'                  => null,
         'zip'                    => null,
         'company'                => null,
-		'company_id'             => null,
+        'company_id'             => null,
         'vat_number'             => null,
         'vat_rate'               => null,
         'address'                => null,
         'address_confirmed'      => false,
         'shipping'               => null,
-		'subtotal'               => 0,
+        'subtotal'               => 0,
         'total_discount'         => 0,
         'total_tax'              => 0,
-		'total_fees'             => 0,
-		'total'                  => 0,
+        'total_fees'             => 0,
+        'total'                  => 0,
         'fees'                   => array(),
         'discounts'              => array(),
         'taxes'                  => array(),
@@ -83,23 +83,23 @@ 
         'transaction_id'         => '',
         'currency'               => '',
         'disable_taxes'          => false,
-		'subscription_id'        => null,
-		'remote_subscription_id' => null,
-		'is_anonymized'          => false,
-		'is_viewed'              => false,
-		'email_cc'               => '',
-		'template'               => 'quantity', // hours, amount only
-		'created_via'            => null,
+        'subscription_id'        => null,
+        'remote_subscription_id' => null,
+        'is_anonymized'          => false,
+        'is_viewed'              => false,
+        'email_cc'               => '',
+        'template'               => 'quantity', // hours, amount only
+        'created_via'            => null,
     );
 
     /**
-	 * Stores meta in cache for future reads.
-	 *
-	 * A group must be set to to enable caching.
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'getpaid_invoices';
+     * Stores meta in cache for future reads.
+     *
+     * A group must be set to to enable caching.
+     *
+     * @var string
+     */
+    protected $cache_group = 'getpaid_invoices';
 
     /**
      * Stores a reference to the original WP_Post object
@@ -113,122 +113,122 @@ 
      *
      * @var int
      */
-	protected $recurring_item = null;
+    protected $recurring_item = null;
 
-	/**
+    /**
      * Stores an array of item totals.
-	 *
-	 * e.g $totals['discount'] = array(
-	 *      'initial'   => 10,
-	 *      'recurring' => 10,
-	 * )
+     *
+     * e.g $totals['discount'] = array(
+     *      'initial'   => 10,
+     *      'recurring' => 10,
+     * )
      *
      * @var array
      */
-	protected $totals = array();
+    protected $totals = array();
 
-	/**
+    /**
      * Tax rate.
-	 *
+     *
      * @var float
      */
-	protected $tax_rate = 0;
+    protected $tax_rate = 0;
 
-	/**
-	 * Stores the status transition information.
-	 *
-	 * @since 1.0.19
-	 * @var bool|array
-	 */
-	protected $status_transition = false;
+    /**
+     * Stores the status transition information.
+     *
+     * @since 1.0.19
+     * @var bool|array
+     */
+    protected $status_transition = false;
 
     /**
-	 * Get the invoice if ID is passed, otherwise the invoice is new and empty.
-	 *
-	 * @param  int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object to read.
-	 */
+     * Get the invoice if ID is passed, otherwise the invoice is new and empty.
+     *
+     * @param  int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object to read.
+     */
     public function __construct( $invoice = 0 ) {
 
         parent::__construct( $invoice );
 
-		if ( ! empty( $invoice ) && is_numeric( $invoice ) && getpaid_is_invoice_post_type( get_post_type( (int) $invoice ) ) ) {
-			$this->set_id( (int) $invoice );
-		} elseif ( $invoice instanceof self ) {
-			$this->set_id( $invoice->get_id() );
-		} elseif ( ! empty( $invoice->ID ) ) {
-			$this->set_id( $invoice->ID );
-		} elseif ( is_array( $invoice ) ) {
-			$this->set_props( $invoice );
-
-			if ( isset( $invoice['ID'] ) ) {
-				$this->set_id( $invoice['ID'] );
-			}
+        if ( ! empty( $invoice ) && is_numeric( $invoice ) && getpaid_is_invoice_post_type( get_post_type( (int) $invoice ) ) ) {
+            $this->set_id( (int) $invoice );
+        } elseif ( $invoice instanceof self ) {
+            $this->set_id( $invoice->get_id() );
+        } elseif ( ! empty( $invoice->ID ) ) {
+            $this->set_id( $invoice->ID );
+        } elseif ( is_array( $invoice ) ) {
+            $this->set_props( $invoice );
+
+            if ( isset( $invoice['ID'] ) ) {
+                $this->set_id( $invoice['ID'] );
+            }
 } elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'key' ) ) {
-			$this->set_id( $invoice_id );
-		} elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'number' ) ) {
-			$this->set_id( $invoice_id );
-		} elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'transaction_id' ) ) {
-			$this->set_id( $invoice_id );
-		} else {
-			$this->set_object_read( true );
-		}
+            $this->set_id( $invoice_id );
+        } elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'number' ) ) {
+            $this->set_id( $invoice_id );
+        } elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'transaction_id' ) ) {
+            $this->set_id( $invoice_id );
+        } else {
+            $this->set_object_read( true );
+        }
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
 
-		if ( $this->get_id() > 0 ) {
+        if ( $this->get_id() > 0 ) {
             $this->post = get_post( $this->get_id() );
             $this->ID   = $this->get_id();
-			$this->data_store->read( $this );
+            $this->data_store->read( $this );
         }
 
     }
 
     /**
-	 * Given an invoice key/number, it returns its id.
-	 *
-	 *
-	 * @static
-	 * @param string $value The invoice key or number
-	 * @param string $field Either key, transaction_id or number.
-	 * @since 1.0.15
-	 * @return int
-	 */
-	public static function get_invoice_id_by_field( $value, $field = 'key' ) {
+     * Given an invoice key/number, it returns its id.
+     *
+     *
+     * @static
+     * @param string $value The invoice key or number
+     * @param string $field Either key, transaction_id or number.
+     * @since 1.0.15
+     * @return int
+     */
+    public static function get_invoice_id_by_field( $value, $field = 'key' ) {
         global $wpdb;
 
-		// Trim the value.
-		$value = trim( $value );
+        // Trim the value.
+        $value = trim( $value );
 
-		if ( empty( $value ) ) {
-			return 0;
-		}
+        if ( empty( $value ) ) {
+            return 0;
+        }
 
         // Valid fields.
         $fields = array( 'key', 'number', 'transaction_id' );
 
-		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
-			return 0;
-		}
+        // Ensure a field has been passed.
+        if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+            return 0;
+        }
 
-		// Maybe retrieve from the cache.
-		$invoice_id   = wp_cache_get( $value, "getpaid_invoice_{$field}s_to_invoice_ids" );
-		if ( false !== $invoice_id ) {
-			return $invoice_id;
-		}
+        // Maybe retrieve from the cache.
+        $invoice_id   = wp_cache_get( $value, "getpaid_invoice_{$field}s_to_invoice_ids" );
+        if ( false !== $invoice_id ) {
+            return $invoice_id;
+        }
 
         // Fetch from the db.
         $table       = $wpdb->prefix . 'getpaid_invoices';
-		$db_field    = 'key' === $field ? 'invoice_key' : $field;
+        $db_field    = 'key' === $field ? 'invoice_key' : $field;
         $invoice_id  = (int) $wpdb->get_var(
             $wpdb->prepare( "SELECT `post_id` FROM $table WHERE `$db_field`=%s LIMIT 1", $value )
         );
 
-		// Update the cache with our data
-		wp_cache_set( $value, $invoice_id, "getpaid_invoice_{$field}s_to_invoice_ids" );
+        // Update the cache with our data
+        wp_cache_set( $value, $invoice_id, "getpaid_invoice_{$field}s_to_invoice_ids" );
 
-		return $invoice_id;
+        return $invoice_id;
     }
 
     /**
@@ -254,83 +254,83 @@ 
     */
 
     /**
-	 * Get parent invoice ID.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_parent_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_id', $context );
+     * Get parent invoice ID.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_parent_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'parent_id', $context );
     }
 
     /**
-	 * Get parent invoice.
-	 *
-	 * @since 1.0.19
-	 * @return WPInv_Invoice
-	 */
+     * Get parent invoice.
+     *
+     * @since 1.0.19
+     * @return WPInv_Invoice
+     */
     public function get_parent_payment() {
         return new WPInv_Invoice( $this->get_parent_id() );
     }
 
     /**
-	 * Alias for self::get_parent_payment().
-	 *
-	 * @since 1.0.19
-	 * @return WPInv_Invoice
-	 */
+     * Alias for self::get_parent_payment().
+     *
+     * @since 1.0.19
+     * @return WPInv_Invoice
+     */
     public function get_parent() {
         return $this->get_parent_payment();
     }
 
     /**
-	 * Get invoice status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
-	}
+     * Get invoice status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
+    }
 
-	/**
-	 * Retrieves an array of possible invoice statuses.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_all_statuses() {
-		return wpinv_get_invoice_statuses( true, true, $this );
+    /**
+     * Retrieves an array of possible invoice statuses.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_all_statuses() {
+        return wpinv_get_invoice_statuses( true, true, $this );
     }
 
     /**
-	 * Get invoice status nice name.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
+     * Get invoice status nice name.
+     *
+     * @since 1.0.19
+     * @return string
+     */
     public function get_status_nicename() {
-		$statuses = $this->get_all_statuses();
+        $statuses = $this->get_all_statuses();
 
         $status = isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : $this->get_status();
 
         return apply_filters( 'wpinv_get_invoice_status_nicename', $status, $this );
     }
 
-	/**
-	 * Retrieves the invoice status class
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_status_class() {
-		$statuses = getpaid_get_invoice_status_classes();
-		return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark text-white';
-	}
+    /**
+     * Retrieves the invoice status class
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_status_class() {
+        $statuses = getpaid_get_invoice_status_classes();
+        return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark text-white';
+    }
 
-	/**
+    /**
      * Retrieves the invoice status label html
      *
      * @since  1.0.0
@@ -338,263 +338,263 @@ 
      */
     public function get_status_label_html() {
 
-		$status_label = sanitize_text_field( $this->get_status_nicename() );
-		$status       = sanitize_html_class( $this->get_status() );
-		$class        = esc_attr( $this->get_status_class() );
-
-		return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
-	}
-
-    /**
-	 * Get plugin version when the invoice was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function get_invoice_date( $format = true ) {
-		$date      = getpaid_format_date( $this->get_date_completed() );
-		$date      = empty( $date ) ? $this->get_date_created() : $this->get_date_completed();
-		$formatted = getpaid_format_date( $date );
-
-		if ( $format ) {
-			return $formatted;
-		}
-
-		return empty( $formatted ) ? '' : $date;
-
-    }
-
-    /**
-	 * Get date when the invoice was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
-	}
-
-	/**
-	 * Alias for self::get_date_created().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_created_date( $context = 'view' ) {
-		return $this->get_date_created( $context );
-    }
-
-    /**
-	 * Get GMT date when the invoice was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
+        $status_label = sanitize_text_field( $this->get_status_nicename() );
+        $status       = sanitize_html_class( $this->get_status() );
+        $class        = esc_attr( $this->get_status_class() );
+
+        return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
+    }
+
+    /**
+     * Get plugin version when the invoice was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_version( $context = 'view' ) {
+        return $this->get_prop( 'version', $context );
+    }
+
+    /**
+     * @deprecated
+     */
+    public function get_invoice_date( $format = true ) {
+        $date      = getpaid_format_date( $this->get_date_completed() );
+        $date      = empty( $date ) ? $this->get_date_created() : $this->get_date_completed();
+        $formatted = getpaid_format_date( $date );
+
+        if ( $format ) {
+            return $formatted;
+        }
+
+        return empty( $formatted ) ? '' : $date;
+
+    }
+
+    /**
+     * Get date when the invoice was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_prop( 'date_created', $context );
+    }
+
+    /**
+     * Alias for self::get_date_created().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_created_date( $context = 'view' ) {
+        return $this->get_date_created( $context );
+    }
+
+    /**
+     * Get GMT date when the invoice was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created_gmt( $context = 'view' ) {
         $date = $this->get_date_created( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
-    }
-
-    /**
-	 * Get date when the invoice was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
-	}
-
-	/**
-	 * Alias for self::get_date_modified().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_modified_date( $context = 'view' ) {
-		return $this->get_date_modified( $context );
-    }
-
-    /**
-	 * Get GMT date when the invoice was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
+        return $date;
+    }
+
+    /**
+     * Get date when the invoice was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified( $context = 'view' ) {
+        return $this->get_prop( 'date_modified', $context );
+    }
+
+    /**
+     * Alias for self::get_date_modified().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_modified_date( $context = 'view' ) {
+        return $this->get_date_modified( $context );
+    }
+
+    /**
+     * Get GMT date when the invoice was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified_gmt( $context = 'view' ) {
         $date = $this->get_date_modified( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get the invoice due date.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_due_date( $context = 'view' ) {
-		return $this->get_prop( 'due_date', $context );
+     * Get the invoice due date.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_due_date( $context = 'view' ) {
+        return $this->get_prop( 'due_date', $context );
     }
 
     /**
-	 * Alias for self::get_due_date().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_due( $context = 'view' ) {
-		return $this->get_due_date( $context );
+     * Alias for self::get_due_date().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_due( $context = 'view' ) {
+        return $this->get_due_date( $context );
     }
 
     /**
-	 * Get the invoice GMT due date.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_due_date_gmt( $context = 'view' ) {
+     * Get the invoice GMT due date.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_due_date_gmt( $context = 'view' ) {
         $date = $this->get_due_date( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Alias for self::get_due_date_gmt().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_gmt_date_due( $context = 'view' ) {
-		return $this->get_due_date_gmt( $context );
+     * Alias for self::get_due_date_gmt().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_gmt_date_due( $context = 'view' ) {
+        return $this->get_due_date_gmt( $context );
     }
 
     /**
-	 * Get date when the invoice was completed.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_completed_date( $context = 'view' ) {
-		return $this->get_prop( 'completed_date', $context );
+     * Get date when the invoice was completed.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_completed_date( $context = 'view' ) {
+        return $this->get_prop( 'completed_date', $context );
     }
 
     /**
-	 * Alias for self::get_completed_date().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_completed( $context = 'view' ) {
-		return $this->get_completed_date( $context );
+     * Alias for self::get_completed_date().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_completed( $context = 'view' ) {
+        return $this->get_completed_date( $context );
     }
 
     /**
-	 * Get GMT date when the invoice was was completed.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_completed_date_gmt( $context = 'view' ) {
+     * Get GMT date when the invoice was was completed.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_completed_date_gmt( $context = 'view' ) {
         $date = $this->get_completed_date( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Alias for self::get_completed_date_gmt().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_gmt_completed_date( $context = 'view' ) {
-		return $this->get_completed_date_gmt( $context );
+     * Alias for self::get_completed_date_gmt().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_gmt_completed_date( $context = 'view' ) {
+        return $this->get_completed_date_gmt( $context );
     }
 
     /**
-	 * Get the invoice number.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_number( $context = 'view' ) {
-		$number = $this->get_prop( 'number', $context );
+     * Get the invoice number.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_number( $context = 'view' ) {
+        $number = $this->get_prop( 'number', $context );
 
-		if ( empty( $number ) ) {
-			$number = $this->generate_number();
-			$this->set_number( $this->generate_number() );
-		}
+        if ( empty( $number ) ) {
+            $number = $this->generate_number();
+            $this->set_number( $this->generate_number() );
+        }
 
-		return $number;
+        return $number;
     }
 
-	/**
-	 * Set the invoice number.
-	 *
-	 * @since 1.0.19
-	 */
-	public function maybe_set_number() {
+    /**
+     * Set the invoice number.
+     *
+     * @since 1.0.19
+     */
+    public function maybe_set_number() {
         $number = $this->get_number();
 
         if ( empty( $number ) || $this->get_id() == $number ) {
-			$this->set_number( $this->generate_number() );
+            $this->set_number( $this->generate_number() );
         }
 
-	}
+    }
 
     /**
-	 * Get the invoice key.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_key( $context = 'view' ) {
+     * Get the invoice key.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_key( $context = 'view' ) {
         return $this->get_prop( 'key', $context );
-	}
-
-	/**
-	 * Set the invoice key.
-	 *
-	 * @since 1.0.19
-	 */
-	public function maybe_set_key() {
+    }
+
+    /**
+     * Set the invoice key.
+     *
+     * @since 1.0.19
+     */
+    public function maybe_set_key() {
         $key = $this->get_key();
 
         if ( empty( $key ) ) {
@@ -605,140 +605,140 @@ 
     }
 
     /**
-	 * Get the invoice type.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_type( $context = 'view' ) {
+     * Get the invoice type.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_type( $context = 'view' ) {
         return $this->get_prop( 'type', $context );
-	}
-
-	/**
-	 * Returns the post type name.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_invoice_quote_type() {
+    }
+
+    /**
+     * Returns the post type name.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_invoice_quote_type() {
         return getpaid_get_post_type_label( $this->get_post_type(), false );
     }
 
     /**
-	 * Get the invoice post type label.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_label( $context = 'view' ) {
+     * Get the invoice post type label.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_label( $context = 'view' ) {
         return getpaid_get_post_type_label( $this->get_post_type( $context ), false );
-	}
-
-	/**
-	 * Get the invoice post type.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_post_type( $context = 'view' ) {
+    }
+
+    /**
+     * Get the invoice post type.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_post_type( $context = 'view' ) {
         return $this->get_prop( 'post_type', $context );
     }
 
     /**
-	 * Get the invoice mode.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_mode( $context = 'view' ) {
+     * Get the invoice mode.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_mode( $context = 'view' ) {
         return $this->get_prop( 'mode', $context );
     }
 
     /**
-	 * Get the invoice path.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_path( $context = 'view' ) {
+     * Get the invoice path.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_path( $context = 'view' ) {
         $path   = $this->get_prop( 'path', $context );
-		$prefix = $this->get_type();
+        $prefix = $this->get_type();
 
-		if ( 0 !== strpos( $path, $prefix ) ) {
-			$path = sanitize_title( $prefix . '-' . $this->get_id() );
-			$this->set_path( $path );
-		}
+        if ( 0 !== strpos( $path, $prefix ) ) {
+            $path = sanitize_title( $prefix . '-' . $this->get_id() );
+            $this->set_path( $path );
+        }
 
-		return $path;
+        return $path;
     }
 
     /**
-	 * Get the invoice name/title.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
+     * Get the invoice name/title.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
         return $this->get_prop( 'title', $context );
     }
 
     /**
-	 * Alias of self::get_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+     * Alias of self::get_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_title( $context = 'view' ) {
+        return $this->get_name( $context );
     }
 
     /**
-	 * Get the invoice description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_description( $context = 'view' ) {
-		return $this->get_prop( 'description', $context );
+     * Get the invoice description.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_description( $context = 'view' ) {
+        return $this->get_prop( 'description', $context );
     }
 
     /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_excerpt( $context = 'view' ) {
-		return $this->get_description( $context );
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_excerpt( $context = 'view' ) {
+        return $this->get_description( $context );
     }
 
     /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_summary( $context = 'view' ) {
-		return $this->get_description( $context );
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_summary( $context = 'view' ) {
+        return $this->get_description( $context );
     }
 
     /**
-	 * Returns the user info.
-	 *
-	 * @since 1.0.19
+     * Returns the user info.
+     *
+     * @since 1.0.19
      * @param  string $context View or edit context.
-	 * @return array
-	 */
+     * @return array
+     */
     public function get_user_info( $context = 'view' ) {
 
         $user_info = array(
@@ -753,683 +753,683 @@ 
             'state'      => $this->get_state( $context ),
             'zip'        => $this->get_zip( $context ),
             'company'    => $this->get_company( $context ),
-			'company_id' => $this->get_company_id( $context ),
+            'company_id' => $this->get_company_id( $context ),
             'vat_number' => $this->get_vat_number( $context ),
             'discount'   => $this->get_discount_code( $context ),
-		);
+        );
 
-		return apply_filters( 'wpinv_user_info', $user_info, $this->get_id(), $this );
+        return apply_filters( 'wpinv_user_info', $user_info, $this->get_id(), $this );
 
     }
 
     /**
-	 * Get the user id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+     * Get the user id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_author( $context = 'view' ) {
+        return (int) $this->get_prop( 'author', $context );
     }
 
     /**
-	 * Alias of self::get_author().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_user_id( $context = 'view' ) {
-		return $this->get_author( $context );
+     * Alias of self::get_author().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_user_id( $context = 'view' ) {
+        return $this->get_author( $context );
     }
 
-     /**
-	 * Get customer ID.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_customer_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'customer_id', $context );
+        /**
+         * Get customer ID.
+         *
+         * @since 1.0.19
+         * @param  string $context View or edit context.
+         * @return int
+         */
+    public function get_customer_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'customer_id', $context );
     }
 
     /**
-	 * Get the customer's ip.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_ip( $context = 'view' ) {
-		return $this->get_prop( 'user_ip', $context );
+     * Get the customer's ip.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_ip( $context = 'view' ) {
+        return $this->get_prop( 'user_ip', $context );
     }
 
     /**
-	 * Alias of self::get_ip().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_ip( $context = 'view' ) {
-		return $this->get_ip( $context );
+     * Alias of self::get_ip().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_ip( $context = 'view' ) {
+        return $this->get_ip( $context );
     }
 
-     /**
-	 * Alias of self::get_ip().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_ip( $context = 'view' ) {
-		return $this->get_ip( $context );
+        /**
+         * Alias of self::get_ip().
+         *
+         * @since 1.0.19
+         * @param  string $context View or edit context.
+         * @return string
+         */
+    public function get_customer_ip( $context = 'view' ) {
+        return $this->get_ip( $context );
     }
 
     /**
-	 * Get the customer's first name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_first_name( $context = 'view' ) {
-		return $this->get_prop( 'first_name', $context );
+     * Get the customer's first name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_first_name( $context = 'view' ) {
+        return $this->get_prop( 'first_name', $context );
     }
 
     /**
-	 * Alias of self::get_first_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_first_name( $context = 'view' ) {
-		return $this->get_first_name( $context );
+     * Alias of self::get_first_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_first_name( $context = 'view' ) {
+        return $this->get_first_name( $context );
     }
 
-     /**
-	 * Alias of self::get_first_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_first_name( $context = 'view' ) {
-		return $this->get_first_name( $context );
+        /**
+         * Alias of self::get_first_name().
+         *
+         * @since 1.0.19
+         * @param  string $context View or edit context.
+         * @return string
+         */
+    public function get_customer_first_name( $context = 'view' ) {
+        return $this->get_first_name( $context );
     }
 
     /**
-	 * Get the customer's last name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_last_name( $context = 'view' ) {
-		return $this->get_prop( 'last_name', $context );
+     * Get the customer's last name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_last_name( $context = 'view' ) {
+        return $this->get_prop( 'last_name', $context );
     }
 
     /**
-	 * Alias of self::get_last_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_last_name( $context = 'view' ) {
-		return $this->get_last_name( $context );
+     * Alias of self::get_last_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_last_name( $context = 'view' ) {
+        return $this->get_last_name( $context );
     }
 
     /**
-	 * Alias of self::get_last_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_last_name( $context = 'view' ) {
-		return $this->get_last_name( $context );
+     * Alias of self::get_last_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_last_name( $context = 'view' ) {
+        return $this->get_last_name( $context );
     }
 
     /**
-	 * Get the customer's full name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_full_name( $context = 'view' ) {
-		$name = trim( $this->get_first_name( $context ) . ' ' . $this->get_last_name( $context ) );
+     * Get the customer's full name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_full_name( $context = 'view' ) {
+        $name = trim( $this->get_first_name( $context ) . ' ' . $this->get_last_name( $context ) );
 
-		if ( ! $name ) {
-			$user = get_userdata( $this->get_author( $context ) );
+        if ( ! $name ) {
+            $user = get_userdata( $this->get_author( $context ) );
 
-			if ( $user ) {
-				$name = $user->display_name;
-			}
-		}
+            if ( $user ) {
+                $name = $user->display_name;
+            }
+        }
 
-		if ( ! $name ) {
-			$name = $this->get_email( $context );
-		}
+        if ( ! $name ) {
+            $name = $this->get_email( $context );
+        }
 
-		return apply_filters( 'wpinv_invoice_user_full_name', $name, $this );
+        return apply_filters( 'wpinv_invoice_user_full_name', $name, $this );
     }
 
     /**
-	 * Alias of self::get_full_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_full_name( $context = 'view' ) {
-		return $this->get_full_name( $context );
-    }
+     * Alias of self::get_full_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_full_name( $context = 'view' ) {
+        return $this->get_full_name( $context );
+    }
+
+    /**
+     * Alias of self::get_full_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_full_name( $context = 'view' ) {
+        return $this->get_full_name( $context );
+    }
+
+    /**
+     * Get the customer's phone number.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_phone( $context = 'view' ) {
+        return $this->get_prop( 'phone', $context );
+    }
+
+    /**
+     * Alias of self::get_phone().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_phone_number( $context = 'view' ) {
+        return $this->get_phone( $context );
+    }
+
+    /**
+     * Alias of self::get_phone().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_phone( $context = 'view' ) {
+        return $this->get_phone( $context );
+    }
+
+    /**
+     * Alias of self::get_phone().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_phone( $context = 'view' ) {
+        return $this->get_phone( $context );
+    }
+
+    /**
+     * Get the customer's email address.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_email( $context = 'view' ) {
+        return $this->get_prop( 'email', $context );
+    }
 
     /**
-	 * Alias of self::get_full_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_full_name( $context = 'view' ) {
-		return $this->get_full_name( $context );
+     * Alias of self::get_email().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_email_address( $context = 'view' ) {
+        return $this->get_email( $context );
+    }
+
+    /**
+     * Alias of self::get_email().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_email( $context = 'view' ) {
+        return $this->get_email( $context );
     }
 
     /**
-	 * Get the customer's phone number.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_phone( $context = 'view' ) {
-		return $this->get_prop( 'phone', $context );
+     * Alias of self::get_email().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_email( $context = 'view' ) {
+        return $this->get_email( $context );
     }
 
     /**
-	 * Alias of self::get_phone().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_phone_number( $context = 'view' ) {
-		return $this->get_phone( $context );
+     * Get the customer's country.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_country( $context = 'view' ) {
+        $country = $this->get_prop( 'country', $context );
+        return empty( $country ) ? wpinv_get_default_country() : $country;
     }
 
     /**
-	 * Alias of self::get_phone().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_phone( $context = 'view' ) {
-		return $this->get_phone( $context );
+     * Alias of self::get_country().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_country( $context = 'view' ) {
+        return $this->get_country( $context );
     }
 
     /**
-	 * Alias of self::get_phone().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_phone( $context = 'view' ) {
-		return $this->get_phone( $context );
+     * Alias of self::get_country().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_country( $context = 'view' ) {
+        return $this->get_country( $context );
+    }
+
+    /**
+     * Get the customer's state.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_state( $context = 'view' ) {
+        $state = $this->get_prop( 'state', $context );
+        return empty( $state ) ? wpinv_get_default_state() : $state;
+    }
+
+    /**
+     * Alias of self::get_state().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_state( $context = 'view' ) {
+        return $this->get_state( $context );
+    }
+
+    /**
+     * Alias of self::get_state().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_state( $context = 'view' ) {
+        return $this->get_state( $context );
     }
 
     /**
-	 * Get the customer's email address.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_email( $context = 'view' ) {
-		return $this->get_prop( 'email', $context );
+     * Get the customer's city.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_city( $context = 'view' ) {
+        return $this->get_prop( 'city', $context );
     }
 
     /**
-	 * Alias of self::get_email().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_email_address( $context = 'view' ) {
-		return $this->get_email( $context );
+     * Alias of self::get_city().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_city( $context = 'view' ) {
+        return $this->get_city( $context );
     }
 
     /**
-	 * Alias of self::get_email().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_email( $context = 'view' ) {
-		return $this->get_email( $context );
+     * Alias of self::get_city().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_city( $context = 'view' ) {
+        return $this->get_city( $context );
     }
 
     /**
-	 * Alias of self::get_email().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_email( $context = 'view' ) {
-		return $this->get_email( $context );
+     * Get the customer's zip.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_zip( $context = 'view' ) {
+        return $this->get_prop( 'zip', $context );
     }
 
     /**
-	 * Get the customer's country.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_country( $context = 'view' ) {
-		$country = $this->get_prop( 'country', $context );
-		return empty( $country ) ? wpinv_get_default_country() : $country;
+     * Alias of self::get_zip().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_zip( $context = 'view' ) {
+        return $this->get_zip( $context );
     }
 
     /**
-	 * Alias of self::get_country().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_country( $context = 'view' ) {
-		return $this->get_country( $context );
+     * Alias of self::get_zip().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_zip( $context = 'view' ) {
+        return $this->get_zip( $context );
     }
 
     /**
-	 * Alias of self::get_country().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_country( $context = 'view' ) {
-		return $this->get_country( $context );
+     * Get the customer's company.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_company( $context = 'view' ) {
+        return $this->get_prop( 'company', $context );
     }
 
     /**
-	 * Get the customer's state.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_state( $context = 'view' ) {
-		$state = $this->get_prop( 'state', $context );
-		return empty( $state ) ? wpinv_get_default_state() : $state;
+     * Alias of self::get_company().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_company( $context = 'view' ) {
+        return $this->get_company( $context );
     }
 
     /**
-	 * Alias of self::get_state().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_state( $context = 'view' ) {
-		return $this->get_state( $context );
+     * Alias of self::get_company().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_company( $context = 'view' ) {
+        return $this->get_company( $context );
     }
 
     /**
-	 * Alias of self::get_state().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_state( $context = 'view' ) {
-		return $this->get_state( $context );
+     * Get the customer's company id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_company_id( $context = 'view' ) {
+        return $this->get_prop( 'company_id', $context );
     }
 
     /**
-	 * Get the customer's city.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_city( $context = 'view' ) {
-		return $this->get_prop( 'city', $context );
+     * Get the customer's vat number.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_vat_number( $context = 'view' ) {
+        return $this->get_prop( 'vat_number', $context );
     }
 
     /**
-	 * Alias of self::get_city().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_city( $context = 'view' ) {
-		return $this->get_city( $context );
+     * Alias of self::get_vat_number().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_vat_number( $context = 'view' ) {
+        return $this->get_vat_number( $context );
     }
 
     /**
-	 * Alias of self::get_city().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_city( $context = 'view' ) {
-		return $this->get_city( $context );
+     * Alias of self::get_vat_number().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_vat_number( $context = 'view' ) {
+        return $this->get_vat_number( $context );
     }
 
     /**
-	 * Get the customer's zip.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_zip( $context = 'view' ) {
-		return $this->get_prop( 'zip', $context );
+     * Get the customer's vat rate.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_vat_rate( $context = 'view' ) {
+        return $this->get_prop( 'vat_rate', $context );
     }
 
     /**
-	 * Alias of self::get_zip().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_zip( $context = 'view' ) {
-		return $this->get_zip( $context );
+     * Alias of self::get_vat_rate().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_vat_rate( $context = 'view' ) {
+        return $this->get_vat_rate( $context );
     }
 
     /**
-	 * Alias of self::get_zip().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_zip( $context = 'view' ) {
-		return $this->get_zip( $context );
+     * Alias of self::get_vat_rate().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_vat_rate( $context = 'view' ) {
+        return $this->get_vat_rate( $context );
     }
 
     /**
-	 * Get the customer's company.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_company( $context = 'view' ) {
-		return $this->get_prop( 'company', $context );
+     * Get the customer's address.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_address( $context = 'view' ) {
+        return $this->get_prop( 'address', $context );
     }
 
     /**
-	 * Alias of self::get_company().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_company( $context = 'view' ) {
-		return $this->get_company( $context );
+     * Alias of self::get_address().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_user_address( $context = 'view' ) {
+        return $this->get_address( $context );
     }
 
     /**
-	 * Alias of self::get_company().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_company( $context = 'view' ) {
-		return $this->get_company( $context );
+     * Alias of self::get_address().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_customer_address( $context = 'view' ) {
+        return $this->get_address( $context );
     }
 
-	/**
-	 * Get the customer's company id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_company_id( $context = 'view' ) {
-		return $this->get_prop( 'company_id', $context );
+    /**
+     * Get whether the customer has viewed the invoice or not.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_is_viewed( $context = 'view' ) {
+        return (bool) $this->get_prop( 'is_viewed', $context );
     }
 
     /**
-	 * Get the customer's vat number.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_vat_number( $context = 'view' ) {
-		return $this->get_prop( 'vat_number', $context );
+     * Get other recipients for invoice communications.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_email_cc( $context = 'view' ) {
+        return $this->get_prop( 'email_cc', $context );
     }
 
     /**
-	 * Alias of self::get_vat_number().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_vat_number( $context = 'view' ) {
-		return $this->get_vat_number( $context );
+     * Get invoice template.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_template( $context = 'view' ) {
+        return $this->get_prop( 'template', $context );
     }
 
     /**
-	 * Alias of self::get_vat_number().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_vat_number( $context = 'view' ) {
-		return $this->get_vat_number( $context );
+     * Get invoice source.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_created_via( $context = 'view' ) {
+        return $this->get_prop( 'created_via', $context );
     }
 
-    /**
-	 * Get the customer's vat rate.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_vat_rate( $context = 'view' ) {
-		return $this->get_prop( 'vat_rate', $context );
-    }
-
-    /**
-	 * Alias of self::get_vat_rate().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_vat_rate( $context = 'view' ) {
-		return $this->get_vat_rate( $context );
-    }
-
-    /**
-	 * Alias of self::get_vat_rate().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_vat_rate( $context = 'view' ) {
-		return $this->get_vat_rate( $context );
-    }
-
-    /**
-	 * Get the customer's address.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_address( $context = 'view' ) {
-		return $this->get_prop( 'address', $context );
-    }
-
-    /**
-	 * Alias of self::get_address().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_user_address( $context = 'view' ) {
-		return $this->get_address( $context );
-    }
-
-    /**
-	 * Alias of self::get_address().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_customer_address( $context = 'view' ) {
-		return $this->get_address( $context );
-    }
-
-    /**
-	 * Get whether the customer has viewed the invoice or not.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_is_viewed( $context = 'view' ) {
-		return (bool) $this->get_prop( 'is_viewed', $context );
-	}
-
-	/**
-	 * Get other recipients for invoice communications.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_email_cc( $context = 'view' ) {
-		return $this->get_prop( 'email_cc', $context );
-	}
-
-	/**
-	 * Get invoice template.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_template( $context = 'view' ) {
-		return $this->get_prop( 'template', $context );
-	}
-
-	/**
-	 * Get invoice source.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_created_via( $context = 'view' ) {
-		return $this->get_prop( 'created_via', $context );
-	}
-
-	/**
-	 * Get whether the customer has confirmed their address.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_address_confirmed( $context = 'view' ) {
-		return (bool) $this->get_prop( 'address_confirmed', $context );
-    }
-
-    /**
-	 * Alias of self::get_address_confirmed().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_user_address_confirmed( $context = 'view' ) {
-		return $this->get_address_confirmed( $context );
-    }
-
-    /**
-	 * Alias of self::get_address().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_customer_address_confirmed( $context = 'view' ) {
-		return $this->get_address_confirmed( $context );
-    }
-
-	/**
-	 * Get the shipping address.
-	 *
-	 * @since 1.0.19
-	 * @return array|false
-	 */
-	public function get_shipping_address() {
-
-		$shipping_address = get_post_meta( $this->get_id(), 'shipping_address', true );
-		return is_array( $shipping_address ) ? $shipping_address : false;
-    }
-
-	/**
-	 * Check if the invoice has a shipping address.
-	 */
-	public function has_shipping_address() {
-		return false !== $this->get_shipping_address();
-    }
-
-	/**
-	 * Get the shipping amount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_shipping( $context = 'view' ) {
-
-		if ( $context = 'view' ) {
-			return floatval( $this->get_prop( 'shipping', $context ) );
-		}
-
-		return $this->get_prop( 'shipping', $context );
-    }
-
-	public function has_shipping() {
-		return defined( 'GETPAID_SHIPPING_CALCULATOR_VERSION' ) && $this->get_prop( 'shipping', 'edit' );
-    }
-
-    /**
-	 * Get the invoice subtotal.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_subtotal( $context = 'view' ) {
+    /**
+     * Get whether the customer has confirmed their address.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_address_confirmed( $context = 'view' ) {
+        return (bool) $this->get_prop( 'address_confirmed', $context );
+    }
+
+    /**
+     * Alias of self::get_address_confirmed().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_user_address_confirmed( $context = 'view' ) {
+        return $this->get_address_confirmed( $context );
+    }
+
+    /**
+     * Alias of self::get_address().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_customer_address_confirmed( $context = 'view' ) {
+        return $this->get_address_confirmed( $context );
+    }
+
+    /**
+     * Get the shipping address.
+     *
+     * @since 1.0.19
+     * @return array|false
+     */
+    public function get_shipping_address() {
+
+        $shipping_address = get_post_meta( $this->get_id(), 'shipping_address', true );
+        return is_array( $shipping_address ) ? $shipping_address : false;
+    }
+
+    /**
+     * Check if the invoice has a shipping address.
+     */
+    public function has_shipping_address() {
+        return false !== $this->get_shipping_address();
+    }
+
+    /**
+     * Get the shipping amount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_shipping( $context = 'view' ) {
+
+        if ( $context = 'view' ) {
+            return floatval( $this->get_prop( 'shipping', $context ) );
+        }
+
+        return $this->get_prop( 'shipping', $context );
+    }
+
+    public function has_shipping() {
+        return defined( 'GETPAID_SHIPPING_CALCULATOR_VERSION' ) && $this->get_prop( 'shipping', 'edit' );
+    }
+
+    /**
+     * Get the invoice subtotal.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_subtotal( $context = 'view' ) {
         $subtotal = (float) $this->get_prop( 'subtotal', $context );
 
         // Backwards compatibility.
@@ -1441,198 +1441,198 @@ 
     }
 
     /**
-	 * Get the invoice discount total.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_total_discount( $context = 'view' ) {
-		return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_discount', $context ) ) );
+     * Get the invoice discount total.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_total_discount( $context = 'view' ) {
+        return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_discount', $context ) ) );
     }
 
     /**
-	 * Get the invoice tax total.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_total_tax( $context = 'view' ) {
-		return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_tax', $context ) ) );
-	}
+     * Get the invoice tax total.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_total_tax( $context = 'view' ) {
+        return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_tax', $context ) ) );
+    }
 
-	/**
-	 * @deprecated
-	 */
-	public function get_final_tax( $currency = false ) {
-		$tax = $this->get_total_tax();
+    /**
+     * @deprecated
+     */
+    public function get_final_tax( $currency = false ) {
+        $tax = $this->get_total_tax();
 
         if ( $currency ) {
-			return wpinv_price( $tax, $this->get_currency() );
+            return wpinv_price( $tax, $this->get_currency() );
         }
 
         return $tax;
     }
 
     /**
-	 * Get the invoice fees total.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_total_fees( $context = 'view' ) {
-		return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_fees', $context ) ) );
+     * Get the invoice fees total.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_total_fees( $context = 'view' ) {
+        return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_fees', $context ) ) );
+    }
+
+    /**
+     * Alias for self::get_total_fees().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_fees_total( $context = 'view' ) {
+        return $this->get_total_fees( $context );
     }
 
     /**
-	 * Alias for self::get_total_fees().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_fees_total( $context = 'view' ) {
-		return $this->get_total_fees( $context );
+     * Get the invoice total.
+     *
+     * @since 1.0.19
+     * @return float
+     */
+    public function get_total( $context = 'view' ) {
+        $total = $this->get_prop( 'total', $context );
+
+        if ( $this->has_shipping() && $context == 'view' ) {
+            $total = $this->get_prop( 'total', $context ) + $this->get_shipping( $context );
+        }
+
+        return wpinv_round_amount( wpinv_sanitize_amount( $total ) );
     }
 
     /**
-	 * Get the invoice total.
-	 *
-	 * @since 1.0.19
+     * Retrieves the non-recurring total of items.
+     *
+     * @since 2.3.0
      * @return float
-	 */
-	public function get_total( $context = 'view' ) {
-		$total = $this->get_prop( 'total', $context );
-
-		if ( $this->has_shipping() && $context == 'view' ) {
-			$total = $this->get_prop( 'total', $context ) + $this->get_shipping( $context );
-		}
-
-		return wpinv_round_amount( wpinv_sanitize_amount( $total ) );
-	}
-
-	/**
-	 * Retrieves the non-recurring total of items.
-	 *
-	 * @since 2.3.0
-	 * @return float
-	 */
-	public function get_non_recurring_total() {
-
-		$subtotal = 0;
-		foreach ( $this->get_items() as $item ) {
-			if ( ! $item->is_recurring() ) {
-				$subtotal += $item->get_sub_total();
-			}
-		}
-
-		foreach ( $this->get_fees() as $fee ) {
-			if ( empty( $fee['recurring_fee'] ) ) {
-				$subtotal += wpinv_sanitize_amount( $fee['initial_fee'] );
-			}
-		}
-
-		$subtotal = wpinv_round_amount( wpinv_sanitize_amount( $subtotal ) );
+     */
+    public function get_non_recurring_total() {
+
+        $subtotal = 0;
+        foreach ( $this->get_items() as $item ) {
+            if ( ! $item->is_recurring() ) {
+                $subtotal += $item->get_sub_total();
+            }
+        }
+
+        foreach ( $this->get_fees() as $fee ) {
+            if ( empty( $fee['recurring_fee'] ) ) {
+                $subtotal += wpinv_sanitize_amount( $fee['initial_fee'] );
+            }
+        }
+
+        $subtotal = wpinv_round_amount( wpinv_sanitize_amount( $subtotal ) );
         return apply_filters( 'wpinv_get_non_recurring_invoice_total', $subtotal, $this );
 
     }
 
-	/**
-	 * Get the invoice totals.
-	 *
-	 * @since 1.0.19
+    /**
+     * Get the invoice totals.
+     *
+     * @since 1.0.19
      * @return array
-	 */
-	public function get_totals() {
-		return $this->totals;
+     */
+    public function get_totals() {
+        return $this->totals;
     }
 
     /**
-	 * Get the initial invoice total.
-	 *
-	 * @since 1.0.19
+     * Get the initial invoice total.
+     *
+     * @since 1.0.19
      * @param  string $context View or edit context.
      * @return float
-	 */
+     */
     public function get_initial_total() {
 
-		if ( empty( $this->totals ) ) {
-			$this->recalculate_total();
-		}
+        if ( empty( $this->totals ) ) {
+            $this->recalculate_total();
+        }
 
-		$tax      = $this->totals['tax']['initial'];
-		$fee      = $this->totals['fee']['initial'];
-		$discount = $this->totals['discount']['initial'];
-		$subtotal = $this->totals['subtotal']['initial'];
-		$total    = $tax + $fee - $discount + $subtotal;
+        $tax      = $this->totals['tax']['initial'];
+        $fee      = $this->totals['fee']['initial'];
+        $discount = $this->totals['discount']['initial'];
+        $subtotal = $this->totals['subtotal']['initial'];
+        $total    = $tax + $fee - $discount + $subtotal;
 
-		if ( 0 > $total ) {
-			$total = 0;
-		}
+        if ( 0 > $total ) {
+            $total = 0;
+        }
 
-		$total = wpinv_round_amount( wpinv_sanitize_amount( $total ) );
+        $total = wpinv_round_amount( wpinv_sanitize_amount( $total ) );
         return apply_filters( 'wpinv_get_initial_invoice_total', $total, $this );
-	}
+    }
 
-	/**
-	 * Get the recurring invoice total.
-	 *
-	 * @since 1.0.19
+    /**
+     * Get the recurring invoice total.
+     *
+     * @since 1.0.19
      * @param  string $context View or edit context.
      * @return float
-	 */
+     */
     public function get_recurring_total() {
 
-		if ( empty( $this->totals ) ) {
-			$this->recalculate_total();
-		}
+        if ( empty( $this->totals ) ) {
+            $this->recalculate_total();
+        }
 
-		$tax      = $this->totals['tax']['recurring'];
-		$fee      = $this->totals['fee']['recurring'];
-		$discount = $this->totals['discount']['recurring'];
-		$subtotal = $this->totals['subtotal']['recurring'];
-		$total    = $tax + $fee - $discount + $subtotal;
+        $tax      = $this->totals['tax']['recurring'];
+        $fee      = $this->totals['fee']['recurring'];
+        $discount = $this->totals['discount']['recurring'];
+        $subtotal = $this->totals['subtotal']['recurring'];
+        $total    = $tax + $fee - $discount + $subtotal;
 
-		if ( 0 > $total ) {
-			$total = 0;
-		}
+        if ( 0 > $total ) {
+            $total = 0;
+        }
 
-		$total = wpinv_round_amount( wpinv_sanitize_amount( $total ) );
+        $total = wpinv_round_amount( wpinv_sanitize_amount( $total ) );
         return apply_filters( 'wpinv_get_recurring_invoice_total', $total, $this );
-	}
+    }
 
-	/**
-	 * Returns recurring payment details.
-	 *
-	 * @since 1.0.19
+    /**
+     * Returns recurring payment details.
+     *
+     * @since 1.0.19
      * @param  string $field Optionally provide a field to return.
-	 * @param string $currency Whether to include the currency.
+     * @param string $currency Whether to include the currency.
      * @return float|string
-	 */
+     */
     public function get_recurring_details( $field = '', $currency = false ) {
 
-		// Maybe recalculate totals.
-		if ( empty( $this->totals ) ) {
-			$this->recalculate_total();
-		}
+        // Maybe recalculate totals.
+        if ( empty( $this->totals ) ) {
+            $this->recalculate_total();
+        }
 
-		// Prepare recurring totals.
+        // Prepare recurring totals.
         $data = apply_filters(
-			'wpinv_get_invoice_recurring_details',
-			array(
-				'cart_details' => $this->get_cart_details(),
-				'subtotal'     => $this->totals['subtotal']['recurring'],
-				'discount'     => $this->totals['discount']['recurring'],
-				'tax'          => $this->totals['tax']['recurring'],
-				'fee'          => $this->totals['fee']['recurring'],
-				'total'        => $this->get_recurring_total(),
-			),
-			$this,
-			$field,
-			$currency
-		);
+            'wpinv_get_invoice_recurring_details',
+            array(
+                'cart_details' => $this->get_cart_details(),
+                'subtotal'     => $this->totals['subtotal']['recurring'],
+                'discount'     => $this->totals['discount']['recurring'],
+                'tax'          => $this->totals['tax']['recurring'],
+                'fee'          => $this->totals['fee']['recurring'],
+                'total'        => $this->get_recurring_total(),
+            ),
+            $this,
+            $field,
+            $currency
+        );
 
         if ( isset( $data[ $field ] ) ) {
             return ( $currency ? wpinv_price( $data[ $field ], $this->get_currency() ) : $data[ $field ] );
@@ -1642,166 +1642,166 @@ 
     }
 
     /**
-	 * Get the invoice fees.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_fees( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'fees', $context ) );
+     * Get the invoice fees.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_fees( $context = 'view' ) {
+        return wpinv_parse_list( $this->get_prop( 'fees', $context ) );
     }
 
     /**
-	 * Get the invoice discounts.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_discounts( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'discounts', $context ) );
+     * Get the invoice discounts.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_discounts( $context = 'view' ) {
+        return wpinv_parse_list( $this->get_prop( 'discounts', $context ) );
     }
 
     /**
-	 * Get the invoice taxes.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_taxes( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'taxes', $context ) );
+     * Get the invoice taxes.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_taxes( $context = 'view' ) {
+        return wpinv_parse_list( $this->get_prop( 'taxes', $context ) );
     }
 
     /**
-	 * Get the invoice items.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items( $context = 'view' ) {
+     * Get the invoice items.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items( $context = 'view' ) {
         return $this->get_prop( 'items', $context );
-	}
+    }
 
-	/**
-	 * Get the invoice item ids.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_item_ids() {
-		return implode( ', ', wp_list_pluck( $this->get_cart_details(), 'item_id' ) );
+    /**
+     * Get the invoice item ids.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_item_ids() {
+        return implode( ', ', wp_list_pluck( $this->get_cart_details(), 'item_id' ) );
     }
 
     /**
-	 * Get the invoice's payment form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_payment_form( $context = 'view' ) {
-		return intval( $this->get_prop( 'payment_form', $context ) );
+     * Get the invoice's payment form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_payment_form( $context = 'view' ) {
+        return intval( $this->get_prop( 'payment_form', $context ) );
     }
 
     /**
-	 * Get the invoice's submission id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_submission_id( $context = 'view' ) {
-		return $this->get_prop( 'submission_id', $context );
+     * Get the invoice's submission id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_submission_id( $context = 'view' ) {
+        return $this->get_prop( 'submission_id', $context );
     }
 
     /**
-	 * Get the invoice's discount code.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_discount_code( $context = 'view' ) {
-		return $this->get_prop( 'discount_code', $context );
+     * Get the invoice's discount code.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_discount_code( $context = 'view' ) {
+        return $this->get_prop( 'discount_code', $context );
     }
 
     /**
-	 * Get the invoice's gateway.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_gateway( $context = 'view' ) {
-		return $this->get_prop( 'gateway', $context );
+     * Get the invoice's gateway.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_gateway( $context = 'view' ) {
+        return $this->get_prop( 'gateway', $context );
     }
 
     /**
-	 * Get the invoice's gateway display title.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
+     * Get the invoice's gateway display title.
+     *
+     * @since 1.0.19
+     * @return string
+     */
     public function get_gateway_title() {
         $title = wpinv_get_gateway_checkout_label( $this->get_gateway() );
         return apply_filters( 'wpinv_gateway_title', $title, $this->get_id(), $this );
     }
 
     /**
-	 * Get the invoice's transaction id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_transaction_id( $context = 'view' ) {
-		return $this->get_prop( 'transaction_id', $context );
+     * Get the invoice's transaction id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_transaction_id( $context = 'view' ) {
+        return $this->get_prop( 'transaction_id', $context );
     }
 
     /**
-	 * Get the invoice's currency.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_currency( $context = 'view' ) {
+     * Get the invoice's currency.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_currency( $context = 'view' ) {
         $currency = $this->get_prop( 'currency', $context );
         return empty( $currency ) ? wpinv_get_currency() : $currency;
     }
 
     /**
-	 * Checks if we are charging taxes for this invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_disable_taxes( $context = 'view' ) {
+     * Checks if we are charging taxes for this invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_disable_taxes( $context = 'view' ) {
         return (bool) $this->get_prop( 'disable_taxes', $context );
     }
 
     /**
-	 * Retrieves the subscription id for an invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
+     * Retrieves the subscription id for an invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
     public function get_subscription_id( $context = 'view' ) {
-		return $this->is_renewal() ? $this->get_parent()->get_subscription_id( $context ) : $this->get_prop( 'subscription_id', $context );
-	}
-
-	/**
-	 * Retrieves the remote subscription id for an invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
+        return $this->is_renewal() ? $this->get_parent()->get_subscription_id( $context ) : $this->get_prop( 'subscription_id', $context );
+    }
+
+    /**
+     * Retrieves the remote subscription id for an invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
     public function get_remote_subscription_id( $context = 'view' ) {
         $subscription_id = $this->get_prop( 'remote_subscription_id', $context );
 
@@ -1813,24 +1813,24 @@ 
         return $subscription_id;
     }
 
-	/**
-	 * Get the invoice's _anonymize status.
-	 *
-	 * @since 2.8.22
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_is_anonymized( $context = 'view' ) {
-		return (bool) $this->get_prop( 'is_anonymized', $context );
+    /**
+     * Get the invoice's _anonymize status.
+     *
+     * @since 2.8.22
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_is_anonymized( $context = 'view' ) {
+        return (bool) $this->get_prop( 'is_anonymized', $context );
     }
 
     /**
-	 * Retrieves the payment meta for an invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
+     * Retrieves the payment meta for an invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
     public function get_payment_meta( $context = 'view' ) {
 
         return array(
@@ -1850,31 +1850,31 @@ 
     }
 
     /**
-	 * Retrieves the cart details for an invoice.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
+     * Retrieves the cart details for an invoice.
+     *
+     * @since 1.0.19
+     * @return array
+     */
     public function get_cart_details() {
         $items        = $this->get_items();
         $cart_details = array();
 
         foreach ( $items as $item ) {
-			$item->invoice_id = $this->get_id();
+            $item->invoice_id = $this->get_id();
             $cart_details[]   = $item->prepare_data_for_saving();
         }
 
         return $cart_details;
-	}
+    }
 
-	/**
-	 * Retrieves the recurring item.
-	 *
-	 * @return null|GetPaid_Form_Item|int
-	 */
-	public function get_recurring( $object = false ) {
+    /**
+     * Retrieves the recurring item.
+     *
+     * @return null|GetPaid_Form_Item|int
+     */
+    public function get_recurring( $object = false ) {
 
-		// Are we returning an object?
+        // Are we returning an object?
         if ( $object ) {
             return $this->get_item( $this->recurring_item );
         }
@@ -1882,130 +1882,130 @@ 
         return $this->recurring_item;
     }
 
-	/**
-	 * Retrieves the subscription name.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_subscription_name() {
+    /**
+     * Retrieves the subscription name.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_subscription_name() {
 
-		// Retrieve the recurring name
+        // Retrieve the recurring name
         $item = $this->get_recurring( true );
 
-		// Abort if it does not exist.
+        // Abort if it does not exist.
         if ( empty( $item ) ) {
             return '';
         }
 
-		// Return the item name.
+        // Return the item name.
         return apply_filters( 'wpinv_invoice_get_subscription_name', $item->get_name(), $this );
-	}
-
-	/**
-	 * Retrieves the view url.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_view_url() {
+    }
+
+    /**
+     * Retrieves the view url.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_view_url() {
         $invoice_url = get_permalink( $this->get_id() );
-		$invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
+        $invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
         return apply_filters( 'wpinv_get_view_url', $invoice_url, $this );
-	}
+    }
 
-	/**
-	 * Retrieves the payment url.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_checkout_payment_url( $deprecated = false, $secret = false ) {
+    /**
+     * Retrieves the payment url.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_checkout_payment_url( $deprecated = false, $secret = false ) {
 
-		// Retrieve the checkout url.
+        // Retrieve the checkout url.
         $pay_url = wpinv_get_checkout_uri();
 
-		// Maybe force ssl.
+        // Maybe force ssl.
         if ( is_ssl() ) {
             $pay_url = str_replace( 'http:', 'https:', $pay_url );
         }
 
-		// Add the invoice key.
-		$pay_url = add_query_arg( 'invoice_key', $this->get_key(), $pay_url );
+        // Add the invoice key.
+        $pay_url = add_query_arg( 'invoice_key', $this->get_key(), $pay_url );
 
-		// (Maybe?) add a secret
+        // (Maybe?) add a secret
         if ( $secret ) {
             $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $this->get_key() ) ), $pay_url );
         }
 
         return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $deprecated, $secret );
-	}
+    }
 
-	/**
-	 * Retrieves the receipt url.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_receipt_url() {
+    /**
+     * Retrieves the receipt url.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_receipt_url() {
 
-		// Retrieve the checkout url.
+        // Retrieve the checkout url.
         $receipt_url = wpinv_get_success_page_uri();
 
-		// Maybe force ssl.
+        // Maybe force ssl.
         if ( is_ssl() ) {
             $receipt_url = str_replace( 'http:', 'https:', $receipt_url );
         }
 
-		// Add the invoice key.
-		$receipt_url = add_query_arg( 'invoice_key', $this->get_key(), $receipt_url );
+        // Add the invoice key.
+        $receipt_url = add_query_arg( 'invoice_key', $this->get_key(), $receipt_url );
 
         return apply_filters( 'getpaid_get_invoice_receipt_url', $receipt_url, $this );
-	}
-
-	/**
-	 * Retrieves the remote transaction url.
-	 *
-	 * @since 1.6.0
-	 * @return string
-	 */
-	public function get_transaction_url() {
-		return apply_filters( 'getpaid_gateway_' . $this->get_gateway() . '_transaction_url', '', $this );
-	}
-
-	/**
-	 * Retrieves the default status.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_default_status() {
-
-		$type   = $this->get_type();
-		$status = "wpi-$type-pending";
-		return str_replace( '-invoice', '', $status );
-
-	}
-
-    /**
-	 * Magic method for accessing invoice properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @param  string $context View or edit context.
-	 * @return mixed Value of the given invoice property (if set).
-	 */
-	public function get( $key, $context = 'view' ) {
-		$method = "get_$key";
-
-		if ( is_callable( array( $this, $method ) ) ) {
-			return $this->$method( $context );
-		}
+    }
+
+    /**
+     * Retrieves the remote transaction url.
+     *
+     * @since 1.6.0
+     * @return string
+     */
+    public function get_transaction_url() {
+        return apply_filters( 'getpaid_gateway_' . $this->get_gateway() . '_transaction_url', '', $this );
+    }
+
+    /**
+     * Retrieves the default status.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_default_status() {
+
+        $type   = $this->get_type();
+        $status = "wpi-$type-pending";
+        return str_replace( '-invoice', '', $status );
+
+    }
+
+    /**
+     * Magic method for accessing invoice properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @param  string $context View or edit context.
+     * @return mixed Value of the given invoice property (if set).
+     */
+    public function get( $key, $context = 'view' ) {
+        $method = "get_$key";
+
+        if ( is_callable( array( $this, $method ) ) ) {
+            return $this->$method( $context );
+        }
 
         return $this->get_prop( $key, $context );
-	}
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -2018,129 +2018,129 @@ 
     */
 
     /**
-	 * Magic method for setting invoice properties.
-	 *
-	 * @since 1.0.19
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @param  mixed $value new value.
-	 * @return mixed Value of the given invoice property (if set).
-	 */
-	public function set( $key, $value ) {
+     * Magic method for setting invoice properties.
+     *
+     * @since 1.0.19
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @param  mixed $value new value.
+     * @return mixed Value of the given invoice property (if set).
+     */
+    public function set( $key, $value ) {
 
         $setter = "set_$key";
         if ( is_callable( array( $this, $setter ) ) ) {
             $this->{$setter}( $value );
         }
 
-	}
-
-	/**
-	 * Sets item status.
-	 *
-	 * @since 1.0.19
-	 * @param string $new_status    New status.
-	 * @param string $note          Optional note to add.
-	 * @param bool   $manual_update Is this a manual status change?.
-	 * @return array details of change.
-	 */
-	public function set_status( $new_status, $note = '', $manual_update = false ) {
-		$old_status = $this->get_status();
-
-		$statuses = $this->get_all_statuses();
-
-		if ( isset( $statuses['draft'] ) ) {
-			unset( $statuses['draft'] );
-		}
-
-		$this->set_prop( 'status', $new_status );
-
-		// If setting the status, ensure it's set to a valid status.
-		if ( true === $this->object_read ) {
-
-			// Only allow valid new status.
-			if ( ! array_key_exists( $new_status, $statuses ) ) {
-				$new_status = $this->get_default_status();
-			}
-
-			// If the old status is set but unknown (e.g. draft) assume its pending for action usage.
-			if ( $old_status && ! array_key_exists( $new_status, $statuses ) ) {
-				$old_status = $this->get_default_status();
-			}
-
-			// Paid - Renewal (i.e when duplicating a parent invoice )
-			if ( $new_status == 'wpi-pending' && $old_status == 'publish' && ! $this->get_id() ) {
-				$old_status = 'wpi-pending';
-			}
-
-			if ( $old_status !== $new_status ) {
-				$this->status_transition = array(
-					'from'   => ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $old_status,
-					'to'     => $new_status,
-					'note'   => $note,
-					'manual' => (bool) $manual_update,
-				);
-
-				if ( $manual_update ) {
-					do_action( 'getpaid_' . $this->object_type . '_edit_status', $this->get_id(), $new_status );
-				}
-
-				$this->maybe_set_date_paid();
-
-			}
-		}
-
-		return array(
-			'from' => $old_status,
-			'to'   => $new_status,
-		);
-	}
-
-	/**
-	 * Maybe set date paid.
-	 *
-	 * Sets the date paid variable when transitioning to the payment complete
-	 * order status.
-	 *
-	 * @since 1.0.19
-	 */
-	public function maybe_set_date_paid() {
-
-		if ( ! $this->get_date_completed( 'edit' ) && $this->is_paid() ) {
-			$this->set_date_completed( current_time( 'mysql' ) );
-		}
-	}
-
-    /**
-	 * Set parent invoice ID.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_parent_id( $value ) {
-		if ( $value && ( $value === $this->get_id() ) ) {
-			return;
-		}
-		$this->set_prop( 'parent_id', absint( $value ) );
-    }
-
-    /**
-	 * Set plugin version when the invoice was created.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
-    }
-
-    /**
-	 * Set date when the invoice was created.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+    }
+
+    /**
+     * Sets item status.
+     *
+     * @since 1.0.19
+     * @param string $new_status    New status.
+     * @param string $note          Optional note to add.
+     * @param bool   $manual_update Is this a manual status change?.
+     * @return array details of change.
+     */
+    public function set_status( $new_status, $note = '', $manual_update = false ) {
+        $old_status = $this->get_status();
+
+        $statuses = $this->get_all_statuses();
+
+        if ( isset( $statuses['draft'] ) ) {
+            unset( $statuses['draft'] );
+        }
+
+        $this->set_prop( 'status', $new_status );
+
+        // If setting the status, ensure it's set to a valid status.
+        if ( true === $this->object_read ) {
+
+            // Only allow valid new status.
+            if ( ! array_key_exists( $new_status, $statuses ) ) {
+                $new_status = $this->get_default_status();
+            }
+
+            // If the old status is set but unknown (e.g. draft) assume its pending for action usage.
+            if ( $old_status && ! array_key_exists( $new_status, $statuses ) ) {
+                $old_status = $this->get_default_status();
+            }
+
+            // Paid - Renewal (i.e when duplicating a parent invoice )
+            if ( $new_status == 'wpi-pending' && $old_status == 'publish' && ! $this->get_id() ) {
+                $old_status = 'wpi-pending';
+            }
+
+            if ( $old_status !== $new_status ) {
+                $this->status_transition = array(
+                    'from'   => ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $old_status,
+                    'to'     => $new_status,
+                    'note'   => $note,
+                    'manual' => (bool) $manual_update,
+                );
+
+                if ( $manual_update ) {
+                    do_action( 'getpaid_' . $this->object_type . '_edit_status', $this->get_id(), $new_status );
+                }
+
+                $this->maybe_set_date_paid();
+
+            }
+        }
+
+        return array(
+            'from' => $old_status,
+            'to'   => $new_status,
+        );
+    }
+
+    /**
+     * Maybe set date paid.
+     *
+     * Sets the date paid variable when transitioning to the payment complete
+     * order status.
+     *
+     * @since 1.0.19
+     */
+    public function maybe_set_date_paid() {
+
+        if ( ! $this->get_date_completed( 'edit' ) && $this->is_paid() ) {
+            $this->set_date_completed( current_time( 'mysql' ) );
+        }
+    }
+
+    /**
+     * Set parent invoice ID.
+     *
+     * @since 1.0.19
+     */
+    public function set_parent_id( $value ) {
+        if ( $value && ( $value === $this->get_id() ) ) {
+            return;
+        }
+        $this->set_prop( 'parent_id', absint( $value ) );
+    }
+
+    /**
+     * Set plugin version when the invoice was created.
+     *
+     * @since 1.0.19
+     */
+    public function set_version( $value ) {
+        $this->set_prop( 'version', $value );
+    }
+
+    /**
+     * Set date when the invoice was created.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_created( $value ) {
+     */
+    public function set_date_created( $value ) {
         $date = strtotime( $value );
 
         if ( $date && $value !== '0000-00-00 00:00:00' ) {
@@ -2148,19 +2148,19 @@ 
             return true;
         }
 
-		$this->set_prop( 'date_created', '' );
-		return false;
+        $this->set_prop( 'date_created', '' );
+        return false;
 
     }
 
     /**
-	 * Set date invoice due date.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date invoice due date.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_due_date( $value ) {
+     */
+    public function set_due_date( $value ) {
         $date = strtotime( $value );
 
         if ( $date && $value !== '0000-00-00 00:00:00' ) {
@@ -2168,29 +2168,29 @@ 
             return true;
         }
 
-		$this->set_prop( 'due_date', '' );
+        $this->set_prop( 'due_date', '' );
         return false;
 
     }
 
     /**
-	 * Alias of self::set_due_date().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_date_due( $value ) {
-		$this->set_due_date( $value );
+     * Alias of self::set_due_date().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_date_due( $value ) {
+        $this->set_due_date( $value );
     }
 
     /**
-	 * Set date invoice was completed.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date invoice was completed.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_completed_date( $value ) {
+     */
+    public function set_completed_date( $value ) {
         $date = strtotime( $value );
 
         if ( $date && $value !== '0000-00-00 00:00:00' ) {
@@ -2198,29 +2198,29 @@ 
             return true;
         }
 
-		$this->set_prop( 'completed_date', '' );
+        $this->set_prop( 'completed_date', '' );
         return false;
 
     }
 
     /**
-	 * Alias of self::set_completed_date().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_date_completed( $value ) {
-		$this->set_completed_date( $value );
+     * Alias of self::set_completed_date().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_date_completed( $value ) {
+        $this->set_completed_date( $value );
     }
 
     /**
-	 * Set date when the invoice was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the invoice was last modified.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_modified( $value ) {
+     */
+    public function set_date_modified( $value ) {
         $date = strtotime( $value );
 
         if ( $date && $value !== '0000-00-00 00:00:00' ) {
@@ -2228,813 +2228,813 @@ 
             return true;
         }
 
-		$this->set_prop( 'date_modified', '' );
+        $this->set_prop( 'date_modified', '' );
         return false;
 
     }
 
     /**
-	 * Set the invoice number.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New number.
-	 */
-	public function set_number( $value ) {
+     * Set the invoice number.
+     *
+     * @since 1.0.19
+     * @param  string $value New number.
+     */
+    public function set_number( $value ) {
         $number = sanitize_text_field( $value );
-		$this->set_prop( 'number', $number );
+        $this->set_prop( 'number', $number );
     }
 
     /**
-	 * Set the invoice type.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value Type.
-	 */
-	public function set_type( $value ) {
+     * Set the invoice type.
+     *
+     * @since 1.0.19
+     * @param  string $value Type.
+     */
+    public function set_type( $value ) {
         $type = sanitize_text_field( str_replace( 'wpi_', '', $value ) );
-		$this->set_prop( 'type', $type );
-	}
+        $this->set_prop( 'type', $type );
+    }
 
     /**
-	 * Set the invoice post type.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value Post type.
-	 */
-	public function set_post_type( $value ) {
+     * Set the invoice post type.
+     *
+     * @since 1.0.19
+     * @param  string $value Post type.
+     */
+    public function set_post_type( $value ) {
         if ( getpaid_is_invoice_post_type( $value ) ) {
-			$this->set_type( $value );
+            $this->set_type( $value );
             $this->set_prop( 'post_type', $value );
         }
     }
 
     /**
-	 * Set the invoice key.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New key.
-	 */
-	public function set_key( $value ) {
+     * Set the invoice key.
+     *
+     * @since 1.0.19
+     * @param  string $value New key.
+     */
+    public function set_key( $value ) {
         $key = sanitize_text_field( $value );
-		$this->set_prop( 'key', $key );
+        $this->set_prop( 'key', $key );
     }
 
     /**
-	 * Set the invoice mode.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value mode.
-	 */
-	public function set_mode( $value ) {
+     * Set the invoice mode.
+     *
+     * @since 1.0.19
+     * @param  string $value mode.
+     */
+    public function set_mode( $value ) {
         if ( in_array( $value, array( 'live', 'test' ) ) ) {
             $this->set_prop( 'mode', $value );
         }
     }
 
     /**
-	 * Set the invoice path.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value path.
-	 */
-	public function set_path( $value ) {
+     * Set the invoice path.
+     *
+     * @since 1.0.19
+     * @param  string $value path.
+     */
+    public function set_path( $value ) {
         $this->set_prop( 'path', $value );
     }
 
     /**
-	 * Set the invoice name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_name( $value ) {
+     * Set the invoice name.
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_name( $value ) {
         $name = sanitize_text_field( $value );
-		$this->set_prop( 'name', $name );
+        $this->set_prop( 'name', $name );
     }
 
     /**
-	 * Alias of self::set_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+     * Alias of self::set_name().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_title( $value ) {
+        $this->set_name( $value );
     }
 
     /**
-	 * Set the invoice description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_description( $value ) {
+     * Set the invoice description.
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_description( $value ) {
         $description = wp_kses_post( $value );
-		$this->set_prop( 'description', $description );
+        $this->set_prop( 'description', $description );
+    }
+
+    /**
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_excerpt( $value ) {
+        $this->set_description( $value );
+    }
+
+    /**
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_summary( $value ) {
+        $this->set_description( $value );
+    }
+
+    /**
+     * Set the receiver of the invoice.
+     *
+     * @since 1.0.19
+     * @param  int $value New author.
+     */
+    public function set_author( $value ) {
+        $user = get_user_by( 'id', (int) $value );
+
+        if ( $user && $user->ID ) {
+            $this->set_prop( 'author', $user->ID );
+            $this->set_prop( 'email', $user->user_email );
+        }
+
+    }
+
+    /**
+     * Alias of self::set_author().
+     *
+     * @since 1.0.19
+     * @param  int $value New user id.
+     */
+    public function set_user_id( $value ) {
+        $this->set_author( $value );
+    }
+
+    /**
+     * Sets the customer ID.
+     *
+     * @since 1.0.19
+     * @param  int $value New user id.
+     */
+    public function set_customer_id( $value ) {
+        $this->set_prop( 'customer_id', (int) $value );
+    }
+
+    /**
+     * Set the customer's ip.
+     *
+     * @since 1.0.19
+     * @param  string $value ip address.
+     */
+    public function set_ip( $value ) {
+        $this->set_prop( 'ip', $value );
+    }
+
+    /**
+     * Alias of self::set_ip().
+     *
+     * @since 1.0.19
+     * @param  string $value ip address.
+     */
+    public function set_user_ip( $value ) {
+        $this->set_ip( $value );
+    }
+
+    /**
+     * Set the customer's first name.
+     *
+     * @since 1.0.19
+     * @param  string $value first name.
+     */
+    public function set_first_name( $value ) {
+        $this->set_prop( 'first_name', $value );
+    }
+
+    /**
+     * Alias of self::set_first_name().
+     *
+     * @since 1.0.19
+     * @param  string $value first name.
+     */
+    public function set_user_first_name( $value ) {
+        $this->set_first_name( $value );
+    }
+
+    /**
+     * Alias of self::set_first_name().
+     *
+     * @since 1.0.19
+     * @param  string $value first name.
+     */
+    public function set_customer_first_name( $value ) {
+        $this->set_first_name( $value );
+    }
+
+    /**
+     * Set the customer's last name.
+     *
+     * @since 1.0.19
+     * @param  string $value last name.
+     */
+    public function set_last_name( $value ) {
+        $this->set_prop( 'last_name', $value );
+    }
+
+    /**
+     * Alias of self::set_last_name().
+     *
+     * @since 1.0.19
+     * @param  string $value last name.
+     */
+    public function set_user_last_name( $value ) {
+        $this->set_last_name( $value );
+    }
+
+    /**
+     * Alias of self::set_last_name().
+     *
+     * @since 1.0.19
+     * @param  string $value last name.
+     */
+    public function set_customer_last_name( $value ) {
+        $this->set_last_name( $value );
     }
 
     /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_excerpt( $value ) {
-		$this->set_description( $value );
+     * Set the customer's phone number.
+     *
+     * @since 1.0.19
+     * @param  string $value phone.
+     */
+    public function set_phone( $value ) {
+        $this->set_prop( 'phone', $value );
+    }
+
+    /**
+     * Alias of self::set_phone().
+     *
+     * @since 1.0.19
+     * @param  string $value phone.
+     */
+    public function set_user_phone( $value ) {
+        $this->set_phone( $value );
     }
 
     /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_summary( $value ) {
-		$this->set_description( $value );
+     * Alias of self::set_phone().
+     *
+     * @since 1.0.19
+     * @param  string $value phone.
+     */
+    public function set_customer_phone( $value ) {
+        $this->set_phone( $value );
     }
 
     /**
-	 * Set the receiver of the invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New author.
-	 */
-	public function set_author( $value ) {
-		$user = get_user_by( 'id', (int) $value );
+     * Alias of self::set_phone().
+     *
+     * @since 1.0.19
+     * @param  string $value phone.
+     */
+    public function set_phone_number( $value ) {
+        $this->set_phone( $value );
+    }
 
-		if ( $user && $user->ID ) {
-			$this->set_prop( 'author', $user->ID );
-			$this->set_prop( 'email', $user->user_email );
-		}
+    /**
+     * Set the customer's email address.
+     *
+     * @since 1.0.19
+     * @param  string $value email address.
+     */
+    public function set_email( $value ) {
+        $this->set_prop( 'email', $value );
+    }
 
+    /**
+     * Alias of self::set_email().
+     *
+     * @since 1.0.19
+     * @param  string $value email address.
+     */
+    public function set_user_email( $value ) {
+        $this->set_email( $value );
     }
 
     /**
-	 * Alias of self::set_author().
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New user id.
-	 */
-	public function set_user_id( $value ) {
-		$this->set_author( $value );
+     * Alias of self::set_email().
+     *
+     * @since 1.0.19
+     * @param  string $value email address.
+     */
+    public function set_email_address( $value ) {
+        $this->set_email( $value );
     }
 
     /**
-	 * Sets the customer ID.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New user id.
-	 */
-	public function set_customer_id( $value ) {
-		$this->set_prop( 'customer_id', (int) $value );
+     * Alias of self::set_email().
+     *
+     * @since 1.0.19
+     * @param  string $value email address.
+     */
+    public function set_customer_email( $value ) {
+        $this->set_email( $value );
     }
 
     /**
-	 * Set the customer's ip.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value ip address.
-	 */
-	public function set_ip( $value ) {
-		$this->set_prop( 'ip', $value );
+     * Set the customer's country.
+     *
+     * @since 1.0.19
+     * @param  string $value country.
+     */
+    public function set_country( $value ) {
+        $this->set_prop( 'country', $value );
     }
 
     /**
-	 * Alias of self::set_ip().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value ip address.
-	 */
-	public function set_user_ip( $value ) {
-		$this->set_ip( $value );
+     * Alias of self::set_country().
+     *
+     * @since 1.0.19
+     * @param  string $value country.
+     */
+    public function set_user_country( $value ) {
+        $this->set_country( $value );
     }
 
     /**
-	 * Set the customer's first name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value first name.
-	 */
-	public function set_first_name( $value ) {
-		$this->set_prop( 'first_name', $value );
+     * Alias of self::set_country().
+     *
+     * @since 1.0.19
+     * @param  string $value country.
+     */
+    public function set_customer_country( $value ) {
+        $this->set_country( $value );
     }
 
     /**
-	 * Alias of self::set_first_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value first name.
-	 */
-	public function set_user_first_name( $value ) {
-		$this->set_first_name( $value );
+     * Set the customer's state.
+     *
+     * @since 1.0.19
+     * @param  string $value state.
+     */
+    public function set_state( $value ) {
+        $this->set_prop( 'state', $value );
     }
 
     /**
-	 * Alias of self::set_first_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value first name.
-	 */
-	public function set_customer_first_name( $value ) {
-		$this->set_first_name( $value );
+     * Alias of self::set_state().
+     *
+     * @since 1.0.19
+     * @param  string $value state.
+     */
+    public function set_user_state( $value ) {
+        $this->set_state( $value );
     }
 
     /**
-	 * Set the customer's last name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value last name.
-	 */
-	public function set_last_name( $value ) {
-		$this->set_prop( 'last_name', $value );
+     * Alias of self::set_state().
+     *
+     * @since 1.0.19
+     * @param  string $value state.
+     */
+    public function set_customer_state( $value ) {
+        $this->set_state( $value );
     }
 
     /**
-	 * Alias of self::set_last_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value last name.
-	 */
-	public function set_user_last_name( $value ) {
-		$this->set_last_name( $value );
+     * Set the customer's city.
+     *
+     * @since 1.0.19
+     * @param  string $value city.
+     */
+    public function set_city( $value ) {
+        $this->set_prop( 'city', $value );
     }
 
     /**
-	 * Alias of self::set_last_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value last name.
-	 */
-	public function set_customer_last_name( $value ) {
-		$this->set_last_name( $value );
+     * Alias of self::set_city().
+     *
+     * @since 1.0.19
+     * @param  string $value city.
+     */
+    public function set_user_city( $value ) {
+        $this->set_city( $value );
     }
 
     /**
-	 * Set the customer's phone number.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value phone.
-	 */
-	public function set_phone( $value ) {
-		$this->set_prop( 'phone', $value );
+     * Alias of self::set_city().
+     *
+     * @since 1.0.19
+     * @param  string $value city.
+     */
+    public function set_customer_city( $value ) {
+        $this->set_city( $value );
     }
 
     /**
-	 * Alias of self::set_phone().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value phone.
-	 */
-	public function set_user_phone( $value ) {
-		$this->set_phone( $value );
+     * Set the customer's zip code.
+     *
+     * @since 1.0.19
+     * @param  string $value zip.
+     */
+    public function set_zip( $value ) {
+        $this->set_prop( 'zip', $value );
     }
 
     /**
-	 * Alias of self::set_phone().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value phone.
-	 */
-	public function set_customer_phone( $value ) {
-		$this->set_phone( $value );
+     * Alias of self::set_zip().
+     *
+     * @since 1.0.19
+     * @param  string $value zip.
+     */
+    public function set_user_zip( $value ) {
+        $this->set_zip( $value );
     }
 
     /**
-	 * Alias of self::set_phone().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value phone.
-	 */
-	public function set_phone_number( $value ) {
-		$this->set_phone( $value );
+     * Alias of self::set_zip().
+     *
+     * @since 1.0.19
+     * @param  string $value zip.
+     */
+    public function set_customer_zip( $value ) {
+        $this->set_zip( $value );
     }
 
     /**
-	 * Set the customer's email address.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value email address.
-	 */
-	public function set_email( $value ) {
-		$this->set_prop( 'email', $value );
+     * Set the customer's company.
+     *
+     * @since 1.0.19
+     * @param  string $value company.
+     */
+    public function set_company( $value ) {
+        $this->set_prop( 'company', $value );
     }
 
     /**
-	 * Alias of self::set_email().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value email address.
-	 */
-	public function set_user_email( $value ) {
-		$this->set_email( $value );
+     * Alias of self::set_company().
+     *
+     * @since 1.0.19
+     * @param  string $value company.
+     */
+    public function set_user_company( $value ) {
+        $this->set_company( $value );
     }
 
     /**
-	 * Alias of self::set_email().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value email address.
-	 */
-	public function set_email_address( $value ) {
-		$this->set_email( $value );
+     * Alias of self::set_company().
+     *
+     * @since 1.0.19
+     * @param  string $value company.
+     */
+    public function set_customer_company( $value ) {
+        $this->set_company( $value );
     }
 
     /**
-	 * Alias of self::set_email().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value email address.
-	 */
-	public function set_customer_email( $value ) {
-		$this->set_email( $value );
+     * Set the customer's company id.
+     *
+     * @since 1.0.19
+     * @param  string $value company id.
+     */
+    public function set_company_id( $value ) {
+        $this->set_prop( 'company_id', $value );
     }
 
     /**
-	 * Set the customer's country.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value country.
-	 */
-	public function set_country( $value ) {
-		$this->set_prop( 'country', $value );
+     * Set the customer's var number.
+     *
+     * @since 1.0.19
+     * @param  string $value var number.
+     */
+    public function set_vat_number( $value ) {
+        $this->set_prop( 'vat_number', $value );
     }
 
     /**
-	 * Alias of self::set_country().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value country.
-	 */
-	public function set_user_country( $value ) {
-		$this->set_country( $value );
+     * Alias of self::set_vat_number().
+     *
+     * @since 1.0.19
+     * @param  string $value var number.
+     */
+    public function set_user_vat_number( $value ) {
+        $this->set_vat_number( $value );
     }
 
     /**
-	 * Alias of self::set_country().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value country.
-	 */
-	public function set_customer_country( $value ) {
-		$this->set_country( $value );
+     * Alias of self::set_vat_number().
+     *
+     * @since 1.0.19
+     * @param  string $value var number.
+     */
+    public function set_customer_vat_number( $value ) {
+        $this->set_vat_number( $value );
     }
 
     /**
-	 * Set the customer's state.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value state.
-	 */
-	public function set_state( $value ) {
-		$this->set_prop( 'state', $value );
+     * Set the customer's vat rate.
+     *
+     * @since 1.0.19
+     * @param  string $value var rate.
+     */
+    public function set_vat_rate( $value ) {
+        $this->set_prop( 'vat_rate', $value );
     }
 
     /**
-	 * Alias of self::set_state().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value state.
-	 */
-	public function set_user_state( $value ) {
-		$this->set_state( $value );
+     * Alias of self::set_vat_rate().
+     *
+     * @since 1.0.19
+     * @param  string $value var number.
+     */
+    public function set_user_vat_rate( $value ) {
+        $this->set_vat_rate( $value );
     }
 
     /**
-	 * Alias of self::set_state().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value state.
-	 */
-	public function set_customer_state( $value ) {
-		$this->set_state( $value );
+     * Alias of self::set_vat_rate().
+     *
+     * @since 1.0.19
+     * @param  string $value var number.
+     */
+    public function set_customer_vat_rate( $value ) {
+        $this->set_vat_rate( $value );
     }
 
     /**
-	 * Set the customer's city.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value city.
-	 */
-	public function set_city( $value ) {
-		$this->set_prop( 'city', $value );
+     * Set the customer's address.
+     *
+     * @since 1.0.19
+     * @param  string $value address.
+     */
+    public function set_address( $value ) {
+        $this->set_prop( 'address', $value );
     }
 
     /**
-	 * Alias of self::set_city().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value city.
-	 */
-	public function set_user_city( $value ) {
-		$this->set_city( $value );
+     * Alias of self::set_address().
+     *
+     * @since 1.0.19
+     * @param  string $value address.
+     */
+    public function set_user_address( $value ) {
+        $this->set_address( $value );
     }
 
     /**
-	 * Alias of self::set_city().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value city.
-	 */
-	public function set_customer_city( $value ) {
-		$this->set_city( $value );
+     * Alias of self::set_address().
+     *
+     * @since 1.0.19
+     * @param  string $value address.
+     */
+    public function set_customer_address( $value ) {
+        $this->set_address( $value );
     }
 
     /**
-	 * Set the customer's zip code.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value zip.
-	 */
-	public function set_zip( $value ) {
-		$this->set_prop( 'zip', $value );
+     * Set whether the customer has viewed the invoice or not.
+     *
+     * @since 1.0.19
+     * @param  int|bool $value confirmed.
+     */
+    public function set_is_viewed( $value ) {
+        $this->set_prop( 'is_viewed', $value );
     }
 
     /**
-	 * Alias of self::set_zip().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value zip.
-	 */
-	public function set_user_zip( $value ) {
-		$this->set_zip( $value );
+     * Set extra email recipients.
+     *
+     * @since 1.0.19
+     * @param  string $value email recipients.
+     */
+    public function set_email_cc( $value ) {
+        $this->set_prop( 'email_cc', $value );
     }
 
     /**
-	 * Alias of self::set_zip().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value zip.
-	 */
-	public function set_customer_zip( $value ) {
-		$this->set_zip( $value );
+     * Set the invoice template.
+     *
+     * @since 1.0.19
+     * @param  string $value template.
+     */
+    public function set_template( $value ) {
+        if ( in_array( $value, array( 'quantity', 'hours', 'amount' ) ) ) {
+            $this->set_prop( 'template', $value );
+        }
     }
 
     /**
-	 * Set the customer's company.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value company.
-	 */
-	public function set_company( $value ) {
-		$this->set_prop( 'company', $value );
+     * Set the invoice source.
+     *
+     * @since 1.0.19
+     * @param  string $value source.
+     * @deprecated
+     */
+    public function created_via( $value ) {
+        $this->set_created_via( sanitize_text_field( $value ) );
     }
 
     /**
-	 * Alias of self::set_company().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value company.
-	 */
-	public function set_user_company( $value ) {
-		$this->set_company( $value );
+     * Set the invoice source.
+     *
+     * @since 1.0.19
+     * @param  string $value source.
+     */
+    public function set_created_via( $value ) {
+        $this->set_prop( 'created_via', sanitize_text_field( $value ) );
     }
 
     /**
-	 * Alias of self::set_company().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value company.
-	 */
-	public function set_customer_company( $value ) {
-		$this->set_company( $value );
-    }
-
-	/**
-	 * Set the customer's company id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value company id.
-	 */
-	public function set_company_id( $value ) {
-		$this->set_prop( 'company_id', $value );
+     * Set the customer's address confirmed status.
+     *
+     * @since 1.0.19
+     * @param  int|bool $value confirmed.
+     */
+    public function set_address_confirmed( $value ) {
+        $this->set_prop( 'address_confirmed', $value );
     }
 
     /**
-	 * Set the customer's var number.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value var number.
-	 */
-	public function set_vat_number( $value ) {
-		$this->set_prop( 'vat_number', $value );
+     * Alias of self::set_address_confirmed().
+     *
+     * @since 1.0.19
+     * @param  int|bool $value confirmed.
+     */
+    public function set_user_address_confirmed( $value ) {
+        $this->set_address_confirmed( $value );
     }
 
     /**
-	 * Alias of self::set_vat_number().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value var number.
-	 */
-	public function set_user_vat_number( $value ) {
-		$this->set_vat_number( $value );
+     * Alias of self::set_address_confirmed().
+     *
+     * @since 1.0.19
+     * @param  int|bool $value confirmed.
+     */
+    public function set_customer_address_confirmed( $value ) {
+        $this->set_address_confirmed( $value );
     }
 
     /**
-	 * Alias of self::set_vat_number().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value var number.
-	 */
-	public function set_customer_vat_number( $value ) {
-		$this->set_vat_number( $value );
+     * Set the shipping fee
+     *
+     * @since 1.0.19
+     * @param  float $value shipping amount.
+     */
+    public function set_shipping( $value ) {
+
+        if ( ! is_numeric( $value ) ) {
+            return $this->set_prop( 'shipping', null );
+        }
+
+        $this->set_prop( 'shipping', max( 0, floatval( $value ) ) );
     }
 
     /**
-	 * Set the customer's vat rate.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value var rate.
-	 */
-	public function set_vat_rate( $value ) {
-		$this->set_prop( 'vat_rate', $value );
+     * Set the invoice sub total.
+     *
+     * @since 1.0.19
+     * @param  float $value sub total.
+     */
+    public function set_subtotal( $value ) {
+        $this->set_prop( 'subtotal', max( 0, $value ) );
     }
 
-    /**
-	 * Alias of self::set_vat_rate().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value var number.
-	 */
-	public function set_user_vat_rate( $value ) {
-		$this->set_vat_rate( $value );
-    }
-
-    /**
-	 * Alias of self::set_vat_rate().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value var number.
-	 */
-	public function set_customer_vat_rate( $value ) {
-		$this->set_vat_rate( $value );
-    }
-
-    /**
-	 * Set the customer's address.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value address.
-	 */
-	public function set_address( $value ) {
-		$this->set_prop( 'address', $value );
-    }
-
-    /**
-	 * Alias of self::set_address().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value address.
-	 */
-	public function set_user_address( $value ) {
-		$this->set_address( $value );
-    }
-
-    /**
-	 * Alias of self::set_address().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value address.
-	 */
-	public function set_customer_address( $value ) {
-		$this->set_address( $value );
-    }
-
-    /**
-	 * Set whether the customer has viewed the invoice or not.
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value confirmed.
-	 */
-	public function set_is_viewed( $value ) {
-		$this->set_prop( 'is_viewed', $value );
-	}
-
-	/**
-	 * Set extra email recipients.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value email recipients.
-	 */
-	public function set_email_cc( $value ) {
-		$this->set_prop( 'email_cc', $value );
-	}
-
-	/**
-	 * Set the invoice template.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value template.
-	 */
-	public function set_template( $value ) {
-		if ( in_array( $value, array( 'quantity', 'hours', 'amount' ) ) ) {
-			$this->set_prop( 'template', $value );
-		}
-	}
-
-	/**
-	 * Set the invoice source.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value source.
-	 * @deprecated
-	 */
-	public function created_via( $value ) {
-		$this->set_created_via( sanitize_text_field( $value ) );
-	}
-
-	/**
-	 * Set the invoice source.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value source.
-	 */
-	public function set_created_via( $value ) {
-		$this->set_prop( 'created_via', sanitize_text_field( $value ) );
-	}
-
-	/**
-	 * Set the customer's address confirmed status.
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value confirmed.
-	 */
-	public function set_address_confirmed( $value ) {
-		$this->set_prop( 'address_confirmed', $value );
-    }
-
-    /**
-	 * Alias of self::set_address_confirmed().
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value confirmed.
-	 */
-	public function set_user_address_confirmed( $value ) {
-		$this->set_address_confirmed( $value );
-    }
-
-    /**
-	 * Alias of self::set_address_confirmed().
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value confirmed.
-	 */
-	public function set_customer_address_confirmed( $value ) {
-		$this->set_address_confirmed( $value );
-    }
-
-    /**
-	 * Set the shipping fee
-	 *
-	 * @since 1.0.19
-	 * @param  float $value shipping amount.
-	 */
-	public function set_shipping( $value ) {
-
-		if ( ! is_numeric( $value ) ) {
-			return $this->set_prop( 'shipping', null );
-		}
-
-		$this->set_prop( 'shipping', max( 0, floatval( $value ) ) );
-	}
-
-	/**
-	 * Set the invoice sub total.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value sub total.
-	 */
-	public function set_subtotal( $value ) {
-		$this->set_prop( 'subtotal', max( 0, $value ) );
-	}
-
-	/**
-	 * Set the invoice total.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value sub total.
-	 */
-	public function set_total( $value ) {
-		$this->set_prop( 'total', max( 0, $value ) );
+    /**
+     * Set the invoice total.
+     *
+     * @since 1.0.19
+     * @param  float $value sub total.
+     */
+    public function set_total( $value ) {
+        $this->set_prop( 'total', max( 0, $value ) );
     }
 
     /**
-	 * Set the invoice discount amount.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value discount total.
-	 */
-	public function set_total_discount( $value ) {
-		$this->set_prop( 'total_discount', max( 0, $value ) );
+     * Set the invoice discount amount.
+     *
+     * @since 1.0.19
+     * @param  float $value discount total.
+     */
+    public function set_total_discount( $value ) {
+        $this->set_prop( 'total_discount', max( 0, $value ) );
     }
 
     /**
-	 * Alias of self::set_total_discount().
-	 *
-	 * @since 1.0.19
-	 * @param  float $value discount total.
-	 */
-	public function set_discount( $value ) {
-		$this->set_total_discount( $value );
+     * Alias of self::set_total_discount().
+     *
+     * @since 1.0.19
+     * @param  float $value discount total.
+     */
+    public function set_discount( $value ) {
+        $this->set_total_discount( $value );
     }
 
     /**
-	 * Set the invoice tax amount.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value tax total.
-	 */
-	public function set_total_tax( $value ) {
-		$this->set_prop( 'total_tax', max( 0, $value ) );
+     * Set the invoice tax amount.
+     *
+     * @since 1.0.19
+     * @param  float $value tax total.
+     */
+    public function set_total_tax( $value ) {
+        $this->set_prop( 'total_tax', max( 0, $value ) );
     }
 
     /**
-	 * Alias of self::set_total_tax().
-	 *
-	 * @since 1.0.19
-	 * @param  float $value tax total.
-	 */
-	public function set_tax_total( $value ) {
-		$this->set_total_tax( $value );
+     * Alias of self::set_total_tax().
+     *
+     * @since 1.0.19
+     * @param  float $value tax total.
+     */
+    public function set_tax_total( $value ) {
+        $this->set_total_tax( $value );
     }
 
     /**
-	 * Set the invoice fees amount.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value fees total.
-	 */
-	public function set_total_fees( $value ) {
-		$this->set_prop( 'total_fees', max( 0, $value ) );
+     * Set the invoice fees amount.
+     *
+     * @since 1.0.19
+     * @param  float $value fees total.
+     */
+    public function set_total_fees( $value ) {
+        $this->set_prop( 'total_fees', max( 0, $value ) );
     }
 
     /**
-	 * Alias of self::set_total_fees().
-	 *
-	 * @since 1.0.19
-	 * @param  float $value fees total.
-	 */
-	public function set_fees_total( $value ) {
-		$this->set_total_fees( $value );
+     * Alias of self::set_total_fees().
+     *
+     * @since 1.0.19
+     * @param  float $value fees total.
+     */
+    public function set_fees_total( $value ) {
+        $this->set_total_fees( $value );
     }
 
     /**
-	 * Set the invoice fees.
-	 *
-	 * @since 1.0.19
-	 * @param  array $value fees.
-	 */
-	public function set_fees( $value ) {
+     * Set the invoice fees.
+     *
+     * @since 1.0.19
+     * @param  array $value fees.
+     */
+    public function set_fees( $value ) {
 
-		if ( ! is_array( $value ) ) {
-			$value = array();
-		}
+        if ( ! is_array( $value ) ) {
+            $value = array();
+        }
 
-		$this->set_prop( 'fees', $value );
+        $this->set_prop( 'fees', $value );
 
     }
 
     /**
-	 * Set the invoice taxes.
-	 *
-	 * @since 1.0.19
-	 * @param  array $value taxes.
-	 */
-	public function set_taxes( $value ) {
+     * Set the invoice taxes.
+     *
+     * @since 1.0.19
+     * @param  array $value taxes.
+     */
+    public function set_taxes( $value ) {
 
-		if ( ! is_array( $value ) ) {
-			$value = array();
-		}
+        if ( ! is_array( $value ) ) {
+            $value = array();
+        }
 
-		$this->set_prop( 'taxes', $value );
+        $this->set_prop( 'taxes', $value );
 
     }
 
     /**
-	 * Set the invoice discounts.
-	 *
-	 * @since 1.0.19
-	 * @param  array $value discounts.
-	 */
-	public function set_discounts( $value ) {
+     * Set the invoice discounts.
+     *
+     * @since 1.0.19
+     * @param  array $value discounts.
+     */
+    public function set_discounts( $value ) {
 
-		if ( ! is_array( $value ) ) {
-			$value = array();
-		}
+        if ( ! is_array( $value ) ) {
+            $value = array();
+        }
 
-		$this->set_prop( 'discounts', $value );
+        $this->set_prop( 'discounts', $value );
     }
 
     /**
-	 * Set the invoice items.
-	 *
-	 * @since 1.0.19
-	 * @param  GetPaid_Form_Item[] $value items.
-	 */
-	public function set_items( $value ) {
+     * Set the invoice items.
+     *
+     * @since 1.0.19
+     * @param  GetPaid_Form_Item[] $value items.
+     */
+    public function set_items( $value ) {
 
         // Remove existing items.
         $this->set_prop( 'items', array() );
-		$this->recurring_item = null;
+        $this->recurring_item = null;
 
         // Ensure that we have an array.
         if ( ! is_array( $value ) ) {
@@ -3048,105 +3048,105 @@ 
     }
 
     /**
-	 * Set the payment form.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value payment form.
-	 */
-	public function set_payment_form( $value ) {
-		$this->set_prop( 'payment_form', $value );
+     * Set the payment form.
+     *
+     * @since 1.0.19
+     * @param  int $value payment form.
+     */
+    public function set_payment_form( $value ) {
+        $this->set_prop( 'payment_form', $value );
     }
 
     /**
-	 * Set the submission id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value submission id.
-	 */
-	public function set_submission_id( $value ) {
-		$this->set_prop( 'submission_id', $value );
+     * Set the submission id.
+     *
+     * @since 1.0.19
+     * @param  string $value submission id.
+     */
+    public function set_submission_id( $value ) {
+        $this->set_prop( 'submission_id', $value );
     }
 
     /**
-	 * Set the discount code.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value discount code.
-	 */
-	public function set_discount_code( $value ) {
-		$this->set_prop( 'discount_code', sanitize_text_field( $value ) );
+     * Set the discount code.
+     *
+     * @since 1.0.19
+     * @param  string $value discount code.
+     */
+    public function set_discount_code( $value ) {
+        $this->set_prop( 'discount_code', sanitize_text_field( $value ) );
     }
 
     /**
-	 * Set the gateway.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value gateway.
-	 */
-	public function set_gateway( $value ) {
-		$this->set_prop( 'gateway', $value );
+     * Set the gateway.
+     *
+     * @since 1.0.19
+     * @param  string $value gateway.
+     */
+    public function set_gateway( $value ) {
+        $this->set_prop( 'gateway', $value );
     }
 
     /**
-	 * Set the transaction id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value transaction id.
-	 */
-	public function set_transaction_id( $value ) {
-		if ( ! empty( $value ) ) {
-			$this->set_prop( 'transaction_id', $value );
-		}
+     * Set the transaction id.
+     *
+     * @since 1.0.19
+     * @param  string $value transaction id.
+     */
+    public function set_transaction_id( $value ) {
+        if ( ! empty( $value ) ) {
+            $this->set_prop( 'transaction_id', $value );
+        }
     }
 
     /**
-	 * Set the currency id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value currency id.
-	 */
-	public function set_currency( $value ) {
-		$this->set_prop( 'currency', $value );
+     * Set the currency id.
+     *
+     * @since 1.0.19
+     * @param  string $value currency id.
+     */
+    public function set_currency( $value ) {
+        $this->set_prop( 'currency', $value );
     }
 
-	/**
-	 * Set whether to disable taxes.
-	 *
-	 * @since 1.0.19
-	 * @param  bool $value value.
-	 */
-	public function set_disable_taxes( $value ) {
-		$this->set_prop( 'disable_taxes', (bool) $value );
-	}
+    /**
+     * Set whether to disable taxes.
+     *
+     * @since 1.0.19
+     * @param  bool $value value.
+     */
+    public function set_disable_taxes( $value ) {
+        $this->set_prop( 'disable_taxes', (bool) $value );
+    }
 
     /**
-	 * Set the subscription id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value subscription id.
-	 */
-	public function set_subscription_id( $value ) {
-		$this->set_prop( 'subscription_id', $value );
-	}
+     * Set the subscription id.
+     *
+     * @since 1.0.19
+     * @param  string $value subscription id.
+     */
+    public function set_subscription_id( $value ) {
+        $this->set_prop( 'subscription_id', $value );
+    }
 
-	/**
-	 * Set the remote subscription id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value subscription id.
-	 */
-	public function set_remote_subscription_id( $value ) {
-		$this->set_prop( 'remote_subscription_id', $value );
+    /**
+     * Set the remote subscription id.
+     *
+     * @since 1.0.19
+     * @param  string $value subscription id.
+     */
+    public function set_remote_subscription_id( $value ) {
+        $this->set_prop( 'remote_subscription_id', $value );
     }
 
-	/**
-	 * Set the invoice anonymize status.
-	 *
-	 * @since 2.8.22
-	 * @param  bool $is_anonymized is anonymized.
-	 */
-	public function set_is_anonymized( $is_anonymized ) {
-		$this->set_prop( 'is_anonymized', (bool) $is_anonymized );
+    /**
+     * Set the invoice anonymize status.
+     *
+     * @since 2.8.22
+     * @param  bool $is_anonymized is anonymized.
+     */
+    public function set_is_anonymized( $is_anonymized ) {
+        $this->set_prop( 'is_anonymized', (bool) $is_anonymized );
     }
 
     /*
@@ -3185,24 +3185,24 @@ 
      */
     public function is_taxable() {
         return ! $this->get_disable_taxes();
-	}
+    }
 
-	/**
-	 * @deprecated
-	 */
-	public function has_vat() {
+    /**
+     * @deprecated
+     */
+    public function has_vat() {
         return $this->is_taxable();
-	}
+    }
 
-	/**
-	 * Checks to see if the invoice requires payment.
-	 */
-	public function is_free() {
+    /**
+     * Checks to see if the invoice requires payment.
+     */
+    public function is_free() {
         $is_free = ( (float) wpinv_round_amount( $this->get_initial_total() ) == 0 );
 
-		if ( $this->is_recurring() && $this->get_recurring_total() > 0 ) {
-			$is_free = false;
-		}
+        if ( $this->is_recurring() && $this->get_recurring_total() > 0 ) {
+            $is_free = false;
+        }
 
         return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
     }
@@ -3213,46 +3213,46 @@ 
     public function is_paid() {
         $is_paid = $this->has_status( array( 'publish', 'wpi-processing', 'wpi-renewal' ) );
         return apply_filters( 'wpinv_invoice_is_paid', $is_paid, $this );
-	}
+    }
 
-	/**
+    /**
      * Checks if the invoice needs payment.
      */
-	public function needs_payment() {
-		$needs_payment = ! $this->is_paid() && ! $this->is_refunded() && ! $this->is_free();
+    public function needs_payment() {
+        $needs_payment = ! $this->is_paid() && ! $this->is_refunded() && ! $this->is_free();
         return apply_filters( 'wpinv_needs_payment', $needs_payment, $this );
     }
 
-	/**
+    /**
      * Checks if the invoice is refunded.
      */
-	public function is_refunded() {
+    public function is_refunded() {
         $is_refunded = $this->has_status( 'wpi-refunded' );
         return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
-	}
+    }
 
-	/**
+    /**
      * Checks if the invoice is held.
      */
-	public function is_held() {
+    public function is_held() {
         $is_held = $this->has_status( 'wpi-onhold' );
         return apply_filters( 'wpinv_invoice_is_held', $is_held, $this );
-	}
+    }
 
-	/**
+    /**
      * Checks if the invoice is due.
      */
-	public function is_due() {
-		$due_date = $this->get_due_date();
-		return empty( $due_date ) ? false : current_time( 'timestamp' ) > strtotime( $due_date );
-	}
+    public function is_due() {
+        $due_date = $this->get_due_date();
+        return empty( $due_date ) ? false : current_time( 'timestamp' ) > strtotime( $due_date );
+    }
 
-	/**
+    /**
      * Checks if the invoice is draft.
      */
-	public function is_draft() {
+    public function is_draft() {
         return $this->has_status( 'draft, auto-draft' );
-	}
+    }
 
     /**
      * Checks if the invoice has a given status.
@@ -3260,9 +3260,9 @@ 
     public function has_status( $status ) {
         $status = wpinv_parse_list( $status );
         return apply_filters( 'wpinv_has_status', in_array( $this->get_status(), $status ), $status );
-	}
+    }
 
-	/**
+    /**
      * Checks if the invoice is of a given type.
      */
     public function is_type( $type ) {
@@ -3285,25 +3285,25 @@ 
      */
     public function has_free_trial() {
         return $this->is_recurring() && 0 == $this->get_initial_total();
-	}
+    }
 
-	/**
+    /**
      * @deprecated
      */
     public function is_free_trial() {
         return $this->has_free_trial();
     }
 
-	/**
+    /**
      * Check if the initial payment if 0.
      *
      */
-	public function is_initial_free() {
+    public function is_initial_free() {
         $is_initial_free = ! ( (float) wpinv_round_amount( $this->get_initial_total() ) > 0 );
         return apply_filters( 'wpinv_invoice_is_initial_free', $is_initial_free, $this->get_cart_details(), $this );
     }
 
-	/**
+    /**
      * Check if the recurring item has a free trial.
      *
      */
@@ -3316,16 +3316,16 @@ 
 
         $item = $this->get_recurring( true );
         return $item->has_free_trial();
-	}
+    }
 
-	/**
+    /**
      * Check if the free trial is a result of a discount.
      */
     public function is_free_trial_from_discount() {
-		return $this->has_free_trial() && ! $this->item_has_free_trial();
-	}
+        return $this->has_free_trial() && ! $this->item_has_free_trial();
+    }
 
-	/**
+    /**
      * Checks if this is an anonymized invoice.
      *
      * @since 2.8.22
@@ -3334,12 +3334,12 @@ 
         return true === (bool) $this->get_is_anonymized();
     }
 
-	/**
+    /**
      * @deprecated
      */
     public function discount_first_payment_only() {
 
-		$discount = wpinv_get_discount_obj( $this->get_discount_code() );
+        $discount = wpinv_get_discount_obj( $this->get_discount_code() );
         if ( ! $discount->exists() || ! $this->is_recurring() ) {
             return true;
         }
@@ -3364,146 +3364,146 @@ 
      */
     public function add_item( $item ) {
 
-		if ( is_array( $item ) ) {
-			$item = $this->process_array_item( $item );
-		}
+        if ( is_array( $item ) ) {
+            $item = $this->process_array_item( $item );
+        }
 
-		if ( is_numeric( $item ) ) {
-			$item = new GetPaid_Form_Item( $item );
-		}
+        if ( is_numeric( $item ) ) {
+            $item = new GetPaid_Form_Item( $item );
+        }
 
         // Make sure that it is available for purchase.
-		if ( $item->get_id() > 0 && ! $item->can_purchase() ) {
-			return new WP_Error( 'invalid_item', __( 'This item is not available for purchase', 'invoicing' ) );
+        if ( $item->get_id() > 0 && ! $item->can_purchase() ) {
+            return new WP_Error( 'invalid_item', __( 'This item is not available for purchase', 'invoicing' ) );
         }
 
         // Do we have a recurring item?
-		if ( $item->is_recurring() ) {
-			$this->recurring_item = $item->get_id();
+        if ( $item->is_recurring() ) {
+            $this->recurring_item = $item->get_id();
         }
 
         // Invoice id.
         $item->invoice_id = (int) $this->get_id();
 
-		// Remove duplicates.
-		$this->remove_item( $item->get_id() );
+        // Remove duplicates.
+        $this->remove_item( $item->get_id() );
 
-		if ( 0 == $item->get_quantity() ) {
-			return;
-		}
+        if ( 0 == $item->get_quantity() ) {
+            return;
+        }
 
-		// Retrieve all items.
+        // Retrieve all items.
         $items   = $this->get_items();
 
-		// Add new item.
+        // Add new item.
         $items[] = $item;
 
         $this->set_prop( 'items', $items );
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Converts an array to an item.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Form_Item
-	 */
-	protected function process_array_item( $array ) {
+    /**
+     * Converts an array to an item.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Form_Item
+     */
+    protected function process_array_item( $array ) {
 
-		$item_id = isset( $array['item_id'] ) ? $array['item_id'] : 0;
-		$item    = new GetPaid_Form_Item( $item_id );
+        $item_id = isset( $array['item_id'] ) ? $array['item_id'] : 0;
+        $item    = new GetPaid_Form_Item( $item_id );
 
-		// Set item data.
-		foreach ( array( 'name', 'price', 'description' ) as $key ) {
-			if ( isset( $array[ "item_$key" ] ) ) {
-				$method = "set_$key";
-				$item->$method( $array[ "item_$key" ] );
-			}
-		}
+        // Set item data.
+        foreach ( array( 'name', 'price', 'description' ) as $key ) {
+            if ( isset( $array[ "item_$key" ] ) ) {
+                $method = "set_$key";
+                $item->$method( $array[ "item_$key" ] );
+            }
+        }
 
-		if ( isset( $array['quantity'] ) ) {
-			$item->set_quantity( $array['quantity'] );
-		}
+        if ( isset( $array['quantity'] ) ) {
+            $item->set_quantity( $array['quantity'] );
+        }
 
-		// Set item meta.
-		if ( isset( $array['meta'] ) && is_array( $array['meta'] ) ) {
-			$item->set_item_meta( $array['meta'] );
-		}
+        // Set item meta.
+        if ( isset( $array['meta'] ) && is_array( $array['meta'] ) ) {
+            $item->set_item_meta( $array['meta'] );
+        }
 
-		return $item;
+        return $item;
 
-	}
+    }
 
     /**
-	 * Retrieves a specific item.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Form_Item|null
-	 */
-	public function get_item( $item_id ) {
+     * Retrieves a specific item.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Form_Item|null
+     */
+    public function get_item( $item_id ) {
 
-		foreach ( $this->get_items() as $item ) {
-			if ( (int) $item_id == $item->get_id() ) {
-				return $item;
-			}
-		}
+        foreach ( $this->get_items() as $item ) {
+            if ( (int) $item_id == $item->get_id() ) {
+                return $item;
+            }
+        }
 
-		return null;
+        return null;
     }
 
     /**
-	 * Removes a specific item.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_item( $item_id ) {
-		$items   = $this->get_items();
-		$item_id = (int) $item_id;
+     * Removes a specific item.
+     *
+     * @since 1.0.19
+     */
+    public function remove_item( $item_id ) {
+        $items   = $this->get_items();
+        $item_id = (int) $item_id;
 
-		foreach ( $items as $index => $item ) {
-			if ( (int) $item_id == $item->get_id() ) {
-				unset( $items[ $index ] );
-				$this->set_prop( 'items', $items );
+        foreach ( $items as $index => $item ) {
+            if ( (int) $item_id == $item->get_id() ) {
+                unset( $items[ $index ] );
+                $this->set_prop( 'items', $items );
 
-				if ( $item_id == $this->recurring_item ) {
-					$this->recurring_item = null;
-				}
+                if ( $item_id == $this->recurring_item ) {
+                    $this->recurring_item = null;
+                }
 }
-		}
+        }
 
     }
 
     /**
-	 * Adds a fee to the invoice.
-	 *
-	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
-	 * @since 1.0.19
-	 */
+     * Adds a fee to the invoice.
+     *
+     * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
+     * @since 1.0.19
+     */
     public function add_fee( $fee ) {
 
-		$fees                 = $this->get_fees();
-		$fees[ $fee['name'] ] = $fee;
-		$this->set_prop( 'fees', $fees );
+        $fees                 = $this->get_fees();
+        $fees[ $fee['name'] ] = $fee;
+        $this->set_prop( 'fees', $fees );
 
     }
 
     /**
-	 * Retrieves a specific fee.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fee( $fee ) {
+     * Retrieves a specific fee.
+     *
+     * @since 1.0.19
+     */
+    public function get_fee( $fee ) {
         $fees = $this->get_fees();
-		return isset( $fees[ $fee ] ) ? $fees[ $fee ] : null;
+        return isset( $fees[ $fee ] ) ? $fees[ $fee ] : null;
     }
 
     /**
-	 * Removes a specific fee.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_fee( $fee ) {
+     * Removes a specific fee.
+     *
+     * @since 1.0.19
+     */
+    public function remove_fee( $fee ) {
         $fees = $this->get_fees();
         if ( isset( $fees[ $fee ] ) ) {
             unset( $fees[ $fee ] );
@@ -3511,55 +3511,55 @@ 
         }
     }
 
-	/**
-	 * Adds a discount to the invoice.
-	 *
-	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
-	 * @since 1.0.19
-	 */
-	public function add_discount( $discount ) {
+    /**
+     * Adds a discount to the invoice.
+     *
+     * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
+     * @since 1.0.19
+     */
+    public function add_discount( $discount ) {
 
-		$discounts = $this->get_discounts();
-		$discounts[ $discount['name'] ] = $discount;
-		$this->set_prop( 'discounts', $discounts );
+        $discounts = $this->get_discounts();
+        $discounts[ $discount['name'] ] = $discount;
+        $this->set_prop( 'discounts', $discounts );
 
-	}
+    }
 
     /**
-	 * Retrieves a specific discount.
-	 *
-	 * @since 1.0.19
-	 * @return float
-	 */
-	public function get_discount( $discount = false ) {
+     * Retrieves a specific discount.
+     *
+     * @since 1.0.19
+     * @return float
+     */
+    public function get_discount( $discount = false ) {
 
-		// Backwards compatibility.
-		if ( empty( $discount ) ) {
-			return $this->get_total_discount();
-		}
+        // Backwards compatibility.
+        if ( empty( $discount ) ) {
+            return $this->get_total_discount();
+        }
 
         $discounts = $this->get_discounts();
-		return isset( $discounts[ $discount ] ) ? $discounts[ $discount ] : null;
+        return isset( $discounts[ $discount ] ) ? $discounts[ $discount ] : null;
     }
 
     /**
-	 * Removes a specific discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_discount( $discount ) {
+     * Removes a specific discount.
+     *
+     * @since 1.0.19
+     */
+    public function remove_discount( $discount ) {
         $discounts = $this->get_discounts();
         if ( isset( $discounts[ $discount ] ) ) {
             unset( $discounts[ $discount ] );
             $this->set_prop( 'discounts', $discounts );
         }
 
-		if ( 'discount_code' == $discount ) {
-			foreach ( $this->get_items() as $item ) {
-				$item->item_discount           = 0;
-				$item->recurring_item_discount = 0;
-			}
-		}
+        if ( 'discount_code' == $discount ) {
+            foreach ( $this->get_items() as $item ) {
+                $item->item_discount           = 0;
+                $item->recurring_item_discount = 0;
+            }
+        }
 
     }
 
@@ -3572,116 +3572,116 @@ 
         if ( $this->is_taxable() ) {
 
             $taxes                 = $this->get_taxes();
-			$taxes[ $tax['name'] ] = $tax;
-			$this->set_prop( 'taxes', $tax );
+            $taxes[ $tax['name'] ] = $tax;
+            $this->set_prop( 'taxes', $tax );
 
         }
     }
 
     /**
-	 * Retrieves a specific tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_tax( $tax = null ) {
+     * Retrieves a specific tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_tax( $tax = null ) {
 
-		// Backwards compatibility.
-		if ( empty( $tax ) ) {
-			return $this->get_total_tax();
-		}
+        // Backwards compatibility.
+        if ( empty( $tax ) ) {
+            return $this->get_total_tax();
+        }
 
         $taxes = $this->get_taxes();
-		return isset( $taxes[ $tax ] ) ? $taxes[ $tax ] : null;
+        return isset( $taxes[ $tax ] ) ? $taxes[ $tax ] : null;
     }
 
-	public function get_tax_total_by_name( $name ) {
-		if ( $name && 0 === strpos( $name, 'tax__' ) ) {
-			$name = str_replace( 'tax__', '', $name );
-		}
+    public function get_tax_total_by_name( $name ) {
+        if ( $name && 0 === strpos( $name, 'tax__' ) ) {
+            $name = str_replace( 'tax__', '', $name );
+        }
 
-		if ( empty( $name ) ) {
-			return 0;
-		}
+        if ( empty( $name ) ) {
+            return 0;
+        }
 
-		$tax = $this->get_tax( $name );
+        $tax = $this->get_tax( $name );
 
-		if ( empty( $tax ) ) {
-			return 0;
-		}
+        if ( empty( $tax ) ) {
+            return 0;
+        }
 
         return $this->is_renewal() ? $tax['recurring_tax'] : $tax['initial_tax'];
     }
 
-	/**
-	 * Get tax item name.
-	 *
-	 * @since 2.8.8
-	 */
-	public function get_tax_item_name( $tax_key, $tax_item, $suffix = '' ) {
-		$tax_name = _x( 'Tax', 'Tax name', 'invoicing' );
+    /**
+     * Get tax item name.
+     *
+     * @since 2.8.8
+     */
+    public function get_tax_item_name( $tax_key, $tax_item, $suffix = '' ) {
+        $tax_name = _x( 'Tax', 'Tax name', 'invoicing' );
 
-		if ( ! empty( $tax_item ) && is_array( $tax_item ) && ! empty( $tax_item['name'] ) ) {
-			$tax_name = __( $tax_item['name'], 'invoicing' );
-		}
+        if ( ! empty( $tax_item ) && is_array( $tax_item ) && ! empty( $tax_item['name'] ) ) {
+            $tax_name = __( $tax_item['name'], 'invoicing' );
+        }
 
-		if ( $suffix ) {
-			$tax_name .= $suffix;
-		}
+        if ( $suffix ) {
+            $tax_name .= $suffix;
+        }
 
-		return apply_filters( 'wpinv_invoice_get_tax_name', $tax_name, $this, $tax_key, $tax_item, $suffix );
-	}
+        return apply_filters( 'wpinv_invoice_get_tax_name', $tax_name, $this, $tax_key, $tax_item, $suffix );
+    }
 
-	/**
-	 * Get tax item amount.
-	 *
-	 * @since 2.8.8
-	 */
-	public function get_tax_item_amount( $tax_key, $tax_item, $with_currency = false ) {
-		$tax_amount = $this->get_tax_total_by_name( $tax_key );
+    /**
+     * Get tax item amount.
+     *
+     * @since 2.8.8
+     */
+    public function get_tax_item_amount( $tax_key, $tax_item, $with_currency = false ) {
+        $tax_amount = $this->get_tax_total_by_name( $tax_key );
 
-		if ( $with_currency ) {
-			$tax_amount = wpinv_price( $tax_amount, $this->get_currency() );
-		}
+        if ( $with_currency ) {
+            $tax_amount = wpinv_price( $tax_amount, $this->get_currency() );
+        }
 
-		return apply_filters( 'wpinv_invoice_get_tax_amount', $tax_amount, $this, $tax_item, $with_currency );
-	}
+        return apply_filters( 'wpinv_invoice_get_tax_amount', $tax_amount, $this, $tax_item, $with_currency );
+    }
 
-	public function get_item_tax_name( $percentage = true, $sep = ' + ' ) {
-		$taxes = $this->get_taxes();
+    public function get_item_tax_name( $percentage = true, $sep = ' + ' ) {
+        $taxes = $this->get_taxes();
 
-		if ( ! empty( $taxes ) && is_array( $taxes ) && count( $taxes ) == 1 && wpinv_display_individual_tax_rates() ) {
-			$names = array();
+        if ( ! empty( $taxes ) && is_array( $taxes ) && count( $taxes ) == 1 && wpinv_display_individual_tax_rates() ) {
+            $names = array();
 
-			foreach ( $taxes as $key => $tax ) {
-				if ( ! empty( $tax ) && ! empty( $tax['name'] ) ) {
-					$name = __( $tax['name'], 'invoicing' );
+            foreach ( $taxes as $key => $tax ) {
+                if ( ! empty( $tax ) && ! empty( $tax['name'] ) ) {
+                    $name = __( $tax['name'], 'invoicing' );
 
-					$names[] = $name;
-				}
-			}
+                    $names[] = $name;
+                }
+            }
 
-			if ( ! empty( $names ) ) {
-				$names = array_unique( $names );
+            if ( ! empty( $names ) ) {
+                $names = array_unique( $names );
 
-				$tax_name = implode( $sep, $names );
-			}
+                $tax_name = implode( $sep, $names );
+            }
 
-			if ( $percentage ) {
-				$tax_name = wp_sprintf( _x( '%s (%%)', 'Tax name with %. Ex: Tax (%)', 'invoicing' ), $tax_name );
-			}
-		} else {
-			$tax_name = $percentage ? __( 'Tax (%)', 'invoicing' ) : _x( 'Tax', 'Tax name', 'invoicing' );
-		}
+            if ( $percentage ) {
+                $tax_name = wp_sprintf( _x( '%s (%%)', 'Tax name with %. Ex: Tax (%)', 'invoicing' ), $tax_name );
+            }
+        } else {
+            $tax_name = $percentage ? __( 'Tax (%)', 'invoicing' ) : _x( 'Tax', 'Tax name', 'invoicing' );
+        }
 
-		return apply_filters( 'wpinv_invoice_get_item_tax_name', $tax_name, $this, $percentage, $sep );
-	}
+        return apply_filters( 'wpinv_invoice_get_item_tax_name', $tax_name, $this, $percentage, $sep );
+    }
 
     /**
-	 * Removes a specific tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_tax( $tax ) {
+     * Removes a specific tax.
+     *
+     * @since 1.0.19
+     */
+    public function remove_tax( $tax ) {
         $taxes = $this->get_taxes();
         if ( isset( $taxes[ $tax ] ) ) {
             unset( $taxes[ $tax ] );
@@ -3690,198 +3690,198 @@ 
     }
 
     /**
-	 * Recalculates the invoice subtotal.
-	 *
-	 * @since 1.0.19
-	 * @return float The recalculated subtotal
-	 */
-	public function recalculate_subtotal() {
+     * Recalculates the invoice subtotal.
+     *
+     * @since 1.0.19
+     * @return float The recalculated subtotal
+     */
+    public function recalculate_subtotal() {
         $items     = $this->get_items();
-		$subtotal  = 0;
-		$recurring = 0;
+        $subtotal  = 0;
+        $recurring = 0;
 
         foreach ( $items as $item ) {
-			$subtotal  += $item->get_sub_total( 'edit' );
-			$recurring += $item->get_recurring_sub_total( 'edit' );
+            $subtotal  += $item->get_sub_total( 'edit' );
+            $recurring += $item->get_recurring_sub_total( 'edit' );
         }
 
-		if ( wpinv_prices_include_tax() ) {
-			$subtotal  = max( 0, $subtotal - $this->totals['tax']['initial'] );
-			$recurring = max( 0, $recurring - $this->totals['tax']['recurring'] );
-		}
+        if ( wpinv_prices_include_tax() ) {
+            $subtotal  = max( 0, $subtotal - $this->totals['tax']['initial'] );
+            $recurring = max( 0, $recurring - $this->totals['tax']['recurring'] );
+        }
 
-		$current = $this->is_renewal() ? $recurring : $subtotal;
-		$this->set_subtotal( $current );
+        $current = $this->is_renewal() ? $recurring : $subtotal;
+        $this->set_subtotal( $current );
 
-		$this->totals['subtotal'] = array(
-			'initial'   => $subtotal,
-			'recurring' => $recurring,
-		);
+        $this->totals['subtotal'] = array(
+            'initial'   => $subtotal,
+            'recurring' => $recurring,
+        );
 
         return $current;
     }
 
     /**
-	 * Recalculates the invoice discount total.
-	 *
-	 * @since 1.0.19
-	 * @return float The recalculated discount
-	 */
-	public function recalculate_total_discount() {
-		// Fix renewal invoice amount when tax + recurring discount applied.
-		if ( $this->is_renewal() && $this->get_discount_code() ) {
-			// Maybe recalculate discount (Pre-GetPaid Fix).
-			$discount = new WPInv_Discount( $this->get_discount_code() );
-
-			if ( $discount->exists() && $discount->is_recurring() ) {
-				getpaid_calculate_invoice_discount( $this, $discount );
-			}
-		}
+     * Recalculates the invoice discount total.
+     *
+     * @since 1.0.19
+     * @return float The recalculated discount
+     */
+    public function recalculate_total_discount() {
+        // Fix renewal invoice amount when tax + recurring discount applied.
+        if ( $this->is_renewal() && $this->get_discount_code() ) {
+            // Maybe recalculate discount (Pre-GetPaid Fix).
+            $discount = new WPInv_Discount( $this->get_discount_code() );
+
+            if ( $discount->exists() && $discount->is_recurring() ) {
+                getpaid_calculate_invoice_discount( $this, $discount );
+            }
+        }
 
-		$discounts = $this->get_discounts();
-		$discount  = 0;
-		$recurring = 0;
+        $discounts = $this->get_discounts();
+        $discount  = 0;
+        $recurring = 0;
 
         foreach ( $discounts as $data ) {
-			$discount  += wpinv_sanitize_amount( $data['initial_discount'] );
-			$recurring += wpinv_sanitize_amount( $data['recurring_discount'] );
-		}
+            $discount  += wpinv_sanitize_amount( $data['initial_discount'] );
+            $recurring += wpinv_sanitize_amount( $data['recurring_discount'] );
+        }
 
-		$current = $this->is_renewal() ? $recurring : $discount;
+        $current = $this->is_renewal() ? $recurring : $discount;
 
-		$this->set_total_discount( $current );
+        $this->set_total_discount( $current );
 
-		$this->totals['discount'] = array(
-			'initial'   => $discount,
-			'recurring' => $recurring,
-		);
+        $this->totals['discount'] = array(
+            'initial'   => $discount,
+            'recurring' => $recurring,
+        );
 
-		return $current;
+        return $current;
 
     }
 
     /**
-	 * Recalculates the invoice tax total.
-	 *
-	 * @since 1.0.19
-	 * @return float The recalculated tax
-	 */
-	public function recalculate_total_tax() {
+     * Recalculates the invoice tax total.
+     *
+     * @since 1.0.19
+     * @return float The recalculated tax
+     */
+    public function recalculate_total_tax() {
 
-		// Maybe disable taxes.
-		$vat_number = $this->get_vat_number();
-		$skip_tax   = GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $this->get_country() ) && ! empty( $vat_number );
+        // Maybe disable taxes.
+        $vat_number = $this->get_vat_number();
+        $skip_tax   = GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $this->get_country() ) && ! empty( $vat_number );
 
-		if ( wpinv_is_base_country( $this->get_country() ) && 'vat_too' === wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
-			$skip_tax = false;
-		}
+        if ( wpinv_is_base_country( $this->get_country() ) && 'vat_too' === wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+            $skip_tax = false;
+        }
 
-		if ( ! wpinv_use_taxes() || $this->get_disable_taxes() || ! wpinv_is_country_taxable( $this->get_country() ) || $skip_tax ) {
+        if ( ! wpinv_use_taxes() || $this->get_disable_taxes() || ! wpinv_is_country_taxable( $this->get_country() ) || $skip_tax ) {
 
-			$this->totals['tax'] = array(
-				'initial'   => 0,
-				'recurring' => 0,
-			);
+            $this->totals['tax'] = array(
+                'initial'   => 0,
+                'recurring' => 0,
+            );
 
-			$this->tax_rate = 0;
+            $this->tax_rate = 0;
 
-			$this->set_taxes( array() );
-			$current = 0;
-		} else {
+            $this->set_taxes( array() );
+            $current = 0;
+        } else {
 
-			$item_taxes = array();
+            $item_taxes = array();
 
-			foreach ( $this->get_items() as $item ) {
-				$rates    = getpaid_get_item_tax_rates( $item, $this->get_country(), $this->get_state() );
-				$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-				$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-				$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
-				foreach ( $taxes as $name => $amount ) {
-					$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-					$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+            foreach ( $this->get_items() as $item ) {
+                $rates    = getpaid_get_item_tax_rates( $item, $this->get_country(), $this->get_state() );
+                $rates    = getpaid_filter_item_tax_rates( $item, $rates );
+                $taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
+                $r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+                foreach ( $taxes as $name => $amount ) {
+                    $recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
+                    $tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
 
-					if ( ! isset( $item_taxes[ $name ] ) ) {
-						$item_taxes[ $name ] = $tax;
-						continue;
-					}
+                    if ( ! isset( $item_taxes[ $name ] ) ) {
+                        $item_taxes[ $name ] = $tax;
+                        continue;
+                    }
 
-					$item_taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-					$item_taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+                    $item_taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
+                    $item_taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
 
-				}
-			}
+                }
+            }
 
-			$this->set_taxes( $item_taxes );
+            $this->set_taxes( $item_taxes );
 
-			$initial_tax   = array_sum( wp_list_pluck( $item_taxes, 'initial_tax' ) );
-			$recurring_tax = array_sum( wp_list_pluck( $item_taxes, 'recurring_tax' ) );
+            $initial_tax   = array_sum( wp_list_pluck( $item_taxes, 'initial_tax' ) );
+            $recurring_tax = array_sum( wp_list_pluck( $item_taxes, 'recurring_tax' ) );
 
-			$current = $this->is_renewal() ? $recurring_tax : $initial_tax;
+            $current = $this->is_renewal() ? $recurring_tax : $initial_tax;
 
-			$this->totals['tax'] = array(
-				'initial'   => $initial_tax,
-				'recurring' => $recurring_tax,
-			);
+            $this->totals['tax'] = array(
+                'initial'   => $initial_tax,
+                'recurring' => $recurring_tax,
+            );
 
-		}
+        }
 
-		$this->set_total_tax( $current );
+        $this->set_total_tax( $current );
 
-		return $current;
+        return $current;
 
     }
 
     /**
-	 * Recalculates the invoice fees total.
-	 *
-	 * @since 1.0.19
-	 * @return float The recalculated fee
-	 */
-	public function recalculate_total_fees() {
-		$fees      = $this->get_fees();
-		$fee       = 0;
-		$recurring = 0;
+     * Recalculates the invoice fees total.
+     *
+     * @since 1.0.19
+     * @return float The recalculated fee
+     */
+    public function recalculate_total_fees() {
+        $fees      = $this->get_fees();
+        $fee       = 0;
+        $recurring = 0;
 
         foreach ( $fees as $data ) {
-			if( isset( $data['initial_fee'] ) ){
-				$fee += wpinv_sanitize_amount( $data['initial_fee'] );
-			}
+            if( isset( $data['initial_fee'] ) ){
+                $fee += wpinv_sanitize_amount( $data['initial_fee'] );
+            }
 
-			if( isset( $data['recurring_fee'] ) ){
-				$recurring += wpinv_sanitize_amount( $data['recurring_fee'] );
-			}
-		}
+            if( isset( $data['recurring_fee'] ) ){
+                $recurring += wpinv_sanitize_amount( $data['recurring_fee'] );
+            }
+        }
 
-		$current = $this->is_renewal() ? $recurring : $fee;
-		$this->set_total_fees( $current );
+        $current = $this->is_renewal() ? $recurring : $fee;
+        $this->set_total_fees( $current );
 
-		$this->totals['fee'] = array(
-			'initial'   => $fee,
-			'recurring' => $recurring,
-		);
+        $this->totals['fee'] = array(
+            'initial'   => $fee,
+            'recurring' => $recurring,
+        );
 
         $this->set_total_fees( $fee );
         return $current;
     }
 
     /**
-	 * Recalculates the invoice total.
-	 *
-	 * @since 1.0.19
+     * Recalculates the invoice total.
+     *
+     * @since 1.0.19
      * @return float The invoice total
-	 */
-	public function recalculate_total() {
+     */
+    public function recalculate_total() {
         $this->recalculate_total_fees();
         $this->recalculate_total_discount();
-		$this->recalculate_total_tax();
-		$this->recalculate_subtotal();
-		$this->set_total( $this->get_total_tax( 'edit' ) + $this->get_total_fees( 'edit' ) + $this->get_subtotal( 'edit' ) - $this->get_total_discount( 'edit' ) );
-		return $this->get_total();
-	}
-
-	/**
-	 * @deprecated
-	 */
+        $this->recalculate_total_tax();
+        $this->recalculate_subtotal();
+        $this->set_total( $this->get_total_tax( 'edit' ) + $this->get_total_fees( 'edit' ) + $this->get_subtotal( 'edit' ) - $this->get_total_discount( 'edit' ) );
+        return $this->get_total();
+    }
+
+    /**
+     * @deprecated
+     */
     public function recalculate_totals() {
         $this->recalculate_total();
         $this->save( true );
@@ -3895,22 +3895,22 @@ 
         return $this->get_data();
     }
 
-	/**
+    /**
      * Adds a system note to an invoice.
      *
      * @param string $note The note being added.
-	 * @return int|false The new note's ID on success, false on failure.
+     * @return int|false The new note's ID on success, false on failure.
      *
      */
     public function add_system_note( $note ) {
-		return $this->add_note( $note, false, false, true );
-	}
+        return $this->add_note( $note, false, false, true );
+    }
 
     /**
      * Adds a note to an invoice.
      *
      * @param string $note The note being added.
-	 * @return int|false The new note's ID on success, false on failure.
+     * @return int|false The new note's ID on success, false on failure.
      *
      */
     public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
@@ -3920,21 +3920,21 @@ 
             return false;
         }
 
-		$author       = 'System';
-		$author_email = 'bot@wpinvoicing.com';
+        $author       = 'System';
+        $author_email = 'bot@wpinvoicing.com';
 
-		// If this is an admin comment or it has been added by the user.
-		if ( is_user_logged_in() && ( ! $system || $added_by_user ) ) {
-			$user         = get_user_by( 'id', get_current_user_id() );
+        // If this is an admin comment or it has been added by the user.
+        if ( is_user_logged_in() && ( ! $system || $added_by_user ) ) {
+            $user         = get_user_by( 'id', get_current_user_id() );
             $author       = $user->display_name;
             $author_email = $user->user_email;
-		}
+        }
 
-		return getpaid_notes()->add_invoice_note( $this, $note, $author, $author_email, $customer_type );
+        return getpaid_notes()->add_invoice_note( $this, $note, $author, $author_email, $customer_type );
 
-	}
+    }
 
-	/**
+    /**
      * Generates a unique key for the invoice.
      */
     public function generate_key( $string = '' ) {
@@ -3954,113 +3954,113 @@ 
             $number = wpinv_get_next_invoice_number( $this->get_post_type() );
         }
 
-		return wpinv_format_invoice_number( $number, $this->get_post_type() );
-
-	}
-
-	/**
-	 * Handle the status transition.
-	 */
-	protected function status_transition() {
-		$status_transition = $this->status_transition;
-
-		// Reset status transition variable.
-		$this->status_transition = false;
-
-		if ( $status_transition ) {
-			try {
-
-				// Fire a hook for the status change.
-				do_action( 'getpaid_invoice_status_' . $status_transition['to'], $this, $status_transition );
-
-				// @deprecated this is deprecated and will be removed in the future.
-				do_action( 'wpinv_status_' . $status_transition['to'], $this->get_id(), $status_transition['from'] );
-
-				if ( ! empty( $status_transition['from'] ) ) {
-
-					/* translators: 1: old invoice status 2: new invoice status */
-					$transition_note = sprintf( __( 'Status changed from %1$s to %2$s.', 'invoicing' ), wpinv_status_nicename( $status_transition['from'], $this ), wpinv_status_nicename( $status_transition['to'], $this ) );
-
-					// Fire another hook.
-					do_action( 'getpaid_invoice_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this );
-					do_action( 'getpaid_invoice_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+        return wpinv_format_invoice_number( $number, $this->get_post_type() );
 
-					// @deprecated this is deprecated and will be removed in the future.
-					do_action( 'wpinv_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $status_transition['from'] );
-
-					// Note the transition occurred.
-					$this->add_note( trim( $status_transition['note'] . ' ' . $transition_note ), false, $status_transition['manual'] );
-
-					// Work out if this was for a payment, and trigger a payment_status hook instead.
-					if (
-						in_array( $status_transition['from'], array( 'wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold' ), true )
-						&& in_array( $status_transition['to'], array( 'publish', 'wpi-processing', 'wpi-renewal' ), true )
-					) {
-						do_action( 'getpaid_invoice_payment_status_changed', $this, $status_transition );
-					}
-
-					// Work out if this was for a payment reversal, and trigger a payment_status_reversed hook instead.
-					if (
-						in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ), true )
-						&& in_array( $status_transition['to'], array( 'wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold' ), true )
-					) {
-						do_action( 'getpaid_invoice_payment_status_reversed', $this, $status_transition );
-					}
-				} else {
-					/* translators: %s: new invoice status */
-					$transition_note = sprintf( __( 'Status set to %s.', 'invoicing' ), wpinv_status_nicename( $status_transition['to'], $this ) );
-
-					// Note the transition occurred.
-					$this->add_note( trim( $status_transition['note'] . ' ' . $transition_note ), 0, $status_transition['manual'] );
+    }
 
-				}
-			} catch ( Exception $e ) {
-				$this->add_note( __( 'Error during status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
-			}
-		}
-	}
+    /**
+     * Handle the status transition.
+     */
+    protected function status_transition() {
+        $status_transition = $this->status_transition;
+
+        // Reset status transition variable.
+        $this->status_transition = false;
+
+        if ( $status_transition ) {
+            try {
+
+                // Fire a hook for the status change.
+                do_action( 'getpaid_invoice_status_' . $status_transition['to'], $this, $status_transition );
+
+                // @deprecated this is deprecated and will be removed in the future.
+                do_action( 'wpinv_status_' . $status_transition['to'], $this->get_id(), $status_transition['from'] );
+
+                if ( ! empty( $status_transition['from'] ) ) {
+
+                    /* translators: 1: old invoice status 2: new invoice status */
+                    $transition_note = sprintf( __( 'Status changed from %1$s to %2$s.', 'invoicing' ), wpinv_status_nicename( $status_transition['from'], $this ), wpinv_status_nicename( $status_transition['to'], $this ) );
+
+                    // Fire another hook.
+                    do_action( 'getpaid_invoice_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this );
+                    do_action( 'getpaid_invoice_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+
+                    // @deprecated this is deprecated and will be removed in the future.
+                    do_action( 'wpinv_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $status_transition['from'] );
+
+                    // Note the transition occurred.
+                    $this->add_note( trim( $status_transition['note'] . ' ' . $transition_note ), false, $status_transition['manual'] );
+
+                    // Work out if this was for a payment, and trigger a payment_status hook instead.
+                    if (
+                        in_array( $status_transition['from'], array( 'wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold' ), true )
+                        && in_array( $status_transition['to'], array( 'publish', 'wpi-processing', 'wpi-renewal' ), true )
+                    ) {
+                        do_action( 'getpaid_invoice_payment_status_changed', $this, $status_transition );
+                    }
+
+                    // Work out if this was for a payment reversal, and trigger a payment_status_reversed hook instead.
+                    if (
+                        in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ), true )
+                        && in_array( $status_transition['to'], array( 'wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold' ), true )
+                    ) {
+                        do_action( 'getpaid_invoice_payment_status_reversed', $this, $status_transition );
+                    }
+                } else {
+                    /* translators: %s: new invoice status */
+                    $transition_note = sprintf( __( 'Status set to %s.', 'invoicing' ), wpinv_status_nicename( $status_transition['to'], $this ) );
+
+                    // Note the transition occurred.
+                    $this->add_note( trim( $status_transition['note'] . ' ' . $transition_note ), 0, $status_transition['manual'] );
+
+                }
+            } catch ( Exception $e ) {
+                $this->add_note( __( 'Error during status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
+            }
+        }
+    }
 
-	/**
-	 * Updates an invoice status.
-	 */
-	public function update_status( $new_status = false, $note = '', $manual = false ) {
+    /**
+     * Updates an invoice status.
+     */
+    public function update_status( $new_status = false, $note = '', $manual = false ) {
 
-		// Fires before updating a status.
-		do_action( 'wpinv_before_invoice_status_change', $this->get_id(), $new_status, $this->get_status( 'edit' ) );
+        // Fires before updating a status.
+        do_action( 'wpinv_before_invoice_status_change', $this->get_id(), $new_status, $this->get_status( 'edit' ) );
 
-		// Update the status.
-		$this->set_status( $new_status, $note, $manual );
+        // Update the status.
+        $this->set_status( $new_status, $note, $manual );
 
-		// Save the order.
-		return $this->save();
+        // Save the order.
+        return $this->save();
 
-	}
+    }
 
-	/**
-	 * @deprecated
-	 */
-	public function refresh_item_ids() {
+    /**
+     * @deprecated
+     */
+    public function refresh_item_ids() {
         $item_ids = implode( ',', array_unique( wp_list_pluck( $this->get_cart_details(), 'item_id' ) ) );
         update_post_meta( $this->get_id(), '_wpinv_item_ids', $item_ids );
-	}
+    }
 
-	/**
-	 * @deprecated
-	 */
-	public function update_items( $temp = false ) {
+    /**
+     * @deprecated
+     */
+    public function update_items( $temp = false ) {
 
-		$this->set_items( $this->get_items() );
+        $this->set_items( $this->get_items() );
 
-		if ( ! $temp ) {
-			$this->save();
-		}
+        if ( ! $temp ) {
+            $this->save();
+        }
 
         return $this;
-	}
+    }
 
-	/**
-	 * @deprecated
-	 */
+    /**
+     * @deprecated
+     */
     public function validate_discount() {
 
         $discount_code = $this->get_discount_code();
@@ -4076,101 +4076,101 @@ 
 
     }
 
-	/**
-	 * Refunds an invoice.
-	 */
+    /**
+     * Refunds an invoice.
+     */
     public function refund() {
-		$this->set_status( 'wpi-refunded' );
+        $this->set_status( 'wpi-refunded' );
         $this->save();
-	}
+    }
 
-	/**
-	 * Marks an invoice as paid.
-	 *
-	 * @param string $transaction_id
-	 */
+    /**
+     * Marks an invoice as paid.
+     *
+     * @param string $transaction_id
+     */
     public function mark_paid( $transaction_id = null, $note = '' ) {
 
-		// Set the transaction id.
-		if ( empty( $transaction_id ) ) {
-			$transaction_id = $this->generate_key( 'trans_' );
-		}
+        // Set the transaction id.
+        if ( empty( $transaction_id ) ) {
+            $transaction_id = $this->generate_key( 'trans_' );
+        }
 
-		if ( ! $this->get_transaction_id() ) {
-			$this->set_transaction_id( $transaction_id );
-		}
+        if ( ! $this->get_transaction_id() ) {
+            $this->set_transaction_id( $transaction_id );
+        }
 
-		if ( $this->is_paid() && 'wpi-processing' !== $this->get_status() ) {
-			return $this->save();
-		}
+        if ( $this->is_paid() && 'wpi-processing' !== $this->get_status() ) {
+            return $this->save();
+        }
 
-		// Set the completed date.
-		$this->set_date_completed( current_time( 'mysql' ) );
+        // Set the completed date.
+        $this->set_date_completed( current_time( 'mysql' ) );
 
-		// Set the new status.
-		$gateway = sanitize_text_field( $this->get_gateway_title() );
-		if ( $this->is_renewal() || ! $this->is_parent() ) {
+        // Set the new status.
+        $gateway = sanitize_text_field( $this->get_gateway_title() );
+        if ( $this->is_renewal() || ! $this->is_parent() ) {
 
-			$_note = wp_sprintf( __( 'Renewed via %s', 'invoicing' ), $gateway );
-			$_note = $_note . empty( $note ) ? '' : " ($note)";
+            $_note = wp_sprintf( __( 'Renewed via %s', 'invoicing' ), $gateway );
+            $_note = $_note . empty( $note ) ? '' : " ($note)";
 
-			if ( 'none' == $this->get_gateway() ) {
-				$_note = $note;
-			}
+            if ( 'none' == $this->get_gateway() ) {
+                $_note = $note;
+            }
 
-			$this->set_status( 'wpi-renewal', $_note );
+            $this->set_status( 'wpi-renewal', $_note );
 
-		} else {
+        } else {
 
-			$_note = wp_sprintf( __( 'Paid via %s', 'invoicing' ), $gateway );
-			$_note = $_note . empty( $note ) ? '' : " ($note)";
+            $_note = wp_sprintf( __( 'Paid via %s', 'invoicing' ), $gateway );
+            $_note = $_note . empty( $note ) ? '' : " ($note)";
 
-			if ( 'none' == $this->get_gateway() ) {
-				$_note = $note;
-			}
+            if ( 'none' == $this->get_gateway() ) {
+                $_note = $note;
+            }
 
-			$this->set_status( 'publish', $_note );
+            $this->set_status( 'publish', $_note );
 
-		}
+        }
 
-		// Set checkout mode.
-		$mode = wpinv_is_test_mode( $this->get_gateway() ) ? 'test' : 'live';
-		$this->set_mode( $mode );
+        // Set checkout mode.
+        $mode = wpinv_is_test_mode( $this->get_gateway() ) ? 'test' : 'live';
+        $this->set_mode( $mode );
 
-		// Save the invoice.
+        // Save the invoice.
         $this->save();
-	}
-
-	/**
-	 * Save data to the database.
-	 *
-	 * @since 1.0.19
-	 * @return int invoice ID
-	 */
-	public function save() {
-		$this->maybe_set_date_paid();
-		$this->maybe_set_key();
-		parent::save();
-		$this->clear_cache();
-		$this->status_transition();
-		return $this->get_id();
-	}
-
-	/**
+    }
+
+    /**
+     * Save data to the database.
+     *
+     * @since 1.0.19
+     * @return int invoice ID
+     */
+    public function save() {
+        $this->maybe_set_date_paid();
+        $this->maybe_set_key();
+        parent::save();
+        $this->clear_cache();
+        $this->status_transition();
+        return $this->get_id();
+    }
+
+    /**
      * Clears the subscription's cache.
      */
     public function clear_cache() {
-		if ( $this->get_key() ) {
-			wp_cache_delete( $this->get_key(), 'getpaid_invoice_keys_to_invoice_ids' );
-		}
-
-		if ( $this->get_number() ) {
-			wp_cache_delete( $this->get_number(), 'getpaid_invoice_numbers_to_invoice_ids' );
-		}
-
-		if ( $this->get_transaction_id() ) {
-			wp_cache_delete( $this->get_transaction_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids' );
-		}
-	}
+        if ( $this->get_key() ) {
+            wp_cache_delete( $this->get_key(), 'getpaid_invoice_keys_to_invoice_ids' );
+        }
+
+        if ( $this->get_number() ) {
+            wp_cache_delete( $this->get_number(), 'getpaid_invoice_numbers_to_invoice_ids' );
+        }
+
+        if ( $this->get_transaction_id() ) {
+            wp_cache_delete( $this->get_transaction_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids' );
+        }
+    }
 
 }

Spacing +856 added lines, -856 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Invoice class.
@@ -147,39 +147,39 @@ 
 	 *
 	 * @param  int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object to read.
 	 */
-    public function __construct( $invoice = 0 ) {
+    public function __construct($invoice = 0) {
 
-        parent::__construct( $invoice );
+        parent::__construct($invoice);
 
-		if ( ! empty( $invoice ) && is_numeric( $invoice ) && getpaid_is_invoice_post_type( get_post_type( (int) $invoice ) ) ) {
-			$this->set_id( (int) $invoice );
-		} elseif ( $invoice instanceof self ) {
-			$this->set_id( $invoice->get_id() );
-		} elseif ( ! empty( $invoice->ID ) ) {
-			$this->set_id( $invoice->ID );
-		} elseif ( is_array( $invoice ) ) {
-			$this->set_props( $invoice );
+		if (!empty($invoice) && is_numeric($invoice) && getpaid_is_invoice_post_type(get_post_type((int) $invoice))) {
+			$this->set_id((int) $invoice);
+		} elseif ($invoice instanceof self) {
+			$this->set_id($invoice->get_id());
+		} elseif (!empty($invoice->ID)) {
+			$this->set_id($invoice->ID);
+		} elseif (is_array($invoice)) {
+			$this->set_props($invoice);
 
-			if ( isset( $invoice['ID'] ) ) {
-				$this->set_id( $invoice['ID'] );
+			if (isset($invoice['ID'])) {
+				$this->set_id($invoice['ID']);
 			}
-} elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'key' ) ) {
-			$this->set_id( $invoice_id );
-		} elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'number' ) ) {
-			$this->set_id( $invoice_id );
-		} elseif ( is_string( $invoice ) && $invoice_id = self::get_invoice_id_by_field( $invoice, 'transaction_id' ) ) {
-			$this->set_id( $invoice_id );
+} elseif (is_string($invoice) && $invoice_id = self::get_invoice_id_by_field($invoice, 'key')) {
+			$this->set_id($invoice_id);
+		} elseif (is_string($invoice) && $invoice_id = self::get_invoice_id_by_field($invoice, 'number')) {
+			$this->set_id($invoice_id);
+		} elseif (is_string($invoice) && $invoice_id = self::get_invoice_id_by_field($invoice, 'transaction_id')) {
+			$this->set_id($invoice_id);
 		} else {
-			$this->set_object_read( true );
+			$this->set_object_read(true);
 		}
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-            $this->post = get_post( $this->get_id() );
+		if ($this->get_id() > 0) {
+            $this->post = get_post($this->get_id());
             $this->ID   = $this->get_id();
-			$this->data_store->read( $this );
+			$this->data_store->read($this);
         }
 
     }
@@ -194,39 +194,39 @@ 
 	 * @since 1.0.15
 	 * @return int
 	 */
-	public static function get_invoice_id_by_field( $value, $field = 'key' ) {
+	public static function get_invoice_id_by_field($value, $field = 'key') {
         global $wpdb;
 
 		// Trim the value.
-		$value = trim( $value );
+		$value = trim($value);
 
-		if ( empty( $value ) ) {
+		if (empty($value)) {
 			return 0;
 		}
 
         // Valid fields.
-        $fields = array( 'key', 'number', 'transaction_id' );
+        $fields = array('key', 'number', 'transaction_id');
 
 		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+		if (empty($field) || !in_array($field, $fields)) {
 			return 0;
 		}
 
 		// Maybe retrieve from the cache.
-		$invoice_id   = wp_cache_get( $value, "getpaid_invoice_{$field}s_to_invoice_ids" );
-		if ( false !== $invoice_id ) {
+		$invoice_id = wp_cache_get($value, "getpaid_invoice_{$field}s_to_invoice_ids");
+		if (false !== $invoice_id) {
 			return $invoice_id;
 		}
 
         // Fetch from the db.
         $table       = $wpdb->prefix . 'getpaid_invoices';
-		$db_field    = 'key' === $field ? 'invoice_key' : $field;
+		$db_field = 'key' === $field ? 'invoice_key' : $field;
         $invoice_id  = (int) $wpdb->get_var(
-            $wpdb->prepare( "SELECT `post_id` FROM $table WHERE `$db_field`=%s LIMIT 1", $value )
+            $wpdb->prepare("SELECT `post_id` FROM $table WHERE `$db_field`=%s LIMIT 1", $value)
         );
 
 		// Update the cache with our data
-		wp_cache_set( $value, $invoice_id, "getpaid_invoice_{$field}s_to_invoice_ids" );
+		wp_cache_set($value, $invoice_id, "getpaid_invoice_{$field}s_to_invoice_ids");
 
 		return $invoice_id;
     }
@@ -234,8 +234,8 @@ 
     /**
      * Checks if an invoice key is set.
      */
-    public function _isset( $key ) {
-        return isset( $this->data[ $key ] ) || method_exists( $this, "get_$key" );
+    public function _isset($key) {
+        return isset($this->data[$key]) || method_exists($this, "get_$key");
     }
 
     /*
@@ -260,8 +260,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_parent_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_id', $context );
+	public function get_parent_id($context = 'view') {
+		return (int) $this->get_prop('parent_id', $context);
     }
 
     /**
@@ -271,7 +271,7 @@ 
 	 * @return WPInv_Invoice
 	 */
     public function get_parent_payment() {
-        return new WPInv_Invoice( $this->get_parent_id() );
+        return new WPInv_Invoice($this->get_parent_id());
     }
 
     /**
@@ -291,8 +291,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
 	}
 
 	/**
@@ -302,7 +302,7 @@ 
 	 * @return array
 	 */
 	public function get_all_statuses() {
-		return wpinv_get_invoice_statuses( true, true, $this );
+		return wpinv_get_invoice_statuses(true, true, $this);
     }
 
     /**
@@ -314,9 +314,9 @@ 
     public function get_status_nicename() {
 		$statuses = $this->get_all_statuses();
 
-        $status = isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : $this->get_status();
+        $status = isset($statuses[$this->get_status()]) ? $statuses[$this->get_status()] : $this->get_status();
 
-        return apply_filters( 'wpinv_get_invoice_status_nicename', $status, $this );
+        return apply_filters('wpinv_get_invoice_status_nicename', $status, $this);
     }
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function get_status_class() {
 		$statuses = getpaid_get_invoice_status_classes();
-		return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark text-white';
+		return isset($statuses[$this->get_status()]) ? $statuses[$this->get_status()] : 'bg-dark text-white';
 	}
 
 	/**
@@ -338,9 +338,9 @@ 
      */
     public function get_status_label_html() {
 
-		$status_label = sanitize_text_field( $this->get_status_nicename() );
-		$status       = sanitize_html_class( $this->get_status() );
-		$class        = esc_attr( $this->get_status_class() );
+		$status_label = sanitize_text_field($this->get_status_nicename());
+		$status       = sanitize_html_class($this->get_status());
+		$class        = esc_attr($this->get_status_class());
 
 		return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
 	}
@@ -352,23 +352,23 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+	public function get_version($context = 'view') {
+		return $this->get_prop('version', $context);
 	}
 
 	/**
 	 * @deprecated
 	 */
-	public function get_invoice_date( $format = true ) {
-		$date      = getpaid_format_date( $this->get_date_completed() );
-		$date      = empty( $date ) ? $this->get_date_created() : $this->get_date_completed();
-		$formatted = getpaid_format_date( $date );
+	public function get_invoice_date($format = true) {
+		$date      = getpaid_format_date($this->get_date_completed());
+		$date      = empty($date) ? $this->get_date_created() : $this->get_date_completed();
+		$formatted = getpaid_format_date($date);
 
-		if ( $format ) {
+		if ($format) {
 			return $formatted;
 		}
 
-		return empty( $formatted ) ? '' : $date;
+		return empty($formatted) ? '' : $date;
 
     }
 
@@ -379,8 +379,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_prop('date_created', $context);
 	}
 
 	/**
@@ -390,8 +390,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_created_date( $context = 'view' ) {
-		return $this->get_date_created( $context );
+	public function get_created_date($context = 'view') {
+		return $this->get_date_created($context);
     }
 
     /**
@@ -401,11 +401,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+	public function get_date_created_gmt($context = 'view') {
+        $date = $this->get_date_created($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -417,8 +417,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+	public function get_date_modified($context = 'view') {
+		return $this->get_prop('date_modified', $context);
 	}
 
 	/**
@@ -428,8 +428,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_modified_date( $context = 'view' ) {
-		return $this->get_date_modified( $context );
+	public function get_modified_date($context = 'view') {
+		return $this->get_date_modified($context);
     }
 
     /**
@@ -439,11 +439,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
-        $date = $this->get_date_modified( $context );
+	public function get_date_modified_gmt($context = 'view') {
+        $date = $this->get_date_modified($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -455,8 +455,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_due_date( $context = 'view' ) {
-		return $this->get_prop( 'due_date', $context );
+	public function get_due_date($context = 'view') {
+		return $this->get_prop('due_date', $context);
     }
 
     /**
@@ -466,8 +466,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_due( $context = 'view' ) {
-		return $this->get_due_date( $context );
+	public function get_date_due($context = 'view') {
+		return $this->get_due_date($context);
     }
 
     /**
@@ -477,11 +477,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_due_date_gmt( $context = 'view' ) {
-        $date = $this->get_due_date( $context );
+	public function get_due_date_gmt($context = 'view') {
+        $date = $this->get_due_date($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -493,8 +493,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_gmt_date_due( $context = 'view' ) {
-		return $this->get_due_date_gmt( $context );
+	public function get_gmt_date_due($context = 'view') {
+		return $this->get_due_date_gmt($context);
     }
 
     /**
@@ -504,8 +504,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_completed_date( $context = 'view' ) {
-		return $this->get_prop( 'completed_date', $context );
+	public function get_completed_date($context = 'view') {
+		return $this->get_prop('completed_date', $context);
     }
 
     /**
@@ -515,8 +515,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_completed( $context = 'view' ) {
-		return $this->get_completed_date( $context );
+	public function get_date_completed($context = 'view') {
+		return $this->get_completed_date($context);
     }
 
     /**
@@ -526,11 +526,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_completed_date_gmt( $context = 'view' ) {
-        $date = $this->get_completed_date( $context );
+	public function get_completed_date_gmt($context = 'view') {
+        $date = $this->get_completed_date($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -542,8 +542,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_gmt_completed_date( $context = 'view' ) {
-		return $this->get_completed_date_gmt( $context );
+	public function get_gmt_completed_date($context = 'view') {
+		return $this->get_completed_date_gmt($context);
     }
 
     /**
@@ -553,12 +553,12 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_number( $context = 'view' ) {
-		$number = $this->get_prop( 'number', $context );
+	public function get_number($context = 'view') {
+		$number = $this->get_prop('number', $context);
 
-		if ( empty( $number ) ) {
+		if (empty($number)) {
 			$number = $this->generate_number();
-			$this->set_number( $this->generate_number() );
+			$this->set_number($this->generate_number());
 		}
 
 		return $number;
@@ -572,8 +572,8 @@ 
 	public function maybe_set_number() {
         $number = $this->get_number();
 
-        if ( empty( $number ) || $this->get_id() == $number ) {
-			$this->set_number( $this->generate_number() );
+        if (empty($number) || $this->get_id() == $number) {
+			$this->set_number($this->generate_number());
         }
 
 	}
@@ -585,8 +585,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_key( $context = 'view' ) {
-        return $this->get_prop( 'key', $context );
+	public function get_key($context = 'view') {
+        return $this->get_prop('key', $context);
 	}
 
 	/**
@@ -597,9 +597,9 @@ 
 	public function maybe_set_key() {
         $key = $this->get_key();
 
-        if ( empty( $key ) ) {
-            $key = $this->generate_key( $this->get_type() . '_' );
-            $this->set_key( $key );
+        if (empty($key)) {
+            $key = $this->generate_key($this->get_type() . '_');
+            $this->set_key($key);
         }
 
     }
@@ -611,8 +611,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_type( $context = 'view' ) {
-        return $this->get_prop( 'type', $context );
+	public function get_type($context = 'view') {
+        return $this->get_prop('type', $context);
 	}
 
 	/**
@@ -622,7 +622,7 @@ 
 	 * @return string
 	 */
 	public function get_invoice_quote_type() {
-        return getpaid_get_post_type_label( $this->get_post_type(), false );
+        return getpaid_get_post_type_label($this->get_post_type(), false);
     }
 
     /**
@@ -632,8 +632,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_label( $context = 'view' ) {
-        return getpaid_get_post_type_label( $this->get_post_type( $context ), false );
+	public function get_label($context = 'view') {
+        return getpaid_get_post_type_label($this->get_post_type($context), false);
 	}
 
 	/**
@@ -643,8 +643,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_post_type( $context = 'view' ) {
-        return $this->get_prop( 'post_type', $context );
+	public function get_post_type($context = 'view') {
+        return $this->get_prop('post_type', $context);
     }
 
     /**
@@ -654,8 +654,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_mode( $context = 'view' ) {
-        return $this->get_prop( 'mode', $context );
+	public function get_mode($context = 'view') {
+        return $this->get_prop('mode', $context);
     }
 
     /**
@@ -665,13 +665,13 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_path( $context = 'view' ) {
-        $path   = $this->get_prop( 'path', $context );
+	public function get_path($context = 'view') {
+        $path = $this->get_prop('path', $context);
 		$prefix = $this->get_type();
 
-		if ( 0 !== strpos( $path, $prefix ) ) {
-			$path = sanitize_title( $prefix . '-' . $this->get_id() );
-			$this->set_path( $path );
+		if (0 !== strpos($path, $prefix)) {
+			$path = sanitize_title($prefix . '-' . $this->get_id());
+			$this->set_path($path);
 		}
 
 		return $path;
@@ -684,8 +684,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_name( $context = 'view' ) {
-        return $this->get_prop( 'title', $context );
+	public function get_name($context = 'view') {
+        return $this->get_prop('title', $context);
     }
 
     /**
@@ -695,8 +695,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+	public function get_title($context = 'view') {
+		return $this->get_name($context);
     }
 
     /**
@@ -706,8 +706,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_description( $context = 'view' ) {
-		return $this->get_prop( 'description', $context );
+	public function get_description($context = 'view') {
+		return $this->get_prop('description', $context);
     }
 
     /**
@@ -717,8 +717,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_excerpt( $context = 'view' ) {
-		return $this->get_description( $context );
+	public function get_excerpt($context = 'view') {
+		return $this->get_description($context);
     }
 
     /**
@@ -728,8 +728,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_summary( $context = 'view' ) {
-		return $this->get_description( $context );
+	public function get_summary($context = 'view') {
+		return $this->get_description($context);
     }
 
     /**
@@ -739,26 +739,26 @@ 
      * @param  string $context View or edit context.
 	 * @return array
 	 */
-    public function get_user_info( $context = 'view' ) {
+    public function get_user_info($context = 'view') {
 
         $user_info = array(
-            'user_id'    => $this->get_user_id( $context ),
-            'email'      => $this->get_email( $context ),
-            'first_name' => $this->get_first_name( $context ),
-            'last_name'  => $this->get_last_name( $context ),
-            'address'    => $this->get_address( $context ),
-            'phone'      => $this->get_phone( $context ),
-            'city'       => $this->get_city( $context ),
-            'country'    => $this->get_country( $context ),
-            'state'      => $this->get_state( $context ),
-            'zip'        => $this->get_zip( $context ),
-            'company'    => $this->get_company( $context ),
-			'company_id' => $this->get_company_id( $context ),
-            'vat_number' => $this->get_vat_number( $context ),
-            'discount'   => $this->get_discount_code( $context ),
+            'user_id'    => $this->get_user_id($context),
+            'email'      => $this->get_email($context),
+            'first_name' => $this->get_first_name($context),
+            'last_name'  => $this->get_last_name($context),
+            'address'    => $this->get_address($context),
+            'phone'      => $this->get_phone($context),
+            'city'       => $this->get_city($context),
+            'country'    => $this->get_country($context),
+            'state'      => $this->get_state($context),
+            'zip'        => $this->get_zip($context),
+            'company'    => $this->get_company($context),
+			'company_id' => $this->get_company_id($context),
+            'vat_number' => $this->get_vat_number($context),
+            'discount'   => $this->get_discount_code($context),
 		);
 
-		return apply_filters( 'wpinv_user_info', $user_info, $this->get_id(), $this );
+		return apply_filters('wpinv_user_info', $user_info, $this->get_id(), $this);
 
     }
 
@@ -769,8 +769,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+	public function get_author($context = 'view') {
+		return (int) $this->get_prop('author', $context);
     }
 
     /**
@@ -780,8 +780,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_user_id( $context = 'view' ) {
-		return $this->get_author( $context );
+	public function get_user_id($context = 'view') {
+		return $this->get_author($context);
     }
 
      /**
@@ -791,8 +791,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_customer_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'customer_id', $context );
+	public function get_customer_id($context = 'view') {
+		return (int) $this->get_prop('customer_id', $context);
     }
 
     /**
@@ -802,8 +802,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_ip( $context = 'view' ) {
-		return $this->get_prop( 'user_ip', $context );
+	public function get_ip($context = 'view') {
+		return $this->get_prop('user_ip', $context);
     }
 
     /**
@@ -813,8 +813,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_ip( $context = 'view' ) {
-		return $this->get_ip( $context );
+	public function get_user_ip($context = 'view') {
+		return $this->get_ip($context);
     }
 
      /**
@@ -824,8 +824,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_ip( $context = 'view' ) {
-		return $this->get_ip( $context );
+	public function get_customer_ip($context = 'view') {
+		return $this->get_ip($context);
     }
 
     /**
@@ -835,8 +835,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_first_name( $context = 'view' ) {
-		return $this->get_prop( 'first_name', $context );
+	public function get_first_name($context = 'view') {
+		return $this->get_prop('first_name', $context);
     }
 
     /**
@@ -846,8 +846,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_first_name( $context = 'view' ) {
-		return $this->get_first_name( $context );
+	public function get_user_first_name($context = 'view') {
+		return $this->get_first_name($context);
     }
 
      /**
@@ -857,8 +857,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_first_name( $context = 'view' ) {
-		return $this->get_first_name( $context );
+	public function get_customer_first_name($context = 'view') {
+		return $this->get_first_name($context);
     }
 
     /**
@@ -868,8 +868,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_last_name( $context = 'view' ) {
-		return $this->get_prop( 'last_name', $context );
+	public function get_last_name($context = 'view') {
+		return $this->get_prop('last_name', $context);
     }
 
     /**
@@ -879,8 +879,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_last_name( $context = 'view' ) {
-		return $this->get_last_name( $context );
+	public function get_user_last_name($context = 'view') {
+		return $this->get_last_name($context);
     }
 
     /**
@@ -890,8 +890,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_last_name( $context = 'view' ) {
-		return $this->get_last_name( $context );
+	public function get_customer_last_name($context = 'view') {
+		return $this->get_last_name($context);
     }
 
     /**
@@ -901,22 +901,22 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_full_name( $context = 'view' ) {
-		$name = trim( $this->get_first_name( $context ) . ' ' . $this->get_last_name( $context ) );
+	public function get_full_name($context = 'view') {
+		$name = trim($this->get_first_name($context) . ' ' . $this->get_last_name($context));
 
-		if ( ! $name ) {
-			$user = get_userdata( $this->get_author( $context ) );
+		if (!$name) {
+			$user = get_userdata($this->get_author($context));
 
-			if ( $user ) {
+			if ($user) {
 				$name = $user->display_name;
 			}
 		}
 
-		if ( ! $name ) {
-			$name = $this->get_email( $context );
+		if (!$name) {
+			$name = $this->get_email($context);
 		}
 
-		return apply_filters( 'wpinv_invoice_user_full_name', $name, $this );
+		return apply_filters('wpinv_invoice_user_full_name', $name, $this);
     }
 
     /**
@@ -926,8 +926,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_full_name( $context = 'view' ) {
-		return $this->get_full_name( $context );
+	public function get_user_full_name($context = 'view') {
+		return $this->get_full_name($context);
     }
 
     /**
@@ -937,8 +937,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_full_name( $context = 'view' ) {
-		return $this->get_full_name( $context );
+	public function get_customer_full_name($context = 'view') {
+		return $this->get_full_name($context);
     }
 
     /**
@@ -948,8 +948,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_phone( $context = 'view' ) {
-		return $this->get_prop( 'phone', $context );
+	public function get_phone($context = 'view') {
+		return $this->get_prop('phone', $context);
     }
 
     /**
@@ -959,8 +959,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_phone_number( $context = 'view' ) {
-		return $this->get_phone( $context );
+	public function get_phone_number($context = 'view') {
+		return $this->get_phone($context);
     }
 
     /**
@@ -970,8 +970,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_phone( $context = 'view' ) {
-		return $this->get_phone( $context );
+	public function get_user_phone($context = 'view') {
+		return $this->get_phone($context);
     }
 
     /**
@@ -981,8 +981,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_phone( $context = 'view' ) {
-		return $this->get_phone( $context );
+	public function get_customer_phone($context = 'view') {
+		return $this->get_phone($context);
     }
 
     /**
@@ -992,8 +992,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_email( $context = 'view' ) {
-		return $this->get_prop( 'email', $context );
+	public function get_email($context = 'view') {
+		return $this->get_prop('email', $context);
     }
 
     /**
@@ -1003,8 +1003,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_email_address( $context = 'view' ) {
-		return $this->get_email( $context );
+	public function get_email_address($context = 'view') {
+		return $this->get_email($context);
     }
 
     /**
@@ -1014,8 +1014,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_email( $context = 'view' ) {
-		return $this->get_email( $context );
+	public function get_user_email($context = 'view') {
+		return $this->get_email($context);
     }
 
     /**
@@ -1025,8 +1025,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_email( $context = 'view' ) {
-		return $this->get_email( $context );
+	public function get_customer_email($context = 'view') {
+		return $this->get_email($context);
     }
 
     /**
@@ -1036,9 +1036,9 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_country( $context = 'view' ) {
-		$country = $this->get_prop( 'country', $context );
-		return empty( $country ) ? wpinv_get_default_country() : $country;
+	public function get_country($context = 'view') {
+		$country = $this->get_prop('country', $context);
+		return empty($country) ? wpinv_get_default_country() : $country;
     }
 
     /**
@@ -1048,8 +1048,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_country( $context = 'view' ) {
-		return $this->get_country( $context );
+	public function get_user_country($context = 'view') {
+		return $this->get_country($context);
     }
 
     /**
@@ -1059,8 +1059,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_country( $context = 'view' ) {
-		return $this->get_country( $context );
+	public function get_customer_country($context = 'view') {
+		return $this->get_country($context);
     }
 
     /**
@@ -1070,9 +1070,9 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_state( $context = 'view' ) {
-		$state = $this->get_prop( 'state', $context );
-		return empty( $state ) ? wpinv_get_default_state() : $state;
+	public function get_state($context = 'view') {
+		$state = $this->get_prop('state', $context);
+		return empty($state) ? wpinv_get_default_state() : $state;
     }
 
     /**
@@ -1082,8 +1082,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_state( $context = 'view' ) {
-		return $this->get_state( $context );
+	public function get_user_state($context = 'view') {
+		return $this->get_state($context);
     }
 
     /**
@@ -1093,8 +1093,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_state( $context = 'view' ) {
-		return $this->get_state( $context );
+	public function get_customer_state($context = 'view') {
+		return $this->get_state($context);
     }
 
     /**
@@ -1104,8 +1104,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_city( $context = 'view' ) {
-		return $this->get_prop( 'city', $context );
+	public function get_city($context = 'view') {
+		return $this->get_prop('city', $context);
     }
 
     /**
@@ -1115,8 +1115,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_city( $context = 'view' ) {
-		return $this->get_city( $context );
+	public function get_user_city($context = 'view') {
+		return $this->get_city($context);
     }
 
     /**
@@ -1126,8 +1126,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_city( $context = 'view' ) {
-		return $this->get_city( $context );
+	public function get_customer_city($context = 'view') {
+		return $this->get_city($context);
     }
 
     /**
@@ -1137,8 +1137,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_zip( $context = 'view' ) {
-		return $this->get_prop( 'zip', $context );
+	public function get_zip($context = 'view') {
+		return $this->get_prop('zip', $context);
     }
 
     /**
@@ -1148,8 +1148,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_zip( $context = 'view' ) {
-		return $this->get_zip( $context );
+	public function get_user_zip($context = 'view') {
+		return $this->get_zip($context);
     }
 
     /**
@@ -1159,8 +1159,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_zip( $context = 'view' ) {
-		return $this->get_zip( $context );
+	public function get_customer_zip($context = 'view') {
+		return $this->get_zip($context);
     }
 
     /**
@@ -1170,8 +1170,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_company( $context = 'view' ) {
-		return $this->get_prop( 'company', $context );
+	public function get_company($context = 'view') {
+		return $this->get_prop('company', $context);
     }
 
     /**
@@ -1181,8 +1181,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_company( $context = 'view' ) {
-		return $this->get_company( $context );
+	public function get_user_company($context = 'view') {
+		return $this->get_company($context);
     }
 
     /**
@@ -1192,8 +1192,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_company( $context = 'view' ) {
-		return $this->get_company( $context );
+	public function get_customer_company($context = 'view') {
+		return $this->get_company($context);
     }
 
 	/**
@@ -1203,8 +1203,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_company_id( $context = 'view' ) {
-		return $this->get_prop( 'company_id', $context );
+	public function get_company_id($context = 'view') {
+		return $this->get_prop('company_id', $context);
     }
 
     /**
@@ -1214,8 +1214,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_vat_number( $context = 'view' ) {
-		return $this->get_prop( 'vat_number', $context );
+	public function get_vat_number($context = 'view') {
+		return $this->get_prop('vat_number', $context);
     }
 
     /**
@@ -1225,8 +1225,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_vat_number( $context = 'view' ) {
-		return $this->get_vat_number( $context );
+	public function get_user_vat_number($context = 'view') {
+		return $this->get_vat_number($context);
     }
 
     /**
@@ -1236,8 +1236,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_vat_number( $context = 'view' ) {
-		return $this->get_vat_number( $context );
+	public function get_customer_vat_number($context = 'view') {
+		return $this->get_vat_number($context);
     }
 
     /**
@@ -1247,8 +1247,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_vat_rate( $context = 'view' ) {
-		return $this->get_prop( 'vat_rate', $context );
+	public function get_vat_rate($context = 'view') {
+		return $this->get_prop('vat_rate', $context);
     }
 
     /**
@@ -1258,8 +1258,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_vat_rate( $context = 'view' ) {
-		return $this->get_vat_rate( $context );
+	public function get_user_vat_rate($context = 'view') {
+		return $this->get_vat_rate($context);
     }
 
     /**
@@ -1269,8 +1269,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_vat_rate( $context = 'view' ) {
-		return $this->get_vat_rate( $context );
+	public function get_customer_vat_rate($context = 'view') {
+		return $this->get_vat_rate($context);
     }
 
     /**
@@ -1280,8 +1280,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_address( $context = 'view' ) {
-		return $this->get_prop( 'address', $context );
+	public function get_address($context = 'view') {
+		return $this->get_prop('address', $context);
     }
 
     /**
@@ -1291,8 +1291,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_user_address( $context = 'view' ) {
-		return $this->get_address( $context );
+	public function get_user_address($context = 'view') {
+		return $this->get_address($context);
     }
 
     /**
@@ -1302,8 +1302,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_customer_address( $context = 'view' ) {
-		return $this->get_address( $context );
+	public function get_customer_address($context = 'view') {
+		return $this->get_address($context);
     }
 
     /**
@@ -1313,8 +1313,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_is_viewed( $context = 'view' ) {
-		return (bool) $this->get_prop( 'is_viewed', $context );
+	public function get_is_viewed($context = 'view') {
+		return (bool) $this->get_prop('is_viewed', $context);
 	}
 
 	/**
@@ -1324,8 +1324,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_email_cc( $context = 'view' ) {
-		return $this->get_prop( 'email_cc', $context );
+	public function get_email_cc($context = 'view') {
+		return $this->get_prop('email_cc', $context);
 	}
 
 	/**
@@ -1335,8 +1335,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_template( $context = 'view' ) {
-		return $this->get_prop( 'template', $context );
+	public function get_template($context = 'view') {
+		return $this->get_prop('template', $context);
 	}
 
 	/**
@@ -1346,8 +1346,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_created_via( $context = 'view' ) {
-		return $this->get_prop( 'created_via', $context );
+	public function get_created_via($context = 'view') {
+		return $this->get_prop('created_via', $context);
 	}
 
 	/**
@@ -1357,8 +1357,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_address_confirmed( $context = 'view' ) {
-		return (bool) $this->get_prop( 'address_confirmed', $context );
+	public function get_address_confirmed($context = 'view') {
+		return (bool) $this->get_prop('address_confirmed', $context);
     }
 
     /**
@@ -1368,8 +1368,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_user_address_confirmed( $context = 'view' ) {
-		return $this->get_address_confirmed( $context );
+	public function get_user_address_confirmed($context = 'view') {
+		return $this->get_address_confirmed($context);
     }
 
     /**
@@ -1379,8 +1379,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_customer_address_confirmed( $context = 'view' ) {
-		return $this->get_address_confirmed( $context );
+	public function get_customer_address_confirmed($context = 'view') {
+		return $this->get_address_confirmed($context);
     }
 
 	/**
@@ -1391,8 +1391,8 @@ 
 	 */
 	public function get_shipping_address() {
 
-		$shipping_address = get_post_meta( $this->get_id(), 'shipping_address', true );
-		return is_array( $shipping_address ) ? $shipping_address : false;
+		$shipping_address = get_post_meta($this->get_id(), 'shipping_address', true);
+		return is_array($shipping_address) ? $shipping_address : false;
     }
 
 	/**
@@ -1409,17 +1409,17 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_shipping( $context = 'view' ) {
+	public function get_shipping($context = 'view') {
 
-		if ( $context = 'view' ) {
-			return floatval( $this->get_prop( 'shipping', $context ) );
+		if ($context = 'view') {
+			return floatval($this->get_prop('shipping', $context));
 		}
 
-		return $this->get_prop( 'shipping', $context );
+		return $this->get_prop('shipping', $context);
     }
 
 	public function has_shipping() {
-		return defined( 'GETPAID_SHIPPING_CALCULATOR_VERSION' ) && $this->get_prop( 'shipping', 'edit' );
+		return defined('GETPAID_SHIPPING_CALCULATOR_VERSION') && $this->get_prop('shipping', 'edit');
     }
 
     /**
@@ -1429,12 +1429,12 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_subtotal( $context = 'view' ) {
-        $subtotal = (float) $this->get_prop( 'subtotal', $context );
+	public function get_subtotal($context = 'view') {
+        $subtotal = (float) $this->get_prop('subtotal', $context);
 
         // Backwards compatibility.
-        if ( is_bool( $context ) && $context ) {
-            return wpinv_price( $subtotal, $this->get_currency() );
+        if (is_bool($context) && $context) {
+            return wpinv_price($subtotal, $this->get_currency());
         }
 
         return $subtotal;
@@ -1447,8 +1447,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_total_discount( $context = 'view' ) {
-		return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_discount', $context ) ) );
+	public function get_total_discount($context = 'view') {
+		return wpinv_round_amount(wpinv_sanitize_amount($this->get_prop('total_discount', $context)));
     }
 
     /**
@@ -1458,18 +1458,18 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_total_tax( $context = 'view' ) {
-		return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_tax', $context ) ) );
+	public function get_total_tax($context = 'view') {
+		return wpinv_round_amount(wpinv_sanitize_amount($this->get_prop('total_tax', $context)));
 	}
 
 	/**
 	 * @deprecated
 	 */
-	public function get_final_tax( $currency = false ) {
+	public function get_final_tax($currency = false) {
 		$tax = $this->get_total_tax();
 
-        if ( $currency ) {
-			return wpinv_price( $tax, $this->get_currency() );
+        if ($currency) {
+			return wpinv_price($tax, $this->get_currency());
         }
 
         return $tax;
@@ -1482,8 +1482,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_total_fees( $context = 'view' ) {
-		return wpinv_round_amount( wpinv_sanitize_amount( $this->get_prop( 'total_fees', $context ) ) );
+	public function get_total_fees($context = 'view') {
+		return wpinv_round_amount(wpinv_sanitize_amount($this->get_prop('total_fees', $context)));
     }
 
     /**
@@ -1493,8 +1493,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_fees_total( $context = 'view' ) {
-		return $this->get_total_fees( $context );
+	public function get_fees_total($context = 'view') {
+		return $this->get_total_fees($context);
     }
 
     /**
@@ -1503,14 +1503,14 @@ 
 	 * @since 1.0.19
      * @return float
 	 */
-	public function get_total( $context = 'view' ) {
-		$total = $this->get_prop( 'total', $context );
+	public function get_total($context = 'view') {
+		$total = $this->get_prop('total', $context);
 
-		if ( $this->has_shipping() && $context == 'view' ) {
-			$total = $this->get_prop( 'total', $context ) + $this->get_shipping( $context );
+		if ($this->has_shipping() && $context == 'view') {
+			$total = $this->get_prop('total', $context) + $this->get_shipping($context);
 		}
 
-		return wpinv_round_amount( wpinv_sanitize_amount( $total ) );
+		return wpinv_round_amount(wpinv_sanitize_amount($total));
 	}
 
 	/**
@@ -1522,20 +1522,20 @@ 
 	public function get_non_recurring_total() {
 
 		$subtotal = 0;
-		foreach ( $this->get_items() as $item ) {
-			if ( ! $item->is_recurring() ) {
+		foreach ($this->get_items() as $item) {
+			if (!$item->is_recurring()) {
 				$subtotal += $item->get_sub_total();
 			}
 		}
 
-		foreach ( $this->get_fees() as $fee ) {
-			if ( empty( $fee['recurring_fee'] ) ) {
-				$subtotal += wpinv_sanitize_amount( $fee['initial_fee'] );
+		foreach ($this->get_fees() as $fee) {
+			if (empty($fee['recurring_fee'])) {
+				$subtotal += wpinv_sanitize_amount($fee['initial_fee']);
 			}
 		}
 
-		$subtotal = wpinv_round_amount( wpinv_sanitize_amount( $subtotal ) );
-        return apply_filters( 'wpinv_get_non_recurring_invoice_total', $subtotal, $this );
+		$subtotal = wpinv_round_amount(wpinv_sanitize_amount($subtotal));
+        return apply_filters('wpinv_get_non_recurring_invoice_total', $subtotal, $this);
 
     }
 
@@ -1558,7 +1558,7 @@ 
 	 */
     public function get_initial_total() {
 
-		if ( empty( $this->totals ) ) {
+		if (empty($this->totals)) {
 			$this->recalculate_total();
 		}
 
@@ -1568,12 +1568,12 @@ 
 		$subtotal = $this->totals['subtotal']['initial'];
 		$total    = $tax + $fee - $discount + $subtotal;
 
-		if ( 0 > $total ) {
+		if (0 > $total) {
 			$total = 0;
 		}
 
-		$total = wpinv_round_amount( wpinv_sanitize_amount( $total ) );
-        return apply_filters( 'wpinv_get_initial_invoice_total', $total, $this );
+		$total = wpinv_round_amount(wpinv_sanitize_amount($total));
+        return apply_filters('wpinv_get_initial_invoice_total', $total, $this);
 	}
 
 	/**
@@ -1585,7 +1585,7 @@ 
 	 */
     public function get_recurring_total() {
 
-		if ( empty( $this->totals ) ) {
+		if (empty($this->totals)) {
 			$this->recalculate_total();
 		}
 
@@ -1595,12 +1595,12 @@ 
 		$subtotal = $this->totals['subtotal']['recurring'];
 		$total    = $tax + $fee - $discount + $subtotal;
 
-		if ( 0 > $total ) {
+		if (0 > $total) {
 			$total = 0;
 		}
 
-		$total = wpinv_round_amount( wpinv_sanitize_amount( $total ) );
-        return apply_filters( 'wpinv_get_recurring_invoice_total', $total, $this );
+		$total = wpinv_round_amount(wpinv_sanitize_amount($total));
+        return apply_filters('wpinv_get_recurring_invoice_total', $total, $this);
 	}
 
 	/**
@@ -1611,10 +1611,10 @@ 
 	 * @param string $currency Whether to include the currency.
      * @return float|string
 	 */
-    public function get_recurring_details( $field = '', $currency = false ) {
+    public function get_recurring_details($field = '', $currency = false) {
 
 		// Maybe recalculate totals.
-		if ( empty( $this->totals ) ) {
+		if (empty($this->totals)) {
 			$this->recalculate_total();
 		}
 
@@ -1634,8 +1634,8 @@ 
 			$currency
 		);
 
-        if ( isset( $data[ $field ] ) ) {
-            return ( $currency ? wpinv_price( $data[ $field ], $this->get_currency() ) : $data[ $field ] );
+        if (isset($data[$field])) {
+            return ($currency ? wpinv_price($data[$field], $this->get_currency()) : $data[$field]);
         }
 
         return $data;
@@ -1648,8 +1648,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_fees( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'fees', $context ) );
+	public function get_fees($context = 'view') {
+		return wpinv_parse_list($this->get_prop('fees', $context));
     }
 
     /**
@@ -1659,8 +1659,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_discounts( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'discounts', $context ) );
+	public function get_discounts($context = 'view') {
+		return wpinv_parse_list($this->get_prop('discounts', $context));
     }
 
     /**
@@ -1670,8 +1670,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_taxes( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'taxes', $context ) );
+	public function get_taxes($context = 'view') {
+		return wpinv_parse_list($this->get_prop('taxes', $context));
     }
 
     /**
@@ -1681,8 +1681,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return GetPaid_Form_Item[]
 	 */
-	public function get_items( $context = 'view' ) {
-        return $this->get_prop( 'items', $context );
+	public function get_items($context = 'view') {
+        return $this->get_prop('items', $context);
 	}
 
 	/**
@@ -1692,7 +1692,7 @@ 
 	 * @return string
 	 */
 	public function get_item_ids() {
-		return implode( ', ', wp_list_pluck( $this->get_cart_details(), 'item_id' ) );
+		return implode(', ', wp_list_pluck($this->get_cart_details(), 'item_id'));
     }
 
     /**
@@ -1702,8 +1702,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_payment_form( $context = 'view' ) {
-		return intval( $this->get_prop( 'payment_form', $context ) );
+	public function get_payment_form($context = 'view') {
+		return intval($this->get_prop('payment_form', $context));
     }
 
     /**
@@ -1713,8 +1713,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_submission_id( $context = 'view' ) {
-		return $this->get_prop( 'submission_id', $context );
+	public function get_submission_id($context = 'view') {
+		return $this->get_prop('submission_id', $context);
     }
 
     /**
@@ -1724,8 +1724,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_discount_code( $context = 'view' ) {
-		return $this->get_prop( 'discount_code', $context );
+	public function get_discount_code($context = 'view') {
+		return $this->get_prop('discount_code', $context);
     }
 
     /**
@@ -1735,8 +1735,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_gateway( $context = 'view' ) {
-		return $this->get_prop( 'gateway', $context );
+	public function get_gateway($context = 'view') {
+		return $this->get_prop('gateway', $context);
     }
 
     /**
@@ -1746,8 +1746,8 @@ 
 	 * @return string
 	 */
     public function get_gateway_title() {
-        $title = wpinv_get_gateway_checkout_label( $this->get_gateway() );
-        return apply_filters( 'wpinv_gateway_title', $title, $this->get_id(), $this );
+        $title = wpinv_get_gateway_checkout_label($this->get_gateway());
+        return apply_filters('wpinv_gateway_title', $title, $this->get_id(), $this);
     }
 
     /**
@@ -1757,8 +1757,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_transaction_id( $context = 'view' ) {
-		return $this->get_prop( 'transaction_id', $context );
+	public function get_transaction_id($context = 'view') {
+		return $this->get_prop('transaction_id', $context);
     }
 
     /**
@@ -1768,9 +1768,9 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_currency( $context = 'view' ) {
-        $currency = $this->get_prop( 'currency', $context );
-        return empty( $currency ) ? wpinv_get_currency() : $currency;
+	public function get_currency($context = 'view') {
+        $currency = $this->get_prop('currency', $context);
+        return empty($currency) ? wpinv_get_currency() : $currency;
     }
 
     /**
@@ -1780,8 +1780,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_disable_taxes( $context = 'view' ) {
-        return (bool) $this->get_prop( 'disable_taxes', $context );
+	public function get_disable_taxes($context = 'view') {
+        return (bool) $this->get_prop('disable_taxes', $context);
     }
 
     /**
@@ -1791,8 +1791,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-    public function get_subscription_id( $context = 'view' ) {
-		return $this->is_renewal() ? $this->get_parent()->get_subscription_id( $context ) : $this->get_prop( 'subscription_id', $context );
+    public function get_subscription_id($context = 'view') {
+		return $this->is_renewal() ? $this->get_parent()->get_subscription_id($context) : $this->get_prop('subscription_id', $context);
 	}
 
 	/**
@@ -1802,12 +1802,12 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-    public function get_remote_subscription_id( $context = 'view' ) {
-        $subscription_id = $this->get_prop( 'remote_subscription_id', $context );
+    public function get_remote_subscription_id($context = 'view') {
+        $subscription_id = $this->get_prop('remote_subscription_id', $context);
 
-        if ( empty( $subscription_id ) && $this->is_renewal() ) {
+        if (empty($subscription_id) && $this->is_renewal()) {
             $parent = $this->get_parent();
-            return $parent->get_remote_subscription_id( $context );
+            return $parent->get_remote_subscription_id($context);
         }
 
         return $subscription_id;
@@ -1820,8 +1820,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_is_anonymized( $context = 'view' ) {
-		return (bool) $this->get_prop( 'is_anonymized', $context );
+	public function get_is_anonymized($context = 'view') {
+		return (bool) $this->get_prop('is_anonymized', $context);
     }
 
     /**
@@ -1831,20 +1831,20 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-    public function get_payment_meta( $context = 'view' ) {
+    public function get_payment_meta($context = 'view') {
 
         return array(
-            'price'        => $this->get_total( $context ),
-            'date'         => $this->get_date_created( $context ),
-            'user_email'   => $this->get_email( $context ),
-            'invoice_key'  => $this->get_key( $context ),
-            'currency'     => $this->get_currency( $context ),
-            'items'        => $this->get_items( $context ),
-            'user_info'    => $this->get_user_info( $context ),
+            'price'        => $this->get_total($context),
+            'date'         => $this->get_date_created($context),
+            'user_email'   => $this->get_email($context),
+            'invoice_key'  => $this->get_key($context),
+            'currency'     => $this->get_currency($context),
+            'items'        => $this->get_items($context),
+            'user_info'    => $this->get_user_info($context),
             'cart_details' => $this->get_cart_details(),
-            'status'       => $this->get_status( $context ),
-            'fees'         => $this->get_fees( $context ),
-            'taxes'        => $this->get_taxes( $context ),
+            'status'       => $this->get_status($context),
+            'fees'         => $this->get_fees($context),
+            'taxes'        => $this->get_taxes($context),
         );
 
     }
@@ -1859,9 +1859,9 @@ 
         $items        = $this->get_items();
         $cart_details = array();
 
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
 			$item->invoice_id = $this->get_id();
-            $cart_details[]   = $item->prepare_data_for_saving();
+            $cart_details[] = $item->prepare_data_for_saving();
         }
 
         return $cart_details;
@@ -1872,11 +1872,11 @@ 
 	 *
 	 * @return null|GetPaid_Form_Item|int
 	 */
-	public function get_recurring( $object = false ) {
+	public function get_recurring($object = false) {
 
 		// Are we returning an object?
-        if ( $object ) {
-            return $this->get_item( $this->recurring_item );
+        if ($object) {
+            return $this->get_item($this->recurring_item);
         }
 
         return $this->recurring_item;
@@ -1891,15 +1891,15 @@ 
 	public function get_subscription_name() {
 
 		// Retrieve the recurring name
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
 
 		// Abort if it does not exist.
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return '';
         }
 
 		// Return the item name.
-        return apply_filters( 'wpinv_invoice_get_subscription_name', $item->get_name(), $this );
+        return apply_filters('wpinv_invoice_get_subscription_name', $item->get_name(), $this);
 	}
 
 	/**
@@ -1909,9 +1909,9 @@ 
 	 * @return string
 	 */
 	public function get_view_url() {
-        $invoice_url = get_permalink( $this->get_id() );
-		$invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
-        return apply_filters( 'wpinv_get_view_url', $invoice_url, $this );
+        $invoice_url = get_permalink($this->get_id());
+		$invoice_url = add_query_arg('invoice_key', $this->get_key(), $invoice_url);
+        return apply_filters('wpinv_get_view_url', $invoice_url, $this);
 	}
 
 	/**
@@ -1920,25 +1920,25 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_checkout_payment_url( $deprecated = false, $secret = false ) {
+	public function get_checkout_payment_url($deprecated = false, $secret = false) {
 
 		// Retrieve the checkout url.
         $pay_url = wpinv_get_checkout_uri();
 
 		// Maybe force ssl.
-        if ( is_ssl() ) {
-            $pay_url = str_replace( 'http:', 'https:', $pay_url );
+        if (is_ssl()) {
+            $pay_url = str_replace('http:', 'https:', $pay_url);
         }
 
 		// Add the invoice key.
-		$pay_url = add_query_arg( 'invoice_key', $this->get_key(), $pay_url );
+		$pay_url = add_query_arg('invoice_key', $this->get_key(), $pay_url);
 
 		// (Maybe?) add a secret
-        if ( $secret ) {
-            $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $this->get_key() ) ), $pay_url );
+        if ($secret) {
+            $pay_url = add_query_arg(array('_wpipay' => md5($this->get_user_id() . '::' . $this->get_email() . '::' . $this->get_key())), $pay_url);
         }
 
-        return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $deprecated, $secret );
+        return apply_filters('wpinv_get_checkout_payment_url', $pay_url, $this, $deprecated, $secret);
 	}
 
 	/**
@@ -1953,14 +1953,14 @@ 
         $receipt_url = wpinv_get_success_page_uri();
 
 		// Maybe force ssl.
-        if ( is_ssl() ) {
-            $receipt_url = str_replace( 'http:', 'https:', $receipt_url );
+        if (is_ssl()) {
+            $receipt_url = str_replace('http:', 'https:', $receipt_url);
         }
 
 		// Add the invoice key.
-		$receipt_url = add_query_arg( 'invoice_key', $this->get_key(), $receipt_url );
+		$receipt_url = add_query_arg('invoice_key', $this->get_key(), $receipt_url);
 
-        return apply_filters( 'getpaid_get_invoice_receipt_url', $receipt_url, $this );
+        return apply_filters('getpaid_get_invoice_receipt_url', $receipt_url, $this);
 	}
 
 	/**
@@ -1970,7 +1970,7 @@ 
 	 * @return string
 	 */
 	public function get_transaction_url() {
-		return apply_filters( 'getpaid_gateway_' . $this->get_gateway() . '_transaction_url', '', $this );
+		return apply_filters('getpaid_gateway_' . $this->get_gateway() . '_transaction_url', '', $this);
 	}
 
 	/**
@@ -1983,7 +1983,7 @@ 
 
 		$type   = $this->get_type();
 		$status = "wpi-$type-pending";
-		return str_replace( '-invoice', '', $status );
+		return str_replace('-invoice', '', $status);
 
 	}
 
@@ -1997,14 +1997,14 @@ 
 	 * @param  string $context View or edit context.
 	 * @return mixed Value of the given invoice property (if set).
 	 */
-	public function get( $key, $context = 'view' ) {
+	public function get($key, $context = 'view') {
 		$method = "get_$key";
 
-		if ( is_callable( array( $this, $method ) ) ) {
-			return $this->$method( $context );
+		if (is_callable(array($this, $method))) {
+			return $this->$method($context);
 		}
 
-        return $this->get_prop( $key, $context );
+        return $this->get_prop($key, $context);
 	}
 
     /*
@@ -2027,11 +2027,11 @@ 
 	 * @param  mixed $value new value.
 	 * @return mixed Value of the given invoice property (if set).
 	 */
-	public function set( $key, $value ) {
+	public function set($key, $value) {
 
         $setter = "set_$key";
-        if ( is_callable( array( $this, $setter ) ) ) {
-            $this->{$setter}( $value );
+        if (is_callable(array($this, $setter))) {
+            $this->{$setter}($value);
         }
 
 	}
@@ -2045,45 +2045,45 @@ 
 	 * @param bool   $manual_update Is this a manual status change?.
 	 * @return array details of change.
 	 */
-	public function set_status( $new_status, $note = '', $manual_update = false ) {
+	public function set_status($new_status, $note = '', $manual_update = false) {
 		$old_status = $this->get_status();
 
 		$statuses = $this->get_all_statuses();
 
-		if ( isset( $statuses['draft'] ) ) {
-			unset( $statuses['draft'] );
+		if (isset($statuses['draft'])) {
+			unset($statuses['draft']);
 		}
 
-		$this->set_prop( 'status', $new_status );
+		$this->set_prop('status', $new_status);
 
 		// If setting the status, ensure it's set to a valid status.
-		if ( true === $this->object_read ) {
+		if (true === $this->object_read) {
 
 			// Only allow valid new status.
-			if ( ! array_key_exists( $new_status, $statuses ) ) {
+			if (!array_key_exists($new_status, $statuses)) {
 				$new_status = $this->get_default_status();
 			}
 
 			// If the old status is set but unknown (e.g. draft) assume its pending for action usage.
-			if ( $old_status && ! array_key_exists( $new_status, $statuses ) ) {
+			if ($old_status && !array_key_exists($new_status, $statuses)) {
 				$old_status = $this->get_default_status();
 			}
 
 			// Paid - Renewal (i.e when duplicating a parent invoice )
-			if ( $new_status == 'wpi-pending' && $old_status == 'publish' && ! $this->get_id() ) {
+			if ($new_status == 'wpi-pending' && $old_status == 'publish' && !$this->get_id()) {
 				$old_status = 'wpi-pending';
 			}
 
-			if ( $old_status !== $new_status ) {
+			if ($old_status !== $new_status) {
 				$this->status_transition = array(
-					'from'   => ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $old_status,
+					'from'   => !empty($this->status_transition['from']) ? $this->status_transition['from'] : $old_status,
 					'to'     => $new_status,
 					'note'   => $note,
 					'manual' => (bool) $manual_update,
 				);
 
-				if ( $manual_update ) {
-					do_action( 'getpaid_' . $this->object_type . '_edit_status', $this->get_id(), $new_status );
+				if ($manual_update) {
+					do_action('getpaid_' . $this->object_type . '_edit_status', $this->get_id(), $new_status);
 				}
 
 				$this->maybe_set_date_paid();
@@ -2107,8 +2107,8 @@ 
 	 */
 	public function maybe_set_date_paid() {
 
-		if ( ! $this->get_date_completed( 'edit' ) && $this->is_paid() ) {
-			$this->set_date_completed( current_time( 'mysql' ) );
+		if (!$this->get_date_completed('edit') && $this->is_paid()) {
+			$this->set_date_completed(current_time('mysql'));
 		}
 	}
 
@@ -2117,11 +2117,11 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function set_parent_id( $value ) {
-		if ( $value && ( $value === $this->get_id() ) ) {
+	public function set_parent_id($value) {
+		if ($value && ($value === $this->get_id())) {
 			return;
 		}
-		$this->set_prop( 'parent_id', absint( $value ) );
+		$this->set_prop('parent_id', absint($value));
     }
 
     /**
@@ -2129,8 +2129,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+	public function set_version($value) {
+		$this->set_prop('version', $value);
     }
 
     /**
@@ -2140,15 +2140,15 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_created( $value ) {
-        $date = strtotime( $value );
+	public function set_date_created($value) {
+        $date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'date_created', date( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('date_created', date('Y-m-d H:i:s', $date));
             return true;
         }
 
-		$this->set_prop( 'date_created', '' );
+		$this->set_prop('date_created', '');
 		return false;
 
     }
@@ -2160,15 +2160,15 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_due_date( $value ) {
-        $date = strtotime( $value );
+	public function set_due_date($value) {
+        $date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'due_date', date( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('due_date', date('Y-m-d H:i:s', $date));
             return true;
         }
 
-		$this->set_prop( 'due_date', '' );
+		$this->set_prop('due_date', '');
         return false;
 
     }
@@ -2179,8 +2179,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_date_due( $value ) {
-		$this->set_due_date( $value );
+	public function set_date_due($value) {
+		$this->set_due_date($value);
     }
 
     /**
@@ -2190,15 +2190,15 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_completed_date( $value ) {
-        $date = strtotime( $value );
+	public function set_completed_date($value) {
+        $date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'completed_date', date( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('completed_date', date('Y-m-d H:i:s', $date));
             return true;
         }
 
-		$this->set_prop( 'completed_date', '' );
+		$this->set_prop('completed_date', '');
         return false;
 
     }
@@ -2209,8 +2209,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_date_completed( $value ) {
-		$this->set_completed_date( $value );
+	public function set_date_completed($value) {
+		$this->set_completed_date($value);
     }
 
     /**
@@ -2220,15 +2220,15 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_modified( $value ) {
-        $date = strtotime( $value );
+	public function set_date_modified($value) {
+        $date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'date_modified', date( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('date_modified', date('Y-m-d H:i:s', $date));
             return true;
         }
 
-		$this->set_prop( 'date_modified', '' );
+		$this->set_prop('date_modified', '');
         return false;
 
     }
@@ -2239,9 +2239,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New number.
 	 */
-	public function set_number( $value ) {
-        $number = sanitize_text_field( $value );
-		$this->set_prop( 'number', $number );
+	public function set_number($value) {
+        $number = sanitize_text_field($value);
+		$this->set_prop('number', $number);
     }
 
     /**
@@ -2250,9 +2250,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value Type.
 	 */
-	public function set_type( $value ) {
-        $type = sanitize_text_field( str_replace( 'wpi_', '', $value ) );
-		$this->set_prop( 'type', $type );
+	public function set_type($value) {
+        $type = sanitize_text_field(str_replace('wpi_', '', $value));
+		$this->set_prop('type', $type);
 	}
 
     /**
@@ -2261,10 +2261,10 @@ 
 	 * @since 1.0.19
 	 * @param  string $value Post type.
 	 */
-	public function set_post_type( $value ) {
-        if ( getpaid_is_invoice_post_type( $value ) ) {
-			$this->set_type( $value );
-            $this->set_prop( 'post_type', $value );
+	public function set_post_type($value) {
+        if (getpaid_is_invoice_post_type($value)) {
+			$this->set_type($value);
+            $this->set_prop('post_type', $value);
         }
     }
 
@@ -2274,9 +2274,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New key.
 	 */
-	public function set_key( $value ) {
-        $key = sanitize_text_field( $value );
-		$this->set_prop( 'key', $key );
+	public function set_key($value) {
+        $key = sanitize_text_field($value);
+		$this->set_prop('key', $key);
     }
 
     /**
@@ -2285,9 +2285,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value mode.
 	 */
-	public function set_mode( $value ) {
-        if ( in_array( $value, array( 'live', 'test' ) ) ) {
-            $this->set_prop( 'mode', $value );
+	public function set_mode($value) {
+        if (in_array($value, array('live', 'test'))) {
+            $this->set_prop('mode', $value);
         }
     }
 
@@ -2297,8 +2297,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value path.
 	 */
-	public function set_path( $value ) {
-        $this->set_prop( 'path', $value );
+	public function set_path($value) {
+        $this->set_prop('path', $value);
     }
 
     /**
@@ -2307,9 +2307,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_name( $value ) {
-        $name = sanitize_text_field( $value );
-		$this->set_prop( 'name', $name );
+	public function set_name($value) {
+        $name = sanitize_text_field($value);
+		$this->set_prop('name', $name);
     }
 
     /**
@@ -2318,8 +2318,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+	public function set_title($value) {
+		$this->set_name($value);
     }
 
     /**
@@ -2328,9 +2328,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New description.
 	 */
-	public function set_description( $value ) {
-        $description = wp_kses_post( $value );
-		$this->set_prop( 'description', $description );
+	public function set_description($value) {
+        $description = wp_kses_post($value);
+		$this->set_prop('description', $description);
     }
 
     /**
@@ -2339,8 +2339,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New description.
 	 */
-	public function set_excerpt( $value ) {
-		$this->set_description( $value );
+	public function set_excerpt($value) {
+		$this->set_description($value);
     }
 
     /**
@@ -2349,8 +2349,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New description.
 	 */
-	public function set_summary( $value ) {
-		$this->set_description( $value );
+	public function set_summary($value) {
+		$this->set_description($value);
     }
 
     /**
@@ -2359,12 +2359,12 @@ 
 	 * @since 1.0.19
 	 * @param  int $value New author.
 	 */
-	public function set_author( $value ) {
-		$user = get_user_by( 'id', (int) $value );
+	public function set_author($value) {
+		$user = get_user_by('id', (int) $value);
 
-		if ( $user && $user->ID ) {
-			$this->set_prop( 'author', $user->ID );
-			$this->set_prop( 'email', $user->user_email );
+		if ($user && $user->ID) {
+			$this->set_prop('author', $user->ID);
+			$this->set_prop('email', $user->user_email);
 		}
 
     }
@@ -2375,8 +2375,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value New user id.
 	 */
-	public function set_user_id( $value ) {
-		$this->set_author( $value );
+	public function set_user_id($value) {
+		$this->set_author($value);
     }
 
     /**
@@ -2385,8 +2385,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value New user id.
 	 */
-	public function set_customer_id( $value ) {
-		$this->set_prop( 'customer_id', (int) $value );
+	public function set_customer_id($value) {
+		$this->set_prop('customer_id', (int) $value);
     }
 
     /**
@@ -2395,8 +2395,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value ip address.
 	 */
-	public function set_ip( $value ) {
-		$this->set_prop( 'ip', $value );
+	public function set_ip($value) {
+		$this->set_prop('ip', $value);
     }
 
     /**
@@ -2405,8 +2405,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value ip address.
 	 */
-	public function set_user_ip( $value ) {
-		$this->set_ip( $value );
+	public function set_user_ip($value) {
+		$this->set_ip($value);
     }
 
     /**
@@ -2415,8 +2415,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value first name.
 	 */
-	public function set_first_name( $value ) {
-		$this->set_prop( 'first_name', $value );
+	public function set_first_name($value) {
+		$this->set_prop('first_name', $value);
     }
 
     /**
@@ -2425,8 +2425,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value first name.
 	 */
-	public function set_user_first_name( $value ) {
-		$this->set_first_name( $value );
+	public function set_user_first_name($value) {
+		$this->set_first_name($value);
     }
 
     /**
@@ -2435,8 +2435,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value first name.
 	 */
-	public function set_customer_first_name( $value ) {
-		$this->set_first_name( $value );
+	public function set_customer_first_name($value) {
+		$this->set_first_name($value);
     }
 
     /**
@@ -2445,8 +2445,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value last name.
 	 */
-	public function set_last_name( $value ) {
-		$this->set_prop( 'last_name', $value );
+	public function set_last_name($value) {
+		$this->set_prop('last_name', $value);
     }
 
     /**
@@ -2455,8 +2455,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value last name.
 	 */
-	public function set_user_last_name( $value ) {
-		$this->set_last_name( $value );
+	public function set_user_last_name($value) {
+		$this->set_last_name($value);
     }
 
     /**
@@ -2465,8 +2465,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value last name.
 	 */
-	public function set_customer_last_name( $value ) {
-		$this->set_last_name( $value );
+	public function set_customer_last_name($value) {
+		$this->set_last_name($value);
     }
 
     /**
@@ -2475,8 +2475,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value phone.
 	 */
-	public function set_phone( $value ) {
-		$this->set_prop( 'phone', $value );
+	public function set_phone($value) {
+		$this->set_prop('phone', $value);
     }
 
     /**
@@ -2485,8 +2485,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value phone.
 	 */
-	public function set_user_phone( $value ) {
-		$this->set_phone( $value );
+	public function set_user_phone($value) {
+		$this->set_phone($value);
     }
 
     /**
@@ -2495,8 +2495,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value phone.
 	 */
-	public function set_customer_phone( $value ) {
-		$this->set_phone( $value );
+	public function set_customer_phone($value) {
+		$this->set_phone($value);
     }
 
     /**
@@ -2505,8 +2505,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value phone.
 	 */
-	public function set_phone_number( $value ) {
-		$this->set_phone( $value );
+	public function set_phone_number($value) {
+		$this->set_phone($value);
     }
 
     /**
@@ -2515,8 +2515,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value email address.
 	 */
-	public function set_email( $value ) {
-		$this->set_prop( 'email', $value );
+	public function set_email($value) {
+		$this->set_prop('email', $value);
     }
 
     /**
@@ -2525,8 +2525,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value email address.
 	 */
-	public function set_user_email( $value ) {
-		$this->set_email( $value );
+	public function set_user_email($value) {
+		$this->set_email($value);
     }
 
     /**
@@ -2535,8 +2535,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value email address.
 	 */
-	public function set_email_address( $value ) {
-		$this->set_email( $value );
+	public function set_email_address($value) {
+		$this->set_email($value);
     }
 
     /**
@@ -2545,8 +2545,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value email address.
 	 */
-	public function set_customer_email( $value ) {
-		$this->set_email( $value );
+	public function set_customer_email($value) {
+		$this->set_email($value);
     }
 
     /**
@@ -2555,8 +2555,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value country.
 	 */
-	public function set_country( $value ) {
-		$this->set_prop( 'country', $value );
+	public function set_country($value) {
+		$this->set_prop('country', $value);
     }
 
     /**
@@ -2565,8 +2565,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value country.
 	 */
-	public function set_user_country( $value ) {
-		$this->set_country( $value );
+	public function set_user_country($value) {
+		$this->set_country($value);
     }
 
     /**
@@ -2575,8 +2575,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value country.
 	 */
-	public function set_customer_country( $value ) {
-		$this->set_country( $value );
+	public function set_customer_country($value) {
+		$this->set_country($value);
     }
 
     /**
@@ -2585,8 +2585,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value state.
 	 */
-	public function set_state( $value ) {
-		$this->set_prop( 'state', $value );
+	public function set_state($value) {
+		$this->set_prop('state', $value);
     }
 
     /**
@@ -2595,8 +2595,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value state.
 	 */
-	public function set_user_state( $value ) {
-		$this->set_state( $value );
+	public function set_user_state($value) {
+		$this->set_state($value);
     }
 
     /**
@@ -2605,8 +2605,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value state.
 	 */
-	public function set_customer_state( $value ) {
-		$this->set_state( $value );
+	public function set_customer_state($value) {
+		$this->set_state($value);
     }
 
     /**
@@ -2615,8 +2615,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value city.
 	 */
-	public function set_city( $value ) {
-		$this->set_prop( 'city', $value );
+	public function set_city($value) {
+		$this->set_prop('city', $value);
     }
 
     /**
@@ -2625,8 +2625,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value city.
 	 */
-	public function set_user_city( $value ) {
-		$this->set_city( $value );
+	public function set_user_city($value) {
+		$this->set_city($value);
     }
 
     /**
@@ -2635,8 +2635,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value city.
 	 */
-	public function set_customer_city( $value ) {
-		$this->set_city( $value );
+	public function set_customer_city($value) {
+		$this->set_city($value);
     }
 
     /**
@@ -2645,8 +2645,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value zip.
 	 */
-	public function set_zip( $value ) {
-		$this->set_prop( 'zip', $value );
+	public function set_zip($value) {
+		$this->set_prop('zip', $value);
     }
 
     /**
@@ -2655,8 +2655,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value zip.
 	 */
-	public function set_user_zip( $value ) {
-		$this->set_zip( $value );
+	public function set_user_zip($value) {
+		$this->set_zip($value);
     }
 
     /**
@@ -2665,8 +2665,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value zip.
 	 */
-	public function set_customer_zip( $value ) {
-		$this->set_zip( $value );
+	public function set_customer_zip($value) {
+		$this->set_zip($value);
     }
 
     /**
@@ -2675,8 +2675,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value company.
 	 */
-	public function set_company( $value ) {
-		$this->set_prop( 'company', $value );
+	public function set_company($value) {
+		$this->set_prop('company', $value);
     }
 
     /**
@@ -2685,8 +2685,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value company.
 	 */
-	public function set_user_company( $value ) {
-		$this->set_company( $value );
+	public function set_user_company($value) {
+		$this->set_company($value);
     }
 
     /**
@@ -2695,8 +2695,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value company.
 	 */
-	public function set_customer_company( $value ) {
-		$this->set_company( $value );
+	public function set_customer_company($value) {
+		$this->set_company($value);
     }
 
 	/**
@@ -2705,8 +2705,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value company id.
 	 */
-	public function set_company_id( $value ) {
-		$this->set_prop( 'company_id', $value );
+	public function set_company_id($value) {
+		$this->set_prop('company_id', $value);
     }
 
     /**
@@ -2715,8 +2715,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value var number.
 	 */
-	public function set_vat_number( $value ) {
-		$this->set_prop( 'vat_number', $value );
+	public function set_vat_number($value) {
+		$this->set_prop('vat_number', $value);
     }
 
     /**
@@ -2725,8 +2725,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value var number.
 	 */
-	public function set_user_vat_number( $value ) {
-		$this->set_vat_number( $value );
+	public function set_user_vat_number($value) {
+		$this->set_vat_number($value);
     }
 
     /**
@@ -2735,8 +2735,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value var number.
 	 */
-	public function set_customer_vat_number( $value ) {
-		$this->set_vat_number( $value );
+	public function set_customer_vat_number($value) {
+		$this->set_vat_number($value);
     }
 
     /**
@@ -2745,8 +2745,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value var rate.
 	 */
-	public function set_vat_rate( $value ) {
-		$this->set_prop( 'vat_rate', $value );
+	public function set_vat_rate($value) {
+		$this->set_prop('vat_rate', $value);
     }
 
     /**
@@ -2755,8 +2755,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value var number.
 	 */
-	public function set_user_vat_rate( $value ) {
-		$this->set_vat_rate( $value );
+	public function set_user_vat_rate($value) {
+		$this->set_vat_rate($value);
     }
 
     /**
@@ -2765,8 +2765,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value var number.
 	 */
-	public function set_customer_vat_rate( $value ) {
-		$this->set_vat_rate( $value );
+	public function set_customer_vat_rate($value) {
+		$this->set_vat_rate($value);
     }
 
     /**
@@ -2775,8 +2775,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value address.
 	 */
-	public function set_address( $value ) {
-		$this->set_prop( 'address', $value );
+	public function set_address($value) {
+		$this->set_prop('address', $value);
     }
 
     /**
@@ -2785,8 +2785,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value address.
 	 */
-	public function set_user_address( $value ) {
-		$this->set_address( $value );
+	public function set_user_address($value) {
+		$this->set_address($value);
     }
 
     /**
@@ -2795,8 +2795,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value address.
 	 */
-	public function set_customer_address( $value ) {
-		$this->set_address( $value );
+	public function set_customer_address($value) {
+		$this->set_address($value);
     }
 
     /**
@@ -2805,8 +2805,8 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value confirmed.
 	 */
-	public function set_is_viewed( $value ) {
-		$this->set_prop( 'is_viewed', $value );
+	public function set_is_viewed($value) {
+		$this->set_prop('is_viewed', $value);
 	}
 
 	/**
@@ -2815,8 +2815,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value email recipients.
 	 */
-	public function set_email_cc( $value ) {
-		$this->set_prop( 'email_cc', $value );
+	public function set_email_cc($value) {
+		$this->set_prop('email_cc', $value);
 	}
 
 	/**
@@ -2825,9 +2825,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value template.
 	 */
-	public function set_template( $value ) {
-		if ( in_array( $value, array( 'quantity', 'hours', 'amount' ) ) ) {
-			$this->set_prop( 'template', $value );
+	public function set_template($value) {
+		if (in_array($value, array('quantity', 'hours', 'amount'))) {
+			$this->set_prop('template', $value);
 		}
 	}
 
@@ -2838,8 +2838,8 @@ 
 	 * @param  string $value source.
 	 * @deprecated
 	 */
-	public function created_via( $value ) {
-		$this->set_created_via( sanitize_text_field( $value ) );
+	public function created_via($value) {
+		$this->set_created_via(sanitize_text_field($value));
 	}
 
 	/**
@@ -2848,8 +2848,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value source.
 	 */
-	public function set_created_via( $value ) {
-		$this->set_prop( 'created_via', sanitize_text_field( $value ) );
+	public function set_created_via($value) {
+		$this->set_prop('created_via', sanitize_text_field($value));
 	}
 
 	/**
@@ -2858,8 +2858,8 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value confirmed.
 	 */
-	public function set_address_confirmed( $value ) {
-		$this->set_prop( 'address_confirmed', $value );
+	public function set_address_confirmed($value) {
+		$this->set_prop('address_confirmed', $value);
     }
 
     /**
@@ -2868,8 +2868,8 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value confirmed.
 	 */
-	public function set_user_address_confirmed( $value ) {
-		$this->set_address_confirmed( $value );
+	public function set_user_address_confirmed($value) {
+		$this->set_address_confirmed($value);
     }
 
     /**
@@ -2878,8 +2878,8 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value confirmed.
 	 */
-	public function set_customer_address_confirmed( $value ) {
-		$this->set_address_confirmed( $value );
+	public function set_customer_address_confirmed($value) {
+		$this->set_address_confirmed($value);
     }
 
     /**
@@ -2888,13 +2888,13 @@ 
 	 * @since 1.0.19
 	 * @param  float $value shipping amount.
 	 */
-	public function set_shipping( $value ) {
+	public function set_shipping($value) {
 
-		if ( ! is_numeric( $value ) ) {
-			return $this->set_prop( 'shipping', null );
+		if (!is_numeric($value)) {
+			return $this->set_prop('shipping', null);
 		}
 
-		$this->set_prop( 'shipping', max( 0, floatval( $value ) ) );
+		$this->set_prop('shipping', max(0, floatval($value)));
 	}
 
 	/**
@@ -2903,8 +2903,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value sub total.
 	 */
-	public function set_subtotal( $value ) {
-		$this->set_prop( 'subtotal', max( 0, $value ) );
+	public function set_subtotal($value) {
+		$this->set_prop('subtotal', max(0, $value));
 	}
 
 	/**
@@ -2913,8 +2913,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value sub total.
 	 */
-	public function set_total( $value ) {
-		$this->set_prop( 'total', max( 0, $value ) );
+	public function set_total($value) {
+		$this->set_prop('total', max(0, $value));
     }
 
     /**
@@ -2923,8 +2923,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value discount total.
 	 */
-	public function set_total_discount( $value ) {
-		$this->set_prop( 'total_discount', max( 0, $value ) );
+	public function set_total_discount($value) {
+		$this->set_prop('total_discount', max(0, $value));
     }
 
     /**
@@ -2933,8 +2933,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value discount total.
 	 */
-	public function set_discount( $value ) {
-		$this->set_total_discount( $value );
+	public function set_discount($value) {
+		$this->set_total_discount($value);
     }
 
     /**
@@ -2943,8 +2943,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value tax total.
 	 */
-	public function set_total_tax( $value ) {
-		$this->set_prop( 'total_tax', max( 0, $value ) );
+	public function set_total_tax($value) {
+		$this->set_prop('total_tax', max(0, $value));
     }
 
     /**
@@ -2953,8 +2953,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value tax total.
 	 */
-	public function set_tax_total( $value ) {
-		$this->set_total_tax( $value );
+	public function set_tax_total($value) {
+		$this->set_total_tax($value);
     }
 
     /**
@@ -2963,8 +2963,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value fees total.
 	 */
-	public function set_total_fees( $value ) {
-		$this->set_prop( 'total_fees', max( 0, $value ) );
+	public function set_total_fees($value) {
+		$this->set_prop('total_fees', max(0, $value));
     }
 
     /**
@@ -2973,8 +2973,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value fees total.
 	 */
-	public function set_fees_total( $value ) {
-		$this->set_total_fees( $value );
+	public function set_fees_total($value) {
+		$this->set_total_fees($value);
     }
 
     /**
@@ -2983,13 +2983,13 @@ 
 	 * @since 1.0.19
 	 * @param  array $value fees.
 	 */
-	public function set_fees( $value ) {
+	public function set_fees($value) {
 
-		if ( ! is_array( $value ) ) {
+		if (!is_array($value)) {
 			$value = array();
 		}
 
-		$this->set_prop( 'fees', $value );
+		$this->set_prop('fees', $value);
 
     }
 
@@ -2999,13 +2999,13 @@ 
 	 * @since 1.0.19
 	 * @param  array $value taxes.
 	 */
-	public function set_taxes( $value ) {
+	public function set_taxes($value) {
 
-		if ( ! is_array( $value ) ) {
+		if (!is_array($value)) {
 			$value = array();
 		}
 
-		$this->set_prop( 'taxes', $value );
+		$this->set_prop('taxes', $value);
 
     }
 
@@ -3015,13 +3015,13 @@ 
 	 * @since 1.0.19
 	 * @param  array $value discounts.
 	 */
-	public function set_discounts( $value ) {
+	public function set_discounts($value) {
 
-		if ( ! is_array( $value ) ) {
+		if (!is_array($value)) {
 			$value = array();
 		}
 
-		$this->set_prop( 'discounts', $value );
+		$this->set_prop('discounts', $value);
     }
 
     /**
@@ -3030,19 +3030,19 @@ 
 	 * @since 1.0.19
 	 * @param  GetPaid_Form_Item[] $value items.
 	 */
-	public function set_items( $value ) {
+	public function set_items($value) {
 
         // Remove existing items.
-        $this->set_prop( 'items', array() );
+        $this->set_prop('items', array());
 		$this->recurring_item = null;
 
         // Ensure that we have an array.
-        if ( ! is_array( $value ) ) {
+        if (!is_array($value)) {
             return;
         }
 
-        foreach ( $value as $item ) {
-            $this->add_item( $item );
+        foreach ($value as $item) {
+            $this->add_item($item);
         }
 
     }
@@ -3053,8 +3053,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value payment form.
 	 */
-	public function set_payment_form( $value ) {
-		$this->set_prop( 'payment_form', $value );
+	public function set_payment_form($value) {
+		$this->set_prop('payment_form', $value);
     }
 
     /**
@@ -3063,8 +3063,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value submission id.
 	 */
-	public function set_submission_id( $value ) {
-		$this->set_prop( 'submission_id', $value );
+	public function set_submission_id($value) {
+		$this->set_prop('submission_id', $value);
     }
 
     /**
@@ -3073,8 +3073,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value discount code.
 	 */
-	public function set_discount_code( $value ) {
-		$this->set_prop( 'discount_code', sanitize_text_field( $value ) );
+	public function set_discount_code($value) {
+		$this->set_prop('discount_code', sanitize_text_field($value));
     }
 
     /**
@@ -3083,8 +3083,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value gateway.
 	 */
-	public function set_gateway( $value ) {
-		$this->set_prop( 'gateway', $value );
+	public function set_gateway($value) {
+		$this->set_prop('gateway', $value);
     }
 
     /**
@@ -3093,9 +3093,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value transaction id.
 	 */
-	public function set_transaction_id( $value ) {
-		if ( ! empty( $value ) ) {
-			$this->set_prop( 'transaction_id', $value );
+	public function set_transaction_id($value) {
+		if (!empty($value)) {
+			$this->set_prop('transaction_id', $value);
 		}
     }
 
@@ -3105,8 +3105,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value currency id.
 	 */
-	public function set_currency( $value ) {
-		$this->set_prop( 'currency', $value );
+	public function set_currency($value) {
+		$this->set_prop('currency', $value);
     }
 
 	/**
@@ -3115,8 +3115,8 @@ 
 	 * @since 1.0.19
 	 * @param  bool $value value.
 	 */
-	public function set_disable_taxes( $value ) {
-		$this->set_prop( 'disable_taxes', (bool) $value );
+	public function set_disable_taxes($value) {
+		$this->set_prop('disable_taxes', (bool) $value);
 	}
 
     /**
@@ -3125,8 +3125,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value subscription id.
 	 */
-	public function set_subscription_id( $value ) {
-		$this->set_prop( 'subscription_id', $value );
+	public function set_subscription_id($value) {
+		$this->set_prop('subscription_id', $value);
 	}
 
 	/**
@@ -3135,8 +3135,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value subscription id.
 	 */
-	public function set_remote_subscription_id( $value ) {
-		$this->set_prop( 'remote_subscription_id', $value );
+	public function set_remote_subscription_id($value) {
+		$this->set_prop('remote_subscription_id', $value);
     }
 
 	/**
@@ -3145,8 +3145,8 @@ 
 	 * @since 2.8.22
 	 * @param  bool $is_anonymized is anonymized.
 	 */
-	public function set_is_anonymized( $is_anonymized ) {
-		$this->set_prop( 'is_anonymized', (bool) $is_anonymized );
+	public function set_is_anonymized($is_anonymized) {
+		$this->set_prop('is_anonymized', (bool) $is_anonymized);
     }
 
     /*
@@ -3163,28 +3163,28 @@ 
      */
     public function is_parent() {
         $parent = $this->get_parent_id();
-        return apply_filters( 'wpinv_invoice_is_parent', empty( $parent ), $this );
+        return apply_filters('wpinv_invoice_is_parent', empty($parent), $this);
     }
 
     /**
      * Checks if this is a renewal invoice.
      */
     public function is_renewal() {
-        return $this->is_recurring() && ! $this->is_parent();
+        return $this->is_recurring() && !$this->is_parent();
     }
 
     /**
      * Checks if this is a recurring invoice.
      */
     public function is_recurring() {
-        return ! empty( $this->recurring_item );
+        return !empty($this->recurring_item);
     }
 
     /**
      * Checks if this is a taxable invoice.
      */
     public function is_taxable() {
-        return ! $this->get_disable_taxes();
+        return !$this->get_disable_taxes();
 	}
 
 	/**
@@ -3198,45 +3198,45 @@ 
 	 * Checks to see if the invoice requires payment.
 	 */
 	public function is_free() {
-        $is_free = ( (float) wpinv_round_amount( $this->get_initial_total() ) == 0 );
+        $is_free = ((float) wpinv_round_amount($this->get_initial_total()) == 0);
 
-		if ( $this->is_recurring() && $this->get_recurring_total() > 0 ) {
+		if ($this->is_recurring() && $this->get_recurring_total() > 0) {
 			$is_free = false;
 		}
 
-        return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
+        return apply_filters('wpinv_invoice_is_free', $is_free, $this);
     }
 
     /**
      * Checks if the invoice is paid.
      */
     public function is_paid() {
-        $is_paid = $this->has_status( array( 'publish', 'wpi-processing', 'wpi-renewal' ) );
-        return apply_filters( 'wpinv_invoice_is_paid', $is_paid, $this );
+        $is_paid = $this->has_status(array('publish', 'wpi-processing', 'wpi-renewal'));
+        return apply_filters('wpinv_invoice_is_paid', $is_paid, $this);
 	}
 
 	/**
      * Checks if the invoice needs payment.
      */
 	public function needs_payment() {
-		$needs_payment = ! $this->is_paid() && ! $this->is_refunded() && ! $this->is_free();
-        return apply_filters( 'wpinv_needs_payment', $needs_payment, $this );
+		$needs_payment = !$this->is_paid() && !$this->is_refunded() && !$this->is_free();
+        return apply_filters('wpinv_needs_payment', $needs_payment, $this);
     }
 
 	/**
      * Checks if the invoice is refunded.
      */
 	public function is_refunded() {
-        $is_refunded = $this->has_status( 'wpi-refunded' );
-        return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
+        $is_refunded = $this->has_status('wpi-refunded');
+        return apply_filters('wpinv_invoice_is_refunded', $is_refunded, $this);
 	}
 
 	/**
      * Checks if the invoice is held.
      */
 	public function is_held() {
-        $is_held = $this->has_status( 'wpi-onhold' );
-        return apply_filters( 'wpinv_invoice_is_held', $is_held, $this );
+        $is_held = $this->has_status('wpi-onhold');
+        return apply_filters('wpinv_invoice_is_held', $is_held, $this);
 	}
 
 	/**
@@ -3244,30 +3244,30 @@ 
      */
 	public function is_due() {
 		$due_date = $this->get_due_date();
-		return empty( $due_date ) ? false : current_time( 'timestamp' ) > strtotime( $due_date );
+		return empty($due_date) ? false : current_time('timestamp') > strtotime($due_date);
 	}
 
 	/**
      * Checks if the invoice is draft.
      */
 	public function is_draft() {
-        return $this->has_status( 'draft, auto-draft' );
+        return $this->has_status('draft, auto-draft');
 	}
 
     /**
      * Checks if the invoice has a given status.
      */
-    public function has_status( $status ) {
-        $status = wpinv_parse_list( $status );
-        return apply_filters( 'wpinv_has_status', in_array( $this->get_status(), $status ), $status );
+    public function has_status($status) {
+        $status = wpinv_parse_list($status);
+        return apply_filters('wpinv_has_status', in_array($this->get_status(), $status), $status);
 	}
 
 	/**
      * Checks if the invoice is of a given type.
      */
-    public function is_type( $type ) {
-        $type = wpinv_parse_list( $type );
-        return in_array( $this->get_type(), $type );
+    public function is_type($type) {
+        $type = wpinv_parse_list($type);
+        return in_array($this->get_type(), $type);
     }
 
     /**
@@ -3299,8 +3299,8 @@ 
      *
      */
 	public function is_initial_free() {
-        $is_initial_free = ! ( (float) wpinv_round_amount( $this->get_initial_total() ) > 0 );
-        return apply_filters( 'wpinv_invoice_is_initial_free', $is_initial_free, $this->get_cart_details(), $this );
+        $is_initial_free = !((float) wpinv_round_amount($this->get_initial_total()) > 0);
+        return apply_filters('wpinv_invoice_is_initial_free', $is_initial_free, $this->get_cart_details(), $this);
     }
 
 	/**
@@ -3310,11 +3310,11 @@ 
     public function item_has_free_trial() {
 
         // Ensure we have a recurring item.
-        if ( ! $this->is_recurring() ) {
+        if (!$this->is_recurring()) {
             return false;
         }
 
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
         return $item->has_free_trial();
 	}
 
@@ -3322,7 +3322,7 @@ 
      * Check if the free trial is a result of a discount.
      */
     public function is_free_trial_from_discount() {
-		return $this->has_free_trial() && ! $this->item_has_free_trial();
+		return $this->has_free_trial() && !$this->item_has_free_trial();
 	}
 
 	/**
@@ -3339,12 +3339,12 @@ 
      */
     public function discount_first_payment_only() {
 
-		$discount = wpinv_get_discount_obj( $this->get_discount_code() );
-        if ( ! $discount->exists() || ! $this->is_recurring() ) {
+		$discount = wpinv_get_discount_obj($this->get_discount_code());
+        if (!$discount->exists() || !$this->is_recurring()) {
             return true;
         }
 
-        return ! $discount->get_is_recurring();
+        return !$discount->get_is_recurring();
     }
 
     /*
@@ -3362,23 +3362,23 @@ 
      * @param GetPaid_Form_Item|array $item
      * @return WP_Error|Bool
      */
-    public function add_item( $item ) {
+    public function add_item($item) {
 
-		if ( is_array( $item ) ) {
-			$item = $this->process_array_item( $item );
+		if (is_array($item)) {
+			$item = $this->process_array_item($item);
 		}
 
-		if ( is_numeric( $item ) ) {
-			$item = new GetPaid_Form_Item( $item );
+		if (is_numeric($item)) {
+			$item = new GetPaid_Form_Item($item);
 		}
 
         // Make sure that it is available for purchase.
-		if ( $item->get_id() > 0 && ! $item->can_purchase() ) {
-			return new WP_Error( 'invalid_item', __( 'This item is not available for purchase', 'invoicing' ) );
+		if ($item->get_id() > 0 && !$item->can_purchase()) {
+			return new WP_Error('invalid_item', __('This item is not available for purchase', 'invoicing'));
         }
 
         // Do we have a recurring item?
-		if ( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 			$this->recurring_item = $item->get_id();
         }
 
@@ -3386,9 +3386,9 @@ 
         $item->invoice_id = (int) $this->get_id();
 
 		// Remove duplicates.
-		$this->remove_item( $item->get_id() );
+		$this->remove_item($item->get_id());
 
-		if ( 0 == $item->get_quantity() ) {
+		if (0 == $item->get_quantity()) {
 			return;
 		}
 
@@ -3398,7 +3398,7 @@ 
 		// Add new item.
         $items[] = $item;
 
-        $this->set_prop( 'items', $items );
+        $this->set_prop('items', $items);
 
 		return true;
 	}
@@ -3409,26 +3409,26 @@ 
 	 * @since 1.0.19
 	 * @return GetPaid_Form_Item
 	 */
-	protected function process_array_item( $array ) {
+	protected function process_array_item($array) {
 
-		$item_id = isset( $array['item_id'] ) ? $array['item_id'] : 0;
-		$item    = new GetPaid_Form_Item( $item_id );
+		$item_id = isset($array['item_id']) ? $array['item_id'] : 0;
+		$item    = new GetPaid_Form_Item($item_id);
 
 		// Set item data.
-		foreach ( array( 'name', 'price', 'description' ) as $key ) {
-			if ( isset( $array[ "item_$key" ] ) ) {
+		foreach (array('name', 'price', 'description') as $key) {
+			if (isset($array["item_$key"])) {
 				$method = "set_$key";
-				$item->$method( $array[ "item_$key" ] );
+				$item->$method($array["item_$key"]);
 			}
 		}
 
-		if ( isset( $array['quantity'] ) ) {
-			$item->set_quantity( $array['quantity'] );
+		if (isset($array['quantity'])) {
+			$item->set_quantity($array['quantity']);
 		}
 
 		// Set item meta.
-		if ( isset( $array['meta'] ) && is_array( $array['meta'] ) ) {
-			$item->set_item_meta( $array['meta'] );
+		if (isset($array['meta']) && is_array($array['meta'])) {
+			$item->set_item_meta($array['meta']);
 		}
 
 		return $item;
@@ -3441,10 +3441,10 @@ 
 	 * @since 1.0.19
 	 * @return GetPaid_Form_Item|null
 	 */
-	public function get_item( $item_id ) {
+	public function get_item($item_id) {
 
-		foreach ( $this->get_items() as $item ) {
-			if ( (int) $item_id == $item->get_id() ) {
+		foreach ($this->get_items() as $item) {
+			if ((int) $item_id == $item->get_id()) {
 				return $item;
 			}
 		}
@@ -3457,16 +3457,16 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_item( $item_id ) {
+	public function remove_item($item_id) {
 		$items   = $this->get_items();
 		$item_id = (int) $item_id;
 
-		foreach ( $items as $index => $item ) {
-			if ( (int) $item_id == $item->get_id() ) {
-				unset( $items[ $index ] );
-				$this->set_prop( 'items', $items );
+		foreach ($items as $index => $item) {
+			if ((int) $item_id == $item->get_id()) {
+				unset($items[$index]);
+				$this->set_prop('items', $items);
 
-				if ( $item_id == $this->recurring_item ) {
+				if ($item_id == $this->recurring_item) {
 					$this->recurring_item = null;
 				}
 }
@@ -3480,11 +3480,11 @@ 
 	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
 	 * @since 1.0.19
 	 */
-    public function add_fee( $fee ) {
+    public function add_fee($fee) {
 
 		$fees                 = $this->get_fees();
-		$fees[ $fee['name'] ] = $fee;
-		$this->set_prop( 'fees', $fees );
+		$fees[$fee['name']] = $fee;
+		$this->set_prop('fees', $fees);
 
     }
 
@@ -3493,9 +3493,9 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function get_fee( $fee ) {
+	public function get_fee($fee) {
         $fees = $this->get_fees();
-		return isset( $fees[ $fee ] ) ? $fees[ $fee ] : null;
+		return isset($fees[$fee]) ? $fees[$fee] : null;
     }
 
     /**
@@ -3503,11 +3503,11 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_fee( $fee ) {
+	public function remove_fee($fee) {
         $fees = $this->get_fees();
-        if ( isset( $fees[ $fee ] ) ) {
-            unset( $fees[ $fee ] );
-            $this->set_prop( 'fees', $fees );
+        if (isset($fees[$fee])) {
+            unset($fees[$fee]);
+            $this->set_prop('fees', $fees);
         }
     }
 
@@ -3517,11 +3517,11 @@ 
 	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
 	 * @since 1.0.19
 	 */
-	public function add_discount( $discount ) {
+	public function add_discount($discount) {
 
 		$discounts = $this->get_discounts();
-		$discounts[ $discount['name'] ] = $discount;
-		$this->set_prop( 'discounts', $discounts );
+		$discounts[$discount['name']] = $discount;
+		$this->set_prop('discounts', $discounts);
 
 	}
 
@@ -3531,15 +3531,15 @@ 
 	 * @since 1.0.19
 	 * @return float
 	 */
-	public function get_discount( $discount = false ) {
+	public function get_discount($discount = false) {
 
 		// Backwards compatibility.
-		if ( empty( $discount ) ) {
+		if (empty($discount)) {
 			return $this->get_total_discount();
 		}
 
         $discounts = $this->get_discounts();
-		return isset( $discounts[ $discount ] ) ? $discounts[ $discount ] : null;
+		return isset($discounts[$discount]) ? $discounts[$discount] : null;
     }
 
     /**
@@ -3547,15 +3547,15 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_discount( $discount ) {
+	public function remove_discount($discount) {
         $discounts = $this->get_discounts();
-        if ( isset( $discounts[ $discount ] ) ) {
-            unset( $discounts[ $discount ] );
-            $this->set_prop( 'discounts', $discounts );
+        if (isset($discounts[$discount])) {
+            unset($discounts[$discount]);
+            $this->set_prop('discounts', $discounts);
         }
 
-		if ( 'discount_code' == $discount ) {
-			foreach ( $this->get_items() as $item ) {
+		if ('discount_code' == $discount) {
+			foreach ($this->get_items() as $item) {
 				$item->item_discount           = 0;
 				$item->recurring_item_discount = 0;
 			}
@@ -3568,12 +3568,12 @@ 
      *
      * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
      */
-    public function add_tax( $tax ) {
-        if ( $this->is_taxable() ) {
+    public function add_tax($tax) {
+        if ($this->is_taxable()) {
 
-            $taxes                 = $this->get_taxes();
-			$taxes[ $tax['name'] ] = $tax;
-			$this->set_prop( 'taxes', $tax );
+            $taxes = $this->get_taxes();
+			$taxes[$tax['name']] = $tax;
+			$this->set_prop('taxes', $tax);
 
         }
     }
@@ -3583,29 +3583,29 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function get_tax( $tax = null ) {
+	public function get_tax($tax = null) {
 
 		// Backwards compatibility.
-		if ( empty( $tax ) ) {
+		if (empty($tax)) {
 			return $this->get_total_tax();
 		}
 
         $taxes = $this->get_taxes();
-		return isset( $taxes[ $tax ] ) ? $taxes[ $tax ] : null;
+		return isset($taxes[$tax]) ? $taxes[$tax] : null;
     }
 
-	public function get_tax_total_by_name( $name ) {
-		if ( $name && 0 === strpos( $name, 'tax__' ) ) {
-			$name = str_replace( 'tax__', '', $name );
+	public function get_tax_total_by_name($name) {
+		if ($name && 0 === strpos($name, 'tax__')) {
+			$name = str_replace('tax__', '', $name);
 		}
 
-		if ( empty( $name ) ) {
+		if (empty($name)) {
 			return 0;
 		}
 
-		$tax = $this->get_tax( $name );
+		$tax = $this->get_tax($name);
 
-		if ( empty( $tax ) ) {
+		if (empty($tax)) {
 			return 0;
 		}
 
@@ -3617,18 +3617,18 @@ 
 	 *
 	 * @since 2.8.8
 	 */
-	public function get_tax_item_name( $tax_key, $tax_item, $suffix = '' ) {
-		$tax_name = _x( 'Tax', 'Tax name', 'invoicing' );
+	public function get_tax_item_name($tax_key, $tax_item, $suffix = '') {
+		$tax_name = _x('Tax', 'Tax name', 'invoicing');
 
-		if ( ! empty( $tax_item ) && is_array( $tax_item ) && ! empty( $tax_item['name'] ) ) {
-			$tax_name = __( $tax_item['name'], 'invoicing' );
+		if (!empty($tax_item) && is_array($tax_item) && !empty($tax_item['name'])) {
+			$tax_name = __($tax_item['name'], 'invoicing');
 		}
 
-		if ( $suffix ) {
+		if ($suffix) {
 			$tax_name .= $suffix;
 		}
 
-		return apply_filters( 'wpinv_invoice_get_tax_name', $tax_name, $this, $tax_key, $tax_item, $suffix );
+		return apply_filters('wpinv_invoice_get_tax_name', $tax_name, $this, $tax_key, $tax_item, $suffix);
 	}
 
 	/**
@@ -3636,44 +3636,44 @@ 
 	 *
 	 * @since 2.8.8
 	 */
-	public function get_tax_item_amount( $tax_key, $tax_item, $with_currency = false ) {
-		$tax_amount = $this->get_tax_total_by_name( $tax_key );
+	public function get_tax_item_amount($tax_key, $tax_item, $with_currency = false) {
+		$tax_amount = $this->get_tax_total_by_name($tax_key);
 
-		if ( $with_currency ) {
-			$tax_amount = wpinv_price( $tax_amount, $this->get_currency() );
+		if ($with_currency) {
+			$tax_amount = wpinv_price($tax_amount, $this->get_currency());
 		}
 
-		return apply_filters( 'wpinv_invoice_get_tax_amount', $tax_amount, $this, $tax_item, $with_currency );
+		return apply_filters('wpinv_invoice_get_tax_amount', $tax_amount, $this, $tax_item, $with_currency);
 	}
 
-	public function get_item_tax_name( $percentage = true, $sep = ' + ' ) {
+	public function get_item_tax_name($percentage = true, $sep = ' + ') {
 		$taxes = $this->get_taxes();
 
-		if ( ! empty( $taxes ) && is_array( $taxes ) && count( $taxes ) == 1 && wpinv_display_individual_tax_rates() ) {
+		if (!empty($taxes) && is_array($taxes) && count($taxes) == 1 && wpinv_display_individual_tax_rates()) {
 			$names = array();
 
-			foreach ( $taxes as $key => $tax ) {
-				if ( ! empty( $tax ) && ! empty( $tax['name'] ) ) {
-					$name = __( $tax['name'], 'invoicing' );
+			foreach ($taxes as $key => $tax) {
+				if (!empty($tax) && !empty($tax['name'])) {
+					$name = __($tax['name'], 'invoicing');
 
 					$names[] = $name;
 				}
 			}
 
-			if ( ! empty( $names ) ) {
-				$names = array_unique( $names );
+			if (!empty($names)) {
+				$names = array_unique($names);
 
-				$tax_name = implode( $sep, $names );
+				$tax_name = implode($sep, $names);
 			}
 
-			if ( $percentage ) {
-				$tax_name = wp_sprintf( _x( '%s (%%)', 'Tax name with %. Ex: Tax (%)', 'invoicing' ), $tax_name );
+			if ($percentage) {
+				$tax_name = wp_sprintf(_x('%s (%%)', 'Tax name with %. Ex: Tax (%)', 'invoicing'), $tax_name);
 			}
 		} else {
-			$tax_name = $percentage ? __( 'Tax (%)', 'invoicing' ) : _x( 'Tax', 'Tax name', 'invoicing' );
+			$tax_name = $percentage ? __('Tax (%)', 'invoicing') : _x('Tax', 'Tax name', 'invoicing');
 		}
 
-		return apply_filters( 'wpinv_invoice_get_item_tax_name', $tax_name, $this, $percentage, $sep );
+		return apply_filters('wpinv_invoice_get_item_tax_name', $tax_name, $this, $percentage, $sep);
 	}
 
     /**
@@ -3681,11 +3681,11 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_tax( $tax ) {
+	public function remove_tax($tax) {
         $taxes = $this->get_taxes();
-        if ( isset( $taxes[ $tax ] ) ) {
-            unset( $taxes[ $tax ] );
-            $this->set_prop( 'taxes', $taxes );
+        if (isset($taxes[$tax])) {
+            unset($taxes[$tax]);
+            $this->set_prop('taxes', $taxes);
         }
     }
 
@@ -3696,22 +3696,22 @@ 
 	 * @return float The recalculated subtotal
 	 */
 	public function recalculate_subtotal() {
-        $items     = $this->get_items();
+        $items = $this->get_items();
 		$subtotal  = 0;
 		$recurring = 0;
 
-        foreach ( $items as $item ) {
-			$subtotal  += $item->get_sub_total( 'edit' );
-			$recurring += $item->get_recurring_sub_total( 'edit' );
+        foreach ($items as $item) {
+			$subtotal  += $item->get_sub_total('edit');
+			$recurring += $item->get_recurring_sub_total('edit');
         }
 
-		if ( wpinv_prices_include_tax() ) {
-			$subtotal  = max( 0, $subtotal - $this->totals['tax']['initial'] );
-			$recurring = max( 0, $recurring - $this->totals['tax']['recurring'] );
+		if (wpinv_prices_include_tax()) {
+			$subtotal  = max(0, $subtotal - $this->totals['tax']['initial']);
+			$recurring = max(0, $recurring - $this->totals['tax']['recurring']);
 		}
 
 		$current = $this->is_renewal() ? $recurring : $subtotal;
-		$this->set_subtotal( $current );
+		$this->set_subtotal($current);
 
 		$this->totals['subtotal'] = array(
 			'initial'   => $subtotal,
@@ -3729,12 +3729,12 @@ 
 	 */
 	public function recalculate_total_discount() {
 		// Fix renewal invoice amount when tax + recurring discount applied.
-		if ( $this->is_renewal() && $this->get_discount_code() ) {
+		if ($this->is_renewal() && $this->get_discount_code()) {
 			// Maybe recalculate discount (Pre-GetPaid Fix).
-			$discount = new WPInv_Discount( $this->get_discount_code() );
+			$discount = new WPInv_Discount($this->get_discount_code());
 
-			if ( $discount->exists() && $discount->is_recurring() ) {
-				getpaid_calculate_invoice_discount( $this, $discount );
+			if ($discount->exists() && $discount->is_recurring()) {
+				getpaid_calculate_invoice_discount($this, $discount);
 			}
 		}
 
@@ -3742,14 +3742,14 @@ 
 		$discount  = 0;
 		$recurring = 0;
 
-        foreach ( $discounts as $data ) {
-			$discount  += wpinv_sanitize_amount( $data['initial_discount'] );
-			$recurring += wpinv_sanitize_amount( $data['recurring_discount'] );
+        foreach ($discounts as $data) {
+			$discount  += wpinv_sanitize_amount($data['initial_discount']);
+			$recurring += wpinv_sanitize_amount($data['recurring_discount']);
 		}
 
 		$current = $this->is_renewal() ? $recurring : $discount;
 
-		$this->set_total_discount( $current );
+		$this->set_total_discount($current);
 
 		$this->totals['discount'] = array(
 			'initial'   => $discount,
@@ -3770,13 +3770,13 @@ 
 
 		// Maybe disable taxes.
 		$vat_number = $this->get_vat_number();
-		$skip_tax   = GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $this->get_country() ) && ! empty( $vat_number );
+		$skip_tax   = GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($this->get_country()) && !empty($vat_number);
 
-		if ( wpinv_is_base_country( $this->get_country() ) && 'vat_too' === wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+		if (wpinv_is_base_country($this->get_country()) && 'vat_too' === wpinv_get_option('vat_same_country_rule', 'vat_too')) {
 			$skip_tax = false;
 		}
 
-		if ( ! wpinv_use_taxes() || $this->get_disable_taxes() || ! wpinv_is_country_taxable( $this->get_country() ) || $skip_tax ) {
+		if (!wpinv_use_taxes() || $this->get_disable_taxes() || !wpinv_is_country_taxable($this->get_country()) || $skip_tax) {
 
 			$this->totals['tax'] = array(
 				'initial'   => 0,
@@ -3785,36 +3785,36 @@ 
 
 			$this->tax_rate = 0;
 
-			$this->set_taxes( array() );
+			$this->set_taxes(array());
 			$current = 0;
 		} else {
 
 			$item_taxes = array();
 
-			foreach ( $this->get_items() as $item ) {
-				$rates    = getpaid_get_item_tax_rates( $item, $this->get_country(), $this->get_state() );
-				$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-				$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-				$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
-				foreach ( $taxes as $name => $amount ) {
-					$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-					$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
-
-					if ( ! isset( $item_taxes[ $name ] ) ) {
-						$item_taxes[ $name ] = $tax;
+			foreach ($this->get_items() as $item) {
+				$rates    = getpaid_get_item_tax_rates($item, $this->get_country(), $this->get_state());
+				$rates    = getpaid_filter_item_tax_rates($item, $rates);
+				$taxes    = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, false), $rates);
+				$r_taxes  = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, true), $rates);
+				foreach ($taxes as $name => $amount) {
+					$recurring = isset($r_taxes[$name]) ? $r_taxes[$name] : 0;
+					$tax       = getpaid_prepare_item_tax($item, $name, $amount, $recurring);
+
+					if (!isset($item_taxes[$name])) {
+						$item_taxes[$name] = $tax;
 						continue;
 					}
 
-					$item_taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-					$item_taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+					$item_taxes[$name]['initial_tax']   += $tax['initial_tax'];
+					$item_taxes[$name]['recurring_tax'] += $tax['recurring_tax'];
 
 				}
 			}
 
-			$this->set_taxes( $item_taxes );
+			$this->set_taxes($item_taxes);
 
-			$initial_tax   = array_sum( wp_list_pluck( $item_taxes, 'initial_tax' ) );
-			$recurring_tax = array_sum( wp_list_pluck( $item_taxes, 'recurring_tax' ) );
+			$initial_tax   = array_sum(wp_list_pluck($item_taxes, 'initial_tax'));
+			$recurring_tax = array_sum(wp_list_pluck($item_taxes, 'recurring_tax'));
 
 			$current = $this->is_renewal() ? $recurring_tax : $initial_tax;
 
@@ -3825,7 +3825,7 @@ 
 
 		}
 
-		$this->set_total_tax( $current );
+		$this->set_total_tax($current);
 
 		return $current;
 
@@ -3842,25 +3842,25 @@ 
 		$fee       = 0;
 		$recurring = 0;
 
-        foreach ( $fees as $data ) {
-			if( isset( $data['initial_fee'] ) ){
-				$fee += wpinv_sanitize_amount( $data['initial_fee'] );
+        foreach ($fees as $data) {
+			if (isset($data['initial_fee'])) {
+				$fee += wpinv_sanitize_amount($data['initial_fee']);
 			}
 
-			if( isset( $data['recurring_fee'] ) ){
-				$recurring += wpinv_sanitize_amount( $data['recurring_fee'] );
+			if (isset($data['recurring_fee'])) {
+				$recurring += wpinv_sanitize_amount($data['recurring_fee']);
 			}
 		}
 
 		$current = $this->is_renewal() ? $recurring : $fee;
-		$this->set_total_fees( $current );
+		$this->set_total_fees($current);
 
 		$this->totals['fee'] = array(
 			'initial'   => $fee,
 			'recurring' => $recurring,
 		);
 
-        $this->set_total_fees( $fee );
+        $this->set_total_fees($fee);
         return $current;
     }
 
@@ -3875,7 +3875,7 @@ 
         $this->recalculate_total_discount();
 		$this->recalculate_total_tax();
 		$this->recalculate_subtotal();
-		$this->set_total( $this->get_total_tax( 'edit' ) + $this->get_total_fees( 'edit' ) + $this->get_subtotal( 'edit' ) - $this->get_total_discount( 'edit' ) );
+		$this->set_total($this->get_total_tax('edit') + $this->get_total_fees('edit') + $this->get_subtotal('edit') - $this->get_total_discount('edit'));
 		return $this->get_total();
 	}
 
@@ -3884,7 +3884,7 @@ 
 	 */
     public function recalculate_totals() {
         $this->recalculate_total();
-        $this->save( true );
+        $this->save(true);
         return $this;
     }
 
@@ -3902,8 +3902,8 @@ 
 	 * @return int|false The new note's ID on success, false on failure.
      *
      */
-    public function add_system_note( $note ) {
-		return $this->add_note( $note, false, false, true );
+    public function add_system_note($note) {
+		return $this->add_note($note, false, false, true);
 	}
 
     /**
@@ -3913,10 +3913,10 @@ 
 	 * @return int|false The new note's ID on success, false on failure.
      *
      */
-    public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
+    public function add_note($note = '', $customer_type = false, $added_by_user = false, $system = false) {
 
         // Bail if no note specified or this invoice is not yet saved.
-        if ( ! $note || $this->get_id() == 0 || ( ! is_user_logged_in() && ! $system ) ) {
+        if (!$note || $this->get_id() == 0 || (!is_user_logged_in() && !$system)) {
             return false;
         }
 
@@ -3924,23 +3924,23 @@ 
 		$author_email = 'bot@wpinvoicing.com';
 
 		// If this is an admin comment or it has been added by the user.
-		if ( is_user_logged_in() && ( ! $system || $added_by_user ) ) {
-			$user         = get_user_by( 'id', get_current_user_id() );
+		if (is_user_logged_in() && (!$system || $added_by_user)) {
+			$user = get_user_by('id', get_current_user_id());
             $author       = $user->display_name;
             $author_email = $user->user_email;
 		}
 
-		return getpaid_notes()->add_invoice_note( $this, $note, $author, $author_email, $customer_type );
+		return getpaid_notes()->add_invoice_note($this, $note, $author, $author_email, $customer_type);
 
 	}
 
 	/**
      * Generates a unique key for the invoice.
      */
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
         return strtolower(
-            $string . md5( $this->get_id() . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) )
+            $string . md5($this->get_id() . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))
         );
     }
 
@@ -3950,11 +3950,11 @@ 
     public function generate_number() {
         $number = $this->get_id();
 
-        if ( wpinv_sequential_number_active( $this->get_post_type() ) ) {
-            $number = wpinv_get_next_invoice_number( $this->get_post_type() );
+        if (wpinv_sequential_number_active($this->get_post_type())) {
+            $number = wpinv_get_next_invoice_number($this->get_post_type());
         }
 
-		return wpinv_format_invoice_number( $number, $this->get_post_type() );
+		return wpinv_format_invoice_number($number, $this->get_post_type());
 
 	}
 
@@ -3967,55 +3967,55 @@ 
 		// Reset status transition variable.
 		$this->status_transition = false;
 
-		if ( $status_transition ) {
+		if ($status_transition) {
 			try {
 
 				// Fire a hook for the status change.
-				do_action( 'getpaid_invoice_status_' . $status_transition['to'], $this, $status_transition );
+				do_action('getpaid_invoice_status_' . $status_transition['to'], $this, $status_transition);
 
 				// @deprecated this is deprecated and will be removed in the future.
-				do_action( 'wpinv_status_' . $status_transition['to'], $this->get_id(), $status_transition['from'] );
+				do_action('wpinv_status_' . $status_transition['to'], $this->get_id(), $status_transition['from']);
 
-				if ( ! empty( $status_transition['from'] ) ) {
+				if (!empty($status_transition['from'])) {
 
 					/* translators: 1: old invoice status 2: new invoice status */
-					$transition_note = sprintf( __( 'Status changed from %1$s to %2$s.', 'invoicing' ), wpinv_status_nicename( $status_transition['from'], $this ), wpinv_status_nicename( $status_transition['to'], $this ) );
+					$transition_note = sprintf(__('Status changed from %1$s to %2$s.', 'invoicing'), wpinv_status_nicename($status_transition['from'], $this), wpinv_status_nicename($status_transition['to'], $this));
 
 					// Fire another hook.
-					do_action( 'getpaid_invoice_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this );
-					do_action( 'getpaid_invoice_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+					do_action('getpaid_invoice_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this);
+					do_action('getpaid_invoice_status_changed', $this, $status_transition['from'], $status_transition['to']);
 
 					// @deprecated this is deprecated and will be removed in the future.
-					do_action( 'wpinv_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $status_transition['from'] );
+					do_action('wpinv_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $status_transition['from']);
 
 					// Note the transition occurred.
-					$this->add_note( trim( $status_transition['note'] . ' ' . $transition_note ), false, $status_transition['manual'] );
+					$this->add_note(trim($status_transition['note'] . ' ' . $transition_note), false, $status_transition['manual']);
 
 					// Work out if this was for a payment, and trigger a payment_status hook instead.
 					if (
-						in_array( $status_transition['from'], array( 'wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold' ), true )
-						&& in_array( $status_transition['to'], array( 'publish', 'wpi-processing', 'wpi-renewal' ), true )
+						in_array($status_transition['from'], array('wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold'), true)
+						&& in_array($status_transition['to'], array('publish', 'wpi-processing', 'wpi-renewal'), true)
 					) {
-						do_action( 'getpaid_invoice_payment_status_changed', $this, $status_transition );
+						do_action('getpaid_invoice_payment_status_changed', $this, $status_transition);
 					}
 
 					// Work out if this was for a payment reversal, and trigger a payment_status_reversed hook instead.
 					if (
-						in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ), true )
-						&& in_array( $status_transition['to'], array( 'wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold' ), true )
+						in_array($status_transition['from'], array('publish', 'wpi-processing', 'wpi-renewal'), true)
+						&& in_array($status_transition['to'], array('wpi-cancelled', 'pending', 'wpi-pending', 'wpi-failed', 'wpi-refunded', 'wpi-onhold'), true)
 					) {
-						do_action( 'getpaid_invoice_payment_status_reversed', $this, $status_transition );
+						do_action('getpaid_invoice_payment_status_reversed', $this, $status_transition);
 					}
 				} else {
 					/* translators: %s: new invoice status */
-					$transition_note = sprintf( __( 'Status set to %s.', 'invoicing' ), wpinv_status_nicename( $status_transition['to'], $this ) );
+					$transition_note = sprintf(__('Status set to %s.', 'invoicing'), wpinv_status_nicename($status_transition['to'], $this));
 
 					// Note the transition occurred.
-					$this->add_note( trim( $status_transition['note'] . ' ' . $transition_note ), 0, $status_transition['manual'] );
+					$this->add_note(trim($status_transition['note'] . ' ' . $transition_note), 0, $status_transition['manual']);
 
 				}
-			} catch ( Exception $e ) {
-				$this->add_note( __( 'Error during status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
+			} catch (Exception $e) {
+				$this->add_note(__('Error during status transition.', 'invoicing') . ' ' . $e->getMessage());
 			}
 		}
 	}
@@ -4023,13 +4023,13 @@ 
 	/**
 	 * Updates an invoice status.
 	 */
-	public function update_status( $new_status = false, $note = '', $manual = false ) {
+	public function update_status($new_status = false, $note = '', $manual = false) {
 
 		// Fires before updating a status.
-		do_action( 'wpinv_before_invoice_status_change', $this->get_id(), $new_status, $this->get_status( 'edit' ) );
+		do_action('wpinv_before_invoice_status_change', $this->get_id(), $new_status, $this->get_status('edit'));
 
 		// Update the status.
-		$this->set_status( $new_status, $note, $manual );
+		$this->set_status($new_status, $note, $manual);
 
 		// Save the order.
 		return $this->save();
@@ -4040,18 +4040,18 @@ 
 	 * @deprecated
 	 */
 	public function refresh_item_ids() {
-        $item_ids = implode( ',', array_unique( wp_list_pluck( $this->get_cart_details(), 'item_id' ) ) );
-        update_post_meta( $this->get_id(), '_wpinv_item_ids', $item_ids );
+        $item_ids = implode(',', array_unique(wp_list_pluck($this->get_cart_details(), 'item_id')));
+        update_post_meta($this->get_id(), '_wpinv_item_ids', $item_ids);
 	}
 
 	/**
 	 * @deprecated
 	 */
-	public function update_items( $temp = false ) {
+	public function update_items($temp = false) {
 
-		$this->set_items( $this->get_items() );
+		$this->set_items($this->get_items());
 
-		if ( ! $temp ) {
+		if (!$temp) {
 			$this->save();
 		}
 
@@ -4065,11 +4065,11 @@ 
 
         $discount_code = $this->get_discount_code();
 
-        if ( empty( $discount_code ) ) {
+        if (empty($discount_code)) {
             return false;
         }
 
-        $discount = wpinv_get_discount_obj( $discount_code );
+        $discount = wpinv_get_discount_obj($discount_code);
 
         // Ensure it is active.
         return $discount->exists();
@@ -4080,7 +4080,7 @@ 
 	 * Refunds an invoice.
 	 */
     public function refund() {
-		$this->set_status( 'wpi-refunded' );
+		$this->set_status('wpi-refunded');
         $this->save();
 	}
 
@@ -4089,53 +4089,53 @@ 
 	 *
 	 * @param string $transaction_id
 	 */
-    public function mark_paid( $transaction_id = null, $note = '' ) {
+    public function mark_paid($transaction_id = null, $note = '') {
 
 		// Set the transaction id.
-		if ( empty( $transaction_id ) ) {
-			$transaction_id = $this->generate_key( 'trans_' );
+		if (empty($transaction_id)) {
+			$transaction_id = $this->generate_key('trans_');
 		}
 
-		if ( ! $this->get_transaction_id() ) {
-			$this->set_transaction_id( $transaction_id );
+		if (!$this->get_transaction_id()) {
+			$this->set_transaction_id($transaction_id);
 		}
 
-		if ( $this->is_paid() && 'wpi-processing' !== $this->get_status() ) {
+		if ($this->is_paid() && 'wpi-processing' !== $this->get_status()) {
 			return $this->save();
 		}
 
 		// Set the completed date.
-		$this->set_date_completed( current_time( 'mysql' ) );
+		$this->set_date_completed(current_time('mysql'));
 
 		// Set the new status.
-		$gateway = sanitize_text_field( $this->get_gateway_title() );
-		if ( $this->is_renewal() || ! $this->is_parent() ) {
+		$gateway = sanitize_text_field($this->get_gateway_title());
+		if ($this->is_renewal() || !$this->is_parent()) {
 
-			$_note = wp_sprintf( __( 'Renewed via %s', 'invoicing' ), $gateway );
-			$_note = $_note . empty( $note ) ? '' : " ($note)";
+			$_note = wp_sprintf(__('Renewed via %s', 'invoicing'), $gateway);
+			$_note = $_note . empty($note) ? '' : " ($note)";
 
-			if ( 'none' == $this->get_gateway() ) {
+			if ('none' == $this->get_gateway()) {
 				$_note = $note;
 			}
 
-			$this->set_status( 'wpi-renewal', $_note );
+			$this->set_status('wpi-renewal', $_note);
 
 		} else {
 
-			$_note = wp_sprintf( __( 'Paid via %s', 'invoicing' ), $gateway );
-			$_note = $_note . empty( $note ) ? '' : " ($note)";
+			$_note = wp_sprintf(__('Paid via %s', 'invoicing'), $gateway);
+			$_note = $_note . empty($note) ? '' : " ($note)";
 
-			if ( 'none' == $this->get_gateway() ) {
+			if ('none' == $this->get_gateway()) {
 				$_note = $note;
 			}
 
-			$this->set_status( 'publish', $_note );
+			$this->set_status('publish', $_note);
 
 		}
 
 		// Set checkout mode.
-		$mode = wpinv_is_test_mode( $this->get_gateway() ) ? 'test' : 'live';
-		$this->set_mode( $mode );
+		$mode = wpinv_is_test_mode($this->get_gateway()) ? 'test' : 'live';
+		$this->set_mode($mode);
 
 		// Save the invoice.
         $this->save();
@@ -4160,16 +4160,16 @@ 
      * Clears the subscription's cache.
      */
     public function clear_cache() {
-		if ( $this->get_key() ) {
-			wp_cache_delete( $this->get_key(), 'getpaid_invoice_keys_to_invoice_ids' );
+		if ($this->get_key()) {
+			wp_cache_delete($this->get_key(), 'getpaid_invoice_keys_to_invoice_ids');
 		}
 
-		if ( $this->get_number() ) {
-			wp_cache_delete( $this->get_number(), 'getpaid_invoice_numbers_to_invoice_ids' );
+		if ($this->get_number()) {
+			wp_cache_delete($this->get_number(), 'getpaid_invoice_numbers_to_invoice_ids');
 		}
 
-		if ( $this->get_transaction_id() ) {
-			wp_cache_delete( $this->get_transaction_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids' );
+		if ($this->get_transaction_id()) {
+			wp_cache_delete($this->get_transaction_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids');
 		}
 	}
 

widgets/subscriptions.php

Indentation +349 added lines, -349 removed lines

@@ -14,144 +14,144 @@ 
  */
 class WPInv_Subscriptions_Widget extends WP_Super_Duper {
 
-	/**
-	 * Register the widget with WordPress.
-	 *
-	 */
-	public function __construct() {
-
-		$options = array(
-			'textdomain'     => 'invoicing',
-			'block-icon'     => 'controls-repeat',
-			'block-category' => 'widgets',
-			'block-keywords' => "['invoicing','subscriptions', 'getpaid']",
-			'class_name'     => __CLASS__,
-			'base_id'        => 'wpinv_subscriptions',
-			'name'           => __( 'GetPaid > Subscriptions', 'invoicing' ),
-			'widget_ops'     => array(
-				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
-			),
-			'arguments'      => array(
-				'title' => array(
-					'title'    => __( 'Widget title', 'invoicing' ),
-					'desc'     => __( 'Enter widget title.', 'invoicing' ),
-					'type'     => 'text',
-					'desc_tip' => true,
-					'default'  => '',
-					'advanced' => false,
-				),
-			),
-
-		);
-
-		parent::__construct( $options );
-	}
-
-	/**
-	 * Retrieves current user's subscriptions.
-	 *
-	 * @return GetPaid_Subscriptions_Query
-	 */
-	public function get_subscriptions() {
-
-		// Prepare license args.
-		$args  = array(
-			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
-		);
-
-		return new GetPaid_Subscriptions_Query( $args );
-
-	}
-
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( intval( $_GET['subscription'] ) );
-		}
-
-		// Retrieve the user's subscriptions.
-		$subscriptions = $this->get_subscriptions();
-
-		// Start the output buffer.
-		ob_start();
-
-		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
-
-		// Display errors and notices.
-		wpinv_print_errors();
-
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
-
-		// Print the table header.
-		$this->print_table_header();
-
-		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
-
-		// Print table footer.
-		$this->print_table_footer();
-
-		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
-
-		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
-
-		// Return the output.
-		return ob_get_clean();
-
-	}
-
-	/**
-	 * Retrieves the subscription columns.
-	 *
-	 * @return array
-	 */
-	public function get_subscriptions_table_columns() {
-
-		$columns = array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'renewal-date' => __( 'Next payment', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-			'actions'      => '',
-		);
+    /**
+     * Register the widget with WordPress.
+     *
+     */
+    public function __construct() {
+
+        $options = array(
+            'textdomain'     => 'invoicing',
+            'block-icon'     => 'controls-repeat',
+            'block-category' => 'widgets',
+            'block-keywords' => "['invoicing','subscriptions', 'getpaid']",
+            'class_name'     => __CLASS__,
+            'base_id'        => 'wpinv_subscriptions',
+            'name'           => __( 'GetPaid > Subscriptions', 'invoicing' ),
+            'widget_ops'     => array(
+                'classname'   => 'getpaid-subscriptions bsui',
+                'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+            ),
+            'arguments'      => array(
+                'title' => array(
+                    'title'    => __( 'Widget title', 'invoicing' ),
+                    'desc'     => __( 'Enter widget title.', 'invoicing' ),
+                    'type'     => 'text',
+                    'desc_tip' => true,
+                    'default'  => '',
+                    'advanced' => false,
+                ),
+            ),
+
+        );
+
+        parent::__construct( $options );
+    }
+
+    /**
+     * Retrieves current user's subscriptions.
+     *
+     * @return GetPaid_Subscriptions_Query
+     */
+    public function get_subscriptions() {
+
+        // Prepare license args.
+        $args  = array(
+            'customer_in' => get_current_user_id(),
+            'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+        );
+
+        return new GetPaid_Subscriptions_Query( $args );
+
+    }
+
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
+    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        // Ensure that the user is logged in.
+        if ( ! is_user_logged_in() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Are we displaying a single subscription?
+        if ( isset( $_GET['subscription'] ) ) {
+            return $this->display_single_subscription( intval( $_GET['subscription'] ) );
+        }
+
+        // Retrieve the user's subscriptions.
+        $subscriptions = $this->get_subscriptions();
+
+        // Start the output buffer.
+        ob_start();
+
+        // Backwards compatibility.
+        do_action( 'wpinv_before_user_subscriptions' );
+
+        // Display errors and notices.
+        wpinv_print_errors();
+
+        do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+
+        // Print the table header.
+        $this->print_table_header();
+
+        // Print table body.
+        $this->print_table_body( $subscriptions->get_results() );
+
+        // Print table footer.
+        $this->print_table_footer();
+
+        // Print the navigation.
+        $this->print_navigation( $subscriptions->get_total() );
+
+        // Backwards compatibility.
+        do_action( 'wpinv_after_user_subscriptions' );
+
+        // Return the output.
+        return ob_get_clean();
+
+    }
+
+    /**
+     * Retrieves the subscription columns.
+     *
+     * @return array
+     */
+    public function get_subscriptions_table_columns() {
+
+        $columns = array(
+            'subscription' => __( 'Subscription', 'invoicing' ),
+            'amount'       => __( 'Amount', 'invoicing' ),
+            'renewal-date' => __( 'Next payment', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+            'actions'      => '',
+        );
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
-	}
+        return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+    }
 
-	/**
-	 * Displays the table header.
-	 *
-	 */
-	public function print_table_header() {
+    /**
+     * Displays the table header.
+     *
+     */
+    public function print_table_header() {
 
-		?>
+        ?>
 
 			<table class="table table-bordered table-striped">
 
@@ -167,122 +167,122 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the table body.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body( $subscriptions ) {
+    /**
+     * Displays the table body.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body( $subscriptions ) {
 
-		if ( empty( $subscriptions ) ) {
-			$this->print_table_body_no_subscriptions();
-		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
-		}
+        if ( empty( $subscriptions ) ) {
+            $this->print_table_body_no_subscriptions();
+        } else {
+            $this->print_table_body_subscriptions( $subscriptions );
+        }
 
-	}
+    }
 
-	/**
-	 * Displays the table body if no subscriptions were found.
-	 *
-	 */
-	public function print_table_body_no_subscriptions() {
+    /**
+     * Displays the table body if no subscriptions were found.
+     *
+     */
+    public function print_table_body_no_subscriptions() {
 
-		?>
+        ?>
 		<tbody>
 
 			<tr>
 				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
 
 					<?php
-						aui()->alert(
-							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
-								'type'    => 'warning',
-							),
+                        aui()->alert(
+                            array(
+                                'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+                                'type'    => 'warning',
+                            ),
                             true
-						);
-					?>
+                        );
+                    ?>
 
 				</td>
 			</tr>
 
 		</tbody>
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the table body if subscriptions were found.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+    /**
+     * Displays the table body if subscriptions were found.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body_subscriptions( $subscriptions ) {
 
-		?>
+        ?>
 		<tbody>
 
 			<?php foreach ( $subscriptions as $subscription ) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
-						wpinv_get_template(
-							'subscriptions/subscriptions-table-row.php',
-							array(
-								'subscription' => $subscription,
-								'widget'       => $this,
-							)
-						);
-					?>
+                        wpinv_get_template(
+                            'subscriptions/subscriptions-table-row.php',
+                            array(
+                                'subscription' => $subscription,
+                                'widget'       => $this,
+                            )
+                        );
+                    ?>
 				</tr>
 			<?php endforeach; ?>
 
 		</tbody>
 		<?php
-	}
-
-	/**
-	 * Adds row actions to a column
-	 *
-	 * @param string $content column content
-	 * @param WPInv_Subscription $subscription
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function add_row_actions( $content, $subscription ) {
-
-		// Prepare row actions.
-		$actions = array();
-
-		// View subscription action.
-		$view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$actions['view'] = "<a href='$view_url' class='btn btn-xs btn-outline-primary text-decoration-none'><i class='fa fa-cog'></i> " . __( 'Manage', 'invoicing' ) . '</a>';
-
-		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
-
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
-			$sanitized[] = "<span class='$key'>$action</span>";
-		}
-
-		$row_actions  = "<small class='form-text getpaid-subscription-item-btn-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
-		$row_actions .= '</small>';
-
-		return $content . $row_actions;
-	}
-
-	/**
-	 * Displays the table footer.
-	 *
-	 */
-	public function print_table_footer() {
-
-		?>
+    }
+
+    /**
+     * Adds row actions to a column
+     *
+     * @param string $content column content
+     * @param WPInv_Subscription $subscription
+     * @since       1.0.0
+     * @return      string
+     */
+    public function add_row_actions( $content, $subscription ) {
+
+        // Prepare row actions.
+        $actions = array();
+
+        // View subscription action.
+        $view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
+        $view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
+        $actions['view'] = "<a href='$view_url' class='btn btn-xs btn-outline-primary text-decoration-none'><i class='fa fa-cog'></i> " . __( 'Manage', 'invoicing' ) . '</a>';
+
+        // Filter the actions.
+        $actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+
+        $sanitized  = array();
+        foreach ( $actions as $key => $action ) {
+            $key         = sanitize_html_class( $key );
+            $action      = wp_kses_post( $action );
+            $sanitized[] = "<span class='$key'>$action</span>";
+        }
+
+        $row_actions  = "<small class='form-text getpaid-subscription-item-btn-actions'>";
+        $row_actions .= implode( ' | ', $sanitized );
+        $row_actions .= '</small>';
+
+        return $content . $row_actions;
+    }
+
+    /**
+     * Displays the table footer.
+     *
+     */
+    public function print_table_footer() {
+
+        ?>
 
 				<tfoot>
 					<tr>
@@ -297,145 +297,145 @@ 
 			</table>
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the navigation.
-	 *
-	 * @param int $total
-	 */
-	public function print_navigation( $total ) {
+    /**
+     * Displays the navigation.
+     *
+     * @param int $total
+     */
+    public function print_navigation( $total ) {
 
-		if ( $total < 1 ) {
+        if ( $total < 1 ) {
 
-			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
-				'customer_in' => get_current_user_id(),
-				'fields'      => 'id',
-			);
+            // Out-of-bounds, run the query again without LIMIT for total count.
+            $args  = array(
+                'customer_in' => get_current_user_id(),
+                'fields'      => 'id',
+            );
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
-			$total       = $count_query->get_total();
-		}
+            $count_query = new GetPaid_Subscriptions_Query( $args );
+            $total       = $count_query->get_total();
+        }
 
-		// Abort if we do not have pages.
-		if ( 2 > $total ) {
-			return;
-		}
+        // Abort if we do not have pages.
+        if ( 2 > $total ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="getpaid-subscriptions-pagination">
 			<?php
-				$big = 999999;
-
-				echo wp_kses_post(
-					getpaid_paginate_links(
-						array(
-							'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-							'format' => '?paged=%#%',
-							'total'  => (int) ceil( $total / 10 ),
-						)
-					)
-				);
-			?>
+                $big = 999999;
+
+                echo wp_kses_post(
+                    getpaid_paginate_links(
+                        array(
+                            'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                            'format' => '?paged=%#%',
+                            'total'  => (int) ceil( $total / 10 ),
+                        )
+                    )
+                );
+            ?>
 		</div>
 
 		<?php
-	}
-
-	/**
-	 * Returns a single subscription's columns.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 *
-	 * @return array
-	 */
-	public function get_single_subscription_columns( $subscription ) {
-
-		// Prepare subscription detail columns.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
-		$fields             = apply_filters(
-			'getpaid_single_subscription_details_fields',
-			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => $items_count > 1 ? __( 'Items', $items_count, 'invoicing' ) : __( 'Item', 'invoicing' )
-			),
-			$subscription,
-			$items_count
-		);
-
-		if ( isset( $fields['expiry_date'] ) ) {
-
-			if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-				$fields['expiry_date'] = __( 'End date', 'invoicing' );
-			}
-
-			if ( 'pending' === $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
-			}
-		}
-
-		if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
-			unset( $fields['start_date'] );
-		}
-
-		if ( $subscription->get_initial_amount() === $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
-		}
-
-		return $fields;
-	}
-
-	/**
-	 * Displays a single subscription.
-	 *
-	 * @param string $subscription
-	 *
-	 * @return string
-	 */
-	public function display_single_subscription( $subscription ) {
-
-		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
-
-		if ( ! $subscription->exists() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		return wpinv_get_template_html(
-			'subscriptions/subscription-details.php',
-			array(
-				'subscription' => $subscription,
-				'widget'       => $this,
-			)
-		);
-
-	}
+    }
+
+    /**
+     * Returns a single subscription's columns.
+     *
+     * @param WPInv_Subscription $subscription
+     *
+     * @return array
+     */
+    public function get_single_subscription_columns( $subscription ) {
+
+        // Prepare subscription detail columns.
+        $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+        $items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+        $fields             = apply_filters(
+            'getpaid_single_subscription_details_fields',
+            array(
+                'status'           => __( 'Status', 'invoicing' ),
+                'initial_amount'   => __( 'Initial amount', 'invoicing' ),
+                'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
+                'start_date'       => __( 'Start date', 'invoicing' ),
+                'expiry_date'      => __( 'Next payment', 'invoicing' ),
+                'payments'         => __( 'Payments', 'invoicing' ),
+                'item'             => $items_count > 1 ? __( 'Items', $items_count, 'invoicing' ) : __( 'Item', 'invoicing' )
+            ),
+            $subscription,
+            $items_count
+        );
+
+        if ( isset( $fields['expiry_date'] ) ) {
+
+            if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
+                $fields['expiry_date'] = __( 'End date', 'invoicing' );
+            }
+
+            if ( 'pending' === $subscription->get_status() ) {
+                unset( $fields['expiry_date'] );
+            }
+        }
+
+        if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
+            unset( $fields['start_date'] );
+        }
+
+        if ( $subscription->get_initial_amount() === $subscription->get_recurring_amount() ) {
+            unset( $fields['initial_amount'] );
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Displays a single subscription.
+     *
+     * @param string $subscription
+     *
+     * @return string
+     */
+    public function display_single_subscription( $subscription ) {
+
+        // Fetch the subscription.
+        $subscription = new WPInv_Subscription( (int) $subscription );
+
+        if ( ! $subscription->exists() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Ensure that the user owns this subscription key.
+        if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        return wpinv_get_template_html(
+            'subscriptions/subscription-details.php',
+            array(
+                'subscription' => $subscription,
+                'widget'       => $this,
+            )
+        );
+
+    }
 
 }

Spacing +79 added lines, -79 removed lines

@@ -5,7 +5,7 @@ 
  * @version 1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Contains the subscriptions widget.
@@ -27,15 +27,15 @@ 
 			'block-keywords' => "['invoicing','subscriptions', 'getpaid']",
 			'class_name'     => __CLASS__,
 			'base_id'        => 'wpinv_subscriptions',
-			'name'           => __( 'GetPaid > Subscriptions', 'invoicing' ),
+			'name'           => __('GetPaid > Subscriptions', 'invoicing'),
 			'widget_ops'     => array(
 				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+				'description' => esc_html__("Displays the current user's subscriptions.", 'invoicing'),
 			),
 			'arguments'      => array(
 				'title' => array(
-					'title'    => __( 'Widget title', 'invoicing' ),
-					'desc'     => __( 'Enter widget title.', 'invoicing' ),
+					'title'    => __('Widget title', 'invoicing'),
+					'desc'     => __('Enter widget title.', 'invoicing'),
 					'type'     => 'text',
 					'desc_tip' => true,
 					'default'  => '',
@@ -45,7 +45,7 @@ 
 
 		);
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 	/**
@@ -56,12 +56,12 @@ 
 	public function get_subscriptions() {
 
 		// Prepare license args.
-		$args  = array(
+		$args = array(
 			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+			'paged'       => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
 		);
 
-		return new GetPaid_Subscriptions_Query( $args );
+		return new GetPaid_Subscriptions_Query($args);
 
 	}
 
@@ -74,14 +74,14 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 
 		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
+		if (!is_user_logged_in()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You need to log-in or create an account to view this section.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -89,8 +89,8 @@ 
 		}
 
 		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( intval( $_GET['subscription'] ) );
+		if (isset($_GET['subscription'])) {
+			return $this->display_single_subscription(intval($_GET['subscription']));
 		}
 
 		// Retrieve the user's subscriptions.
@@ -100,27 +100,27 @@ 
 		ob_start();
 
 		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
+		do_action('wpinv_before_user_subscriptions');
 
 		// Display errors and notices.
 		wpinv_print_errors();
 
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+		do_action('getpaid_license_manager_before_subscriptions', $subscriptions);
 
 		// Print the table header.
 		$this->print_table_header();
 
 		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
+		$this->print_table_body($subscriptions->get_results());
 
 		// Print table footer.
 		$this->print_table_footer();
 
 		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
+		$this->print_navigation($subscriptions->get_total());
 
 		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
+		do_action('wpinv_after_user_subscriptions');
 
 		// Return the output.
 		return ob_get_clean();
@@ -135,14 +135,14 @@ 
 	public function get_subscriptions_table_columns() {
 
 		$columns = array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'renewal-date' => __( 'Next payment', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
+			'subscription' => __('Subscription', 'invoicing'),
+			'amount'       => __('Amount', 'invoicing'),
+			'renewal-date' => __('Next payment', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
 			'actions'      => '',
 		);
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+		return apply_filters('getpaid_frontend_subscriptions_table_columns', $columns);
 	}
 
 	/**
@@ -157,9 +157,9 @@ 
 
 				<thead>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo esc_attr( $key ); ?>">
-								<?php echo esc_html( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo esc_attr($key); ?>">
+								<?php echo esc_html($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -174,12 +174,12 @@ 
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body( $subscriptions ) {
+	public function print_table_body($subscriptions) {
 
-		if ( empty( $subscriptions ) ) {
+		if (empty($subscriptions)) {
 			$this->print_table_body_no_subscriptions();
 		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
+			$this->print_table_body_subscriptions($subscriptions);
 		}
 
 	}
@@ -194,12 +194,12 @@ 
 		<tbody>
 
 			<tr>
-				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
+				<td colspan="<?php echo count($this->get_subscriptions_table_columns()); ?>">
 
 					<?php
 						aui()->alert(
 							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+								'content' => wp_kses_post(__('No subscriptions found.', 'invoicing')),
 								'type'    => 'warning',
 							),
                             true
@@ -218,12 +218,12 @@ 
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+	public function print_table_body_subscriptions($subscriptions) {
 
 		?>
 		<tbody>
 
-			<?php foreach ( $subscriptions as $subscription ) : ?>
+			<?php foreach ($subscriptions as $subscription) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
 						wpinv_get_template(
@@ -249,28 +249,28 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function add_row_actions( $content, $subscription ) {
+	public function add_row_actions($content, $subscription) {
 
 		// Prepare row actions.
 		$actions = array();
 
 		// View subscription action.
-		$view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$actions['view'] = "<a href='$view_url' class='btn btn-xs btn-outline-primary text-decoration-none'><i class='fa fa-cog'></i> " . __( 'Manage', 'invoicing' ) . '</a>';
+		$view_url        = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
+		$view_url        = esc_url(add_query_arg('subscription', (int) $subscription->get_id(), $view_url));
+		$actions['view'] = "<a href='$view_url' class='btn btn-xs btn-outline-primary text-decoration-none'><i class='fa fa-cog'></i> " . __('Manage', 'invoicing') . '</a>';
 
 		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+		$actions = apply_filters('getpaid_subscriptions_table_subscription_actions', $actions, $subscription);
 
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
+		$sanitized = array();
+		foreach ($actions as $key => $action) {
+			$key         = sanitize_html_class($key);
+			$action      = wp_kses_post($action);
 			$sanitized[] = "<span class='$key'>$action</span>";
 		}
 
 		$row_actions  = "<small class='form-text getpaid-subscription-item-btn-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
+		$row_actions .= implode(' | ', $sanitized);
 		$row_actions .= '</small>';
 
 		return $content . $row_actions;
@@ -286,9 +286,9 @@ 
 
 				<tfoot>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th class="font-weight-bold getpaid-subscriptions-<?php echo esc_attr( $key ); ?>">
-								<?php echo esc_html( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th class="font-weight-bold getpaid-subscriptions-<?php echo esc_attr($key); ?>">
+								<?php echo esc_html($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -304,22 +304,22 @@ 
 	 *
 	 * @param int $total
 	 */
-	public function print_navigation( $total ) {
+	public function print_navigation($total) {
 
-		if ( $total < 1 ) {
+		if ($total < 1) {
 
 			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
+			$args = array(
 				'customer_in' => get_current_user_id(),
 				'fields'      => 'id',
 			);
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
+			$count_query = new GetPaid_Subscriptions_Query($args);
 			$total       = $count_query->get_total();
 		}
 
 		// Abort if we do not have pages.
-		if ( 2 > $total ) {
+		if (2 > $total) {
 			return;
 		}
 
@@ -332,9 +332,9 @@ 
 				echo wp_kses_post(
 					getpaid_paginate_links(
 						array(
-							'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+							'base'   => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 							'format' => '?paged=%#%',
-							'total'  => (int) ceil( $total / 10 ),
+							'total'  => (int) ceil($total / 10),
 						)
 					)
 				);
@@ -351,43 +351,43 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_single_subscription_columns( $subscription ) {
+	public function get_single_subscription_columns($subscription) {
 
 		// Prepare subscription detail columns.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+		$subscription_group = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
+		$items_count        = empty($subscription_group) ? 1 : count($subscription_group['items']);
 		$fields             = apply_filters(
 			'getpaid_single_subscription_details_fields',
 			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => $items_count > 1 ? __( 'Items', $items_count, 'invoicing' ) : __( 'Item', 'invoicing' )
+				'status'           => __('Status', 'invoicing'),
+				'initial_amount'   => __('Initial amount', 'invoicing'),
+				'recurring_amount' => __('Recurring amount', 'invoicing'),
+				'start_date'       => __('Start date', 'invoicing'),
+				'expiry_date'      => __('Next payment', 'invoicing'),
+				'payments'         => __('Payments', 'invoicing'),
+				'item'             => $items_count > 1 ? __('Items', $items_count, 'invoicing') : __('Item', 'invoicing')
 			),
 			$subscription,
 			$items_count
 		);
 
-		if ( isset( $fields['expiry_date'] ) ) {
+		if (isset($fields['expiry_date'])) {
 
-			if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-				$fields['expiry_date'] = __( 'End date', 'invoicing' );
+			if (!$subscription->is_active() || $subscription->is_last_renewal()) {
+				$fields['expiry_date'] = __('End date', 'invoicing');
 			}
 
-			if ( 'pending' === $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
+			if ('pending' === $subscription->get_status()) {
+				unset($fields['expiry_date']);
 			}
 		}
 
-		if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
-			unset( $fields['start_date'] );
+		if (isset($fields['start_date']) && 'pending' === $subscription->get_status()) {
+			unset($fields['start_date']);
 		}
 
-		if ( $subscription->get_initial_amount() === $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
+		if ($subscription->get_initial_amount() === $subscription->get_recurring_amount()) {
+			unset($fields['initial_amount']);
 		}
 
 		return $fields;
@@ -400,16 +400,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function display_single_subscription( $subscription ) {
+	public function display_single_subscription($subscription) {
 
 		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
+		$subscription = new WPInv_Subscription((int) $subscription);
 
-		if ( ! $subscription->exists() ) {
+		if (!$subscription->exists()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('Subscription not found.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -417,11 +417,11 @@ 
 		}
 
 		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
+		if (get_current_user_id() != $subscription->get_customer_id() && !wpinv_current_user_can_manage_invoicing()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);

includes/invoice-functions.php

Indentation +38 added lines, -38 removed lines

@@ -67,7 +67,7 @@ 
  * Checks if the current user cna view an invoice receipt.
  */
 function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+    return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
 }
 
 /**
@@ -96,7 +96,7 @@ 
  * @param string $post_type The post type to check for.
  */
 function getpaid_is_invoice_post_type( $post_type ) {
-	return is_scalar( $post_type ) && ! empty( $post_type ) && strpos( $post_type, 'wpi_' ) === 0 && array_key_exists( $post_type, getpaid_get_invoice_post_types() );
+    return is_scalar( $post_type ) && ! empty( $post_type ) && strpos( $post_type, 'wpi_' ) === 0 && array_key_exists( $post_type, getpaid_get_invoice_post_types() );
 }
 
 /**
@@ -556,37 +556,37 @@ 
     $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
     $columns = array(
 
-		'invoice-number'  => array(
-			'title' => $label,
-			'class' => 'text-left',
-		),
+        'invoice-number'  => array(
+            'title' => $label,
+            'class' => 'text-left',
+        ),
 
-		'created-date'    => array(
-			'title' => __( 'Created Date', 'invoicing' ),
-			'class' => 'text-left',
-		),
+        'created-date'    => array(
+            'title' => __( 'Created Date', 'invoicing' ),
+            'class' => 'text-left',
+        ),
 
-		'payment-date'    => array(
-			'title' => __( 'Payment Date', 'invoicing' ),
-			'class' => 'text-left',
-		),
+        'payment-date'    => array(
+            'title' => __( 'Payment Date', 'invoicing' ),
+            'class' => 'text-left',
+        ),
 
-		'invoice-status'  => array(
-			'title' => __( 'Status', 'invoicing' ),
-			'class' => 'text-center',
-		),
+        'invoice-status'  => array(
+            'title' => __( 'Status', 'invoicing' ),
+            'class' => 'text-center',
+        ),
 
-		'invoice-total'   => array(
-			'title' => __( 'Total', 'invoicing' ),
-			'class' => 'text-right',
-		),
+        'invoice-total'   => array(
+            'title' => __( 'Total', 'invoicing' ),
+            'class' => 'text-right',
+        ),
 
-		'invoice-actions' => array(
-			'title' => ' ',
-			'class' => 'text-center',
-		),
+        'invoice-actions' => array(
+            'title' => ' ',
+            'class' => 'text-center',
+        ),
 
-	);
+    );
 
     return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
 }
@@ -1297,22 +1297,22 @@ 
  */
 function getpaid_get_invoice_status_classes() {
 
-	return apply_filters(
-		'getpaid_get_invoice_status_classes',
-		array(
+    return apply_filters(
+        'getpaid_get_invoice_status_classes',
+        array(
             'wpi-quote-declined' => 'bg-danger',
             'wpi-failed'         => 'bg-danger',
-			'wpi-processing'     => 'bg-info',
-			'wpi-onhold'         => 'bg-warning text-dark',
-			'wpi-quote-accepted' => 'bg-success',
-			'publish'            => 'bg-success',
-			'wpi-renewal'        => 'bg-primary',
+            'wpi-processing'     => 'bg-info',
+            'wpi-onhold'         => 'bg-warning text-dark',
+            'wpi-quote-accepted' => 'bg-success',
+            'publish'            => 'bg-success',
+            'wpi-renewal'        => 'bg-primary',
             'wpi-cancelled'      => 'bg-secondary',
             'wpi-pending'        => 'bg-dark text-white',
             'wpi-quote-pending'  => 'bg-dark text-white',
             'wpi-refunded'       => 'bg-secondary',
-		)
-	);
+        )
+    );
 
 }
 
@@ -1326,7 +1326,7 @@ 
 function getpaid_get_invoice_tax_rate( $invoice, $item ) {
 
     $rates   = getpaid_get_item_tax_rates( $item, $invoice->get_country(), $invoice->get_state() );
-	$rates   = getpaid_filter_item_tax_rates( $item, $rates );
+    $rates   = getpaid_filter_item_tax_rates( $item, $rates );
     $rates   = wp_list_pluck( $rates, 'rate' );
 
     return array_sum( $rates );

Spacing +373 added lines, -373 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves the current invoice.
@@ -14,15 +14,15 @@ 
 function getpaid_get_current_invoice_id() {
 
     // Ensure that we have an invoice key.
-    if ( empty( $_GET['invoice_key'] ) ) {
+    if (empty($_GET['invoice_key'])) {
         return 0;
     }
 
     // Retrieve an invoice using the key.
-    $invoice = new WPInv_Invoice( sanitize_text_field( $_GET['invoice_key'] ) );
+    $invoice = new WPInv_Invoice(sanitize_text_field($_GET['invoice_key']));
 
     // Compare the invoice key and the parsed key.
-    if ( $invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field( $_GET['invoice_key'] ) ) {
+    if ($invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field($_GET['invoice_key'])) {
         return $invoice->get_id();
     }
 
@@ -32,42 +32,42 @@ 
 /**
  * Checks if the current user cna view an invoice.
  */
-function wpinv_user_can_view_invoice( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_user_can_view_invoice($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if the invoice does not exist.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->is_draft() ) {
+    if ($invoice->is_draft()) {
         return false;
     }
 
     // If users are not required to login to check out, compare the invoice keys.
-    if ( ! wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && sanitize_text_field( $_GET['invoice_key'] ) == $invoice->get_key() ) {
+    if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && sanitize_text_field($_GET['invoice_key']) == $invoice->get_key()) {
         return true;
     }
 
     // Always enable for admins..
-    if ( wpinv_current_user_can( 'view_invoice', array( 'invoice' => $invoice ) ) || current_user_can( 'view_invoices', $invoice->get_id() ) ) { // Admin user
+    if (wpinv_current_user_can('view_invoice', array('invoice' => $invoice)) || current_user_can('view_invoices', $invoice->get_id())) { // Admin user
         return true;
     }
 
     // Else, ensure that this is their invoice.
-    if ( is_user_logged_in() && $invoice->get_user_id() == get_current_user_id() ) {
+    if (is_user_logged_in() && $invoice->get_user_id() == get_current_user_id()) {
         return true;
     }
 
-    return apply_filters( 'wpinv_current_user_can_view_invoice', false, $invoice );
+    return apply_filters('wpinv_current_user_can_view_invoice', false, $invoice);
 }
 
 /**
  * Checks if the current user cna view an invoice receipt.
  */
-function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+function wpinv_can_view_receipt($invoice) {
+	return (bool) apply_filters('wpinv_can_view_receipt', wpinv_user_can_view_invoice($invoice), $invoice);
 }
 
 /**
@@ -77,16 +77,16 @@ 
  */
 function getpaid_get_invoice_post_types() {
     $post_types = array(
-        'wpi_quote'   => __( 'Quote', 'invoicing' ),
-        'wpi_invoice' => __( 'Invoice', 'invoicing' ),
+        'wpi_quote'   => __('Quote', 'invoicing'),
+        'wpi_invoice' => __('Invoice', 'invoicing'),
     );
 
     // Ensure the quotes addon is installed.
-    if ( ! defined( 'WPINV_QUOTES_VERSION' ) ) {
-        unset( $post_types['wpi_quote'] );
+    if (!defined('WPINV_QUOTES_VERSION')) {
+        unset($post_types['wpi_quote']);
     }
 
-    return apply_filters( 'getpaid_invoice_post_types', $post_types );
+    return apply_filters('getpaid_invoice_post_types', $post_types);
 }
 
 /**
@@ -95,8 +95,8 @@ 
  *
  * @param string $post_type The post type to check for.
  */
-function getpaid_is_invoice_post_type( $post_type ) {
-	return is_scalar( $post_type ) && ! empty( $post_type ) && strpos( $post_type, 'wpi_' ) === 0 && array_key_exists( $post_type, getpaid_get_invoice_post_types() );
+function getpaid_is_invoice_post_type($post_type) {
+	return is_scalar($post_type) && !empty($post_type) && strpos($post_type, 'wpi_') === 0 && array_key_exists($post_type, getpaid_get_invoice_post_types());
 }
 
 /**
@@ -106,9 +106,9 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_create_invoice( $data = array(), $deprecated = null, $wp_error = false ) {
+function wpinv_create_invoice($data = array(), $deprecated = null, $wp_error = false) {
     $data['invoice_id'] = 0;
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 }
 
 /**
@@ -118,35 +118,35 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_update_invoice( $data = array(), $wp_error = false ) {
+function wpinv_update_invoice($data = array(), $wp_error = false) {
 
     // Backwards compatibility.
-    if ( ! empty( $data['ID'] ) ) {
+    if (!empty($data['ID'])) {
         $data['invoice_id'] = $data['ID'];
     }
 
     // Do we have an invoice id?
-    if ( empty( $data['invoice_id'] ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) ) : 0;
+    if (empty($data['invoice_id'])) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing')) : 0;
     }
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $data['invoice_id'] );
+    $invoice = wpinv_get_invoice($data['invoice_id']);
 
     // And abort if it does not exist.
-    if ( empty( $invoice ) ) {
-        return $wp_error ? new WP_Error( 'missing_invoice', __( 'Invoice not found.', 'invoicing' ) ) : 0;
+    if (empty($invoice)) {
+        return $wp_error ? new WP_Error('missing_invoice', __('Invoice not found.', 'invoicing')) : 0;
     }
 
     // Do not update totals for paid / refunded invoices.
-    if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+    if ($invoice->is_paid() || $invoice->is_refunded()) {
 
-        if ( ! empty( $data['items'] ) || ! empty( $data['cart_details'] ) ) {
-            return $wp_error ? new WP_Error( 'paid_invoice', __( 'You can not update cart items for invoices that have already been paid for.', 'invoicing' ) ) : 0;
+        if (!empty($data['items']) || !empty($data['cart_details'])) {
+            return $wp_error ? new WP_Error('paid_invoice', __('You can not update cart items for invoices that have already been paid for.', 'invoicing')) : 0;
         }
 }
 
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 
 }
 
@@ -157,62 +157,62 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_insert_invoice( $data = array(), $wp_error = false ) {
+function wpinv_insert_invoice($data = array(), $wp_error = false) {
 
     // Ensure that we have invoice data.
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         return false;
     }
 
     // The invoice id will be provided when updating an invoice.
-    $data['invoice_id'] = ! empty( $data['invoice_id'] ) ? (int) $data['invoice_id'] : false;
+    $data['invoice_id'] = !empty($data['invoice_id']) ? (int) $data['invoice_id'] : false;
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $data['invoice_id'] );
+    $invoice = new WPInv_Invoice($data['invoice_id']);
 
     // Do we have an error?
-    if ( ! empty( $invoice->last_error ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', $invoice->last_error ) : 0;
+    if (!empty($invoice->last_error)) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', $invoice->last_error) : 0;
     }
 
     // Backwards compatibility (billing address).
-    if ( ! empty( $data['user_info'] ) ) {
+    if (!empty($data['user_info'])) {
 
-        foreach ( $data['user_info'] as $key => $value ) {
+        foreach ($data['user_info'] as $key => $value) {
 
-            if ( $key == 'discounts' ) {
+            if ($key == 'discounts') {
                 $value = (array) $value;
-                $data['discount_code'] = empty( $value ) ? null : $value[0];
+                $data['discount_code'] = empty($value) ? null : $value[0];
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
 }
 }
 
     // Backwards compatibility.
-    if ( ! empty( $data['payment_details'] ) ) {
+    if (!empty($data['payment_details'])) {
 
-        foreach ( $data['payment_details'] as $key => $value ) {
-            $data[ $key ] = $value;
+        foreach ($data['payment_details'] as $key => $value) {
+            $data[$key] = $value;
         }
 }
 
     // Set up the owner of the invoice.
-    $user_id = ! empty( $data['user_id'] ) ? wpinv_clean( $data['user_id'] ) : get_current_user_id();
+    $user_id = !empty($data['user_id']) ? wpinv_clean($data['user_id']) : get_current_user_id();
 
     // Make sure the user exists.
-    if ( ! get_userdata( $user_id ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_user', __( 'There is no user with that ID.', 'invoicing' ) ) : 0;
+    if (!get_userdata($user_id)) {
+        return $wp_error ? new WP_Error('wpinv_invalid_user', __('There is no user with that ID.', 'invoicing')) : 0;
     }
 
-    $address = wpinv_get_user_address( $user_id );
+    $address = wpinv_get_user_address($user_id);
 
-    foreach ( $address as $key => $value ) {
+    foreach ($address as $key => $value) {
 
-        if ( $value == '' ) {
-            $address[ $key ] = null;
+        if ($value == '') {
+            $address[$key] = null;
         } else {
-            $address[ $key ] = wpinv_clean( $value );
+            $address[$key] = wpinv_clean($value);
         }
 }
 
@@ -221,101 +221,101 @@ 
         array(
 
             // Basic info.
-            'template'          => isset( $data['template'] ) ? wpinv_clean( $data['template'] ) : null,
-            'email_cc'          => isset( $data['email_cc'] ) ? wpinv_clean( $data['email_cc'] ) : null,
-            'date_created'      => isset( $data['created_date'] ) ? wpinv_clean( $data['created_date'] ) : null,
-            'due_date'          => isset( $data['due_date'] ) ? wpinv_clean( $data['due_date'] ) : null,
-            'date_completed'    => isset( $data['date_completed'] ) ? wpinv_clean( $data['date_completed'] ) : null,
-            'number'            => isset( $data['number'] ) ? wpinv_clean( $data['number'] ) : null,
-            'key'               => isset( $data['key'] ) ? wpinv_clean( $data['key'] ) : null,
-            'status'            => isset( $data['status'] ) ? wpinv_clean( $data['status'] ) : null,
-            'post_type'         => isset( $data['post_type'] ) ? wpinv_clean( $data['post_type'] ) : null,
-            'user_ip'           => isset( $data['ip'] ) ? wpinv_clean( $data['ip'] ) : wpinv_get_ip(),
-            'parent_id'         => isset( $data['parent'] ) ? intval( $data['parent'] ) : null,
-            'mode'              => isset( $data['mode'] ) ? wpinv_clean( $data['mode'] ) : null,
-            'description'       => isset( $data['description'] ) ? wp_kses_post( $data['description'] ) : null,
+            'template'          => isset($data['template']) ? wpinv_clean($data['template']) : null,
+            'email_cc'          => isset($data['email_cc']) ? wpinv_clean($data['email_cc']) : null,
+            'date_created'      => isset($data['created_date']) ? wpinv_clean($data['created_date']) : null,
+            'due_date'          => isset($data['due_date']) ? wpinv_clean($data['due_date']) : null,
+            'date_completed'    => isset($data['date_completed']) ? wpinv_clean($data['date_completed']) : null,
+            'number'            => isset($data['number']) ? wpinv_clean($data['number']) : null,
+            'key'               => isset($data['key']) ? wpinv_clean($data['key']) : null,
+            'status'            => isset($data['status']) ? wpinv_clean($data['status']) : null,
+            'post_type'         => isset($data['post_type']) ? wpinv_clean($data['post_type']) : null,
+            'user_ip'           => isset($data['ip']) ? wpinv_clean($data['ip']) : wpinv_get_ip(),
+            'parent_id'         => isset($data['parent']) ? intval($data['parent']) : null,
+            'mode'              => isset($data['mode']) ? wpinv_clean($data['mode']) : null,
+            'description'       => isset($data['description']) ? wp_kses_post($data['description']) : null,
 
             // Payment info.
-            'disable_taxes'     => ! empty( $data['disable_taxes'] ),
-            'currency'          => isset( $data['currency'] ) ? wpinv_clean( $data['currency'] ) : wpinv_get_currency(),
-            'gateway'           => isset( $data['gateway'] ) ? wpinv_clean( $data['gateway'] ) : null,
-            'transaction_id'    => isset( $data['transaction_id'] ) ? wpinv_clean( $data['transaction_id'] ) : null,
-            'discount_code'     => isset( $data['discount_code'] ) ? wpinv_clean( $data['discount_code'] ) : null,
-            'payment_form'      => isset( $data['payment_form'] ) ? intval( $data['payment_form'] ) : null,
-            'submission_id'     => isset( $data['submission_id'] ) ? wpinv_clean( $data['submission_id'] ) : null,
-            'subscription_id'   => isset( $data['subscription_id'] ) ? wpinv_clean( $data['subscription_id'] ) : null,
-            'is_viewed'         => isset( $data['is_viewed'] ) ? wpinv_clean( $data['is_viewed'] ) : null,
-            'fees'              => isset( $data['fees'] ) ? wpinv_clean( $data['fees'] ) : null,
-            'discounts'         => isset( $data['discounts'] ) ? wpinv_clean( $data['discounts'] ) : null,
-            'taxes'             => isset( $data['taxes'] ) ? wpinv_clean( $data['taxes'] ) : null,
+            'disable_taxes'     => !empty($data['disable_taxes']),
+            'currency'          => isset($data['currency']) ? wpinv_clean($data['currency']) : wpinv_get_currency(),
+            'gateway'           => isset($data['gateway']) ? wpinv_clean($data['gateway']) : null,
+            'transaction_id'    => isset($data['transaction_id']) ? wpinv_clean($data['transaction_id']) : null,
+            'discount_code'     => isset($data['discount_code']) ? wpinv_clean($data['discount_code']) : null,
+            'payment_form'      => isset($data['payment_form']) ? intval($data['payment_form']) : null,
+            'submission_id'     => isset($data['submission_id']) ? wpinv_clean($data['submission_id']) : null,
+            'subscription_id'   => isset($data['subscription_id']) ? wpinv_clean($data['subscription_id']) : null,
+            'is_viewed'         => isset($data['is_viewed']) ? wpinv_clean($data['is_viewed']) : null,
+            'fees'              => isset($data['fees']) ? wpinv_clean($data['fees']) : null,
+            'discounts'         => isset($data['discounts']) ? wpinv_clean($data['discounts']) : null,
+            'taxes'             => isset($data['taxes']) ? wpinv_clean($data['taxes']) : null,
 
             // Billing details.
             'user_id'           => $data['user_id'],
-            'first_name'        => isset( $data['first_name'] ) ? wpinv_clean( $data['first_name'] ) : $address['first_name'],
-            'last_name'         => isset( $data['last_name'] ) ? wpinv_clean( $data['last_name'] ) : $address['last_name'],
-            'address'           => isset( $data['address'] ) ? wpinv_clean( $data['address'] ) : $address['address'],
-            'vat_number'        => isset( $data['vat_number'] ) ? wpinv_clean( $data['vat_number'] ) : $address['vat_number'],
-            'company'           => isset( $data['company'] ) ? wpinv_clean( $data['company'] ) : $address['company'],
-            'zip'               => isset( $data['zip'] ) ? wpinv_clean( $data['zip'] ) : $address['zip'],
-            'state'             => isset( $data['state'] ) ? wpinv_clean( $data['state'] ) : $address['state'],
-            'city'              => isset( $data['city'] ) ? wpinv_clean( $data['city'] ) : $address['city'],
-            'country'           => isset( $data['country'] ) ? wpinv_clean( $data['country'] ) : $address['country'],
-            'phone'             => isset( $data['phone'] ) ? wpinv_clean( $data['phone'] ) : $address['phone'],
-            'address_confirmed' => ! empty( $data['address_confirmed'] ),
+            'first_name'        => isset($data['first_name']) ? wpinv_clean($data['first_name']) : $address['first_name'],
+            'last_name'         => isset($data['last_name']) ? wpinv_clean($data['last_name']) : $address['last_name'],
+            'address'           => isset($data['address']) ? wpinv_clean($data['address']) : $address['address'],
+            'vat_number'        => isset($data['vat_number']) ? wpinv_clean($data['vat_number']) : $address['vat_number'],
+            'company'           => isset($data['company']) ? wpinv_clean($data['company']) : $address['company'],
+            'zip'               => isset($data['zip']) ? wpinv_clean($data['zip']) : $address['zip'],
+            'state'             => isset($data['state']) ? wpinv_clean($data['state']) : $address['state'],
+            'city'              => isset($data['city']) ? wpinv_clean($data['city']) : $address['city'],
+            'country'           => isset($data['country']) ? wpinv_clean($data['country']) : $address['country'],
+            'phone'             => isset($data['phone']) ? wpinv_clean($data['phone']) : $address['phone'],
+            'address_confirmed' => !empty($data['address_confirmed']),
 
         )
     );
 
     // Backwards compatibililty.
-    if ( ! empty( $data['cart_details'] ) && is_array( $data['cart_details'] ) ) {
+    if (!empty($data['cart_details']) && is_array($data['cart_details'])) {
         $data['items'] = array();
 
-        foreach ( $data['cart_details'] as $_item ) {
+        foreach ($data['cart_details'] as $_item) {
 
             // Ensure that we have an item id.
-            if ( empty( $_item['id'] ) ) {
+            if (empty($_item['id'])) {
                 continue;
             }
 
             // Retrieve the item.
-            $item = new GetPaid_Form_Item( $_item['id'] );
+            $item = new GetPaid_Form_Item($_item['id']);
 
             // Ensure that it is purchasable.
-            if ( ! $item->can_purchase() ) {
+            if (!$item->can_purchase()) {
                 continue;
             }
 
             // Set quantity.
-            if ( ! empty( $_item['quantity'] ) && is_numeric( $_item['quantity'] ) ) {
-                $item->set_quantity( $_item['quantity'] );
+            if (!empty($_item['quantity']) && is_numeric($_item['quantity'])) {
+                $item->set_quantity($_item['quantity']);
             }
 
             // Set price.
-            if ( isset( $_item['item_price'] ) ) {
-                $item->set_price( $_item['item_price'] );
+            if (isset($_item['item_price'])) {
+                $item->set_price($_item['item_price']);
             }
 
-            if ( isset( $_item['custom_price'] ) ) {
-                $item->set_price( $_item['custom_price'] );
+            if (isset($_item['custom_price'])) {
+                $item->set_price($_item['custom_price']);
             }
 
             // Set name.
-            if ( ! empty( $_item['name'] ) ) {
-                $item->set_name( $_item['name'] );
+            if (!empty($_item['name'])) {
+                $item->set_name($_item['name']);
             }
 
             // Set description.
-            if ( isset( $_item['description'] ) ) {
-                $item->set_custom_description( $_item['description'] );
+            if (isset($_item['description'])) {
+                $item->set_custom_description($_item['description']);
             }
 
             // Set meta.
-            if ( isset( $_item['meta'] ) && is_array( $_item['meta'] ) ) {
+            if (isset($_item['meta']) && is_array($_item['meta'])) {
 
-                $item->set_item_meta( $_item['meta'] );
+                $item->set_item_meta($_item['meta']);
 
-                if ( isset( $_item['meta']['description'] ) ) {
-                    $item->set_custom_description( $_item['meta']['description'] );
+                if (isset($_item['meta']['description'])) {
+                    $item->set_custom_description($_item['meta']['description']);
                 }
             }
 
@@ -325,14 +325,14 @@ 
     }
 
     // Add invoice items.
-    if ( ! empty( $data['items'] ) && is_array( $data['items'] ) ) {
+    if (!empty($data['items']) && is_array($data['items'])) {
 
-        $invoice->set_items( array() );
+        $invoice->set_items(array());
 
-        foreach ( $data['items'] as $item ) {
+        foreach ($data['items'] as $item) {
 
-            if ( is_object( $item ) && is_a( $item, 'GetPaid_Form_Item' ) && $item->can_purchase() ) {
-                $invoice->add_item( $item );
+            if (is_object($item) && is_a($item, 'GetPaid_Form_Item') && $item->can_purchase()) {
+                $invoice->add_item($item);
             }
 }
 }
@@ -341,30 +341,30 @@ 
     $invoice->recalculate_total();
     $invoice->save();
 
-    if ( ! $invoice->get_id() ) {
-        return $wp_error ? new WP_Error( 'wpinv_insert_invoice_error', __( 'An error occured when saving your invoice.', 'invoicing' ) ) : 0;
+    if (!$invoice->get_id()) {
+        return $wp_error ? new WP_Error('wpinv_insert_invoice_error', __('An error occured when saving your invoice.', 'invoicing')) : 0;
     }
 
     // Add private note.
-    if ( ! empty( $data['private_note'] ) ) {
-        $invoice->add_note( $data['private_note'] );
+    if (!empty($data['private_note'])) {
+        $invoice->add_note($data['private_note']);
     }
 
     // User notes.
-    if ( ! empty( $data['user_note'] ) ) {
-        $invoice->add_note( $data['user_note'], true );
+    if (!empty($data['user_note'])) {
+        $invoice->add_note($data['user_note'], true);
     }
 
     // Created via.
-    if ( isset( $data['created_via'] ) ) {
-        update_post_meta( $invoice->get_id(), 'wpinv_created_via', $data['created_via'] );
+    if (isset($data['created_via'])) {
+        update_post_meta($invoice->get_id(), 'wpinv_created_via', $data['created_via']);
     }
 
     // Backwards compatiblity.
-    if ( $invoice->is_quote() ) {
+    if ($invoice->is_quote()) {
 
-        if ( isset( $data['valid_until'] ) ) {
-            update_post_meta( $invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until'] );
+        if (isset($data['valid_until'])) {
+            update_post_meta($invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until']);
         }
 }
 
@@ -378,20 +378,20 @@ 
  * @param $bool $deprecated
  * @return WPInv_Invoice|null
  */
-function wpinv_get_invoice( $invoice = 0, $deprecated = false ) {
+function wpinv_get_invoice($invoice = 0, $deprecated = false) {
 
     // If we are retrieving the invoice from the cart...
-    if ( $deprecated && empty( $invoice ) ) {
+    if ($deprecated && empty($invoice)) {
         $invoice = (int) getpaid_get_current_invoice_id();
     }
 
     // Retrieve the invoice.
-    if ( ! is_a( $invoice, 'WPInv_Invoice' ) ) {
-        $invoice = new WPInv_Invoice( $invoice );
+    if (!is_a($invoice, 'WPInv_Invoice')) {
+        $invoice = new WPInv_Invoice($invoice);
     }
 
     // Check if it exists.
-    if ( $invoice->exists() ) {
+    if ($invoice->exists()) {
         return $invoice;
     }
 
@@ -404,15 +404,15 @@ 
  * @param array $args Args to search for.
  * @return WPInv_Invoice[]|int[]|object
  */
-function wpinv_get_invoices( $args ) {
+function wpinv_get_invoices($args) {
 
     // Prepare args.
     $args = wp_parse_args(
         $args,
         array(
-            'status' => array_keys( wpinv_get_invoice_statuses() ),
+            'status' => array_keys(wpinv_get_invoice_statuses()),
             'type'   => 'wpi_invoice',
-            'limit'  => get_option( 'posts_per_page' ),
+            'limit'  => get_option('posts_per_page'),
             'return' => 'objects',
         )
     );
@@ -430,24 +430,24 @@ 
         'post__in'       => 'include',
     );
 
-    foreach ( $map_legacy as $to => $from ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
-            unset( $args[ $from ] );
+    foreach ($map_legacy as $to => $from) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
+            unset($args[$from]);
         }
     }
 
     // Backwards compatibility.
-    if ( ! empty( $args['email'] ) && empty( $args['user'] ) ) {
+    if (!empty($args['email']) && empty($args['user'])) {
         $args['user'] = $args['email'];
-        unset( $args['email'] );
+        unset($args['email']);
     }
 
     // Handle cases where the user is set as an email.
-    if ( ! empty( $args['author'] ) && is_email( $args['author'] ) ) {
-        $user = get_user_by( 'email', $args['user'] );
+    if (!empty($args['author']) && is_email($args['author'])) {
+        $user = get_user_by('email', $args['user']);
 
-        if ( $user ) {
+        if ($user) {
             $args['author'] = $user->user_email;
         }
 }
@@ -457,31 +457,31 @@ 
 
     // Show all posts.
     $paginate = true;
-    if ( isset( $args['paginate'] ) ) {
+    if (isset($args['paginate'])) {
 
         $paginate = $args['paginate'];
-        $args['no_found_rows'] = empty( $args['paginate'] );
-        unset( $args['paginate'] );
+        $args['no_found_rows'] = empty($args['paginate']);
+        unset($args['paginate']);
 
     }
 
     // Whether to return objects or fields.
     $return = $args['return'];
-    unset( $args['return'] );
+    unset($args['return']);
 
     // Get invoices.
-    $invoices = new WP_Query( apply_filters( 'wpinv_get_invoices_args', $args ) );
+    $invoices = new WP_Query(apply_filters('wpinv_get_invoices_args', $args));
 
     // Prepare the results.
-    if ( 'objects' === $return ) {
-        $results = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $return ) {
+    if ('objects' === $return) {
+        $results = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $return) {
         return $invoices;
     } else {
         $results = $invoices->posts;
     }
 
-    if ( $paginate ) {
+    if ($paginate) {
         return (object) array(
             'invoices'      => $results,
             'total'         => $invoices->found_posts,
@@ -499,8 +499,8 @@ 
  * @param string $transaction_id The transaction id to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_transaction_id( $transaction_id ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $transaction_id, 'transaction_id' );
+function wpinv_get_id_by_transaction_id($transaction_id) {
+    return WPInv_Invoice::get_invoice_id_by_field($transaction_id, 'transaction_id');
 }
 
 /**
@@ -509,8 +509,8 @@ 
  * @param string $invoice_number The invoice number to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_invoice_number( $invoice_number ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_number, 'number' );
+function wpinv_get_id_by_invoice_number($invoice_number) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_number, 'number');
 }
 
 /**
@@ -519,8 +519,8 @@ 
  * @param string $invoice_key The invoice key to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_invoice_id_by_key( $invoice_key ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_key, 'key' );
+function wpinv_get_invoice_id_by_key($invoice_key) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_key, 'key');
 }
 
 /**
@@ -530,19 +530,19 @@ 
  * @param string $type Optionally filter by type i.e customer|system
  * @return array|null
  */
-function wpinv_get_invoice_notes( $invoice = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice = 0, $type = '') {
 
     // Prepare the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice);
+    if (empty($invoice)) {
         return null;
     }
 
     // Fetch notes.
-    $notes = getpaid_notes()->get_invoice_notes( $invoice->get_id(), $type );
+    $notes = getpaid_notes()->get_invoice_notes($invoice->get_id(), $type);
 
     // Filter the notes.
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice->get_id(), $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice->get_id(), $type);
 }
 
 /**
@@ -550,10 +550,10 @@ 
  *
  * @param string $post_type
  */
-function wpinv_get_user_invoices_columns( $post_type = 'wpi_invoice' ) {
+function wpinv_get_user_invoices_columns($post_type = 'wpi_invoice') {
 
-    $label   = getpaid_get_post_type_label( $post_type, false );
-    $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
+    $label   = getpaid_get_post_type_label($post_type, false);
+    $label   = empty($label) ? __('Invoice', 'invoicing') : sanitize_text_field($label);
     $columns = array(
 
 		'invoice-number'  => array(
@@ -562,22 +562,22 @@ 
 		),
 
 		'created-date'    => array(
-			'title' => __( 'Created Date', 'invoicing' ),
+			'title' => __('Created Date', 'invoicing'),
 			'class' => 'text-left',
 		),
 
 		'payment-date'    => array(
-			'title' => __( 'Payment Date', 'invoicing' ),
+			'title' => __('Payment Date', 'invoicing'),
 			'class' => 'text-left',
 		),
 
 		'invoice-status'  => array(
-			'title' => __( 'Status', 'invoicing' ),
+			'title' => __('Status', 'invoicing'),
 			'class' => 'text-center',
 		),
 
 		'invoice-total'   => array(
-			'title' => __( 'Total', 'invoicing' ),
+			'title' => __('Total', 'invoicing'),
 			'class' => 'text-right',
 		),
 
@@ -588,7 +588,7 @@ 
 
 	);
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
+    return apply_filters('wpinv_user_invoices_columns', $columns, $post_type);
 }
 
 /**
@@ -598,59 +598,59 @@ 
 
     // Find the invoice.
     $invoice_id = getpaid_get_current_invoice_id();
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Abort if non was found.
-    if ( empty( $invoice_id ) || $invoice->is_draft() ) {
+    if (empty($invoice_id) || $invoice->is_draft()) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'We could not find your invoice', 'invoicing' ),
+                'content' => __('We could not find your invoice', 'invoicing'),
             )
         );
 
     }
 
     // Can the user view this invoice?
-    if ( ! wpinv_can_view_receipt( $invoice_id ) ) {
+    if (!wpinv_can_view_receipt($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'You are not allowed to view this receipt', 'invoicing' ),
+                'content' => __('You are not allowed to view this receipt', 'invoicing'),
             )
         );
 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-receipt.php', compact( 'invoice' ) );
+    return wpinv_get_template_html('invoice-receipt.php', compact('invoice'));
 
 }
 
 /**
  * Displays the invoice history.
  */
-function getpaid_invoice_history( $user_id = 0, $post_type = 'wpi_invoice' ) {
+function getpaid_invoice_history($user_id = 0, $post_type = 'wpi_invoice') {
 
     // Ensure that we have a user id.
-    if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+    if (empty($user_id) || !is_numeric($user_id)) {
         $user_id = get_current_user_id();
     }
 
-    $label = getpaid_get_post_type_label( $post_type );
-    $label = empty( $label ) ? __( 'Invoices', 'invoicing' ) : sanitize_text_field( $label );
+    $label = getpaid_get_post_type_label($post_type);
+    $label = empty($label) ? __('Invoices', 'invoicing') : sanitize_text_field($label);
 
     // View user id.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
                 'content' => sprintf(
-                    __( 'You must be logged in to view your %s.', 'invoicing' ),
-                    strtolower( $label )
+                    __('You must be logged in to view your %s.', 'invoicing'),
+                    strtolower($label)
                 ),
             )
         );
@@ -660,22 +660,22 @@ 
     // Fetch invoices.
     $invoices = wpinv_get_invoices(
         array(
-            'page'     => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+            'page'     => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
             'user'     => $user_id,
             'paginate' => true,
             'type'     => $post_type,
-            'status'   => array_keys( wpinv_get_invoice_statuses( false, false, $post_type ) ),
+            'status'   => array_keys(wpinv_get_invoice_statuses(false, false, $post_type)),
         )
     );
 
-    if ( empty( $invoices->total ) ) {
+    if (empty($invoices->total)) {
 
         return aui()->alert(
             array(
                 'type'    => 'info',
                 'content' => sprintf(
-                    __( 'No %s found.', 'invoicing' ),
-                    strtolower( $label )
+                    __('No %s found.', 'invoicing'),
+                    strtolower($label)
                 ),
             )
         );
@@ -683,38 +683,38 @@ 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-history.php', compact( 'invoices', 'post_type' ) );
+    return wpinv_get_template_html('invoice-history.php', compact('invoices', 'post_type'));
 
 }
 
 /**
  * Formats an invoice number given an invoice type.
  */
-function wpinv_format_invoice_number( $number, $type = '' ) {
+function wpinv_format_invoice_number($number, $type = '') {
 
     // Allow other plugins to overide this.
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure that we have a numeric number.
-    if ( ! is_numeric( $number ) ) {
+    if (!is_numeric($number)) {
         return $number;
     }
 
     // Format the number.
-    $padd             = absint( (int) wpinv_get_option( 'invoice_number_padd', 5 ) );
-    $prefix           = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_prefix', 'INV-' ) );
-    $prefix           = sanitize_text_field( apply_filters( 'getpaid_invoice_type_prefix', $prefix, $type ) );
-    $postfix          = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_postfix' ) );
-    $postfix          = sanitize_text_field( apply_filters( 'getpaid_invoice_type_postfix', $postfix, $type ) );
-    $formatted_number = zeroise( absint( $number ), $padd );
+    $padd             = absint((int) wpinv_get_option('invoice_number_padd', 5));
+    $prefix           = sanitize_text_field((string) wpinv_get_option('invoice_number_prefix', 'INV-'));
+    $prefix           = sanitize_text_field(apply_filters('getpaid_invoice_type_prefix', $prefix, $type));
+    $postfix          = sanitize_text_field((string) wpinv_get_option('invoice_number_postfix'));
+    $postfix          = sanitize_text_field(apply_filters('getpaid_invoice_type_postfix', $postfix, $type));
+    $formatted_number = zeroise(absint($number), $padd);
 
     // Add the prefix and post fix.
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
 /**
@@ -723,58 +723,58 @@ 
  * @param string $type.
  * @return int|null|bool
  */
-function wpinv_get_next_invoice_number( $type = '' ) {
+function wpinv_get_next_invoice_number($type = '') {
 
     // Allow plugins to overide this.
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure sequential invoice numbers is active.
-    if ( ! wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
     // Retrieve the current number and the start number.
-    $number = (int) get_option( 'wpinv_last_invoice_number', 0 );
-    $start  = absint( (int) wpinv_get_option( 'invoice_sequence_start', 1 ) );
+    $number = (int) get_option('wpinv_last_invoice_number', 0);
+    $start  = absint((int) wpinv_get_option('invoice_sequence_start', 1));
 
     // Ensure that we are starting at a positive integer.
-    $start  = max( $start, 1 );
+    $start  = max($start, 1);
 
     // If this is the first invoice, use the start number.
-    $number = max( $start, $number );
+    $number = max($start, $number);
 
     // Format the invoice number.
-    $formatted_number = wpinv_format_invoice_number( $number, $type );
+    $formatted_number = wpinv_format_invoice_number($number, $type);
 
     // Ensure that this number is unique.
-    $invoice_id = WPInv_Invoice::get_invoice_id_by_field( $formatted_number, 'number' );
+    $invoice_id = WPInv_Invoice::get_invoice_id_by_field($formatted_number, 'number');
 
     // We found a match. Nice.
-    if ( empty( $invoice_id ) ) {
-        update_option( 'wpinv_last_invoice_number', $number );
-        return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    if (empty($invoice_id)) {
+        update_option('wpinv_last_invoice_number', $number);
+        return apply_filters('wpinv_get_next_invoice_number', $number);
     }
 
-    update_option( 'wpinv_last_invoice_number', $number + 1 );
-    return wpinv_get_next_invoice_number( $type );
+    update_option('wpinv_last_invoice_number', $number + 1);
+    return wpinv_get_next_invoice_number($type);
 
 }
 
 /**
  * The prefix used for invoice paths.
  */
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
 
 /**
@@ -782,8 +782,8 @@ 
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function wpinv_is_invoice_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_is_invoice_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return (bool) $invoice->get_is_viewed();
 }
 
@@ -792,17 +792,17 @@ 
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function getpaid_maybe_mark_invoice_as_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function getpaid_maybe_mark_invoice_as_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( get_current_user_id() == $invoice->get_user_id() && ! $invoice->get_is_viewed() ) {
-        $invoice->set_is_viewed( true );
+    if (get_current_user_id() == $invoice->get_user_id() && !$invoice->get_is_viewed()) {
+        $invoice->set_is_viewed(true);
         $invoice->save();
     }
 
 }
-add_action( 'wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed' );
-add_action( 'wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed' );
+add_action('wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed');
+add_action('wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed');
 
 /**
  * Processes an invoice refund.
@@ -811,26 +811,26 @@ 
  * @param array $status_transition
  * @todo: descrease customer/store earnings
  */
-function getpaid_maybe_process_refund( $invoice, $status_transition ) {
+function getpaid_maybe_process_refund($invoice, $status_transition) {
 
-    if ( empty( $status_transition['from'] ) || ! in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+    if (empty($status_transition['from']) || !in_array($status_transition['from'], array('publish', 'wpi-processing', 'wpi-renewal'))) {
         return;
     }
 
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code)) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage( -1 );
         }
 }
 
-    do_action( 'wpinv_pre_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_post_refund_invoice', $invoice, $invoice->get_id() );
+    do_action('wpinv_pre_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_post_refund_invoice', $invoice, $invoice->get_id());
 }
-add_action( 'getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2 );
+add_action('getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2);
 
 
 /**
@@ -838,47 +838,47 @@ 
  *
  * @param int $invoice_id
  */
-function getpaid_process_invoice_payment( $invoice_id ) {
+function getpaid_process_invoice_payment($invoice_id) {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // We only want to do this once.
-    if ( 1 == get_post_meta( $invoice->get_id(), 'wpinv_processed_payment', true ) ) {
+    if (1 == get_post_meta($invoice->get_id(), 'wpinv_processed_payment', true)) {
         return;
     }
 
-    update_post_meta( $invoice->get_id(), 'wpinv_processed_payment', 1 );
+    update_post_meta($invoice->get_id(), 'wpinv_processed_payment', 1);
 
     // Fires when processing a payment.
-    do_action( 'getpaid_process_payment', $invoice );
+    do_action('getpaid_process_payment', $invoice);
 
     // Fire an action for each invoice item.
-    foreach ( $invoice->get_items() as $item ) {
-        do_action( 'getpaid_process_item_payment', $item, $invoice );
+    foreach ($invoice->get_items() as $item) {
+        do_action('getpaid_process_item_payment', $item, $invoice);
     }
 
     // Increase discount usage.
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) && ! $invoice->is_renewal() ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code) && !$invoice->is_renewal()) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage();
         }
 }
 
     // Record reverse vat.
-    if ( 'invoice' === $invoice->get_type() && wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+    if ('invoice' === $invoice->get_type() && wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
         $taxes = $invoice->get_total_tax();
-        if ( empty( $taxes ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
-            $invoice->add_note( __( 'VAT was reverse charged', 'invoicing' ), false, false, true );
+        if (empty($taxes) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
+            $invoice->add_note(__('VAT was reverse charged', 'invoicing'), false, false, true);
         }
 }
 
 }
-add_action( 'getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment' );
+add_action('getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment');
 
 /**
  * Returns an array of invoice item columns
@@ -886,13 +886,13 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_item_columns( $invoice ) {
+function getpaid_invoice_item_columns($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
@@ -900,52 +900,52 @@ 
     $columns = apply_filters(
         'getpaid_invoice_item_columns',
         array(
-            'name'     => __( 'Item', 'invoicing' ),
-            'price'    => __( 'Price', 'invoicing' ),
-            'tax_rate' => __( 'Tax Rate', 'invoicing' ),
-            'quantity' => __( 'Quantity', 'invoicing' ),
-            'subtotal' => __( 'Item Subtotal', 'invoicing' ),
+            'name'     => __('Item', 'invoicing'),
+            'price'    => __('Price', 'invoicing'),
+            'tax_rate' => __('Tax Rate', 'invoicing'),
+            'quantity' => __('Quantity', 'invoicing'),
+            'subtotal' => __('Item Subtotal', 'invoicing'),
         ),
         $invoice
     );
 
     // Quantities.
-    if ( isset( $columns['quantity'] ) ) {
+    if (isset($columns['quantity'])) {
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns['quantity'] = __( 'Hours', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['quantity'] = __('Hours', 'invoicing');
         }
 
-        if ( ! wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template() ) {
-            unset( $columns['quantity'] );
+        if (!wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template()) {
+            unset($columns['quantity']);
         }
     }
 
     // Price.
-    if ( isset( $columns['price'] ) ) {
+    if (isset($columns['price'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            $columns['price'] = __( 'Amount', 'invoicing' );
+        if ('amount' == $invoice->get_template()) {
+            $columns['price'] = __('Amount', 'invoicing');
         }
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns['price'] = __( 'Rate', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['price'] = __('Rate', 'invoicing');
         }
 }
 
     // Sub total.
-    if ( isset( $columns['subtotal'] ) ) {
+    if (isset($columns['subtotal'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            unset( $columns['subtotal'] );
+        if ('amount' == $invoice->get_template()) {
+            unset($columns['subtotal']);
         }
 }
 
     // Tax rates.
-    if ( isset( $columns['tax_rate'] ) ) {
+    if (isset($columns['tax_rate'])) {
 
-        if ( 0 == $invoice->get_total_tax() ) {
-            unset( $columns['tax_rate'] );
+        if (0 == $invoice->get_total_tax()) {
+            unset($columns['tax_rate']);
         }
     }
 
@@ -958,53 +958,53 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_totals_rows( $invoice ) {
+function getpaid_invoice_totals_rows($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
     $totals = apply_filters(
         'getpaid_invoice_totals_rows',
         array(
-            'subtotal' => __( 'Subtotal', 'invoicing' ),
-            'shipping' => __( 'Shipping', 'invoicing' ),
-            'tax'      => __( 'Tax', 'invoicing' ),
-            'fee'      => __( 'Fee', 'invoicing' ),
-            'discount' => __( 'Discount', 'invoicing' ),
-            'total'    => __( 'Total', 'invoicing' ),
+            'subtotal' => __('Subtotal', 'invoicing'),
+            'shipping' => __('Shipping', 'invoicing'),
+            'tax'      => __('Tax', 'invoicing'),
+            'fee'      => __('Fee', 'invoicing'),
+            'discount' => __('Discount', 'invoicing'),
+            'total'    => __('Total', 'invoicing'),
         ),
         $invoice
     );
 
-    if ( ! $invoice->has_shipping() ) {
-        unset( $totals['shipping'] );
+    if (!$invoice->has_shipping()) {
+        unset($totals['shipping']);
     }
 
-    if ( ( $invoice->get_disable_taxes() || ! wpinv_use_taxes() ) && isset( $totals['tax'] ) ) {
-        unset( $totals['tax'] );
+    if (($invoice->get_disable_taxes() || !wpinv_use_taxes()) && isset($totals['tax'])) {
+        unset($totals['tax']);
     }
 
     // If we have taxes, display individual taxes.
-    if ( isset( $totals['tax'] ) && wpinv_display_individual_tax_rates() ) {
+    if (isset($totals['tax']) && wpinv_display_individual_tax_rates()) {
 
         $new_totals = array();
-        foreach ( $totals as $key => $label ) {
+        foreach ($totals as $key => $label) {
 
-            if ( 'tax' !== $key ) {
-                $new_totals[ $key ] = $label;
+            if ('tax' !== $key) {
+                $new_totals[$key] = $label;
                 continue;
             }
 
-            $taxes = array_keys( $invoice->get_taxes() );
-            if ( ! empty( $taxes ) ) {
+            $taxes = array_keys($invoice->get_taxes());
+            if (!empty($taxes)) {
 
-                foreach ( $taxes as $tax ) {
-                    $new_totals[ 'tax__' . $tax ] = $tax;
+                foreach ($taxes as $tax) {
+                    $new_totals['tax__' . $tax] = $tax;
                 }
             }
         }
@@ -1012,12 +1012,12 @@ 
         $totals = $new_totals;
     }
 
-    if ( 0 == $invoice->get_total_fees() && isset( $totals['fee'] ) ) {
-        unset( $totals['fee'] );
+    if (0 == $invoice->get_total_fees() && isset($totals['fee'])) {
+        unset($totals['fee']);
     }
 
-    if ( 0 == $invoice->get_total_discount() && isset( $totals['discount'] ) ) {
-        unset( $totals['discount'] );
+    if (0 == $invoice->get_total_discount() && isset($totals['discount'])) {
+        unset($totals['discount']);
     }
 
     return $totals;
@@ -1028,47 +1028,47 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_new_invoice( $invoice ) {
+function getpaid_new_invoice($invoice) {
 
-    if ( ! $invoice->get_status() ) {
+    if (!$invoice->get_status()) {
         return;
     }
 
     // Add an invoice created note.
     $invoice->add_note(
         sprintf(
-            __( '%1$s created with the status "%2$s".', 'invoicing' ),
-            ucfirst( $invoice->get_invoice_quote_type() ),
-            wpinv_status_nicename( $invoice->get_status(), $invoice )
+            __('%1$s created with the status "%2$s".', 'invoicing'),
+            ucfirst($invoice->get_invoice_quote_type()),
+            wpinv_status_nicename($invoice->get_status(), $invoice)
         )
     );
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_new_invoice' );
+add_action('getpaid_new_invoice', 'getpaid_new_invoice');
 
 /**
  * This function updates invoice caches.
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_update_invoice_caches( $invoice ) {
+function getpaid_update_invoice_caches($invoice) {
 
     // Cache invoice number.
-    wp_cache_set( $invoice->get_number(), $invoice->get_id(), 'getpaid_invoice_numbers_to_invoice_ids' );
+    wp_cache_set($invoice->get_number(), $invoice->get_id(), 'getpaid_invoice_numbers_to_invoice_ids');
 
     // Cache invoice key.
-    wp_cache_set( $invoice->get_key(), $invoice->get_id(), 'getpaid_invoice_keys_to_invoice_ids' );
+    wp_cache_set($invoice->get_key(), $invoice->get_id(), 'getpaid_invoice_keys_to_invoice_ids');
 
     // (Maybe) cache transaction id.
     $transaction_id = $invoice->get_transaction_id();
 
-    if ( ! empty( $transaction_id ) ) {
-        wp_cache_set( $transaction_id, $invoice->get_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids' );
+    if (!empty($transaction_id)) {
+        wp_cache_set($transaction_id, $invoice->get_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids');
     }
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_update_invoice_caches', 5 );
-add_action( 'getpaid_update_invoice', 'getpaid_update_invoice_caches', 5 );
+add_action('getpaid_new_invoice', 'getpaid_update_invoice_caches', 5);
+add_action('getpaid_update_invoice', 'getpaid_update_invoice_caches', 5);
 
 /**
  * Duplicates an invoice.
@@ -1078,7 +1078,7 @@ 
  * @param  WPInv_Invoice $old_invoice The invoice to duplicate
  * @return WPInv_Invoice The new invoice.
  */
-function getpaid_duplicate_invoice( $old_invoice ) {
+function getpaid_duplicate_invoice($old_invoice) {
 
     // Create the new invoice.
     $invoice = new WPInv_Invoice();
@@ -1138,136 +1138,136 @@ 
  * @param WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_get_invoice_meta( $invoice ) {
+function getpaid_get_invoice_meta($invoice) {
 
     // Load the invoice meta.
     $meta = array(
 
         'number'         => array(
             'label' => sprintf(
-                __( '%s Number', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Number', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => sanitize_text_field( $invoice->get_number() ),
+            'value' => sanitize_text_field($invoice->get_number()),
         ),
 
         'status'         => array(
             'label' => sprintf(
-                __( '%s Status', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Status', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
             'value' => $invoice->get_status_label_html(),
         ),
 
         'date'           => array(
             'label' => sprintf(
-                __( '%s Date', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Date', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => getpaid_format_date( $invoice->get_created_date() ),
+            'value' => getpaid_format_date($invoice->get_created_date()),
         ),
 
         'date_paid'      => array(
-            'label' => __( 'Paid On', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_completed_date() ),
+            'label' => __('Paid On', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_completed_date()),
         ),
 
         'gateway'        => array(
-            'label' => __( 'Payment Method', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_gateway_title() ),
+            'label' => __('Payment Method', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_gateway_title()),
         ),
 
         'transaction_id' => array(
-            'label' => __( 'Transaction ID', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_transaction_id() ),
+            'label' => __('Transaction ID', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_transaction_id()),
         ),
 
         'due_date'       => array(
-            'label' => __( 'Due Date', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_due_date() ),
+            'label' => __('Due Date', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_due_date()),
         ),
 
         'vat_number'     => array(
-            'label' => __( 'VAT Number', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_vat_number() ),
+            'label' => __('VAT Number', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_vat_number()),
         ),
 
     );
 
-    $additional_meta = get_post_meta( $invoice->get_id(), 'additional_meta_data', true );
+    $additional_meta = get_post_meta($invoice->get_id(), 'additional_meta_data', true);
 
-    if ( ! empty( $additional_meta ) ) {
+    if (!empty($additional_meta)) {
 
-        foreach ( $additional_meta as $label => $value ) {
-            $meta[ sanitize_key( $label ) ] = array(
-                'label' => esc_html( $label ),
-                'value' => esc_html( $value ),
+        foreach ($additional_meta as $label => $value) {
+            $meta[sanitize_key($label)] = array(
+                'label' => esc_html($label),
+                'value' => esc_html($value),
             );
         }
 }
     // If it is not paid, remove the date of payment.
-    if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-        unset( $meta['date_paid'] );
-        unset( $meta['transaction_id'] );
+    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+        unset($meta['date_paid']);
+        unset($meta['transaction_id']);
     }
 
-    if ( ! $invoice->is_paid() || 'none' == $invoice->get_gateway() ) {
-        unset( $meta['gateway'] );
+    if (!$invoice->is_paid() || 'none' == $invoice->get_gateway()) {
+        unset($meta['gateway']);
     }
 
     // Only display the due date if due dates are enabled.
-    if ( ! $invoice->needs_payment() || ! wpinv_get_option( 'overdue_active' ) ) {
-        unset( $meta['due_date'] );
+    if (!$invoice->needs_payment() || !wpinv_get_option('overdue_active')) {
+        unset($meta['due_date']);
     }
 
     // Only display the vat number if taxes are enabled.
-    if ( ! wpinv_use_taxes() ) {
-        unset( $meta['vat_number'] );
+    if (!wpinv_use_taxes()) {
+        unset($meta['vat_number']);
     }
 
     // Link to the parent invoice.
-    if ( $invoice->get_parent_id() > 0 ) {
+    if ($invoice->get_parent_id() > 0) {
 
         $meta['parent'] = array(
 
             'label' => sprintf(
-                __( 'Parent %s', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('Parent %s', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
 
-            'value' => wpinv_invoice_link( $invoice->get_parent_id() ),
+            'value' => wpinv_invoice_link($invoice->get_parent_id()),
 
         );
 
     }
 
-    if ( $invoice->is_recurring() ) {
+    if ($invoice->is_recurring()) {
 
-        $subscription = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! empty( $subscription ) && ! is_array( $subscription ) && $subscription->exists() ) {
+        $subscription = getpaid_get_invoice_subscriptions($invoice);
+        if (!empty($subscription) && !is_array($subscription) && $subscription->exists()) {
 
             // Display the renewal date.
-            if ( $subscription->is_active() && 'cancelled' != $subscription->get_status() ) {
+            if ($subscription->is_active() && 'cancelled' != $subscription->get_status()) {
 
                 $meta['renewal_date'] = array(
-                    'label' => __( 'Renews On', 'invoicing' ),
-                    'value' => getpaid_format_date( $subscription->get_expiration() ) .
+                    'label' => __('Renews On', 'invoicing'),
+                    'value' => getpaid_format_date($subscription->get_expiration()) .
                     sprintf(
                         ' <a class="small" href="%s">%s<a>',
                         $subscription->get_view_url(),
-                        __( '(View Subscription)', 'invoicing' )
+                        __('(View Subscription)', 'invoicing')
                     ),
                 );
 
             }
 
-            if ( $invoice->is_parent() ) {
+            if ($invoice->is_parent()) {
 
                 // Display the recurring amount.
                 $meta['recurring_total'] = array(
 
-                    'label' => __( 'Recurring Amount', 'invoicing' ),
-                    'value' => wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ),
+                    'label' => __('Recurring Amount', 'invoicing'),
+                    'value' => wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency()),
 
                 );
 
@@ -1278,13 +1278,13 @@ 
     // Add the invoice total to the meta.
     $meta['invoice_total'] = array(
 
-        'label' => __( 'Total Amount', 'invoicing' ),
-        'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+        'label' => __('Total Amount', 'invoicing'),
+        'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
 
     );
 
     // Provide a way for third party plugins to filter the meta.
-    $meta = apply_filters( 'getpaid_invoice_meta_data', $meta, $invoice );
+    $meta = apply_filters('getpaid_invoice_meta_data', $meta, $invoice);
 
     return $meta;
 
@@ -1323,12 +1323,12 @@ 
  * @param GetPaid_Form_Item $item
  * @return float
  */
-function getpaid_get_invoice_tax_rate( $invoice, $item ) {
+function getpaid_get_invoice_tax_rate($invoice, $item) {
 
-    $rates   = getpaid_get_item_tax_rates( $item, $invoice->get_country(), $invoice->get_state() );
-	$rates   = getpaid_filter_item_tax_rates( $item, $rates );
-    $rates   = wp_list_pluck( $rates, 'rate' );
+    $rates   = getpaid_get_item_tax_rates($item, $invoice->get_country(), $invoice->get_state());
+	$rates = getpaid_filter_item_tax_rates($item, $rates);
+    $rates   = wp_list_pluck($rates, 'rate');
 
-    return array_sum( $rates );
+    return array_sum($rates);
 
 }

vendor/ayecode/wp-super-duper/wp-super-duper.php

Braces +41 added lines, -42 removed lines

@@ -60,7 +60,7 @@ 
 			if(!empty($this->options['nested-block'])){
 				if(empty($this->options['output_types'])){
 					$this->options['output_types'] = array('shortcode','block');
-				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
+				} elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
 					unset($this->options['output_types'][$key]);
 				}
 			}
@@ -729,7 +729,7 @@ 
 				<?php
 				if(! empty( $insert_shortcode_function )){
 					echo $insert_shortcode_function;
-				}else{
+				} else{
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -2303,7 +2303,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else{
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2531,7 +2531,7 @@ 
 					var InnerBlocks = blockEditor.InnerBlocks;
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
+					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";} else{echo "[]";} ?>;
 					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
 					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
 					const MediaUpload = wp.blockEditor.MediaUpload;
@@ -2588,9 +2588,9 @@ 
 						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
 						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
 							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
+						} elseif( !empty( $example_args ) ){
 							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
+						} elseif( !empty( $this->options['example'] ) ){
 							unset($this->options['example']['viewportWidth']);
 							unset($this->options['example']['innerBlocks']);
 							$example_atts = $this->array_to_attributes( $this->options['example'] );
@@ -2607,7 +2607,7 @@ 
 							if(!empty($example_parts)){
 								echo "example : {".implode(',', $example_parts)."},";
 							}
-						}else{
+						} else{
 							echo 'example : {viewportWidth: 500},';
 						}
 
@@ -2792,7 +2792,7 @@ 
 							<?php
 							if(!empty($this->options['block-edit-raw'])) {
 								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
+							} else{
 							?>
 
 function hasSelectedInnerBlock(props) {
@@ -2927,7 +2927,7 @@ 
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 if(!empty($current_screen->base) && $current_screen->base==='widgets'){
 	echo 'const { deviceType } = "";';
-}else{
+} else{
 ?>
 /** Get device type const. */
 const wpVersion = '<?php global $wp_version; echo esc_attr($wp_version); ?>';
@@ -2991,7 +2991,7 @@ 
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
 										echo $post->ID;
-									}else{echo '0';}?>,
+									} else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -3011,7 +3011,7 @@ 
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
+										} else{
 										?>
 										props.setAttributes({content: env});
 										is_fetching = false;
@@ -3222,7 +3222,7 @@ 
 //
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
@@ -3248,9 +3248,9 @@ 
 								// If the user sets block-output array then build it
 								if ( ! empty( $this->options['block-output'] ) ) {
 								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
+							} elseif(!empty($this->options['block-edit-return'])){
 								   echo $this->options['block-edit-return'];
-							}else{
+							} else{
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
 								?>
@@ -3362,9 +3362,9 @@ 
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
+							} elseif(!empty($this->options['block-save-return'])){
 								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
+							} elseif(!empty($this->options['nested-block'])){
 								?>
 							  return el(
 								   '',
@@ -3374,13 +3374,13 @@ 
 								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
+							} elseif(!empty( $this->options['block-save-return'] ) ){
 								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							} elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
 							?>
 							return content;
 							<?php
-							}else{
+							} else{
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -3431,9 +3431,9 @@ 
 				$device_type_icon = '';
 				if($device_type=='Desktop'){
 					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
+				} elseif($device_type=='Tablet'){
 					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
+				} elseif($device_type=='Mobile'){
 					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 				}
 				echo $element_require;
@@ -3478,7 +3478,7 @@ 
 
 					<?php
 					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -3487,7 +3487,7 @@ 
 							},
 					<?php
 					if(false){?></script><?php }
-				}else{
+				} else{
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -3592,9 +3592,9 @@ 
 			$device_type_icon = '';
 			if($device_type=='Desktop'){
 				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
+			} elseif($device_type=='Tablet'){
 				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
+			} elseif($device_type=='Mobile'){
 				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 			}
 
@@ -3657,7 +3657,7 @@ 
 				$args['type'] == 'text';
 				// Save numbers as numbers and not strings
 				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
+			} else if ( $args['type'] == 'notice' ) {
 
 				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
 				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
@@ -3732,7 +3732,7 @@ 
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
+			} elseif ( $args['type'] == 'gradient' ) {
 				$type = 'GradientPicker';
 				$extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
@@ -3771,7 +3771,7 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+			} elseif ( $args['type'] == 'image' ) {
 //                print_r($args);
 
 				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
@@ -3908,8 +3908,7 @@ 
 				$onchange = "";
 
 				//$inside_elements = ",el('div',{},'file upload')";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			} elseif ( $args['type'] == 'checkbox' ) {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
@@ -3921,9 +3920,9 @@ 
 
 				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
 					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+				} elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
 					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				} else {
 
 					if ( ! empty( $args['options'] ) ) {
 						$options .= "options: [";
@@ -4087,7 +4086,7 @@ 
 				foreach ( $custom_attributes as $key => $val ) {
 					if(is_array($val)){
 						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
+					} else{
 						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
 					}
 				}
@@ -4128,7 +4127,7 @@ 
 
 							if($new_args['element']=='InnerBlocks'){
 								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
+							} elseif($new_args['element']=='innerBlocksProps'){
 								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
 							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
@@ -4141,11 +4140,11 @@ 
 							//    echo '###';
 
 							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
+							} elseif($new_args['element']=='BlocksProps'){
 
 								if ( isset($new_args['if_inner_element']) ) {
 									$element = $new_args['if_inner_element'];
-								}else {
+								} else {
 									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
 								}
 
@@ -4156,7 +4155,7 @@ 
 
 							   // echo "} ),";
 
-							}else{
+							} else{
 								echo "\n el( '" . $new_args['element'] . "', {";
 							}
 
@@ -4181,7 +4180,7 @@ 
 
 									if ( $new_key === 'content' ) {
 										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
+									} else if ( $new_key === 'if_content' ) {
 										echo  $this->block_props_replace(  $new_value  );
 									}
 
@@ -4211,7 +4210,7 @@ 
 
 							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
 								echo "))";// end content
-							}else{
+							} else{
 								echo ")";// end content
 							}
 
@@ -4837,11 +4836,11 @@ 
 		public function get_widget_icon($icon = 'box-top', $title = ''){
 			if($icon=='box-top'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
+			} elseif($icon=='box-right'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
+			} elseif($icon=='box-bottom'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
+			} elseif($icon=='box-left'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}

Indentation +2674 added lines, -2674 removed lines

@@ -1,148 +1,148 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	define( 'SUPER_DUPER_VER', '1.2.25' );
-
-	/**
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
-	 *
-	 * Should not be called direct but extended instead.
-	 *
-	 * Class WP_Super_Duper
-	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
-	 * @ver 1.1.1
-	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = SUPER_DUPER_VER;
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $settings_hash;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
-		 * The relative url to the current folder.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Take the array options and use them to build.
-		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name'],
-				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
-			);
-			$this->base_id                     = $options['base_id'];
-			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-
-			// nested blocks can't work as a widget
-			if(!empty($this->options['nested-block'])){
-				if(empty($this->options['output_types'])){
-					$this->options['output_types'] = array('shortcode','block');
-				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
-					unset($this->options['output_types'][$key]);
-				}
-			}
+    define( 'SUPER_DUPER_VER', '1.2.25' );
+
+    /**
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
+     *
+     * Should not be called direct but extended instead.
+     *
+     * Class WP_Super_Duper
+     * @since 1.0.16 change log moved to file change-log.txt - CHANGED
+     * @ver 1.1.1
+     */
+    class WP_Super_Duper extends WP_Widget {
+
+        public $version = SUPER_DUPER_VER;
+        public $font_awesome_icon_version = "5.11.2";
+        public $block_code;
+        public $options;
+        public $base_id;
+        public $settings_hash;
+        public $arguments = array();
+        public $instance = array();
+        private $class_name;
 
-			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
-			}
+        /**
+         * The relative url to the current folder.
+         *
+         * @var string
+         */
+        public $url = '';
+
+        /**
+         * Take the array options and use them to build.
+         */
+        public function __construct( $options ) {
+            global $sd_widgets;
+
+            $sd_widgets[ $options['base_id'] ] = array(
+                'name'       => $options['name'],
+                'class_name' => $options['class_name'],
+                'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
+            );
+            $this->base_id                     = $options['base_id'];
+            // lets filter the options before we do anything
+            $options       = apply_filters( "wp_super_duper_options", $options );
+            $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
+            $options       = $this->add_name_from_key( $options );
+            $this->options = $options;
+
+            $this->base_id   = $options['base_id'];
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+
+            // nested blocks can't work as a widget
+            if(!empty($this->options['nested-block'])){
+                if(empty($this->options['output_types'])){
+                    $this->options['output_types'] = array('shortcode','block');
+                }elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
+                    unset($this->options['output_types'][$key]);
+                }
+            }
 
+            // init parent
+            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+                parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+            }
 
-			if ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
 
-				// register shortcode, this needs to be done even for blocks and widgets
-				$this->register_shortcode();
+            if ( isset( $options['class_name'] ) ) {
+                // register widget
+                $this->class_name = $options['class_name'];
 
+                // register shortcode, this needs to be done even for blocks and widgets
+                $this->register_shortcode();
 
-				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
-				}
+
+                // Fusion Builder (avada) support
+                if ( function_exists( 'fusion_builder_map' ) ) {
+                    add_action( 'init', array( $this, 'register_fusion_element' ) );
+                }
 
                 // maybe load the Bricks transformer class
                 if( class_exists('\Bricks\Elements', false) ){
-					add_action( 'init', array( $this, 'load_bricks_element_class' ) );
+                    add_action( 'init', array( $this, 'load_bricks_element_class' ) );
                 }
 
-				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-				}
-			}
+                // register block
+                if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
+                    add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+                }
+            }
 
-			// add the CSS and JS we need ONCE
-			global $sd_widget_scripts;
+            // add the CSS and JS we need ONCE
+            global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+            if ( ! $sd_widget_scripts ) {
+                wp_add_inline_script( 'admin-widgets', $this->widget_js() );
+                wp_add_inline_script( 'customize-controls', $this->widget_js() );
+                wp_add_inline_style( 'widgets', $this->widget_css() );
 
-				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+                // maybe add elementor editor styles
+                add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
 
-				$sd_widget_scripts = true;
+                $sd_widget_scripts = true;
 
-				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
-				}
+                // add shortcode insert button once
+                add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
+                add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+                // generatepress theme sections compatibility
+                if ( function_exists( 'generate_sections_sections_metabox' ) ) {
+                    add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+                }
 
-				/* Load script on Divi theme builder page */
-				if ( ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) || ( function_exists( 'et_builder_d5_enabled' ) && et_builder_d5_enabled() && isset( $_GET['et_fb'] ) && '1' === $_GET['et_fb'] && et_pb_is_allowed( 'use_visual_builder' ) ) ) {
-					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
-				}
+                /* Load script on Divi theme builder page */
+                if ( ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) || ( function_exists( 'et_builder_d5_enabled' ) && et_builder_d5_enabled() && isset( $_GET['et_fb'] ) && '1' === $_GET['et_fb'] && et_pb_is_allowed( 'use_visual_builder' ) ) ) {
+                    add_thickbox();
+                    add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+                }
 
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
-					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+                if ( $this->is_preview() ) {
+                    add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+                    // this makes the insert button work for elementor
+                    add_action( 'elementor/editor/after_enqueue_scripts', array(
+                        $this,
+                        'shortcode_insert_button_script'
+                    ) ); // for elementor
+                }
+                // this makes the insert button work for cornerstone
+                add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+                add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+                add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
 
-				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
-			}
+                // add generator text to head
+                add_action( 'admin_head', array( $this, 'generator' ), 99 );
+                add_action( 'wp_head', array( $this, 'generator' ), 99 );
+            }
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
 
         /**
          * Load the Bricks conversion class if we are running Bricks.
@@ -152,163 +152,163 @@ 
                     include_once __DIR__ . '/includes/class-super-duper-bricks-element.php';
         }
 
-		/**
-		 * The register widget function
-		 * @return void
-		 */
-		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::_register();
-			}
-		}
-
-		/**
-		 * Add our widget CSS to elementor editor.
-		 */
-		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
-		}
-
-		public function register_fusion_element() {
-
-			$options = $this->options;
-
-			if ( $this->base_id ) {
-
-				$params = $this->get_fusion_params();
-
-				$args = array(
-					'name'            => $options['name'],
-					'shortcode'       => $this->base_id,
-					'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-					'allow_generator' => true,
-				);
-
-				if ( ! empty( $params ) ) {
-					$args['params'] = $params;
-				}
-
-				fusion_builder_map( $args );
-			}
+        /**
+         * The register widget function
+         * @return void
+         */
+        public function _register() {
+            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+                parent::_register();
+            }
+        }
 
-		}
+        /**
+         * Add our widget CSS to elementor editor.
+         */
+        public function elementor_editor_styles() {
+            wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+        }
 
-		public function get_fusion_params() {
-			$params    = array();
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
-					$param = array();
-					// type
-					$param['type'] = str_replace(
-						array(
-							"text",
-							"number",
-							"email",
-							"color",
-							"checkbox"
-						),
-						array(
-							"textfield",
-							"textfield",
-							"textfield",
-							"colorpicker",
-							"select",
+        public function register_fusion_element() {
 
-						),
-						$val['type'] );
+            $options = $this->options;
 
-					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-						$param['type']     = 'multiple_select';
-						$param['multiple'] = true;
-					}
+            if ( $this->base_id ) {
 
-					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+                $params = $this->get_fusion_params();
 
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+                $args = array(
+                    'name'            => $options['name'],
+                    'shortcode'       => $this->base_id,
+                    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+                    'allow_generator' => true,
+                );
 
-					// param_name
-					$param['param_name'] = $key;
+                if ( ! empty( $params ) ) {
+                    $args['params'] = $params;
+                }
 
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+                fusion_builder_map( $args );
+            }
 
-					// Group
-					if ( isset( $val['group'] ) ) {
-						$param['group'] = $val['group'];
-					}
+        }
 
-					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
-						}
-						$param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
-					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
-					}
+        public function get_fusion_params() {
+            $params    = array();
+            $arguments = $this->get_arguments();
+
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $key => $val ) {
+                    $param = array();
+                    // type
+                    $param['type'] = str_replace(
+                        array(
+                            "text",
+                            "number",
+                            "email",
+                            "color",
+                            "checkbox"
+                        ),
+                        array(
+                            "textfield",
+                            "textfield",
+                            "textfield",
+                            "colorpicker",
+                            "select",
+
+                        ),
+                        $val['type'] );
+
+                    // multiselect
+                    if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+                        $param['type']     = 'multiple_select';
+                        $param['multiple'] = true;
+                    }
+
+                    // heading
+                    $param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+
+                    // description
+                    $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+
+                    // param_name
+                    $param['param_name'] = $key;
+
+                    // Default
+                    $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+
+                    // Group
+                    if ( isset( $val['group'] ) ) {
+                        $param['group'] = $val['group'];
+                    }
+
+                    // value
+                    if ( $val['type'] == 'checkbox' ) {
+                        if ( isset( $val['default'] ) && $val['default'] == '0' ) {
+                            unset( $param['default'] );
+                        }
+                        $param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
+                    } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
+                        $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+                    } else {
+                        $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+                    }
+
+                    // setup the param
+                    $params[] = $param;
 
-					// setup the param
-					$params[] = $param;
+                }
+            }
 
-				}
-			}
 
+            return $params;
+        }
 
-			return $params;
-		}
+        /**
+         * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
+         */
+        public static function maybe_cornerstone_builder() {
+            if ( did_action( 'cornerstone_before_boot_app' ) ) {
+                self::shortcode_insert_button_script();
+            }
+        }
 
-		/**
-		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
-		 */
-		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
-				self::shortcode_insert_button_script();
-			}
-		}
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
 
-		/**
-		 * A function to ge the shortcode builder picker html.
-		 *
-		 * @param string $editor_id
-		 *
-		 * @return string
-		 */
-		public static function get_picker( $editor_id = '' ) {
-
-			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
+            ob_start();
+            if ( isset( $_POST['editor_id'] ) ) {
+                $editor_id = esc_attr( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
 
-			global $sd_widgets;
+            global $sd_widgets;
 
 //			print_r($sd_widgets);exit;
-			?>
+            ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
+                ksort( $sd_widgets );
+                //				print_r($sd_widgets);exit;
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
 
-				}
-				?>
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 			</div>
 			<div class="sd-shortcode-right-wrap">
@@ -321,147 +321,147 @@ 
 				</div>
 			</div>
 			<?php
-			$html = ob_get_clean();
-
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
-
-				// some builder get the editor via ajax so we should not die on those occasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
+            $html = ob_get_clean();
+
+            if ( wp_doing_ajax() ) {
+                echo $html;
+                $should_die = true;
+
+                // some builder get the editor via ajax so we should not die on those occasions
+                $dont_die = array(
+                    'parent_tag',// WP Bakery
+                    'avia_request' // enfold
+                );
+
+                foreach ( $dont_die as $request ) {
+                    if ( isset( $_REQUEST[ $request ] ) ) {
+                        $should_die = false;
+                    }
+                }
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
+                if ( $should_die ) {
+                    wp_die();
+                }
+            } else {
+                return $html;
+            }
 
-				if ( $should_die ) {
-					wp_die();
-				}
-			} else {
-				return $html;
-			}
+            return '';
+        }
 
-			return '';
-		}
+        /**
+         * Output the version in the header.
+         */
+        public function generator() {
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme of SD
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
 
-		/**
-		 * Output the version in the header.
-		 */
-		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme of SD
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
+            echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+        }
 
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
+        /**
+         * Get widget settings.
+         *
+         * @since 1.0.0
+         */
+        public static function get_widget_settings() {
+            global $sd_widgets;
 
-		/**
-		 * Get widget settings.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
-				wp_die();
-			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
+            $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
+            if ( ! $shortcode ) {
+                wp_die();
+            }
+            $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
+            if ( ! $widget_args ) {
+                wp_die();
+            }
+            $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+            if ( ! $class_name ) {
+                wp_die();
+            }
 
-			// invoke an instance method
-			$widget = new $class_name;
+            // invoke an instance method
+            $widget = new $class_name;
 
-			ob_start();
-			$widget->form( array() );
-			$form = ob_get_clean();
-			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
-			echo "<style>" . $widget->widget_css() . "</style>";
-			echo "<script>" . $widget->widget_js() . "</script>";
-			?>
+            ob_start();
+            $widget->form( array() );
+            $form = ob_get_clean();
+            echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
+            echo "<style>" . $widget->widget_css() . "</style>";
+            echo "<script>" . $widget->widget_js() . "</script>";
+            ?>
 			<?php
-			wp_die();
-		}
-
-		/**
-		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
-		 *
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
-		 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
-		 *
-		 *@since 1.0.0
-		 *
-		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
+            wp_die();
+        }
 
-			/**
-			 * Cornerstone makes us play dirty tricks :/
-			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
-			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '<span id="insert-media-button">';
-			}
+        /**
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
+         *
+         *@since 1.0.0
+         *
+         */
+        public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+            global $sd_widgets, $shortcode_insert_button_once;
+            if ( $shortcode_insert_button_once ) {
+                return;
+            }
+            add_thickbox();
+
+            /**
+             * Cornerstone makes us play dirty tricks :/
+             * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
+             */
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '<span id="insert-media-button">';
+            }
 
-			echo self::shortcode_button( 'this', 'true' );
+            echo self::shortcode_button( 'this', 'true' );
 
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
+            // see opening note
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '</span>'; // end #insert-media-button
+            }
 
-			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
-			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			}
+            // Add separate script for generatepress theme sections
+            if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+            } else {
+                self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+            }
 
-			$shortcode_insert_button_once = true;
-		}
+            $shortcode_insert_button_once = true;
+        }
 
-		/**
-		 * Gets the shortcode insert button html.
-		 *
-		 * @param string $id
-		 * @param string $search_for_id
-		 *
-		 * @return mixed
-		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+        /**
+         * Gets the shortcode insert button html.
+         *
+         * @param string $id
+         * @param string $search_for_id
+         *
+         * @return mixed
+         */
+        public static function shortcode_button( $id = '', $search_for_id = '' ) {
+            ob_start();
+            ?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
-					echo "," . $search_for_id;
-				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
+                if ( $search_for_id ) {
+                    echo "," . $search_for_id;
+                } ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
 					<span style="vertical-align: middle;line-height: 18px;font-size: 20px;"
 						  class="dashicons dashicons-screenoptions"></span>
@@ -472,21 +472,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
+            $html = ob_get_clean();
 
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
+            // remove line breaks so we can use it in js
+            return preg_replace( "/\r|\n/", "", trim( $html ) );
+        }
 
-		/**
-		 * Makes SD work with the siteOrigin page builder.
-		 *
-		 * @return mixed
-		 *@since 1.0.6
-		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @return mixed
+         *@since 1.0.6
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -560,29 +560,29 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-		/**
-		 * Output the JS and CSS for the shortcode insert button.
-		 *
-		 * @param string $editor_id
-		 * @param string $insert_shortcode_function
-		 *
-		 *@since 1.0.6
-		 *
-		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+        /**
+         * Output the JS and CSS for the shortcode insert button.
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         *
+         *@since 1.0.6
+         *
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -710,35 +710,35 @@ 
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                echo "<script>" . self::siteorigin_js() . "</script>";
+            }
+            ?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
-
-				/**
-				 * Function for super duper insert shortcode.
-				 *
-				 * @since 1.0.0
-				 */
-				?>
+                if(! empty( $insert_shortcode_function )){
+                    echo $insert_shortcode_function;
+                }else{
+
+                /**
+                 * Function for super duper insert shortcode.
+                 *
+                 * @since 1.0.0
+                 */
+                ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-							} else {
-								echo '$editor_id = "#wp-content-editor-container textarea";';
-							}
-							?>
+                            if ( isset( $_REQUEST['et_fb'] ) ) {
+                                echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+                            } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+                                echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+                            } else {
+                                echo '$editor_id = "#wp-content-editor-container textarea";';
+                            }
+                            ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -1069,18 +1069,18 @@ 
 				}
 			</script>
 			<?php
-		}
+        }
 
-		/**
-		 * Gets some CSS for the widgets screen.
-		 *
-		 * @param bool $advanced If we should include advanced CSS.
-		 *
-		 * @return mixed
-		 */
-		public function widget_css( $advanced = true ) {
-			ob_start();
-			?>
+        /**
+         * Gets some CSS for the widgets screen.
+         *
+         * @param bool $advanced If we should include advanced CSS.
+         *
+         * @return mixed
+         */
+        public function widget_css( $advanced = true ) {
+            ob_start();
+            ?>
 			<style>
 				<?php if( $advanced ){ ?>
 				.sd-advanced-setting {
@@ -1120,26 +1120,26 @@ 
 				.elementor-control .sd-argument select[multiple] option{padding:3px}
 			</style>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', $output );
+        }
 
-		/**
-		 * Gets some JS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_js() {
-			ob_start();
-			?>
+        /**
+         * Gets some JS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_js() {
+            ob_start();
+            ?>
 			<script>
 
 				/**
@@ -1290,517 +1290,517 @@ 
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
 
-		/**
-		 * Set the name from the argument key.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
-				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
-				}
-			}
+        /**
+         * Set the name from the argument key.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        private function add_name_from_key( $options, $arguments = false ) {
+            if ( ! empty( $options['arguments'] ) ) {
+                foreach ( $options['arguments'] as $key => $val ) {
+                    $options['arguments'][ $key ]['name'] = $key;
+                }
+            } elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
+                foreach ( $options as $key => $val ) {
+                    $options[ $key ]['name'] = $key;
+                }
+            }
 
-			return $options;
-		}
+            return $options;
+        }
 
-		/**
-		 * Register the parent shortcode.
-		 *
-		 * @since 1.0.0
-		 */
-		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
-		}
+        /**
+         * Register the parent shortcode.
+         *
+         * @since 1.0.0
+         */
+        public function register_shortcode() {
+            add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
+            add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+        }
 
-		/**
-		 * Render the shortcode via ajax so we can return it to Gutenberg.
-		 *
-		 * @since 1.0.0
-		 */
-		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die();
-			}
+        /**
+         * Render the shortcode via ajax so we can return it to Gutenberg.
+         *
+         * @since 1.0.0
+         */
+        public function render_shortcode() {
+            check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die();
+            }
 
-			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
-					global $post;
-					$post = $post_obj;
-				}
-			}
+            // we might need the $post value here so lets set it.
+            if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
+                $post_obj = get_post( absint( $_POST['post_id'] ) );
+                if ( ! empty( $post_obj ) && empty( $post ) ) {
+                    global $post;
+                    $post = $post_obj;
+                }
+            }
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
-						}
+            if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+                $is_preview = $this->is_preview();
+                $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+                $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+                $attributes       = '';
+                if ( ! empty( $attributes_array ) ) {
+                    foreach ( $attributes_array as $key => $value ) {
+                        if ( is_array( $value ) ) {
+                            $value = implode( ",", $value );
+                        }
+
+                        if ( ! empty( $value ) ) {
+                            $value = wp_unslash( $value );
+
+                            // Encode [ and ].
+                            if ( $is_preview ) {
+                                $value = $this->encode_shortcodes( $value );
+                            }
+                        }
+                        $attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+                    }
+                }
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+                $shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
 
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
+                $content = do_shortcode( $shortcode );
 
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+                // Decode [ and ].
+                if ( ! empty( $content ) && $is_preview ) {
+                    $content = $this->decode_shortcodes( $content );
+                }
 
-				$content = do_shortcode( $shortcode );
+                echo $content;
+            }
+            wp_die();
+        }
 
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $_instance = $args;
 
-				echo $content;
-			}
-			wp_die();
-		}
+            $args = $this->argument_values( $args );
 
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$_instance = $args;
-
-			$args = $this->argument_values( $args );
-
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
-
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
-				$args['html'] = $content;
-			}
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
 
-			if ( ! $this->is_preview() ) {
-				/**
-				 * Filters the settings for a particular widget args.
-				 *
-				 * @param array          $args      The current widget instance's settings.
-				 * @param WP_Super_Duper $widget    The current widget settings.
-				 * @param array          $_instance An array of default widget arguments.
-				 *
-				 *@since 1.0.28
-				 *
-				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+            // if we have a enclosed shortcode we add it to the special `html` argument
+            if ( ! empty( $content ) ) {
+                $args['html'] = $content;
+            }
 
-				if ( ! is_array( $args ) ) {
-					return $args;
-				}
-			}
+            if ( ! $this->is_preview() ) {
+                /**
+                 * Filters the settings for a particular widget args.
+                 *
+                 * @param array          $args      The current widget instance's settings.
+                 * @param WP_Super_Duper $widget    The current widget settings.
+                 * @param array          $_instance An array of default widget arguments.
+                 *
+                 *@since 1.0.28
+                 *
+                 */
+                $args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+
+                if ( ! is_array( $args ) ) {
+                    return $args;
+                }
+            }
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+            $class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+            $class .= " sdel-".$this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
 
-			$shortcode_args = array();
-			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
-				$no_wrap = true;
-			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
-				// wrap the shortcode in a div with the same class as the widget
-				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
-					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
-						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
-									$shortcode_args['before_title'] = $sidebar['before_title'];
-									$shortcode_args['after_title']  = $sidebar['after_title'];
-									break;
-								}
-							}
-						}
-					}
-					$output .= $this->output_title( $shortcode_args, $args );
-				}
-				$output .= $main_content;
-				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
-				$output .= $main_content;
-			}
+            $shortcode_args = array();
+            $output         = '';
+            $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+            if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+                $no_wrap = true;
+            }
+            $main_content = $this->output( $args, $shortcode_args, $content );
+            if ( $main_content && ! $no_wrap ) {
+                // wrap the shortcode in a div with the same class as the widget
+                $output .= '<div class="' . $class . '" ' . $attrs . '>';
+                if ( ! empty( $args['title'] ) ) {
+                    // if its a shortcode and there is a title try to grab the title wrappers
+                    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
+                    if ( empty( $instance ) ) {
+                        global $wp_registered_sidebars;
+                        if ( ! empty( $wp_registered_sidebars ) ) {
+                            foreach ( $wp_registered_sidebars as $sidebar ) {
+                                if ( ! empty( $sidebar['before_title'] ) ) {
+                                    $shortcode_args['before_title'] = $sidebar['before_title'];
+                                    $shortcode_args['after_title']  = $sidebar['after_title'];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    $output .= $this->output_title( $shortcode_args, $args );
+                }
+                $output .= $main_content;
+                $output .= '</div>';
+            } elseif ( $main_content && $no_wrap ) {
+                $output .= $main_content;
+            }
 
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-			}
+            // if preview show a placeholder if empty
+            if ( $this->is_preview() && $output == '' ) {
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+            }
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
-		}
+            return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+        }
 
-		/**
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
-		 *
-		 * @param string $name
-		 *
-		 * @return string
-		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
-		}
+        /**
+         * Placeholder text to show if output is empty and we are on a preview/builder page.
+         *
+         * @param string $name
+         *
+         * @return string
+         */
+        public function preview_placeholder_text( $name = '' ) {
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+        }
 
-		/**
-		 * Sometimes booleans values can be turned to strings, so we fix that.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
+        /**
+         * Sometimes booleans values can be turned to strings, so we fix that.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        public function string_to_bool( $options ) {
+            // convert bool strings to booleans
+            foreach ( $options as $key => $val ) {
+                if ( $val == 'false' ) {
+                    $options[ $key ] = false;
+                } elseif ( $val == 'true' ) {
+                    $options[ $key ] = true;
+                }
+            }
 
-			return $options;
-		}
+            return $options;
+        }
 
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @return array
-		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
-		 *
-		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @return array
+         *@since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
-						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
+            // set widget instance
+            $this->instance = $instance;
 
-			return $argument_values;
-		}
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
 
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @return array Set arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+                        // don't set default for an empty checkbox
+                    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
 
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @return array Get arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
+            return $argument_values;
+        }
+
+        /**
+         * Set arguments in super duper.
+         *
+         * @return array Set arguments.
+         *@since 1.0.0
+         *
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
+
+        /**
+         * Get arguments in super duper.
+         *
+         * @return array Get arguments.
+         *@since 1.0.0
+         *
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
 
             if( !empty( $this->arguments['title']['value'] ) ){
                 $this->arguments['title']['value'] = wp_kses_post( $this->arguments['title']['value'] );
             }
 
-			return $this->arguments;
-		}
+            return $this->arguments;
+        }
 
-		/**
-		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
-		 *
-		 * @param array $args
-		 * @param array $widget_args
-		 * @param string $content
-		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+        /**
+         * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
+         *
+         * @param array $args
+         * @param array $widget_args
+         * @param string $content
+         */
+        public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-		}
+        }
 
-		/**
-		 * Add the dynamic block code inline when the wp-block in enqueued.
-		 */
-		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
-			}
-		}
+        /**
+         * Add the dynamic block code inline when the wp-block in enqueued.
+         */
+        public function register_block() {
+            wp_add_inline_script( 'wp-blocks', $this->block() );
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+            }
+        }
 
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$show      = false;
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
 
-			return $show;
-		}
+            $show      = false;
+            $arguments = $this->get_arguments();
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$url = $this->url;
-
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
-
-				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
-				}
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $argument ) {
+                    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+                        $show = true;
+                        break; // no need to continue if we know we have it
+                    }
+                }
+            }
 
-				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
-				$this->url = $url;
-			}
+            return $show;
+        }
 
-			return $url;
-		}
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $url = $this->url;
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
+            if ( ! $url ) {
+                $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+                $content_url = untrailingslashit( WP_CONTENT_URL );
 
-			$url = $this->url;
+                // Replace http:// to https://.
+                if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                    $content_url = str_replace( 'http://', 'https://', $content_url );
+                }
 
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+                // Check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+                $url = str_replace( $content_dir, $content_url, $file_dir );
+                $url = trailingslashit( $url );
+                $this->url = $url;
+            }
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+            return $url;
+        }
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $url;
-				}
-			}
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
 
+            $url = $this->url;
 
-			return $url;
-		}
+            if ( ! $url ) {
+                // check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
 
-		/**
-		 * Generate the block icon.
-		 *
-		 * Enables the use of Font Awesome icons.
-		 *
-		 * @note xlink:href is actually deprecated but href is not supported by all so we use both.
-		 *
-		 * @param $icon
-		 *
-		 * @return string
-		 *@since 1.1.0
-		 */
-		public function get_block_icon( $icon ) {
-
-			// check if we have a Font Awesome icon
-			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
-				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
-				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
-				$fa_type = 'brands';
-			} else {
-				$icon = "'" . $icon . "'";
-			}
+                $dir_parts = explode( "/wp-content/", $file_dir );
+                $url_parts = explode( "/wp-content/", plugins_url() );
 
-			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
-				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
-			}
+                if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+                    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
 
-			return $icon;
-		}
 
-		public function group_arguments( $arguments ) {
-			if ( ! empty( $arguments ) ) {
-				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
-				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
-						$add_sections                             = true;
-					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
-					}
-				}
+            return $url;
+        }
 
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
+        /**
+         * Generate the block icon.
+         *
+         * Enables the use of Font Awesome icons.
+         *
+         * @note xlink:href is actually deprecated but href is not supported by all so we use both.
+         *
+         * @param $icon
+         *
+         * @return string
+         *@since 1.1.0
+         */
+        public function get_block_icon( $icon ) {
+
+            // check if we have a Font Awesome icon
+            $fa_type = '';
+            if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+                $fa_type = 'solid';
+            } elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+                $fa_type = 'regular';
+            } elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+                $fa_type = 'brands';
+            } else {
+                $icon = "'" . $icon . "'";
+            }
 
-			return $arguments;
-		}
+            // set the icon if we found one
+            if ( $fa_type ) {
+                $fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+                $icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
+            }
 
-		/**
-		 * Parse used group tabs.
-		 *
-		 * @since 1.1.17
-		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
-				$has_sections = false;
-
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$has_sections = true;
-						break;
-					}
-				}
+            return $icon;
+        }
 
-				if ( ! $has_sections ) {
-					return $tabs;
-				}
+        public function group_arguments( $arguments ) {
+            if ( ! empty( $arguments ) ) {
+                $temp_arguments = array();
+                $general        = __( "General", 'ayecode-connect' );
+                $add_sections   = false;
+                foreach ( $arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $temp_arguments[ $args['group'] ][ $key ] = $args;
+                        $add_sections                             = true;
+                    } else {
+                        $temp_arguments[ $general ][ $key ] = $args;
+                    }
+                }
 
-				$new_tabs = array();
+                // only add sections if more than one
+                if ( $add_sections ) {
+                    $arguments = $temp_arguments;
+                }
+            }
 
-				foreach ( $tabs as $tab_key => $tab ) {
-					$new_groups = array();
+            return $arguments;
+        }
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
-								$new_groups[] = $group;
-							}
-						}
-					}
+        /**
+         * Parse used group tabs.
+         *
+         * @since 1.1.17
+         */
+        public function group_block_tabs( $tabs, $arguments ) {
+            if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+                $has_sections = false;
+
+                foreach ( $this->arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $has_sections = true;
+                        break;
+                    }
+                }
 
-					if ( ! empty( $new_groups ) ) {
-						$tab['groups'] = $new_groups;
+                if ( ! $has_sections ) {
+                    return $tabs;
+                }
 
-						$new_tabs[ $tab_key ] = $tab;
-					}
-				}
+                $new_tabs = array();
 
-				$tabs = $new_tabs;
-			}
+                foreach ( $tabs as $tab_key => $tab ) {
+                    $new_groups = array();
 
-			return $tabs;
-		}
+                    if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
+                        foreach ( $tab['groups'] as $group ) {
+                            if ( isset( $arguments[ $group ] ) ) {
+                                $new_groups[] = $group;
+                            }
+                        }
+                    }
+
+                    if ( ! empty( $new_groups ) ) {
+                        $tab['groups'] = $new_groups;
+
+                        $new_tabs[ $tab_key ] = $tab;
+                    }
+                }
+
+                $tabs = $new_tabs;
+            }
+
+            return $tabs;
+        }
 
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @return mixed
-		 *@since 1.0.9 Save numbers as numbers and not strings.
-		 * @since 1.1.0 Font Awesome classes can be used for icons.
-		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
-		 */
-		public function block() {
-			global $sd_is_js_functions_loaded, $aui_bs5;
-
-			$show_advanced = $this->block_show_advanced();
-
-			ob_start();
-			?>
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @return mixed
+         *@since 1.0.9 Save numbers as numbers and not strings.
+         * @since 1.1.0 Font Awesome classes can be used for icons.
+         * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+         */
+        public function block() {
+            global $sd_is_js_functions_loaded, $aui_bs5;
+
+            $show_advanced = $this->block_show_advanced();
+
+            ob_start();
+            ?>
 			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
-				$sd_is_js_functions_loaded = true;
-			?>
+            if ( ! $sd_is_js_functions_loaded ) {
+                $sd_is_js_functions_loaded = true;
+            ?>
 function sd_show_view_options($this){
 	if(jQuery($this).html().length){
 		jQuery($this).html('');
@@ -2300,8 +2300,8 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
-					?>
+                if($aui_bs5){
+                    ?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
 				$p_mr = 'me-';
@@ -2309,8 +2309,8 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
-						?>
+                }else{
+                        ?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
 				$p_mr = 'mr-';
@@ -2318,8 +2318,8 @@ 
 				$p_pl = 'pl-';
 				$p_pr = 'pr-';
 					<?php
-				}
-				?>
+                }
+                ?>
 
 				// margins
 				if ( $args['mt'] !== undefined && $args['mt'] !== '' ) { $classes.push( "mt-" + $args['mt'] );  $mt = $args['mt']; }else{$mt = null;}
@@ -2503,12 +2503,12 @@ 
 			<?php
 
 
-			}
+            }
 
-			if(method_exists($this,'block_global_js')){
-					echo $this->block_global_js();
-			}
-			?>
+            if(method_exists($this,'block_global_js')){
+                    echo $this->block_global_js();
+            }
+            ?>
 
 jQuery(function() {
 
@@ -2561,13 +2561,13 @@ 
 						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if(!isset($this->options['block-supports']['renaming'])){
-								$this->options['block-supports']['renaming'] = false;
-							}
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+                            if(!isset($this->options['block-supports']['renaming'])){
+                                $this->options['block-supports']['renaming'] = false;
+                            }
+                            if ( isset( $this->options['block-supports'] ) ) {
+                                echo $this->array_to_attributes( $this->options['block-supports'] );
+                            }
+                            ?>
 						},
 						__experimentalLabel( attributes, { context } ) {
 							var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
@@ -2577,155 +2577,155 @@ 
 						},
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
-						}
-
-
-						// block hover preview.
-						$example_args = array();
-						if(!empty($this->arguments)){
-							foreach($this->arguments as $key => $a_args){
-								if(isset($a_args['example'])){
-									$example_args[$key] = $a_args['example'];
-								}
-							}
-						}
-						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
-						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
-							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
-							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
-							unset($this->options['example']['viewportWidth']);
-							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
-							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
-							}
-							if($viewport_width){
-								$example_parts[] = $viewport_width;
-							}
-							if($example_inner_blocks){
-								$example_parts[] = $example_inner_blocks;
-							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
-							}
-						}else{
-							echo 'example : {viewportWidth: 500},';
-						}
-
-
-
-						// limit to parent
-						if( !empty( $this->options['parent'] ) ){
-							echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
-						}
-
-						// limit allowed blocks
-						if( !empty( $this->options['allowed-blocks'] ) ){
-							echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
-						}
-
-						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
-							$no_wrap = true;
-						}
-						if ( $no_wrap ) {
-							$this->options['block-wrap'] = '';
-						}
-
-						// Maybe load the drag/drop functions.
-						$img_drag_drop = false;
-						$show_alignment = false;
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
+                        }
+
+
+                        // block hover preview.
+                        $example_args = array();
+                        if(!empty($this->arguments)){
+                            foreach($this->arguments as $key => $a_args){
+                                if(isset($a_args['example'])){
+                                    $example_args[$key] = $a_args['example'];
+                                }
+                            }
+                        }
+                        $viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+                        $example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
+                        if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+                            // no preview if set to false
+                        }elseif( !empty( $example_args ) ){
+                            echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
+                        }elseif( !empty( $this->options['example'] ) ){
+                            unset($this->options['example']['viewportWidth']);
+                            unset($this->options['example']['innerBlocks']);
+                            $example_atts = $this->array_to_attributes( $this->options['example'] );
+                            $example_parts = array();
+                            if($example_atts){
+                                $example_parts[] = rtrim($example_atts,",");
+                            }
+                            if($viewport_width){
+                                $example_parts[] = $viewport_width;
+                            }
+                            if($example_inner_blocks){
+                                $example_parts[] = $example_inner_blocks;
+                            }
+                            if(!empty($example_parts)){
+                                echo "example : {".implode(',', $example_parts)."},";
+                            }
+                        }else{
+                            echo 'example : {viewportWidth: 500},';
+                        }
+
+
+
+                        // limit to parent
+                        if( !empty( $this->options['parent'] ) ){
+                            echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+                        }
+
+                        // limit allowed blocks
+                        if( !empty( $this->options['allowed-blocks'] ) ){
+                            echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+                        }
+
+                        // maybe set no_wrap
+                        $no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+                        if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+                            $no_wrap = true;
+                        }
+                        if ( $no_wrap ) {
+                            $this->options['block-wrap'] = '';
+                        }
+
+                        // Maybe load the drag/drop functions.
+                        $img_drag_drop = false;
+                        $show_alignment = false;
 	
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "  type: 'boolean',";
-								echo "  default: false";
-								echo "},";
-							}
-
-							// Block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
-								echo "block_wrap: {";
-								echo "  type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "'";
-								echo "},";
-							}
-
-							if ( ! empty( $this->arguments ) ) {
-								foreach ( $this->arguments as $key => $args ) {
-									if ( $args['type'] == 'image' ||  $args['type'] == 'images' ) {
-										$img_drag_drop = true;
-									}
-
-									// Set if we should show alignment.
-									if ( $key == 'alignment' ) {
-										$show_alignment = true;
-									}
-
-									$extra = '';
-									$_default = isset( $args['default'] ) && ! is_null( $args['default'] ) ? $args['default'] : '';
-
-									if ( ! empty( $_default ) ) {
-										$_default = wp_slash( $_default );
-									}
-
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
-										continue;
-									} else if ( $args['type'] == 'checkbox' ) {
-										$type    = 'boolean';
-										$default = $_default ? 'true' : 'false';
-									} else if ( $args['type'] == 'number' ) {
-										$type    = 'number';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-										$type = 'array';
-										if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-											$default = ! empty( $_default ) ? "['" . implode( "','", $_default ) . "']" : "[]";
-										} else {
-											$default = "'" . $_default . "'";
-										}
-									} else if ( $args['type'] == 'tagselect' ) {
-										$type    = 'array';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'multiselect' ) {
-										$type    = 'array';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image_xy' ) {
-										$type    = 'object';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image' ) {
-										$type    = 'string';
-										$default = "'" . $_default . "'";
-									} else {
-										$type    = ! empty( $args['hidden_type'] ) ? esc_attr( $args['hidden_type'] ) : 'string';
-										$default = "'" . $_default . "'";
-									}
-
-									echo $key . " : {";
-									echo "type : '$type',";
-									echo "default : $default";
-									echo "},";
-								}
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "sd_shortcode : {type : 'string',default: ''},";
-
-							if ( ! empty( $this->options['nested-block'] ) || ! empty( $this->arguments['html'] ) ) {
-								echo "sd_shortcode_close : {type : 'string',default: ''},";
-							}
-
-							echo "className: { type: 'string', default: '' }";
-							echo "},";
-						?>
+                            echo "attributes : {";
+
+                            if ( $show_advanced ) {
+                                echo "show_advanced: {";
+                                echo "  type: 'boolean',";
+                                echo "  default: false";
+                                echo "},";
+                            }
+
+                            // Block wrap element
+                            if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+                                echo "block_wrap: {";
+                                echo "  type: 'string',";
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "'";
+                                echo "},";
+                            }
+
+                            if ( ! empty( $this->arguments ) ) {
+                                foreach ( $this->arguments as $key => $args ) {
+                                    if ( $args['type'] == 'image' ||  $args['type'] == 'images' ) {
+                                        $img_drag_drop = true;
+                                    }
+
+                                    // Set if we should show alignment.
+                                    if ( $key == 'alignment' ) {
+                                        $show_alignment = true;
+                                    }
+
+                                    $extra = '';
+                                    $_default = isset( $args['default'] ) && ! is_null( $args['default'] ) ? $args['default'] : '';
+
+                                    if ( ! empty( $_default ) ) {
+                                        $_default = wp_slash( $_default );
+                                    }
+
+                                    if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+                                        continue;
+                                    } else if ( $args['type'] == 'checkbox' ) {
+                                        $type    = 'boolean';
+                                        $default = $_default ? 'true' : 'false';
+                                    } else if ( $args['type'] == 'number' ) {
+                                        $type    = 'number';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                        $type = 'array';
+                                        if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+                                            $default = ! empty( $_default ) ? "['" . implode( "','", $_default ) . "']" : "[]";
+                                        } else {
+                                            $default = "'" . $_default . "'";
+                                        }
+                                    } else if ( $args['type'] == 'tagselect' ) {
+                                        $type    = 'array';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'multiselect' ) {
+                                        $type    = 'array';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'image_xy' ) {
+                                        $type    = 'object';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'image' ) {
+                                        $type    = 'string';
+                                        $default = "'" . $_default . "'";
+                                    } else {
+                                        $type    = ! empty( $args['hidden_type'] ) ? esc_attr( $args['hidden_type'] ) : 'string';
+                                        $default = "'" . $_default . "'";
+                                    }
+
+                                    echo $key . " : {";
+                                    echo "type : '$type',";
+                                    echo "default : $default";
+                                    echo "},";
+                                }
+                            }
+
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+                            echo "sd_shortcode : {type : 'string',default: ''},";
+
+                            if ( ! empty( $this->options['nested-block'] ) || ! empty( $this->arguments['html'] ) ) {
+                                echo "sd_shortcode_close : {type : 'string',default: ''},";
+                            }
+
+                            echo "className: { type: 'string', default: '' }";
+                            echo "},";
+                        ?>
 						// The "edit" property must be a valid function.
 						edit: function (props) {
 							const selectedBlock = wp.data.select('core/block-editor').getSelectedBlock();
@@ -2796,10 +2796,10 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
-								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
-							?>
+                            if(!empty($this->options['block-edit-raw'])) {
+                                echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
+                            }else{
+                            ?>
 
 function hasSelectedInnerBlock(props) {
 	const select = wp.data.select('core/editor');
@@ -2821,9 +2821,9 @@ 
 
 	var $value = '';
 	<?php
-	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
-	?>
+    // if we have a post_type and a category then link them
+    if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+    ?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined' && selectedBlock && selectedBlock.clientId === props.clientId){
 		$pt = props.attributes.post_type;
 		if(post_type_rest_slugs.length){
@@ -2836,11 +2836,11 @@ 
 			term_query_type = $pt;
 		}
 <?php
-	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
-	}
+    $cat_path = '';
+    if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
+        $cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
+        $cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+    }
 ?>
 		/* taxonomies */
 		if($value && 'post_type' in prev_attributes[props.clientId] && 'category' in prev_attributes[props.clientId] && run){
@@ -2932,7 +2932,7 @@ 
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 if(!empty($current_screen->base) && $current_screen->base==='widgets'){
-	echo 'const { deviceType } = "";';
+    echo 'const { deviceType } = "";';
 }else{
 ?>
 /** Get device type const. */
@@ -2986,8 +2986,8 @@ 
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}else{echo '0';}?>,
+                                        echo $post->ID;
+                                    }else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -3000,20 +3000,20 @@ 
 										}
 
 										 <?php
-										if(!empty($this->options['nested-block'])){
-											?>
+                                        if(!empty($this->options['nested-block'])){
+                                            ?>
 											// props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
-										?>
+                                        }else{
+                                        ?>
 										props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 										<?php
-										}
-										?>
+                                        }
+                                        ?>
 
 										// if AUI is active call the js init function
 										if (typeof aui_init === "function") {
@@ -3026,28 +3026,28 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-js'])) {
-								echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
-							}
+                            if(!empty($this->options['block-edit-js'])) {
+                                echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+                            }
 
-							if(empty($this->options['block-save-return'])){
-							?>
+                            if(empty($this->options['block-save-return'])){
+                            ?>
 								///////////////////////////////////////////////////////////////////////
 
 								// build the shortcode.
 								shortcode = "[<?php echo $this->options['base_id'];?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+                                if(! empty( $this->arguments )){
 
-								foreach($this->arguments as $key => $args){
-								   // if($args['type']=='tabs'){continue;}
+                                foreach($this->arguments as $key => $args){
+                                    // if($args['type']=='tabs'){continue;}
 
-								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
-									   continue;
-								   }
-								?>
+                                    // don't add metadata arguments
+                                    if (substr($key, 0, 9 ) === 'metadata_') {
+                                        continue;
+                                    }
+                                ?>
 								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 									if ('<?php echo esc_attr( $key );?>' == 'html') {
 									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
@@ -3058,10 +3058,10 @@ 
 									}
 								}
 								<?php
-								}
-								}
+                                }
+                                }
 
-								?>
+                                ?>
 								shortcode += "]";
 
 								if(shortcode){
@@ -3073,17 +3073,17 @@ 
 
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
-									}
-									?>
+                                    if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+                                        echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+                                    }
+                                    ?>
 								}
 
 
 							///////////////////////////////////////////////////////////////////////
 							<?php
-							} // end nested block check
-							?>
+                            } // end nested block check
+                            ?>
 
 							return [
 
@@ -3107,10 +3107,10 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+                                    if(! empty( $this->arguments )){
 
-									if ( $show_advanced ) {
-									?>
+                                    if ( $show_advanced ) {
+                                    ?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
 										},
@@ -3127,119 +3127,119 @@ 
 									)
 									,
 									<?php
-									}
-
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
-
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
-
-									if($has_sections){
-									$panel_count = 0;
-									$open_tab = '';
-
-									$open_tab_groups = array();
-									$used_tabs = array();
-
-									foreach ( $arguments as $key => $args ) {
-										$close_tab = false;
-										$close_tabs = false;
-
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
-													$open_tab_groups[] = $key;
-
-													if ( $open_tab != $tab_name ) {
-														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
-														$tab_args['tab']['open'] = true;
-
-														$this->block_tab_start( '', $tab_args );
-														$open_tab = $tab_name;
-														$used_tabs[] = $tab_name;
-													}
-
-													if ( $open_tab_groups == $tab_args['groups'] ) {
-														$close_tab = true;
-														$open_tab_groups = array();
-
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
-															$close_tabs = true;
-														}
-													}
-												}
-											}
-										}
-										?>
+                                    }
+
+                                    $arguments = $this->group_arguments( $this->arguments );
+                                    $block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+
+                                    // Do we have sections?
+                                    $has_sections = $arguments == $this->arguments ? false : true;
+
+                                    if($has_sections){
+                                    $panel_count = 0;
+                                    $open_tab = '';
+
+                                    $open_tab_groups = array();
+                                    $used_tabs = array();
+
+                                    foreach ( $arguments as $key => $args ) {
+                                        $close_tab = false;
+                                        $close_tabs = false;
+
+                                            if ( ! empty( $block_group_tabs ) ) {
+                                            foreach ( $block_group_tabs as $tab_name => $tab_args ) {
+                                                if ( in_array( $key, $tab_args['groups'] ) ) {
+                                                    $open_tab_groups[] = $key;
+
+                                                    if ( $open_tab != $tab_name ) {
+                                                        $tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
+                                                        $tab_args['tab']['open'] = true;
+
+                                                        $this->block_tab_start( '', $tab_args );
+                                                        $open_tab = $tab_name;
+                                                        $used_tabs[] = $tab_name;
+                                                    }
+
+                                                    if ( $open_tab_groups == $tab_args['groups'] ) {
+                                                        $close_tab = true;
+                                                        $open_tab_groups = array();
+
+                                                        if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+                                                            $close_tabs = true;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        ?>
 										el(wp.components.PanelBody, {
 												title: '<?php esc_attr_e( $key ); ?>',
 												initialOpen: <?php if ( $panel_count ) {
-												echo "false";
-											} else {
-												echo "true";
-											}?>
+                                                echo "false";
+                                            } else {
+                                                echo "true";
+                                            }?>
 											},
 											<?php
-											foreach ( $args as $k => $a ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
-											}
-											?>
+                                            foreach ( $args as $k => $a ) {
+                                                $this->block_tab_start( $k, $a );
+                                                $this->block_row_start( $k, $a );
+                                                $this->build_block_arguments( $k, $a );
+                                                $this->block_row_end( $k, $a );
+                                                $this->block_tab_end( $k, $a );
+                                            }
+                                            ?>
 										),
 										<?php
-										$panel_count ++;
+                                        $panel_count ++;
 
-										if($close_tab || $close_tabs){
-											$tab_args = array(
-												'tab'	=> array(
-													'tabs_close' => $close_tabs,
-												'close' => true,
-												)
+                                        if($close_tab || $close_tabs){
+                                            $tab_args = array(
+                                                'tab'	=> array(
+                                                    'tabs_close' => $close_tabs,
+                                                'close' => true,
+                                                )
 
-											);
-											$this->block_tab_end( '', $tab_args );
+                                            );
+                                            $this->block_tab_end( '', $tab_args );
 //											echo '###close'; print_r($tab_args);
-											$panel_count = 0;
-										}
+                                            $panel_count = 0;
+                                        }
 //
 
-									}
-									}else {
-									?>
+                                    }
+                                    }else {
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
-										}
-										?>
+                                        foreach ( $this->arguments as $key => $args ) {
+                                            $this->block_row_start( $key, $args );
+                                            $this->build_block_arguments( $key, $args );
+                                            $this->block_row_end( $key, $args );
+                                        }
+                                        ?>
 									),
 									<?php
-									}
+                                    }
 
-									}
-									?>
+                                    }
+                                    ?>
 
 								),
 
 								<?php
-								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
-								   echo $this->options['block-edit-return'];
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
-								?>
+                                // If the user sets block-output array then build it
+                                if ( ! empty( $this->options['block-output'] ) ) {
+                                $this->block_element( $this->options['block-output'] );
+                            }elseif(!empty($this->options['block-edit-return'])){
+                                    echo $this->options['block-edit-return'];
+                            }else{
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
+                                $block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
+                                ?>
 								el('<?php echo esc_attr($block_edit_wrap_tag); ?>', wp.blockEditor.useBlockProps({
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
@@ -3247,13 +3247,13 @@ 
 									style: {'minHeight': '30px'}
 								}))
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 
 							<?php
-							} // end block-edit-raw else
-							?>
+                            } // end block-edit-raw else
+                            ?>
 						},
 
 						// The "save" property must be specified and must be a valid function.
@@ -3267,16 +3267,16 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+                            if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							   // if($args['type']=='tabs'){continue;}
+                            foreach($this->arguments as $key => $args){
+                                // if($args['type']=='tabs'){continue;}
 
-							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
-								   continue;
-							   }
-							?>
+                                // don't add metadata arguments
+                                if (substr($key, 0, 9 ) === 'metadata_') {
+                                    continue;
+                                }
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if ('<?php echo esc_attr( $key );?>' == 'html') {
 									$html = attr.<?php echo esc_attr( $key );?>;
@@ -3287,10 +3287,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 							 content = '';
 
@@ -3300,7 +3300,7 @@ 
 //                                $html = 'el( InnerBlocks.Content )';
 //                                <?php
 //                            }
-							?>
+                            ?>
 							// if has html element
 							if ($html) {
 								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
@@ -3333,12 +3333,12 @@ 
 //                                <x?php
 //							}else
 
-							if(!empty($this->options['block-output'])){
+                            if(!empty($this->options['block-output'])){
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
 
-							   ?>
+                                ?>
 							  return el(
 								   '',
 								   {},
@@ -3348,10 +3348,10 @@ 
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
-								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
-								?>
+                            }elseif(!empty($this->options['block-save-return'])){
+                                    echo 'return ' . $this->options['block-save-return'];
+                            }elseif(!empty($this->options['nested-block'])){
+                                ?>
 							  return el(
 								   '',
 								   {},
@@ -3360,22 +3360,22 @@ 
 								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
+                            }elseif(!empty( $this->options['block-save-return'] ) ){
+                                echo "return ". $this->options['block-edit-return'].";";
+                            }elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+                            ?>
 							return content;
 							<?php
-							}else{
-							?>
+                            }else{
+                            ?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, wp.blockEditor.useBlockProps.save( {dangerouslySetInnerHTML: {__html: content}, className: align} ));
 							<?php
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -3389,43 +3389,43 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
 
 
-		public function block_row_start($key, $args){
+        public function block_row_start($key, $args){
 
-			// check for row
-			if(!empty($args['row'])){
+            // check for row
+            if(!empty($args['row'])){
 
-				if(!empty($args['row']['open'])){
+                if(!empty($args['row']['open'])){
 
-				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-				$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-				$device_type_icon = '';
-				if($device_type=='Desktop'){
-					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
-					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
-					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}
-				echo $element_require;
-				echo $device_type_require;
+                // element require
+                $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+                $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+                $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+                $device_type_icon = '';
+                if($device_type=='Desktop'){
+                    $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }elseif($device_type=='Tablet'){
+                    $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }elseif($device_type=='Mobile'){
+                    $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }
+                echo $element_require;
+                echo $device_type_require;
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
@@ -3438,8 +3438,8 @@ 
 								<?php if($device_type_icon){ ?>
 									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
-								}
-								?>
+                                }
+                                ?>
 
 
 							),
@@ -3463,51 +3463,51 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }elseif(!empty($args['row']['close'])){
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }else{
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0 pr-2 pe-2',
 							},
 					<?php
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-			}
+            }
 
-		}
+        }
 
-		public function block_row_end($key, $args){
+        public function block_row_end($key, $args){
 
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "))";
-				}
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "))";
+                }
 
-				echo "),";
-			}
-		}
+                echo "),";
+            }
+        }
 
-		public function block_tab_start($key, $args){
+        public function block_tab_start($key, $args){
 
-			// check for row
-			if(!empty($args['tab'])){
+            // check for row
+            if(!empty($args['tab'])){
 
-				if(!empty($args['tab']['tabs_open'])){
+                if(!empty($args['tab']['tabs_open'])){
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3520,12 +3520,12 @@ 
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-				if(!empty($args['tab']['open'])){
+                if(!empty($args['tab']['open'])){
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 							{
 												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
 												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
@@ -3534,93 +3534,93 @@ 
 									className: 'components-base-control__help mb-0',
 									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-			}
+            }
 
-		}
+        }
 
-		public function block_tab_end($key, $args){
+        public function block_tab_end($key, $args){
 
-			if(!empty($args['tab'])){
-				// maybe close
-				if(!empty($args['tab']['close'])){
-					echo ")}, /* tab close */";
-				}
+            if(!empty($args['tab'])){
+                // maybe close
+                if(!empty($args['tab']['close'])){
+                    echo ")}, /* tab close */";
+                }
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+                if(!empty($args['tab']['tabs_close'])){
+                    if(false){?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
 					<?php if(false){ ?></script><?php }
-				}
-			}
-		}
+                }
+            }
+        }
 
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options           = '';
-			$extra             = '';
-			$require           = '';
-			$inside_elements   = '';
-			$after_elements	   = '';
-
-			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
-				return;
-			}
+        public function build_block_arguments( $key, $args ) {
+            $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+            $options           = '';
+            $extra             = '';
+            $require           = '';
+            $inside_elements   = '';
+            $after_elements	   = '';
+
+            // `content` is a protected and special argument
+            if ( $key == 'content' ) {
+                return;
+            }
 
-			$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-			$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-			$device_type_icon = '';
-			if($device_type=='Desktop'){
-				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
-				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
-				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}
+            $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+            $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+            $device_type_icon = '';
+            if($device_type=='Desktop'){
+                $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }elseif($device_type=='Tablet'){
+                $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }elseif($device_type=='Mobile'){
+                $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }
 
-			// icon
-			$icon = '';
-			if( !empty( $args['icon'] ) ){
-				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
-									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
-								$icon .= "}),";
-
-				// blank title as its added to the icon.
-				$args['title'] = '';
-			}
+            // icon
+            $icon = '';
+            if( !empty( $args['icon'] ) ){
+                $icon .= "el('div', {";
+                                    $icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+                                    $icon .= "className: 'text-center',";
+                                    $icon .= "title: '".addslashes( $args['title'] )."',";
+                                $icon .= "}),";
+
+                // blank title as its added to the icon.
+                $args['title'] = '';
+            }
 
-			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+            // require advanced
+            $require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
 
-			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+            // element require
+            $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
 
 
-			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
-			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
-				$type = 'TextControl';
-				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
-					$onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
-				}
+            $onchange  = "props.setAttributes({ $key: $key } )";
+            $onchangecomplete  = "";
+            $value     = "props.attributes.$key";
+            $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
+            if ( in_array( $args['type'], $text_type ) ) {
+                $type = 'TextControl';
+                // Save numbers as numbers and not strings
+                if ( $args['type'] == 'number' ) {
+                    $onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
+                }
 
-				if (substr($key, 0, 9 ) === 'metadata_') {
-					$real_key = str_replace('metadata_','', $key );
-					$onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-					$value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
-				}
-			}
+                if (substr($key, 0, 9 ) === 'metadata_') {
+                    $real_key = str_replace('metadata_','', $key );
+                    $onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
+                    $value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+                }
+            }
 //			else if ( $args['type'] == 'popup' ) {
 //				$type = 'TextControl';
 //				$args['type'] == 'text';
@@ -3638,21 +3638,21 @@ 
 //
 //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
 //			}
-			else if ( $args['type'] == 'styleid' ) {
-				$type = 'TextControl';
-				$args['type'] == 'text';
-				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
-
-				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
-				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
-
-				$notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
-				echo $notice_message ? $element_require . $notice : '';
-				return;
-			}
-			/*
+            else if ( $args['type'] == 'styleid' ) {
+                $type = 'TextControl';
+                $args['type'] == 'text';
+                // Save numbers as numbers and not strings
+                $value     = "props.attributes.$key ? props.attributes.$key : ''";
+            }else if ( $args['type'] == 'notice' ) {
+
+                $notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
+                $notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
+
+                $notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
+                echo $notice_message ? $element_require . $notice : '';
+                return;
+            }
+            /*
 			 * https://www.wptricks.com/question/set-current-tab-on-a-gutenberg-tabpanel-component-from-outside-that-component/ es5 layout
 						elseif($args['type']=='tabs'){
 							?>
@@ -3705,22 +3705,22 @@ 
 							return;
 						}
 */
-			elseif ( $args['type'] == 'color' ) {
-				$type = 'ColorPicker';
-				$onchange = "";
-				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
-					$extra .= "disableAlpha: true,";
-				}
-				$onchangecomplete = "onChangeComplete: function($key) {
+            elseif ( $args['type'] == 'color' ) {
+                $type = 'ColorPicker';
+                $onchange = "";
+                $extra = "color: $value,";
+                if(!empty($args['disable_alpha'])){
+                    $extra .= "disableAlpha: true,";
+                }
+                $onchangecomplete = "onChangeComplete: function($key) {
 				value =  $key.rgb.a && $key.rgb.a < 1 ? \"rgba(\"+$key.rgb.r+\",\"+$key.rgb.g+\",\"+$key.rgb.b+\",\"+$key.rgb.a+\")\" : $key.hex;
 						props.setAttributes({
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
-				$type = 'GradientPicker';
-				$extra .= "gradients: [{
+            }elseif ( $args['type'] == 'gradient' ) {
+                $type = 'GradientPicker';
+                $extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
 			gradient:
 				'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
@@ -3757,10 +3757,10 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+            }elseif ( $args['type'] == 'image' ) {
 //                print_r($args);
 
-				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
+                $img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
 							url:  props.attributes.{$key}_use_featured === true ? 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxzdmcgYmFzZVByb2ZpbGU9InRpbnkiIGhlaWdodD0iNDAwIiB2ZXJzaW9uPSIxLjIiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6ZXY9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEveG1sLWV2ZW50cyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzIC8+PHJlY3QgZmlsbD0iI2QzZDNkMyIgaGVpZ2h0PSI0MDAiIHdpZHRoPSI0MDAiIHg9IjAiIHk9IjAiIC8+PGxpbmUgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIxMCIgeDE9IjAiIHgyPSI0MDAiIHkxPSIwIiB5Mj0iNDAwIiAvPjxsaW5lIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMTAiIHgxPSIwIiB4Mj0iNDAwIiB5MT0iNDAwIiB5Mj0iMCIgLz48cmVjdCBmaWxsPSIjZDNkM2QzIiBoZWlnaHQ9IjUwIiB3aWR0aD0iMjE4LjAiIHg9IjkxLjAiIHk9IjE3NS4wIiAvPjx0ZXh0IGZpbGw9IndoaXRlIiBmb250LXNpemU9IjMwIiBmb250LXdlaWdodD0iYm9sZCIgdGV4dC1hbmNob3I9Im1pZGRsZSIgeD0iMjAwLjAiIHk9IjIwNy41Ij5QTEFDRUhPTERFUjwvdGV4dD48L3N2Zz4='  : props.attributes.$key,
 							value: props.attributes.{$key}_xy.x !== undefined && props.attributes.{$key}_xy.x >= 0 ? props.attributes.{$key}_xy  : {x: 0.5,y: 0.5,},
 //                            value: props.attributes.{$key}_xy,
@@ -3781,16 +3781,16 @@ 
 						}), ";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+                $value = '""';
+                $type = 'MediaUpload';
+                $extra .= "onSelect: function(media){
 					  return props.setAttributes({
 						  $key: media.url,
 						  {$key}_id: media.id
 						});
 					  },";
-				   $extra .= "type: 'image',";
-				   $extra .= "render: function (obj) {
+                    $extra .= "type: 'image',";
+                    $extra .= "render: function (obj) {
 						return el( 'div',{},
 						( !props.attributes.$key && !props.attributes.{$key}_use_featured ) && el( wp.components.Button, {
 						  className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
@@ -3816,11 +3816,11 @@ 
 
 
 					  }";
-				$onchange = "";
+                $onchange = "";
 
-				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
-				$img_preview = "props.attributes.$key && (function() {
+                //$inside_elements = ",el('div',{},'file upload')";
+            } else if ( $args['type'] == 'images' ) {
+                $img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
 	uploads.map((upload, index) => (
@@ -3847,9 +3847,9 @@ 
 })(),";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+                $value = '""';
+                $type = 'MediaUpload';
+                $extra .= "onSelect: function(media){
 	let slim_images = props.attributes.$key ? JSON.parse('['+props.attributes.$key+']') : [];
 	if(media.length){
 		for (var i=0; i < media.length; i++) {
@@ -3862,9 +3862,9 @@ 
 	}
 	return props.setAttributes({ $key: slimImagesV});
 },";
-				$extra .= "type: 'image',";
-				$extra .= "multiple: true,";
-				$extra .= "render: function (obj) {
+                $extra .= "type: 'image',";
+                $extra .= "multiple: true,";
+                $extra .= "render: function (obj) {
 	/* Init the sort */
 	enableDragSort('sd-sortable');
 	return el( 'div',{},
@@ -3891,40 +3891,40 @@ 
 		)
 	)
 }";
-				$onchange = "";
+                $onchange = "";
 
-				//$inside_elements = ",el('div',{},'file upload')";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
-				$type = 'CheckboxControl';
-				$extra .= "checked: props.attributes.$key,";
-				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
-				$type = 'TextareaControl';
-
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-				$type = 'SelectControl';
-
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
-
-					if ( ! empty( $args['options'] ) ) {
-						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
-						}
-						$options .= "],";
-					}
-				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
-				}
+                //$inside_elements = ",el('div',{},'file upload')";
+            }
+            elseif ( $args['type'] == 'checkbox' ) {
+                $type = 'CheckboxControl';
+                $extra .= "checked: props.attributes.$key,";
+                $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+            } elseif ( $args['type'] == 'textarea' ) {
+                $type = 'TextareaControl';
+
+            } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+                $type = 'SelectControl';
+
+                if($args['name'] == 'category' && !empty($args['post_type_linked'])){
+                    $options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
+                }elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+                    $options .= "options: sort_by_".str_replace("-","_", $this->id).",";
+                }else {
+
+                    if ( ! empty( $args['options'] ) ) {
+                        $options .= "options: [";
+                        foreach ( $args['options'] as $option_val => $option_label ) {
+                            $options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
+                        }
+                        $options .= "],";
+                    }
+                }
+                if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+                    $extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
+                }
 
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+                if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
+                    $after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3935,8 +3935,8 @@ 
 									},
 									'Clear'
 							),";
-				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+                }
+            } elseif ( $args['type'] == 'tagselect' ) {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3971,20 +3971,20 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-			} else if ( $args['type'] == 'alignment' ) {
-				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else if ( $args['type'] == 'margins' ) {
-
-			} else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
-				$type = 'TextControl';
-				$value = "(props.attributes.$key ? props.attributes.$key : '')";
-				$args['type'] = 'text';
-				$options .= 'disabled:true,';
-				$bsvc_title = esc_attr( addslashes( $args['title'] ) );
-				$bsvc_body = $this->block_visibility_fields( $args );
-				// @TODO reset button
-				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
-				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
+            } else if ( $args['type'] == 'alignment' ) {
+                $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+            } else if ( $args['type'] == 'margins' ) {
+
+            } else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+                $type = 'TextControl';
+                $value = "(props.attributes.$key ? props.attributes.$key : '')";
+                $args['type'] = 'text';
+                $options .= 'disabled:true,';
+                $bsvc_title = esc_attr( addslashes( $args['title'] ) );
+                $bsvc_body = $this->block_visibility_fields( $args );
+                // @TODO reset button
+                $bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+                $after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
 						className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
 						onClick: function() {
 							var sValue = props.attributes." . $key . ";
@@ -4010,39 +4010,39 @@ 
 					},
 					'" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
 				) ),";
-			} else {
-				return;// if we have not implemented the control then don't break the JS.
-			}
+            } else {
+                return;// if we have not implemented the control then don't break the JS.
+            }
 
-			// color input does not show the labels so we add them
-			if($args['type']=='color'){
-				// add show only if advanced
-				echo $require_advanced;
-				// add setting require if defined
-				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
-			}
+            // color input does not show the labels so we add them
+            if($args['type']=='color'){
+                // add show only if advanced
+                echo $require_advanced;
+                // add setting require if defined
+                echo $element_require;
+                echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+            }
 
-			// add show only if advanced
-			echo $require_advanced;
-			// add setting require if defined
-			echo $element_require;
-			echo $device_type_require;
+            // add show only if advanced
+            echo $require_advanced;
+            // add setting require if defined
+            echo $element_require;
+            echo $device_type_require;
 
-			// icon
-			echo $icon;
-			?>
+            // icon
+            echo $icon;
+            ?>
 			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
 			label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( empty( $args['row'] ) && ! empty( $args['device_type'] ) ) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),<?php if ( $device_type_icon ) { ?>deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
-			} else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
+            } else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
 			help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( addslashes( $args['desc'] ) ) ) . "'}})" : "''" ); ?>,
 			value: <?php echo $value; ?>,
 			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
-			} ?>
+                echo "type: '" . addslashes( $args['type'] ) . "',";
+            } ?>
 			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
-			} ?>
+                echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+            } ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
@@ -4054,1366 +4054,1366 @@ 
 			<?php } ?>
 		} <?php echo $inside_elements; ?> ),
 			<?php
-			echo $after_elements;
-		}
+            echo $after_elements;
+        }
 
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 *@todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
-
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
-					}
-				}
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         *@todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         */
+        public function array_to_attributes( $custom_attributes, $html = false ) {
+            $attributes = '';
+            if ( ! empty( $custom_attributes ) ) {
+
+                foreach ( $custom_attributes as $key => $val ) {
+                    if(is_array($val)){
+                        $attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
+                    }else{
+                        $attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
+                    }
+                }
 
-			}
+            }
 
-			return $attributes;
-		}
+            return $attributes;
+        }
 
 
 
-		/**
-		 * A self looping function to create the output for JS block elements.
-		 *
-		 * This is what is output in the WP Editor visual view.
-		 *
-		 * @param $args
-		 */
-		public function block_element( $args, $save = false ) {
+        /**
+         * A self looping function to create the output for JS block elements.
+         *
+         * This is what is output in the WP Editor visual view.
+         *
+         * @param $args
+         */
+        public function block_element( $args, $save = false ) {
 
 //            print_r($args);echo '###';exit;
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+            if ( ! empty( $args ) ) {
+                foreach ( $args as $element => $new_args ) {
 
-					if ( is_array( $new_args ) ) { // its an element
+                    if ( is_array( $new_args ) ) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+                        if ( isset( $new_args['element'] ) ) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
+                            if ( isset( $new_args['element_require'] ) ) {
+                                echo str_replace( array(
+                                        "'+",
+                                        "+'"
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                                unset( $new_args['element_require'] );
+                            }
 
-							if($new_args['element']=='InnerBlocks'){
-								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
-								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
-							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
+                            if($new_args['element']=='InnerBlocks'){
+                                echo "\n el( InnerBlocks, {";
+                            }elseif($new_args['element']=='innerBlocksProps'){
+                                $element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
+                                //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-								echo "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
-							//    echo '###';
+                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
+                                echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
+                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+                                echo "} ), {";
+                                echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+                            //    echo '###';
+
+                                //  echo '###';
+                            }elseif($new_args['element']=='BlocksProps'){
+
+                                if ( isset($new_args['if_inner_element']) ) {
+                                    $element = $new_args['if_inner_element'];
+                                }else {
+                                    $element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+                                }
+
+                                unset($new_args['inner_element']);
+                                echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
+                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+
+                                // echo "} ),";
+
+                            }else{
+                                echo "\n el( '" . $new_args['element'] . "', {";
+                            }
+
+
+                            // get the attributes
+                            foreach ( $new_args as $new_key => $new_value ) {
+
+
+                                if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+                                    // do nothing
+                                } else {
+                                    echo $this->block_element( array( $new_key => $new_value ),$save );
+                                }
+                            }
+
+                            echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+
+                            // get the content
+                            $first_item = 0;
+                            foreach ( $new_args as $new_key => $new_value ) {
+                                if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+
+                                    if ( $new_key === 'content' ) {
+                                        echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+                                    }else if ( $new_key === 'if_content' ) {
+                                        echo  $this->block_props_replace(  $new_value  );
+                                    }
+
+                                    if ( is_array( $new_value ) ) {
+
+                                        if ( isset( $new_value['element_require'] ) ) {
+                                            echo str_replace( array(
+                                                    "'+",
+                                                    "+'"
+                                                ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+                                            unset( $new_value['element_require'] );
+                                        }
+
+                                        if ( isset( $new_value['element_repeat'] ) ) {
+                                            $x = 1;
+                                            while ( $x <= absint( $new_value['element_repeat'] ) ) {
+                                                $this->block_element( array( '' => $new_value ),$save );
+                                                $x ++;
+                                            }
+                                        } else {
+                                            $this->block_element( array( '' => $new_value ),$save );
+                                        }
+                                    }
+                                    $first_item ++;
+                                }
+                            }
+
+                            if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
+                                echo "))";// end content
+                            }else{
+                                echo ")";// end content
+                            }
+
+
+                            echo ", \n";
+
+                        }
+                    } else {
+
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
+                            $extra = '';
+                            if( strpos($new_args, '[%WrapClass%]') !== false ){
+                                $new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
+                                $new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+                            }
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                        } elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
+                            $new_args = str_replace('[%WrapStyle%]','',$new_args);
+                            echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+//                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } elseif ( $element == 'style' ) {
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
+                            $new_args = str_replace('[%WrapClass%]','',$new_args);
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
+                        } elseif ( $element == 'template' && $new_args ) {
+                            echo $element . ": $new_args,";
+                        } else {
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+                        }
+
+                    }
+                }
+            }
+        }
 
-							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
-
-								if ( isset($new_args['if_inner_element']) ) {
-									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
-								}
-
-								unset($new_args['inner_element']);
-								echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-
-							   // echo "} ),";
-
-							}else{
-								echo "\n el( '" . $new_args['element'] . "', {";
-							}
-
-
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
-
-
-								if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ),$save );
-								}
-							}
-
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $new_value  );
-									}
-
-									if ( is_array( $new_value ) ) {
-
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ),$save );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ),$save );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
-							}
-
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
-							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-							$new_args = str_replace('[%WrapStyle%]','',$new_args);
-							echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
-//                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-							$new_args = str_replace('[%WrapClass%]','',$new_args);
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
-							echo $element . ": $new_args,";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
-		 * Replace block attributes placeholders with the proper naming.
-		 *
-		 * @param $string
-		 *
-		 * @return mixed
-		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
-			} else {
-				$string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
-			}
+        /**
+         * Replace block attributes placeholders with the proper naming.
+         *
+         * @param $string
+         *
+         * @return mixed
+         */
+        public function block_props_replace( $string, $no_wrap = false ) {
+            if ( $no_wrap ) {
+                $string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+            } else {
+                $string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+            }
 
-			return $string;
-		}
+            return $string;
+        }
 
-		/**
-		 * Outputs the content of the widget
-		 *
-		 * @param array $args
-		 * @param array $instance
-		 */
-		public function widget( $args, $instance ) {
-			if ( ! is_array( $args ) ) {
-				$args = array();
-			}
+        /**
+         * Outputs the content of the widget
+         *
+         * @param array $args
+         * @param array $instance
+         */
+        public function widget( $args, $instance ) {
+            if ( ! is_array( $args ) ) {
+                $args = array();
+            }
 
-			// Get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+            // Get the filtered values
+            $argument_values = $this->argument_values( $instance );
+            $argument_values = $this->string_to_bool( $argument_values );
+            $output          = $this->output( $argument_values, $args );
 
-			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
-				$no_wrap = true;
-			}
+            $no_wrap = false;
+            if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+                $no_wrap = true;
+            }
 
-			ob_start();
-			if ( $output && ! $no_wrap ) {
+            ob_start();
+            if ( $output && ! $no_wrap ) {
 
-				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+                $class_original = $this->options['widget_ops']['classname'];
+                $class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
 
-				// Before widget
-				$before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+                // Before widget
+                $before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
+                $before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
+                $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+                $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
 
-				// After widget
-				$after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+                // After widget
+                $after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
+                $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+                $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
 
-				echo $before_widget;
-				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+                echo $before_widget;
+                // elementor strips the widget wrapping div so we check for and add it back if needed
+                if ( $this->is_elementor_widget_output() ) {
+                    // Filter class & attrs for elementor widget output.
+                    $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+                    $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
 
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
 
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
-				}
-				echo $this->output_title( $args, $instance );
-				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo "</span>";
-				}
-				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-				echo $output;
-			} elseif ( $output && $no_wrap ) {
-				echo $output;
-			}
-			$output = ob_get_clean();
+                    echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+                }
+                echo $this->output_title( $args, $instance );
+                echo $output;
+                if ( $this->is_elementor_widget_output() ) {
+                    echo "</span>";
+                }
+                echo $after_widget;
+            } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+                echo $output;
+            } elseif ( $output && $no_wrap ) {
+                echo $output;
+            }
+            $output = ob_get_clean();
 
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+            $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
 
-			echo $output;
-		}
+            echo $output;
+        }
 
-		/**
-		 * Tests if the current output is inside a elementor container.
-		 *
-		 * @return bool
-		 *@since 1.0.4
-		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a elementor container.
+         *
+         * @return bool
+         *@since 1.0.4
+         */
+        public function is_elementor_widget_output() {
+            $result = false;
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 * @return bool
-		 *@since 1.0.4
-		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         * @return bool
+         *@since 1.0.4
+         */
+        public function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.8
-		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @return bool
+         *@since 1.0.8
+         */
+        public function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @return bool
-		 *@since 1.1.0
-		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @return bool
+         *@since 1.1.0
+         */
+        public function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Tests if the current output is inside a Oxygen builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.18
-		 */
-		public function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a Oxygen builder preview.
+         *
+         * @return bool
+         *@since 1.0.18
+         */
+        public function is_oxygen_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Check for Kallyas theme Zion builder preview.
-		 *
-		 * @since 1.1.22
-		 *
-		 * @return bool True when preview page otherwise false.
-		 */
-		public function is_kallyas_zion_preview() {
-			$result = false;
-
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
+        /**
+         * Check for Kallyas theme Zion builder preview.
+         *
+         * @since 1.1.22
+         *
+         * @return bool True when preview page otherwise false.
+         */
+        public function is_kallyas_zion_preview() {
+            $result = false;
 
-			return $result;
-		}
+            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Check for Bricks theme builder preview.
-		 *
-		 * @since 1.1.31
-		 *
-		 * @return bool True when preview page otherwise false.
-		 */
-		public function is_bricks_preview() {
-			$result = false;
-
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Check for Bricks theme builder preview.
+         *
+         * @since 1.1.31
+         *
+         * @return bool True when preview page otherwise false.
+         */
+        public function is_bricks_preview() {
+            $result = false;
 
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( $this->is_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
-				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
-				$preview = true;
-			}
+            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+                $result = true;
+            }
 
-			return $preview;
-		}
+            return $result;
+        }
 
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @return string
-		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-				if ( empty( $instance['widget_title_tag'] ) ) {
-					if ( ! isset( $args['before_title'] ) ) {
-						$args['before_title'] = '';
-					}
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_preview() {
+            $preview = false;
+            if ( $this->is_divi_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_cornerstone_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_fusion_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_oxygen_preview() ) {
+                $preview = true;
+            } elseif( $this->is_kallyas_zion_preview() ) {
+                $preview = true;
+            } elseif( $this->is_block_content_call() ) {
+                $preview = true;
+            } elseif( $this->is_bricks_preview() ) {
+                $preview = true;
+            }
 
-					if ( ! isset( $args['after_title'] ) ) {
-						$args['after_title'] = '';
-					}
+            return $preview;
+        }
 
-					$output = $args['before_title'] . $title . $args['after_title'];
-				} else {
-					$tag 			= esc_attr( $instance['widget_title_tag'] );
-					$allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
-					$title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
-
-					// classes
-					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
-					$output = "<$title_tag class='$class' >$title</$title_tag>";
-				}
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @return string
+         */
+        public function output_title( $args, $instance = array() ) {
+            $output = '';
+            if ( ! empty( $instance['title'] ) ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+
+                if ( empty( $instance['widget_title_tag'] ) ) {
+                    if ( ! isset( $args['before_title'] ) ) {
+                        $args['before_title'] = '';
+                    }
+
+                    if ( ! isset( $args['after_title'] ) ) {
+                        $args['after_title'] = '';
+                    }
+
+                    $output = $args['before_title'] . $title . $args['after_title'];
+                } else {
+                    $tag 			= esc_attr( $instance['widget_title_tag'] );
+                    $allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
+                    $title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
+
+                    // classes
+                    $title_classes = array();
+                    $title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
+
+                    $class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+                    $output = "<$title_tag class='$class' >$title</$title_tag>";
+                }
 
-			}
+            }
 
-			return $output;
-		}
+            return $output;
+        }
 
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
+        /**
+         * Outputs the options form inputs for the widget.
+         *
+         * @param array $instance The widget options.
+         */
+        public function form( $instance ) {
 
-			// set widget instance
-			$this->instance = $instance;
+            // set widget instance
+            $this->instance = $instance;
 
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
+            // set it as a SD widget
+            echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
-			$arguments_raw = $this->get_arguments();
+            echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+            $arguments_raw = $this->get_arguments();
 
-			if ( is_array( $arguments_raw ) ) {
+            if ( is_array( $arguments_raw ) ) {
 
-				$arguments = $this->group_arguments( $arguments_raw );
+                $arguments = $this->group_arguments( $arguments_raw );
 
-				// Do we have sections?
-				$has_sections = $arguments == $arguments_raw ? false : true;
+                // Do we have sections?
+                $has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
-					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+                if ( $has_sections ) {
+                    $panel_count = 0;
+                    foreach ( $arguments as $key => $args ) {
 
-						?>
+                        ?>
 						<script>
 							//							jQuery(this).find("i").toggleClass("fas fa-chevron-up fas fa-chevron-down");jQuery(this).next().toggle();
 						</script>
 						<?php
 
-						$hide       = $panel_count ? ' style="display:none;" ' : '';
-						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+                        $hide       = $panel_count ? ' style="display:none;" ' : '';
+                        $icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
+                        echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+                        echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+                        foreach ( $args as $k => $a ) {
 
-							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
-							$this->widget_inputs_row_end($k, $a);
+                            $this->widget_inputs_row_start($k, $a);
+                            $this->widget_inputs( $a, $instance );
+                            $this->widget_inputs_row_end($k, $a);
 
-						}
+                        }
 
-						echo "</div>";
+                        echo "</div>";
 
-						$panel_count ++;
+                        $panel_count ++;
 
-					}
-				} else {
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
-						$this->widget_inputs_row_end($key, $args);
-					}
-				}
+                    }
+                } else {
+                    foreach ( $arguments as $key => $args ) {
+                        $this->widget_inputs_row_start($key, $args);
+                        $this->widget_inputs( $args, $instance );
+                        $this->widget_inputs_row_end($key, $args);
+                    }
+                }
 
-			}
-		}
+            }
+        }
 
-		public function widget_inputs_row_start( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe open
-				if ( ! empty( $args['row']['open'] ) ) {
-					?>
+        public function widget_inputs_row_start( $key, $args ) {
+            if ( ! empty( $args['row'] ) ) {
+                // Maybe open
+                if ( ! empty( $args['row']['open'] ) ) {
+                    ?>
 					<div class='bsui sd-argument' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
 					<?php if ( ! empty( $args['row']['title'] ) ) { ?>
 					<?php
-						if ( isset( $args['row']['icon'] ) ) {
-							$args['row']['icon'] = '';
-						}
-
-						if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
-							$args['row']['device_type'] = $args['device_type'];
-						}
-					?>
+                        if ( isset( $args['row']['icon'] ) ) {
+                            $args['row']['icon'] = '';
+                        }
+
+                        if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+                            $args['row']['device_type'] = $args['device_type'];
+                        }
+                    ?>
 					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
 					<?php } ?>
 					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
 					<div class='col pr-2'>
 					<?php
-				} else if ( ! empty( $args['row']['close'] ) ) {
-					echo "<div class='col pl-0 ps-0'>";
-				} else {
-					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
-				}
-			}
-		}
+                } else if ( ! empty( $args['row']['close'] ) ) {
+                    echo "<div class='col pl-0 ps-0'>";
+                } else {
+                    echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
+                }
+            }
+        }
 
-		public function widget_inputs_row_end( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe close
-				if ( ! empty( $args['row']['close'] ) ) {
-					echo "</div></div>";
-				}
-				echo "</div>";
-			}
-		}
+        public function widget_inputs_row_end( $key, $args ) {
+            if ( ! empty( $args['row'] ) ) {
+                // Maybe close
+                if ( ! empty( $args['row']['close'] ) ) {
+                    echo "</div></div>";
+                }
+                echo "</div>";
+            }
+        }
 
-		/**
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
-		 *
-		 * @return string
-		 */
-		public function widget_advanced_toggle() {
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
 
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
+            $output = '';
+            if ( $this->block_show_advanced() ) {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
 
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
 
-			return $output;
-		}
+            return $output;
+        }
 
-		/**
-		 * Convert require element.
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 *@since 1.0.0
-		 *
-		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()",
-				"\"]').find('input:checked').val()"
-			), $input ) );
-
-			return $output;
-		}
+        /**
+         * Convert require element.
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         *@since 1.0.0
+         *
+         */
+        public function convert_element_require( $input ) {
+            $input = str_replace( "'", '"', $input );// we only want double quotes
 
-		/**
-		 * Builds the inputs for the widget options.
-		 *
-		 * @param $args
-		 * @param $instance
-		 */
-		public function widget_inputs( $args, $instance ) {
-
-			$class             = "";
-			$element_require   = "";
-			$custom_attributes = "";
-
-			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
-			} else {
-				$value = '';
-			}
+            $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()",
+                "\"]').find('input:checked').val()"
+            ), $input ) );
 
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
+            return $output;
+        }
 
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
+        /**
+         * Builds the inputs for the widget options.
+         *
+         * @param $args
+         * @param $instance
+         */
+        public function widget_inputs( $args, $instance ) {
+
+            $class             = "";
+            $element_require   = "";
+            $custom_attributes = "";
+
+            // get value
+            if ( isset( $instance[ $args['name'] ] ) ) {
+                $value = $instance[ $args['name'] ];
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+            } else {
+                $value = '';
+            }
 
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
 
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
+            // get if advanced
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+                $class .= " sd-advanced-setting ";
+            }
+
+            // element_require
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+                $element_require = $args['element_require'];
+            }
+
+            // custom_attributes
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+            }
 
-			// before wrapper
-			?>
+            // before wrapper
+            ?>
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>" data-argument='<?php echo esc_attr( $args['name'] ); ?>' data-element_require='<?php if ( $element_require ) { echo $this->convert_element_require( $element_require );} ?>'>
 			<?php
-			switch ( $args['type'] ) {
-				//array('text','password','number','email','tel','url','color')
-				case "text":
-				case "password":
-				case "number":
-				case "email":
-				case "tel":
-				case "url":
-				case "color":
-					?>
+            switch ( $args['type'] ) {
+                //array('text','password','number','email','tel','url','color')
+                case "text":
+                case "password":
+                case "number":
+                case "email":
+                case "tel":
+                case "url":
+                case "color":
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="<?php echo esc_attr( $args['type'] ); ?>" value="<?php echo esc_attr( $value ); ?>">
 					<?php
 
-					break;
-				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
-							$value = array();
-						}
-					}
-					?>
+                    break;
+                case "select":
+                    $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                    if ( $multiple ) {
+                        if ( empty( $value ) ) {
+                            $value = array();
+                        }
+                    }
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); if ( $multiple ) { echo "[]"; } ?>"
 						<?php if ( $multiple ) {
-							echo "multiple";
-						} //@todo not implemented yet due to gutenberg not supporting it
-						?>>
+                            echo "multiple";
+                        } //@todo not implemented yet due to gutenberg not supporting it
+                        ?>>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-								} else {
-									$selected = selected( $value, $val, false );
-								}
-								echo "<option value='$val' " . $selected . ">$label</option>";
-							}
-						}
-						?>
+                        if ( ! empty( $args['options'] ) ) {
+                            foreach ( $args['options'] as $val => $label ) {
+                                if ( $multiple ) {
+                                    $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                } else {
+                                    $selected = selected( $value, $val, false );
+                                }
+                                echo "<option value='$val' " . $selected . ">$label</option>";
+                            }
+                        }
+                        ?>
 					</select>
 					<?php
-					break;
-				case "checkbox":
-					?>
+                    break;
+                case "checkbox":
+                    ?>
 					<input <?php echo $placeholder; ?> <?php checked( 1, $value, true ) ?> <?php echo $custom_attributes; ?> class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox" value="1">
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<?php
-					break;
-				case "textarea":
-					?>
+                    break;
+                case "textarea":
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"><?php echo esc_attr( $value ); ?></textarea>
 					<?php
 
-					break;
-				case "hidden":
-					?>
+                    break;
+                case "hidden":
+                    ?>
 					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden" value="<?php echo esc_attr( $value ); ?>">
 					<?php
-					break;
-				default:
-					echo "No input type found!"; // @todo we need to add more input types.
-			}
-			// after wrapper
-			?></p><?php
-		}
+                    break;
+                default:
+                    echo "No input type found!"; // @todo we need to add more input types.
+            }
+            // after wrapper
+            ?></p><?php
+        }
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
-			}
-		}
+        public function get_widget_icon($icon = 'box-top', $title = ''){
+            if($icon=='box-top'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-right'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-bottom'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+            }elseif($icon=='box-left'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+            }
+        }
 
-		/**
-		 * Get the widget input description html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 * @todo, need to make its own tooltip script
-		 */
-		public function widget_field_desc( $args ) {
-
-			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
-				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
-				}
-			}
+        /**
+         * Get the widget input description html.
+         *
+         * @param $args
+         *
+         * @return string
+         * @todo, need to make its own tooltip script
+         */
+        public function widget_field_desc( $args ) {
+
+            $description = '';
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
+                    $description = $this->desc_tip( $args['desc'] );
+                } else {
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+                }
+            }
 
-			return $description;
-		}
+            return $description;
+        }
 
-		/**
-		 * Get the widget input title html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 */
-		public function widget_field_title( $args ) {
-			$title = '';
-
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( ! empty( $args['device_type'] ) ) {
-					$args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
-				}
+        /**
+         * Get the widget input title html.
+         *
+         * @param $args
+         *
+         * @return string
+         */
+        public function widget_field_title( $args ) {
+            $title = '';
 
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
-				} else {
-					$title = esc_attr( $args['title'] );
-				}
-			}
+            if ( isset( $args['title'] ) && $args['title'] ) {
+                if ( ! empty( $args['device_type'] ) ) {
+                    $args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
+                }
 
-			return $title;
-		}
+                if ( isset( $args['icon'] ) && $args['icon'] ) {
+                    $title = self::get_widget_icon( $args['icon'], $args['title']  );
+                } else {
+                    $title = esc_attr( $args['title'] );
+                }
+            }
 
-		/**
-		 * Get the tool tip html.
-		 *
-		 * @param $tip
-		 * @param bool $allow_html
-		 *
-		 * @return string
-		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
-			} else {
-				$tip = esc_attr( $tip );
-			}
+            return $title;
+        }
 
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
+        /**
+         * Get the tool tip html.
+         *
+         * @param $tip
+         * @param bool $allow_html
+         *
+         * @return string
+         */
+        function desc_tip( $tip, $allow_html = false ) {
+            if ( $allow_html ) {
+                $tip = $this->sanitize_tooltip( $tip );
+            } else {
+                $tip = esc_attr( $tip );
+            }
 
-		/**
-		 * Sanitize a string destined to be a tooltip.
-		 *
-		 * @param string $var
-		 *
-		 * @return string
-		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
-				'br'     => array(),
-				'em'     => array(),
-				'strong' => array(),
-				'small'  => array(),
-				'span'   => array(),
-				'ul'     => array(),
-				'li'     => array(),
-				'ol'     => array(),
-				'p'      => array(),
-			) ) );
-		}
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
 
-		/**
-		 * Processing widget options on save
-		 *
-		 * @param array $new_instance The new options
-		 * @param array $old_instance The previous options
-		 *
-		 * @return array
-		 * @todo we should add some sanitation here.
-		 */
-		public function update( $new_instance, $old_instance ) {
-
-			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->get_arguments();
-			}
+        /**
+         * Sanitize a string destined to be a tooltip.
+         *
+         * @param string $var
+         *
+         * @return string
+         */
+        public function sanitize_tooltip( $var ) {
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+                'br'     => array(),
+                'em'     => array(),
+                'strong' => array(),
+                'small'  => array(),
+                'span'   => array(),
+                'ul'     => array(),
+                'li'     => array(),
+                'ol'     => array(),
+                'p'      => array(),
+            ) ) );
+        }
 
-			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
-					}
-				}
-			}
+        /**
+         * Processing widget options on save
+         *
+         * @param array $new_instance The new options
+         * @param array $old_instance The previous options
+         *
+         * @return array
+         * @todo we should add some sanitation here.
+         */
+        public function update( $new_instance, $old_instance ) {
+
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
+
+            // check for checkboxes
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $argument ) {
+                    if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
+                        $instance[ $argument['name'] ] = '0';
+                    }
+                }
+            }
 
             // maybe sanitize widget title
             if(!empty($instance['title'])) {
                 $instance['title'] = wp_kses_post( $instance['title'] );
             }
 
-			return $instance;
-		}
+            return $instance;
+        }
 
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @return bool
-		 *@since 1.0.3
-		 */
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @return bool
+         *@since 1.0.3
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Get an instance hash that will be unique to the type and settings.
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
-		}
+        /**
+         * Get an instance hash that will be unique to the type and settings.
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_hash(){
+            $instance_string = $this->base_id.serialize($this->instance);
+            return hash('crc32b',$instance_string);
+        }
 
-		/**
-		 * Generate and return inline styles from CSS rules that will match the unique class of the instance.
-		 *
-		 * @param array $rules
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		public function get_instance_style($rules = array()){
-			$css = '';
-
-			if(!empty($rules)){
-				$rules = array_unique($rules);
-				$instance_hash = $this->get_instance_hash();
-				$css .= "<style>";
-				foreach($rules as $rule){
-					$css .= ".sdel-$instance_hash $rule";
-				}
-				$css .= "</style>";
-			}
+        /**
+         * Generate and return inline styles from CSS rules that will match the unique class of the instance.
+         *
+         * @param array $rules
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_style($rules = array()){
+            $css = '';
+
+            if(!empty($rules)){
+                $rules = array_unique($rules);
+                $instance_hash = $this->get_instance_hash();
+                $css .= "<style>";
+                foreach($rules as $rule){
+                    $css .= ".sdel-$instance_hash $rule";
+                }
+                $css .= "</style>";
+            }
 
-			return $css;
-		}
+            return $css;
+        }
 
-		/**
-		 * Encode shortcodes tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+        /**
+         * Encode shortcodes tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with shortcode tags removed.
-		 *@since 1.0.28
-		 *
-		 */
-		public function encode_shortcodes( $content ) {
-			// Avoids existing encoded tags.
-			$trans   = array(
-				'&#91;' => '&#091;',
-				'&#93;' => '&#093;',
-				'&amp;#91;' => '&#091;',
-				'&amp;#93;' => '&#093;',
-				'&lt;' => '&0lt;',
-				'&gt;' => '&0gt;',
-				'&amp;lt;' => '&0lt;',
-				'&amp;gt;' => '&0gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'[' => '&#91;',
-				']' => '&#93;',
-				'<' => '&lt;',
-				'>' => '&gt;',
-				'"' => '&quot;',
-				"'" => '&#39;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
+         *@since 1.0.28
+         *
+         */
+        public function encode_shortcodes( $content ) {
+            // Avoids existing encoded tags.
+            $trans   = array(
+                '&#91;' => '&#091;',
+                '&#93;' => '&#093;',
+                '&amp;#91;' => '&#091;',
+                '&amp;#93;' => '&#093;',
+                '&lt;' => '&0lt;',
+                '&gt;' => '&0gt;',
+                '&amp;lt;' => '&0lt;',
+                '&amp;gt;' => '&0gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '[' => '&#91;',
+                ']' => '&#93;',
+                '<' => '&lt;',
+                '>' => '&gt;',
+                '"' => '&quot;',
+                "'" => '&#39;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
 
-		/**
-		 * Remove encoded shortcod tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+        /**
+         * Remove encoded shortcod tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with decoded shortcode tags.
-		 *@since 1.0.28
-		 *
-		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
-				'&#91;' => '[',
-				'&#93;' => ']',
-				'&amp;#91;' => '[',
-				'&amp;#93;' => ']',
-				'&lt;' => '<',
-				'&gt;' => '>',
-				'&amp;lt;' => '<',
-				'&amp;gt;' => '>',
-				'&quot;' => '"',
-				'&apos;' => "'",
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'&#091;' => '&#91;',
-				'&#093;' => '&#93;',
-				'&amp;#091;' => '&#91;',
-				'&amp;#093;' => '&#93;',
-				'&0lt;' => '&lt;',
-				'&0gt;' => '&gt;',
-				'&amp;0lt;' => '&lt;',
-				'&amp;0gt;' => '&gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-
-		public function block_visibility_fields( $args ) {
-			$value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
-			$content = '<div class="bs-vc-rule-template d-none">';
-				$content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
-					$content .= '<div class="row">';
-						$content .= '<div class="col-sm-12">';
-							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
-							$content .= aui()->select(
-								array(
-									'id'          => 'bsvc_rule_BSVCINDEX',
-									'name'        => 'bsvc_rule_BSVCINDEX',
-									'label'       => __( 'Rule', 'ayecode-connect' ),
-									'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
-									'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
-									'options'     => sd_visibility_rules_options(),
-									'default'     => '',
-									'value'       => '',
-									'label_type'  => '',
-									'select2'     => false,
-									'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
-									'extra_attributes' => array(
-										'data-minimum-results-for-search' => '-1'
-									)
-								)
-							);
-
-						$content .= '</div>';
-
-						if ( class_exists( 'GeoDirectory' ) ) {
-							$content .= '<div class="col-md-7 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_BSVCINDEX',
-										'label'       => __( 'FIELD', 'ayecode-connect' ),
-										'placeholder' => __( 'FIELD', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_gd_field_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-md-5 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-										'label'       => __( 'CONDITION', 'ayecode-connect' ),
-										'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_field_condition_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-sm-12">';
-
-								$content .= aui()->input(
-									array(
-										'type'            => 'text',
-										'id'              => 'bsvc_gd_field_search_BSVCINDEX',
-										'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-										'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'class'           => 'bsvc_gd_field_search form-control-sm',
-										'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'label_type'      => '',
-										'value'           => '',
-										'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
-									)
-								);
+         *@since 1.0.28
+         *
+         */
+        public function decode_shortcodes( $content ) {
+            $trans   = array(
+                '&#91;' => '[',
+                '&#93;' => ']',
+                '&amp;#91;' => '[',
+                '&amp;#93;' => ']',
+                '&lt;' => '<',
+                '&gt;' => '>',
+                '&amp;lt;' => '<',
+                '&amp;gt;' => '>',
+                '&quot;' => '"',
+                '&apos;' => "'",
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '&#091;' => '&#91;',
+                '&#093;' => '&#93;',
+                '&amp;#091;' => '&#91;',
+                '&amp;#093;' => '&#93;',
+                '&0lt;' => '&lt;',
+                '&0gt;' => '&gt;',
+                '&amp;0lt;' => '&lt;',
+                '&amp;0gt;' => '&gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
 
-							$content .= '</div>';
-						}
+        public function block_visibility_fields( $args ) {
+            $value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+            $content = '<div class="bs-vc-rule-template d-none">';
+                $content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
+                    $content .= '<div class="row">';
+                        $content .= '<div class="col-sm-12">';
+                            $content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+                            $content .= aui()->select(
+                                array(
+                                    'id'          => 'bsvc_rule_BSVCINDEX',
+                                    'name'        => 'bsvc_rule_BSVCINDEX',
+                                    'label'       => __( 'Rule', 'ayecode-connect' ),
+                                    'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+                                    'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
+                                    'options'     => sd_visibility_rules_options(),
+                                    'default'     => '',
+                                    'value'       => '',
+                                    'label_type'  => '',
+                                    'select2'     => false,
+                                    'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+                                    'extra_attributes' => array(
+                                        'data-minimum-results-for-search' => '-1'
+                                    )
+                                )
+                            );
+
+                        $content .= '</div>';
+
+                        if ( class_exists( 'GeoDirectory' ) ) {
+                            $content .= '<div class="col-md-7 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_BSVCINDEX',
+                                        'label'       => __( 'FIELD', 'ayecode-connect' ),
+                                        'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_gd_field_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-md-5 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'label'       => __( 'CONDITION', 'ayecode-connect' ),
+                                        'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_field_condition_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-sm-12">';
+
+                                $content .= aui()->input(
+                                    array(
+                                        'type'            => 'text',
+                                        'id'              => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'name'            => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'class'           => 'bsvc_gd_field_search form-control-sm',
+                                        'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'label_type'      => '',
+                                        'value'           => '',
+                                        'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
+                                    )
+                                );
+
+                            $content .= '</div>';
+                        }
 
                         $content .= apply_filters( 'sd_block_visibility_fields', '', $args );
 
-					$content .= '</div>';
-
-					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
-						$role_options = sd_user_roles_options();
-
-						$role_option_i = 0;
-						foreach ( $role_options as $role_option_key => $role_option_name ) {
-							$role_option_i++;
-
-							$content .= '<div class="col-sm-6">';
-							$content .= aui()->input(
-								array(
-									'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
-									'name'             => 'bsvc_user_roles_BSVCINDEX[]',
-									'type'             => 'checkbox',
-									'label'            => $role_option_name,
-									'label_type'       => 'hidden',
-									'class'            => 'bsvc_user_roles',
-									'value'            => $role_option_key,
-									'switch'           => 'md',
-									'no_wrap'          => true
-								)
-							);
-							$content .= '</div>';
-						}
-					$content .= '</div>';
-					$content .= '<div class="bs-vc-sep-wrap text-center position-absolute top-0 mt-n3"><div class="bs-vc-sep-cond d-inline-block badge text-dark bg-gray mt-1">' . esc_html__( 'AND', 'ayecode-connect' ) . '</div></div>';
-				$content .= '</div>';
-			$content .= '</div>';
-			$content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
-			$content .= '<div class="bs-vc-rule-sets"></div>';
-			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
-			$content .= '<div class="row"><div class="col-md-6 col-sm-12">';
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_output',
-					'name'        => 'bsvc_output',
-					'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Show Block', 'ayecode-connect' ),
-					'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
-					'options'     => sd_visibility_output_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-md-6 col-sm-12">';
-
-			$content .= aui()->select(
-				array(
-					'id'              => 'bsvc_page',
-					'name'            => 'bsvc_page',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
-					'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
-					'options'         => sd_template_page_options(),
-					'default'         => '',
-					'value'           => '',
-					'label_type'      => 'top',
-					'select2'         => false,
-					'element_require' => '[%bsvc_output%]=="page"'
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_tmpl_part',
-					'name'        => 'bsvc_tmpl_part',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
-					'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
-					'options'     => sd_template_part_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'element_require'  => '[%bsvc_output%]=="template_part"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'               => 'bsvc_message_type',
-					'name'             => 'bsvc_message_type',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
-					'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
-					'options'          => sd_aui_colors(),
-					'default'          => '',
-					'value'            => '',
-					'label_type'       => 'top',
-					'select2'          => false,
-					'element_require'  => '[%bsvc_output%]=="message"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-sm-12">';
-
-			$content .= aui()->input(
-				array(
-					'type'            => 'text',
-					'id'              => 'bsvc_message',
-					'name'            => 'bsvc_message',
-					'label'           => '',
-					'class'           => 'bsvc_message form-control-sm mb-3',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
-					'label_type'      => '',
-					'value'           => '',
-					'form_group_class' => ' ',
-					'element_require' => '[%bsvc_output%]=="message"',
-				)
-			);
-
-			$content .= '</div></div><div class="row"><div class="col col-12"><div class="pt-3 mt-1 border-top"></div></div><div class="col-md-6 col-sm-12">';
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_output_n',
-					'name'        => 'bsvc_output_n',
-					'label'       => __( 'What should happen if rules NOT met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Show Block', 'ayecode-connect' ),
-					'class'       => 'bsvc_output_n form-select-sm no-select2 mw-100',
-					'options'     => sd_visibility_output_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-md-6 col-sm-12">';
-
-			$content .= aui()->select(
-				array(
-					'id'              => 'bsvc_page_n',
-					'name'            => 'bsvc_page_n',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
-					'class'           => 'bsvc_page_n form-select-sm no-select2 mw-100',
-					'options'         => sd_template_page_options(),
-					'default'         => '',
-					'value'           => '',
-					'label_type'      => 'top',
-					'select2'         => false,
-					'element_require' => '[%bsvc_output_n%]=="page"'
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_tmpl_part_n',
-					'name'        => 'bsvc_tmpl_part_n',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
-					'class'       => 'bsvc_tmpl_part_n form-select-sm no-select2 mw-100',
-					'options'     => sd_template_part_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'element_require'  => '[%bsvc_output_n%]=="template_part"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'               => 'bsvc_message_type_n',
-					'name'             => 'bsvc_message_type_n',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
-					'class'            => 'bsvc_message_type_n form-select-sm no-select2 mw-100',
-					'options'          => sd_aui_colors(),
-					'default'          => '',
-					'value'            => '',
-					'label_type'       => 'top',
-					'select2'          => false,
-					'element_require'  => '[%bsvc_output_n%]=="message"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-sm-12">';
-
-			$content .= aui()->input(
-				array(
-					'type'            => 'text',
-					'id'              => 'bsvc_message_n',
-					'name'            => 'bsvc_message_n',
-					'label'           => '',
-					'class'           => 'bsvc_message_n form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
-					'label_type'      => '',
-					'value'           => '',
-					'form_group_class' => ' ',
-					'element_require' => '[%bsvc_output_n%]=="message"',
-				)
-			);
-
-			$content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
-
-			return $content;
-		}
+                    $content .= '</div>';
+
+                    $content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+                        $role_options = sd_user_roles_options();
+
+                        $role_option_i = 0;
+                        foreach ( $role_options as $role_option_key => $role_option_name ) {
+                            $role_option_i++;
+
+                            $content .= '<div class="col-sm-6">';
+                            $content .= aui()->input(
+                                array(
+                                    'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
+                                    'name'             => 'bsvc_user_roles_BSVCINDEX[]',
+                                    'type'             => 'checkbox',
+                                    'label'            => $role_option_name,
+                                    'label_type'       => 'hidden',
+                                    'class'            => 'bsvc_user_roles',
+                                    'value'            => $role_option_key,
+                                    'switch'           => 'md',
+                                    'no_wrap'          => true
+                                )
+                            );
+                            $content .= '</div>';
+                        }
+                    $content .= '</div>';
+                    $content .= '<div class="bs-vc-sep-wrap text-center position-absolute top-0 mt-n3"><div class="bs-vc-sep-cond d-inline-block badge text-dark bg-gray mt-1">' . esc_html__( 'AND', 'ayecode-connect' ) . '</div></div>';
+                $content .= '</div>';
+            $content .= '</div>';
+            $content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
+            $content .= '<div class="bs-vc-rule-sets"></div>';
+            $content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+            $content .= '<div class="row"><div class="col-md-6 col-sm-12">';
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_output',
+                    'name'        => 'bsvc_output',
+                    'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
+                    'placeholder' => __( 'Show Block', 'ayecode-connect' ),
+                    'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
+                    'options'     => sd_visibility_output_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-md-6 col-sm-12">';
+
+            $content .= aui()->select(
+                array(
+                    'id'              => 'bsvc_page',
+                    'name'            => 'bsvc_page',
+                    'label'           => __( 'Page Content', 'ayecode-connect' ),
+                    'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+                    'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
+                    'options'         => sd_template_page_options(),
+                    'default'         => '',
+                    'value'           => '',
+                    'label_type'      => 'top',
+                    'select2'         => false,
+                    'element_require' => '[%bsvc_output%]=="page"'
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_tmpl_part',
+                    'name'        => 'bsvc_tmpl_part',
+                    'label'       => __( 'Template Part', 'ayecode-connect' ),
+                    'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+                    'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
+                    'options'     => sd_template_part_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'element_require'  => '[%bsvc_output%]=="template_part"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'               => 'bsvc_message_type',
+                    'name'             => 'bsvc_message_type',
+                    'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
+                    'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+                    'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
+                    'options'          => sd_aui_colors(),
+                    'default'          => '',
+                    'value'            => '',
+                    'label_type'       => 'top',
+                    'select2'          => false,
+                    'element_require'  => '[%bsvc_output%]=="message"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-sm-12">';
+
+            $content .= aui()->input(
+                array(
+                    'type'            => 'text',
+                    'id'              => 'bsvc_message',
+                    'name'            => 'bsvc_message',
+                    'label'           => '',
+                    'class'           => 'bsvc_message form-control-sm mb-3',
+                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'label_type'      => '',
+                    'value'           => '',
+                    'form_group_class' => ' ',
+                    'element_require' => '[%bsvc_output%]=="message"',
+                )
+            );
+
+            $content .= '</div></div><div class="row"><div class="col col-12"><div class="pt-3 mt-1 border-top"></div></div><div class="col-md-6 col-sm-12">';
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_output_n',
+                    'name'        => 'bsvc_output_n',
+                    'label'       => __( 'What should happen if rules NOT met.', 'ayecode-connect' ),
+                    'placeholder' => __( 'Show Block', 'ayecode-connect' ),
+                    'class'       => 'bsvc_output_n form-select-sm no-select2 mw-100',
+                    'options'     => sd_visibility_output_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-md-6 col-sm-12">';
+
+            $content .= aui()->select(
+                array(
+                    'id'              => 'bsvc_page_n',
+                    'name'            => 'bsvc_page_n',
+                    'label'           => __( 'Page Content', 'ayecode-connect' ),
+                    'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+                    'class'           => 'bsvc_page_n form-select-sm no-select2 mw-100',
+                    'options'         => sd_template_page_options(),
+                    'default'         => '',
+                    'value'           => '',
+                    'label_type'      => 'top',
+                    'select2'         => false,
+                    'element_require' => '[%bsvc_output_n%]=="page"'
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_tmpl_part_n',
+                    'name'        => 'bsvc_tmpl_part_n',
+                    'label'       => __( 'Template Part', 'ayecode-connect' ),
+                    'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+                    'class'       => 'bsvc_tmpl_part_n form-select-sm no-select2 mw-100',
+                    'options'     => sd_template_part_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'element_require'  => '[%bsvc_output_n%]=="template_part"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'               => 'bsvc_message_type_n',
+                    'name'             => 'bsvc_message_type_n',
+                    'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
+                    'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+                    'class'            => 'bsvc_message_type_n form-select-sm no-select2 mw-100',
+                    'options'          => sd_aui_colors(),
+                    'default'          => '',
+                    'value'            => '',
+                    'label_type'       => 'top',
+                    'select2'          => false,
+                    'element_require'  => '[%bsvc_output_n%]=="message"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-sm-12">';
+
+            $content .= aui()->input(
+                array(
+                    'type'            => 'text',
+                    'id'              => 'bsvc_message_n',
+                    'name'            => 'bsvc_message_n',
+                    'label'           => '',
+                    'class'           => 'bsvc_message_n form-control-sm',
+                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'label_type'      => '',
+                    'value'           => '',
+                    'form_group_class' => ' ',
+                    'element_require' => '[%bsvc_output_n%]=="message"',
+                )
+            );
+
+            $content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
+
+            return $content;
+        }
 
-		/**
-		 * Handle media_buttons hook.
-		 *
-		 * @since 1.2.7
-		 */
-		public function wp_media_buttons() {
-			global $shortcode_insert_button_once;
-
-			// Fix conflicts with UpSolution Core in header template edit element.
-			if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
-				$shortcode_insert_button_once = true;
-			}
-		}
-	}
+        /**
+         * Handle media_buttons hook.
+         *
+         * @since 1.2.7
+         */
+        public function wp_media_buttons() {
+            global $shortcode_insert_button_once;
+
+            // Fix conflicts with UpSolution Core in header template edit element.
+            if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
+                $shortcode_insert_button_once = true;
+            }
+        }
+    }
 }

Spacing +831 added lines, -831 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
-	define( 'SUPER_DUPER_VER', '1.2.25' );
+	define('SUPER_DUPER_VER', '1.2.25');
 
 	/**
 	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
@@ -38,40 +38,40 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name'],
 				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
 			// nested blocks can't work as a widget
-			if(!empty($this->options['nested-block'])){
-				if(empty($this->options['output_types'])){
-					$this->options['output_types'] = array('shortcode','block');
+			if (!empty($this->options['nested-block'])) {
+				if (empty($this->options['output_types'])) {
+					$this->options['output_types'] = array('shortcode', 'block');
 				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
 					unset($this->options['output_types'][$key]);
 				}
 			}
 
 			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
+				parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 			}
 
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -80,68 +80,68 @@ 
 
 
 				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
+				if (function_exists('fusion_builder_map')) {
+					add_action('init', array($this, 'register_fusion_element'));
 				}
 
                 // maybe load the Bricks transformer class
-                if( class_exists('\Bricks\Elements', false) ){
-					add_action( 'init', array( $this, 'load_bricks_element_class' ) );
+                if (class_exists('\Bricks\Elements', false)) {
+					add_action('init', array($this, 'load_bricks_element_class'));
                 }
 
 				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				if (empty($this->options['output_types']) || in_array('block', $this->options['output_types'])) {
+					add_action('admin_enqueue_scripts', array($this, 'register_block'));
 				}
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+				add_action('elementor/editor/after_enqueue_styles', array($this, 'elementor_editor_styles'));
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'wp_media_buttons'), 1);
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
 
 				/* Load script on Divi theme builder page */
-				if ( ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) || ( function_exists( 'et_builder_d5_enabled' ) && et_builder_d5_enabled() && isset( $_GET['et_fb'] ) && '1' === $_GET['et_fb'] && et_pb_is_allowed( 'use_visual_builder' ) ) ) {
+				if ((function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) || (function_exists('et_builder_d5_enabled') && et_builder_d5_enabled() && isset($_GET['et_fb']) && '1' === $_GET['et_fb'] && et_pb_is_allowed('use_visual_builder'))) {
 					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+					add_action('admin_footer', array($this, 'shortcode_insert_button_script'));
 				}
 
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
+				add_action('admin_head', array($this, 'generator'), 99);
+				add_action('wp_head', array($this, 'generator'), 99);
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
         /**
@@ -157,7 +157,7 @@ 
 		 * @return void
 		 */
 		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
 				parent::_register();
 			}
 		}
@@ -166,14 +166,14 @@ 
 		 * Add our widget CSS to elementor editor.
 		 */
 		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+			wp_add_inline_style('elementor-editor', $this->widget_css(false));
 		}
 
 		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if ( $this->base_id ) {
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -184,11 +184,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -197,8 +197,8 @@ 
 			$params    = array();
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $key => $val) {
 					$param = array();
 					// type
 					$param['type'] = str_replace(
@@ -220,38 +220,38 @@ 
 						$val['type'] );
 
 					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+					if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 						$param['type']     = 'multiple_select';
 						$param['multiple'] = true;
 					}
 
 					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+					$param['heading'] = isset($val['title']) ? $val['title'] : '';
 
 					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 					// param_name
 					$param['param_name'] = $key;
 
 					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if ( isset( $val['group'] ) ) {
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
+							unset($param['default']);
 						}
-						$param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('0' => __("No", 'ayecode-connect'), '1' => __("Yes", 'ayecode-connect'));
+					} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+						$param['value'] = isset($val['options']) ? $val['options'] : array();
 					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
 					// setup the param
@@ -268,7 +268,7 @@ 
 		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 		 */
 		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
+			if (did_action('cornerstone_before_boot_app')) {
 				self::shortcode_insert_button_script();
 			}
 		}
@@ -280,12 +280,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function get_picker( $editor_id = '' ) {
+		public static function get_picker($editor_id = '') {
 
 			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
+			if (isset($_POST['editor_id'])) {
+				$editor_id = esc_attr($_POST['editor_id']);
+			} elseif (isset($_REQUEST['et_fb'])) {
 				$editor_id = 'main_content_content_vb_tiny_mce';
 			}
 
@@ -296,14 +296,14 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode', 'ayecode-connect') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						if (!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])) { continue; }
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -314,32 +314,32 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
-						<button class="button sd-insert-shortcode-button" onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) { echo "'" . $editor_id . "'"; } ?>)"><?php esc_html_e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
+					<?php if ($editor_id != '') { ?>
+						<button class="button sd-insert-shortcode-button" onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) { echo "'" . $editor_id . "'"; } ?>)"><?php esc_html_e('Insert shortcode', 'ayecode-connect'); ?></button>
 					<?php } ?>
-					<button class="button" onclick="sd_copy_to_clipboard()"><?php esc_html_e( 'Copy shortcode' ); ?></button>
+					<button class="button" onclick="sd_copy_to_clipboard()"><?php esc_html_e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those occasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 			} else {
@@ -353,22 +353,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+			$plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 			// Find source plugin/theme of SD
 			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+			if (strpos($file, $plugins_dir) !== false) {
+				$source = explode("/", plugin_basename($file));
+			} else if (function_exists('get_theme_root')) {
+				$themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Super Duper v' . esc_attr($this->version) . '"' . (!empty($source[0]) ? ' data-sd-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 
 		/**
@@ -379,16 +379,16 @@ 
 		public static function get_widget_settings() {
 			global $sd_widgets;
 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
+			$shortcode = isset($_REQUEST['shortcode']) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes($_REQUEST['shortcode']) : '';
+			if (!$shortcode) {
 				wp_die();
 			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
+			$widget_args = isset($sd_widgets[$shortcode]) ? $sd_widgets[$shortcode] : '';
+			if (!$widget_args) {
 				wp_die();
 			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
+			$class_name = isset($widget_args['class_name']) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			if (!$class_name) {
 				wp_die();
 			}
 
@@ -396,7 +396,7 @@ 
 			$widget = new $class_name;
 
 			ob_start();
-			$widget->form( array() );
+			$widget->form(array());
 			$form = ob_get_clean();
 			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
 			echo "<style>" . $widget->widget_css() . "</style>";
@@ -415,9 +415,9 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -426,21 +426,21 @@ 
 			 * Cornerstone makes us play dirty tricks :/
 			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
 			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '<span id="insert-media-button">';
 			}
 
-			echo self::shortcode_button( 'this', 'true' );
+			echo self::shortcode_button('this', 'true');
 
 			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '</span>'; // end #insert-media-button
 			}
 
 			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			if (function_exists('generate_sections_sections_metabox') && did_action('generate_sections_metabox')) {
 			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+				self::shortcode_insert_button_script($editor_id, $insert_shortcode_function);
 			}
 
 			$shortcode_insert_button_once = true;
@@ -454,12 +454,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
+		public static function shortcode_button($id = '', $search_for_id = '') {
 			ob_start();
 			?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
+				if ($search_for_id) {
 					echo "," . $search_for_id;
 				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
@@ -475,7 +475,7 @@ 
 			$html = ob_get_clean();
 
 			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
+			return preg_replace("/\r|\n/", "", trim($html));
 		}
 
 		/**
@@ -531,7 +531,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings', 'ayecode-connect'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -566,10 +566,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -581,7 +581,7 @@ 
 		 *@since 1.0.6
 		 *
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -700,25 +700,25 @@ 
 					width: 100%;
 				}
 
-				<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+				<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 				.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 					display: inline;
 				}
 				<?php } ?>
-				<?php if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) { ?>
+				<?php if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) { ?>
 				body.divi_page_et_theme_builder div#TB_window.gd-tb-window{z-index:9999999}
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			if (class_exists('SiteOrigin_Panels')) {
 				echo "<script>" . self::siteorigin_js() . "</script>";
 			}
 			?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
+				if (!empty($insert_shortcode_function)) {
 					echo $insert_shortcode_function;
-				}else{
+				} else {
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -731,9 +731,9 @@ 
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
+							if (isset($_REQUEST['et_fb'])) {
 								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+							} elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') {
 								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
 							} else {
 								echo '$editor_id = "#wp-content-editor-container textarea";';
@@ -815,11 +815,11 @@ 
 							'shortcode': $short_code,
 							'attributes': 123,
 							'post_id': 321,
-							'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+							'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 						};
 
 						if (typeof ajaxurl === 'undefined') {
-							var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' );?>";
+							var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 						}
 
 						jQuery.post(ajaxurl, data, function (response) {
@@ -944,7 +944,7 @@ 
 					});
 
 					// The below tries to add the shortcode builder button to the builders own raw/shortcode sections.
-					<?php if ( function_exists( 'et_setup_theme' ) ) { ?>
+					<?php if (function_exists('et_setup_theme')) { ?>
 					// DIVI
 					jQuery(document).on('focusin', '.et-fb-codemirror', function () {
 						// insert the shortcode button to the textarea lable if not there already
@@ -1036,11 +1036,11 @@ 
 					var data = {
 						'action': 'super_duper_get_picker',
 						'editor_id': $id,
-						'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_picker' );?>'
+						'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_picker'); ?>'
 					};
 
 					if (!ajaxurl) {
-						var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' ); ?>";
+						var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 					}
 
 					jQuery.post(ajaxurl, data, function (response) {
@@ -1062,9 +1062,9 @@ 
 				 */
 				function sd_shortcode_button($id) {
 					if ($id) {
-						return '<?php echo self::shortcode_button( "\\''+\$id+'\\'" );?>';
+						return '<?php echo self::shortcode_button("\\''+\$id+'\\'"); ?>';
 					} else {
-						return '<?php echo self::shortcode_button();?>';
+						return '<?php echo self::shortcode_button(); ?>';
 					}
 				}
 			</script>
@@ -1078,11 +1078,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function widget_css( $advanced = true ) {
+		public function widget_css($advanced = true) {
 			ob_start();
 			?>
 			<style>
-				<?php if( $advanced ){ ?>
+				<?php if ($advanced) { ?>
 				.sd-advanced-setting {
 					display: none;
 				}
@@ -1126,10 +1126,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -1196,7 +1196,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings', 'ayecode-connect'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = $form ? $form : jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1287,7 +1287,7 @@ 
 					});
 
 				}
-				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
+				<?php do_action('wp_super_duper_widget_js', $this); ?>
 			</script>
 			<?php
 			$output = ob_get_clean();
@@ -1296,10 +1296,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
@@ -1310,14 +1310,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
+		private function add_name_from_key($options, $arguments = false) {
+			if (!empty($options['arguments'])) {
+				foreach ($options['arguments'] as $key => $val) {
+					$options['arguments'][$key]['name'] = $key;
 				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
+			} elseif ($arguments && is_array($options) && !empty($options)) {
+				foreach ($options as $key => $val) {
+					$options[$key]['name'] = $key;
 				}
 			}
 
@@ -1330,8 +1330,8 @@ 
 		 * @since 1.0.0
 		 */
 		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array($this, 'render_shortcode'));
 		}
 
 		/**
@@ -1340,50 +1340,50 @@ 
 		 * @since 1.0.0
 		 */
 		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
+			if (!current_user_can('manage_options')) {
 				wp_die();
 			}
 
 			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
+				$post_obj = get_post(absint($_POST['post_id']));
+				if (!empty($post_obj) && empty($post)) {
 					global $post;
 					$post = $post_obj;
 				}
 			}
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
 				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
 				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
+				if (!empty($attributes_array)) {
+					foreach ($attributes_array as $key => $value) {
+						if (is_array($value)) {
+							$value = implode(",", $value);
 						}
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+						if (!empty($value)) {
+							$value = wp_unslash($value);
 
 							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
+							if ($is_preview) {
+								$value = $this->encode_shortcodes($value);
 							}
 						}
-						$attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+						$attributes .= " " . esc_attr(sanitize_title_with_dashes($key)) . "='" . esc_attr($value) . "' ";
 					}
 				}
 
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+				$shortcode = "[" . esc_attr($shortcode_name) . " " . $attributes . "]";
 
-				$content = do_shortcode( $shortcode );
+				$content = do_shortcode($shortcode);
 
 				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
+				if (!empty($content) && $is_preview) {
+					$content = $this->decode_shortcodes($content);
 				}
 
 				echo $content;
@@ -1399,21 +1399,21 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
+		public function shortcode_output($args = array(), $content = '') {
 			$_instance = $args;
 
-			$args = $this->argument_values( $args );
+			$args = $this->argument_values($args);
 
 			// add extra argument so we know its a output to gutenberg
 			//$args
-			$args = $this->string_to_bool( $args );
+			$args = $this->string_to_bool($args);
 
 			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
+			if (!empty($content)) {
 				$args['html'] = $content;
 			}
 
-			if ( ! $this->is_preview() ) {
+			if (!$this->is_preview()) {
 				/**
 				 * Filters the settings for a particular widget args.
 				 *
@@ -1424,40 +1424,40 @@ 
 				 *@since 1.0.28
 				 *
 				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+				$args = apply_filters('wp_super_duper_widget_display_callback', $args, $this, $_instance);
 
-				if ( ! is_array( $args ) ) {
+				if (!is_array($args)) {
 					return $args;
 				}
 			}
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+			$class = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
+			$class .= " sdel-" . $this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+			$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+			$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
 			$shortcode_args = array();
 			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+			if (isset($args['no_wrap']) && $args['no_wrap']) {
 				$no_wrap = true;
 			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
+			$main_content = $this->output($args, $shortcode_args, $content);
+			if ($main_content && !$no_wrap) {
 				// wrap the shortcode in a div with the same class as the widget
 				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
+				if (!empty($args['title'])) {
 					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
+					if (empty($instance)) {
 						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
+						if (!empty($wp_registered_sidebars)) {
+							foreach ($wp_registered_sidebars as $sidebar) {
+								if (!empty($sidebar['before_title'])) {
 									$shortcode_args['before_title'] = $sidebar['before_title'];
 									$shortcode_args['after_title']  = $sidebar['after_title'];
 									break;
@@ -1465,20 +1465,20 @@ 
 							}
 						}
 					}
-					$output .= $this->output_title( $shortcode_args, $args );
+					$output .= $this->output_title($shortcode_args, $args);
 				}
 				$output .= $main_content;
 				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
+			} elseif ($main_content && $no_wrap) {
 				$output .= $main_content;
 			}
 
 			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			if ($this->is_preview() && $output == '') {
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 			}
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+			return apply_filters('wp_super_duper_widget_output', $output, $args, $shortcode_args, $this);
 		}
 
 		/**
@@ -1488,8 +1488,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf(__('Placeholder for: %s', 'ayecode-connect'), $name) . "</div>";
 		}
 
 		/**
@@ -1499,13 +1499,13 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function string_to_bool( $options ) {
+		public function string_to_bool($options) {
 			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
+			foreach ($options as $key => $val) {
+				if ($val == 'false') {
+					$options[$key] = false;
+				} elseif ($val == 'true') {
+					$options[$key] = true;
 				}
 			}
 
@@ -1521,26 +1521,26 @@ 
 		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
 		 *
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1567,15 +1567,15 @@ 
 		 *
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
-            if( !empty( $this->arguments['title']['value'] ) ){
-                $this->arguments['title']['value'] = wp_kses_post( $this->arguments['title']['value'] );
+            if (!empty($this->arguments['title']['value'])) {
+                $this->arguments['title']['value'] = wp_kses_post($this->arguments['title']['value']);
             }
 
 			return $this->arguments;
@@ -1588,7 +1588,7 @@ 
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+		public function output($args = array(), $widget_args = array(), $content = '') {
 
 		}
 
@@ -1596,9 +1596,9 @@ 
 		 * Add the dynamic block code inline when the wp-block in enqueued.
 		 */
 		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+			wp_add_inline_script('wp-blocks', $this->block());
+			if (class_exists('SiteOrigin_Panels')) {
+				wp_add_inline_script('wp-blocks', $this->siteorigin_js());
 			}
 		}
 
@@ -1612,9 +1612,9 @@ 
 			$show      = false;
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $argument) {
+					if (isset($argument['advanced']) && $argument['advanced']) {
 						$show = true;
 						break; // no need to continue if we know we have it
 					}
@@ -1632,19 +1632,19 @@ 
 		public function get_url() {
 			$url = $this->url;
 
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
+			if (!$url) {
+				$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+				$content_url = untrailingslashit(WP_CONTENT_URL);
 
 				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
+				if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+					$content_url = str_replace('http://', 'https://', $content_url);
 				}
 
 				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
+				$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+				$url = str_replace($content_dir, $content_url, $file_dir);
+				$url = trailingslashit($url);
 				$this->url = $url;
 			}
 
@@ -1660,15 +1660,15 @@ 
 
 			$url = $this->url;
 
-			if ( ! $url ) {
+			if (!$url) {
 				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+				$file_dir = str_replace("/includes", "", dirname(__FILE__));
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+				$dir_parts = explode("/wp-content/", $file_dir);
+				$url_parts = explode("/wp-content/", plugins_url());
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+				if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+					$url       = trailingslashit($url_parts[0] . "/wp-content/" . $dir_parts[1]);
 					$this->url = $url;
 				}
 			}
@@ -1689,45 +1689,45 @@ 
 		 * @return string
 		 *@since 1.1.0
 		 */
-		public function get_block_icon( $icon ) {
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+			} elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+			} elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
 			} else {
 				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
 				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments( $arguments ) {
-			if ( ! empty( $arguments ) ) {
+		public function group_arguments($arguments) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
+				$general        = __("General", 'ayecode-connect');
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1740,38 +1740,38 @@ 
 		 *
 		 * @since 1.1.17
 		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+		public function group_block_tabs($tabs, $arguments) {
+			if (!empty($tabs) && !empty($arguments)) {
 				$has_sections = false;
 
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
+				foreach ($this->arguments as $key => $args) {
+					if (isset($args['group'])) {
 						$has_sections = true;
 						break;
 					}
 				}
 
-				if ( ! $has_sections ) {
+				if (!$has_sections) {
 					return $tabs;
 				}
 
 				$new_tabs = array();
 
-				foreach ( $tabs as $tab_key => $tab ) {
+				foreach ($tabs as $tab_key => $tab) {
 					$new_groups = array();
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
+					if (!empty($tab['groups']) && is_array($tab['groups'])) {
+						foreach ($tab['groups'] as $group) {
+							if (isset($arguments[$group])) {
 								$new_groups[] = $group;
 							}
 						}
 					}
 
-					if ( ! empty( $new_groups ) ) {
+					if (!empty($new_groups)) {
 						$tab['groups'] = $new_groups;
 
-						$new_tabs[ $tab_key ] = $tab;
+						$new_tabs[$tab_key] = $tab;
 					}
 				}
 
@@ -1798,7 +1798,7 @@ 
 			?>
 			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
+			if (!$sd_is_js_functions_loaded) {
 				$sd_is_js_functions_loaded = true;
 			?>
 function sd_show_view_options($this){
@@ -2121,7 +2121,7 @@ 
 	}
 }
 
-<?php if( !isset( $_REQUEST['sd-block-recover-debug'] ) ){ ?>
+<?php if (!isset($_REQUEST['sd-block-recover-debug'])) { ?>
 // Wait will window is loaded before calling.
 window.onload = function() {
 	sd_auto_recover_blocks();
@@ -2300,7 +2300,7 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
+				if ($aui_bs5) {
 					?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
@@ -2309,7 +2309,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else {
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2497,7 +2497,7 @@ 
 			}
 
 			function sd_get_class_build_keys(){
-				return <?php echo json_encode(sd_get_class_build_keys());?>;
+				return <?php echo json_encode(sd_get_class_build_keys()); ?>;
 			}
 
 			<?php
@@ -2505,7 +2505,7 @@ 
 
 			}
 
-			if(method_exists($this,'block_global_js')){
+			if (method_exists($this, 'block_global_js')) {
 					echo $this->block_global_js();
 			}
 			?>
@@ -2537,9 +2537,9 @@ 
 					var InnerBlocks = blockEditor.InnerBlocks;
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
-					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
-					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
+					var post_type_rest_slugs = <?php if (!empty($this->arguments) && isset($this->arguments['post_type']['onchange_rest']['values'])) {echo "[" . json_encode($this->arguments['post_type']['onchange_rest']['values']) . "]"; } else {echo "[]"; } ?>;
+					const taxonomies_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
+					const sort_by_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
 					const MediaUpload = wp.blockEditor.MediaUpload;
 
 					/**
@@ -2554,87 +2554,87 @@ 
 					 * @return {?WPBlock}          The block, if it has been successfully
 					 *                             registered; otherwise `undefined`.
 					 */
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2 ; ?>,
-						title: '<?php echo addslashes( $this->options['name'] ); ?>', // Block title.
-						description: '<?php echo addslashes( $this->options['widget_ops']['description'] )?>', // Block title.
-						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2; ?>,
+						title: '<?php echo addslashes($this->options['name']); ?>', // Block title.
+						description: '<?php echo addslashes($this->options['widget_ops']['description'])?>', // Block title.
+						icon: <?php echo $this->get_block_icon($this->options['block-icon']); ?>,//'<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if(!isset($this->options['block-supports']['renaming'])){
+							if (!isset($this->options['block-supports']['renaming'])) {
 								$this->options['block-supports']['renaming'] = false;
 							}
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
 						__experimentalLabel( attributes, { context } ) {
 							var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
 							var metadata_name = attributes && attributes.metadata && attributes.metadata.name ? attributes.metadata.name : '';
-							var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr( addslashes( $this->options['name'] ) ) . "'"; ?>;
+							var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr(addslashes($this->options['name'])) . "'"; ?>;
 							return metadata_name ? metadata_name + visibility_html  : label_name + visibility_html;
 						},
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+						<?php if (isset($this->options['block-keywords'])) {
 						echo "keywords : " . $this->options['block-keywords'] . ",";
 						}
 
 
 						// block hover preview.
 						$example_args = array();
-						if(!empty($this->arguments)){
-							foreach($this->arguments as $key => $a_args){
-								if(isset($a_args['example'])){
+						if (!empty($this->arguments)) {
+							foreach ($this->arguments as $key => $a_args) {
+								if (isset($a_args['example'])) {
 									$example_args[$key] = $a_args['example'];
 								}
 							}
 						}
-						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: ' . absint($this->options['example']['viewportWidth']) : '';
 						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+						if (isset($this->options['example']) && $this->options['example'] === false) {
 							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
-							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
+						}elseif (!empty($example_args)) {
+							echo "example : {attributes:{" . $this->array_to_attributes($example_args) . "},$viewport_width},";
+						}elseif (!empty($this->options['example'])) {
 							unset($this->options['example']['viewportWidth']);
 							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
+							$example_atts = $this->array_to_attributes($this->options['example']);
 							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
+							if ($example_atts) {
+								$example_parts[] = rtrim($example_atts, ",");
 							}
-							if($viewport_width){
+							if ($viewport_width) {
 								$example_parts[] = $viewport_width;
 							}
-							if($example_inner_blocks){
+							if ($example_inner_blocks) {
 								$example_parts[] = $example_inner_blocks;
 							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
+							if (!empty($example_parts)) {
+								echo "example : {" . implode(',', $example_parts) . "},";
 							}
-						}else{
+						} else {
 							echo 'example : {viewportWidth: 500},';
 						}
 
 
 
 						// limit to parent
-						if( !empty( $this->options['parent'] ) ){
-							echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+						if (!empty($this->options['parent'])) {
+							echo "parent : " . wp_json_encode($this->options['parent']) . ",";
 						}
 
 						// limit allowed blocks
-						if( !empty( $this->options['allowed-blocks'] ) ){
-							echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+						if (!empty($this->options['allowed-blocks'])) {
+							echo "allowedBlocks : " . wp_json_encode($this->options['allowed-blocks']) . ",";
 						}
 
 						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+						$no_wrap = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+						if (isset($this->arguments['no_wrap']) && $this->arguments['no_wrap']) {
 							$no_wrap = true;
 						}
-						if ( $no_wrap ) {
+						if ($no_wrap) {
 							$this->options['block-wrap'] = '';
 						}
 
@@ -2644,7 +2644,7 @@ 
 	
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "  type: 'boolean',";
 								echo "  default: false";
@@ -2652,60 +2652,60 @@ 
 							}
 
 							// Block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "  type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "'";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "'";
 								echo "},";
 							}
 
-							if ( ! empty( $this->arguments ) ) {
-								foreach ( $this->arguments as $key => $args ) {
-									if ( $args['type'] == 'image' ||  $args['type'] == 'images' ) {
+							if (!empty($this->arguments)) {
+								foreach ($this->arguments as $key => $args) {
+									if ($args['type'] == 'image' || $args['type'] == 'images') {
 										$img_drag_drop = true;
 									}
 
 									// Set if we should show alignment.
-									if ( $key == 'alignment' ) {
+									if ($key == 'alignment') {
 										$show_alignment = true;
 									}
 
 									$extra = '';
-									$_default = isset( $args['default'] ) && ! is_null( $args['default'] ) ? $args['default'] : '';
+									$_default = isset($args['default']) && !is_null($args['default']) ? $args['default'] : '';
 
-									if ( ! empty( $_default ) ) {
-										$_default = wp_slash( $_default );
+									if (!empty($_default)) {
+										$_default = wp_slash($_default);
 									}
 
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+									if ($args['type'] == 'notice' || $args['type'] == 'tab') {
 										continue;
-									} else if ( $args['type'] == 'checkbox' ) {
+									} else if ($args['type'] == 'checkbox') {
 										$type    = 'boolean';
 										$default = $_default ? 'true' : 'false';
-									} else if ( $args['type'] == 'number' ) {
+									} else if ($args['type'] == 'number') {
 										$type    = 'number';
 										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+									} else if ($args['type'] == 'select' && !empty($args['multiple'])) {
 										$type = 'array';
-										if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-											$default = ! empty( $_default ) ? "['" . implode( "','", $_default ) . "']" : "[]";
+										if (isset($args['default']) && is_array($args['default'])) {
+											$default = !empty($_default) ? "['" . implode("','", $_default) . "']" : "[]";
 										} else {
 											$default = "'" . $_default . "'";
 										}
-									} else if ( $args['type'] == 'tagselect' ) {
+									} else if ($args['type'] == 'tagselect') {
 										$type    = 'array';
 										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'multiselect' ) {
+									} else if ($args['type'] == 'multiselect') {
 										$type    = 'array';
 										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image_xy' ) {
+									} else if ($args['type'] == 'image_xy') {
 										$type    = 'object';
 										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image' ) {
+									} else if ($args['type'] == 'image') {
 										$type    = 'string';
 										$default = "'" . $_default . "'";
 									} else {
-										$type    = ! empty( $args['hidden_type'] ) ? esc_attr( $args['hidden_type'] ) : 'string';
+										$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
 										$default = "'" . $_default . "'";
 									}
 
@@ -2719,7 +2719,7 @@ 
 							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
 							echo "sd_shortcode : {type : 'string',default: ''},";
 
-							if ( ! empty( $this->options['nested-block'] ) || ! empty( $this->arguments['html'] ) ) {
+							if (!empty($this->options['nested-block']) || !empty($this->arguments['html'])) {
 								echo "sd_shortcode_close : {type : 'string',default: ''},";
 							}
 
@@ -2731,7 +2731,7 @@ 
 							const selectedBlock = wp.data.select('core/block-editor').getSelectedBlock();
 <?php
 // only include the drag/drop functions if required.
-if ( $img_drag_drop ) {
+if ($img_drag_drop) {
 ?>
 
 function enableDragSort(listClass) {
@@ -2796,9 +2796,9 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
+							if (!empty($this->options['block-edit-raw'])) {
 								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
+							} else {
 							?>
 
 function hasSelectedInnerBlock(props) {
@@ -2822,7 +2822,7 @@ 
 	var $value = '';
 	<?php
 	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+	if (isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked'])) {
 	?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined' && selectedBlock && selectedBlock.clientId === props.clientId){
 		$pt = props.attributes.post_type;
@@ -2837,9 +2837,9 @@ 
 		}
 <?php
 	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+	if (!empty($this->arguments['post_type']['onchange_rest']['path'])) {
+		$cat_path = esc_js(strip_tags($this->arguments['post_type']['onchange_rest']['path']));
+		$cat_path = str_replace(array('&quot;', '&#039;'), array('"', "'"), $cat_path);
 	}
 ?>
 		/* taxonomies */
@@ -2847,15 +2847,15 @@ 
 			if (!window.gdCPTCats) {
 				window.gdCPTCats = [];
 			}
-			var gdCatPath = "<?php echo ( ! empty( $cat_path ) ? $cat_path : "/wp/v2/" + $value + "/categories/?per_page=100" ); ?>";
+			var gdCatPath = "<?php echo (!empty($cat_path) ? $cat_path : "/wp/v2/" +$value + "/categories/?per_page=100"); ?>";
 			if (window.gdCPTCats[gdCatPath]) {
 				terms = window.gdCPTCats[gdCatPath];
-				while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+				while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 				}
-				taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+				taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 				jQuery.each( terms, function( key, val ) {
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 				});
 
 				/* Setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options. */
@@ -2865,12 +2865,12 @@ 
 			} else {
 				wp.apiFetch({path: gdCatPath}).then(terms => {
 					window.gdCPTCats[gdCatPath] = terms;
-					while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-						taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+					while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+						taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 					}
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 					jQuery.each( terms, function( key, val ) {
-						taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+						taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 					});
 
 					/* Setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options. */
@@ -2878,7 +2878,7 @@ 
 					props.setAttributes({category: [0] });
 					props.setAttributes({category: $old_cat_value });
 
-					return taxonomies_<?php echo str_replace("-","_", $this->id);?>;
+					return taxonomies_<?php echo str_replace("-", "_", $this->id); ?>;
 				});
 			}
 		}
@@ -2890,12 +2890,12 @@ 
 			}
 			if (window.gdCPTSort[$pt]) {
 				response = window.gdCPTSort[$pt];
-				while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-					sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+				while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+					sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 				}
 
 				jQuery.each( response, function( key, val ) {
-					sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+					sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 				});
 
 				// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -2910,12 +2910,12 @@ 
 				jQuery.post(ajaxurl, data, function(response) {
 					response = JSON.parse(response);
 					window.gdCPTSort[$pt] = response;
-					while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-						sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+					while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+						sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 					}
 
 					jQuery.each( response, function( key, val ) {
-						sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+						sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 					});
 
 					// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -2923,7 +2923,7 @@ 
 					props.setAttributes({sort_by: [0] });
 					props.setAttributes({sort_by: $old_sort_by_value });
 
-					return sort_by_<?php echo str_replace("-","_", $this->id);?>;
+					return sort_by_<?php echo str_replace("-", "_", $this->id); ?>;
 				});
 			}
 		}
@@ -2931,9 +2931,9 @@ 
 	<?php } ?>
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
-if(!empty($current_screen->base) && $current_screen->base==='widgets'){
+if (!empty($current_screen->base) && $current_screen->base === 'widgets') {
 	echo 'const { deviceType } = "";';
-}else{
+} else {
 ?>
 /** Get device type const. */
 const wpVersion = '<?php global $wp_version; echo esc_attr($wp_version); ?>';
@@ -2982,13 +2982,13 @@ 
 
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+										'post_id': <?php global $post; if (isset($post->ID)) {
 										echo $post->ID;
-									}else{echo '0';}?>,
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+									} else {echo '0'; }?>,
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 									};
 
 									jQuery.post(ajaxurl, data, function (response) {
@@ -2996,17 +2996,17 @@ 
 									}).then(function (env) {
 										// if the content is empty then we place some placeholder text
 										if (env == '') {
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for:', 'ayecode-connect' );?> " + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for:', 'ayecode-connect'); ?> " + props.name + "</div>";
 										}
 
 										 <?php
-										if(!empty($this->options['nested-block'])){
+										if (!empty($this->options['nested-block'])) {
 											?>
 											// props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
+										} else {
 										?>
 										props.setAttributes({content: env});
 										is_fetching = false;
@@ -3026,35 +3026,35 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-js'])) {
-								echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+							if (!empty($this->options['block-edit-js'])) {
+								echo  $this->options['block-edit-js']; // strings have to be in single quotes, may cause issues
 							}
 
-							if(empty($this->options['block-save-return'])){
+							if (empty($this->options['block-save-return'])) {
 							?>
 								///////////////////////////////////////////////////////////////////////
 
 								// build the shortcode.
-								shortcode = "[<?php echo $this->options['base_id'];?>";
+								shortcode = "[<?php echo $this->options['base_id']; ?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+								if (!empty($this->arguments)) {
 
-								foreach($this->arguments as $key => $args){
+								foreach ($this->arguments as $key => $args) {
 								   // if($args['type']=='tabs'){continue;}
 
 								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
+								   if (substr($key, 0, 9) === 'metadata_') {
 									   continue;
 								   }
 								?>
-								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-									if ('<?php echo esc_attr( $key );?>' == 'html') {
-									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
-										shortcode += props.attributes.<?php echo esc_attr( $key );?>.length && ( props.attributes.<?php echo esc_attr( $key );?>.x.length || props.attributes.<?php echo esc_attr( $key );?>.y.length ) ? " <?php echo esc_attr( $key );?>='{x:" + props.attributes.<?php echo esc_attr( $key );?>.x + ",y:"+props.attributes.<?php echo esc_attr( $key );?>.y +"}' " : "";
+								if (props.attributes.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+									if ('<?php echo esc_attr($key); ?>' == 'html') {
+									} else if ('<?php echo esc_attr($args['type']); ?>' == 'image_xy') {
+										shortcode += props.attributes.<?php echo esc_attr($key); ?>.length && ( props.attributes.<?php echo esc_attr($key); ?>.x.length || props.attributes.<?php echo esc_attr($key); ?>.y.length ) ? " <?php echo esc_attr($key); ?>='{x:" + props.attributes.<?php echo esc_attr($key); ?>.x + ",y:"+props.attributes.<?php echo esc_attr($key); ?>.y +"}' " : "";
 									} else {
-										//shortcode += props.attributes.<?php echo esc_attr( $key );?>.length ? " <?php echo esc_attr( $key );?>='" + props.attributes.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' " : "";
-										shortcode +=  " <?php echo esc_attr( $key );?>='" + props.attributes.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' ";
+										//shortcode += props.attributes.<?php echo esc_attr($key); ?>.length ? " <?php echo esc_attr($key); ?>='" + props.attributes.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' " : "";
+										shortcode +=  " <?php echo esc_attr($key); ?>='" + props.attributes.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' ";
 									}
 								}
 								<?php
@@ -3073,8 +3073,8 @@ 
 
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+									if (!empty($this->options['nested-block']) || !empty($this->arguments['html'])) {
+										echo "props.setAttributes({sd_shortcode_close: '[/" . esc_attr($this->options['base_id']) . "]'});";
 									}
 									?>
 								}
@@ -3089,7 +3089,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -3107,9 +3107,9 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+									if (!empty($this->arguments)) {
 
-									if ( $show_advanced ) {
+									if ($show_advanced) {
 									?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
@@ -3129,42 +3129,42 @@ 
 									<?php
 									}
 
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+									$arguments = $this->group_arguments($this->arguments);
+									$block_group_tabs = !empty($this->options['block_group_tabs']) ? $this->group_block_tabs($this->options['block_group_tabs'], $arguments) : array();
 
 									// Do we have sections?
 									$has_sections = $arguments == $this->arguments ? false : true;
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
 									$open_tab = '';
 
 									$open_tab_groups = array();
 									$used_tabs = array();
 
-									foreach ( $arguments as $key => $args ) {
+									foreach ($arguments as $key => $args) {
 										$close_tab = false;
 										$close_tabs = false;
 
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
+										 if (!empty($block_group_tabs)) {
+											foreach ($block_group_tabs as $tab_name => $tab_args) {
+												if (in_array($key, $tab_args['groups'])) {
 													$open_tab_groups[] = $key;
 
-													if ( $open_tab != $tab_name ) {
+													if ($open_tab != $tab_name) {
 														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
 														$tab_args['tab']['open'] = true;
 
-														$this->block_tab_start( '', $tab_args );
+														$this->block_tab_start('', $tab_args);
 														$open_tab = $tab_name;
 														$used_tabs[] = $tab_name;
 													}
 
-													if ( $open_tab_groups == $tab_args['groups'] ) {
+													if ($open_tab_groups == $tab_args['groups']) {
 														$close_tab = true;
 														$open_tab_groups = array();
 
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+														if ($used_tabs == array_keys($block_group_tabs)) {
 															$close_tabs = true;
 														}
 													}
@@ -3173,27 +3173,27 @@ 
 										}
 										?>
 										el(wp.components.PanelBody, {
-												title: '<?php esc_attr_e( $key ); ?>',
-												initialOpen: <?php if ( $panel_count ) {
+												title: '<?php esc_attr_e($key); ?>',
+												initialOpen: <?php if ($panel_count) {
 												echo "false";
 											} else {
 												echo "true";
 											}?>
 											},
 											<?php
-											foreach ( $args as $k => $a ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
+											foreach ($args as $k => $a) {
+												$this->block_tab_start($k, $a);
+												$this->block_row_start($k, $a);
+												$this->build_block_arguments($k, $a);
+												$this->block_row_end($k, $a);
+												$this->block_tab_end($k, $a);
 											}
 											?>
 										),
 										<?php
-										$panel_count ++;
+										$panel_count++;
 
-										if($close_tab || $close_tabs){
+										if ($close_tab || $close_tabs) {
 											$tab_args = array(
 												'tab'	=> array(
 													'tabs_close' => $close_tabs,
@@ -3201,24 +3201,24 @@ 
 												)
 
 											);
-											$this->block_tab_end( '', $tab_args );
+											$this->block_tab_end('', $tab_args);
 //											echo '###close'; print_r($tab_args);
 											$panel_count = 0;
 										}
 //
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
+											title: '<?php esc_attr_e("Settings", 'ayecode-connect'); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
+										foreach ($this->arguments as $key => $args) {
+											$this->block_row_start($key, $args);
+											$this->build_block_arguments($key, $args);
+											$this->block_row_end($key, $args);
 										}
 										?>
 									),
@@ -3232,11 +3232,11 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							}elseif (!empty($this->options['block-edit-return'])) {
 								   echo $this->options['block-edit-return'];
-							}else{
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
 								?>
@@ -3263,27 +3263,27 @@ 
 							var align = '';
 
 							// build the shortcode.
-							var content = "[<?php echo $this->options['base_id'];?>";
+							var content = "[<?php echo $this->options['base_id']; ?>";
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							if (!empty($this->arguments)) {
 
-							foreach($this->arguments as $key => $args){
+							foreach ($this->arguments as $key => $args) {
 							   // if($args['type']=='tabs'){continue;}
 
 							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
+							   if (substr($key, 0, 9) === 'metadata_') {
 								   continue;
 							   }
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if ('<?php echo esc_attr( $key );?>' == 'html') {
-									$html = attr.<?php echo esc_attr( $key );?>;
-								} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
-									content += " <?php echo esc_attr( $key );?>='{x:" + attr.<?php echo esc_attr( $key );?>.x + ",y:"+attr.<?php echo esc_attr( $key );?>.y +"}' ";
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if ('<?php echo esc_attr($key); ?>' == 'html') {
+									$html = attr.<?php echo esc_attr($key); ?>;
+								} else if ('<?php echo esc_attr($args['type']); ?>' == 'image_xy') {
+									content += " <?php echo esc_attr($key); ?>='{x:" + attr.<?php echo esc_attr($key); ?>.x + ",y:"+attr.<?php echo esc_attr($key); ?>.y +"}' ";
 								} else {
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' ";
 								}
 							}
 							<?php
@@ -3303,7 +3303,7 @@ 
 							?>
 							// if has html element
 							if ($html) {
-								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								//content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 							// @todo should we add inline style here or just css classes?
@@ -3333,7 +3333,7 @@ 
 //                                <x?php
 //							}else
 
-							if(!empty($this->options['block-output'])){
+							if (!empty($this->options['block-output'])) {
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
@@ -3343,30 +3343,30 @@ 
 								   '',
 								   {},
 								  // el('', {dangerouslySetInnerHTML: {__html: content}}),
-								   <?php $this->block_element( $this->options['block-output'], true ); ?>
-								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+								   <?php $this->block_element($this->options['block-output'], true); ?>
+								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
+							}elseif (!empty($this->options['block-save-return'])) {
 								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
+							}elseif (!empty($this->options['nested-block'])) {
 								?>
 							  return el(
 								   '',
 								   {},
 								   el('', {dangerouslySetInnerHTML: {__html: content+"\n"}}),
 								   InnerBlocks.Content ? el( InnerBlocks.Content ) : '', // @todo i think we need a comma here
-								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							}elseif (!empty($this->options['block-save-return'])) {
+								echo "return " . $this->options['block-edit-return'] . ";";
+							}elseif (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -3395,48 +3395,48 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
 
-		public function block_row_start($key, $args){
+		public function block_row_start($key, $args) {
 
 			// check for row
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 
 				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-				$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
+				$device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+				$device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
 				$device_type_icon = '';
-				if($device_type=='Desktop'){
+				if ($device_type == 'Desktop') {
 					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
+				}elseif ($device_type == 'Tablet') {
 					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
+				}elseif ($device_type == 'Mobile') {
 					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 				}
 				echo $element_require;
 				echo $device_type_require;
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
-							<?php if(!empty($args['row']['title'])){ ?>
+							<?php if (!empty($args['row']['title'])) { ?>
 							el('label', {
 									className: 'components-base-control__label position-relative',
 									style: {width:"100%"}
 								},
-								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['row']['title'] ) ?>'}}),
-								<?php if($device_type_icon){ ?>
-									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
+								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['row']['title']) ?>'}}),
+								<?php if ($device_type_icon) { ?>
+									deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
 								}
 								?>
@@ -3444,17 +3444,17 @@ 
 
 							),
 							<?php }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+							<?php if (!empty($args['row']['desc'])) { ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
-								'<?php echo addslashes( $args['row']['desc'] ); ?>'
+								'<?php echo addslashes($args['row']['desc']); ?>'
 							),
 							<?php }?>
 							el(
 								'div',
 								{
-									className: 'row mb-n2 <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>',
+									className: 'row mb-n2 <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>',
 								},
 								el(
 									'div',
@@ -3463,36 +3463,36 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				}elseif (!empty($args['row']['close'])) {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				} else {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0 pr-2 pe-2',
 							},
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_row_end($key, $args){
+		public function block_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "))";
 				}
 
@@ -3500,14 +3500,14 @@ 
 			}
 		}
 
-		public function block_tab_start($key, $args){
+		public function block_tab_start($key, $args) {
 
 			// check for row
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 
-				if(!empty($args['tab']['tabs_open'])){
+				if (!empty($args['tab']['tabs_open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3516,52 +3516,52 @@ 
 									{
 										activeClass: 'is-active',
 										className: 'btn-groupx',
-										initialTabName: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
+										initialTabName: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
-				if(!empty($args['tab']['open'])){
+				if (!empty($args['tab']['open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 							{
-												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
-												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
-												className: '<?php echo addslashes( esc_attr( $args['tab']['class']) ); ?>',
-												content: el('div',{}, <?php if(!empty($args['tab']['desc'])){ ?>el('p', {
+												name: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
+												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes(esc_attr($args['tab']['title'])); ?>'}}),
+												className: '<?php echo addslashes(esc_attr($args['tab']['class'])); ?>',
+												content: el('div',{}, <?php if (!empty($args['tab']['desc'])) { ?>el('p', {
 									className: 'components-base-control__help mb-0',
-									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
+									dangerouslySetInnerHTML: {__html:'<?php echo addslashes($args['tab']['desc']); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_tab_end($key, $args){
+		public function block_tab_end($key, $args) {
 
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 				// maybe close
-				if(!empty($args['tab']['close'])){
+				if (!empty($args['tab']['close'])) {
 					echo ")}, /* tab close */";
 				}
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+				if (!empty($args['tab']['tabs_close'])) {
+					if (false) {?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
-					<?php if(false){ ?></script><?php }
+					<?php if (false) { ?></script><?php }
 				}
 			}
 		}
 
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+		public function build_block_arguments($key, $args) {
+			$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
 			$options           = '';
 			$extra             = '';
 			$require           = '';
@@ -3569,28 +3569,28 @@ 
 			$after_elements	   = '';
 
 			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
+			if ($key == 'content') {
 				return;
 			}
 
-			$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-			$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+			$device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+			$device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
 			$device_type_icon = '';
-			if($device_type=='Desktop'){
+			if ($device_type == 'Desktop') {
 				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
+			}elseif ($device_type == 'Tablet') {
 				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
+			}elseif ($device_type == 'Mobile') {
 				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 			}
 
 			// icon
 			$icon = '';
-			if( !empty( $args['icon'] ) ){
+			if (!empty($args['icon'])) {
 				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									$icon .= "dangerouslySetInnerHTML: {__html: '" . self::get_widget_icon(esc_attr($args['icon'])) . "'},";
 									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
+									$icon .= "title: '" . addslashes($args['title']) . "',";
 								$icon .= "}),";
 
 				// blank title as its added to the icon.
@@ -3598,27 +3598,27 @@ 
 			}
 
 			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+			$require_advanced = !empty($args['advanced']) ? "props.attributes.show_advanced && " : "";
 
 			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+			$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 
 
 			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
+			$onchangecomplete = "";
 			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx', 'range');
+			if (in_array($args['type'], $text_type)) {
 				$type = 'TextControl';
 				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
+				if ($args['type'] == 'number') {
 					$onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
 				}
 
-				if (substr($key, 0, 9 ) === 'metadata_') {
-					$real_key = str_replace('metadata_','', $key );
+				if (substr($key, 0, 9) === 'metadata_') {
+					$real_key = str_replace('metadata_', '', $key);
 					$onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-					$value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+					$value = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
 				}
 			}
 //			else if ( $args['type'] == 'popup' ) {
@@ -3638,12 +3638,12 @@ 
 //
 //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
 //			}
-			else if ( $args['type'] == 'styleid' ) {
+			else if ($args['type'] == 'styleid') {
 				$type = 'TextControl';
 				$args['type'] == 'text';
 				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
+				$value = "props.attributes.$key ? props.attributes.$key : ''";
+			} else if ($args['type'] == 'notice') {
 
 				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
 				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
@@ -3705,11 +3705,11 @@ 
 							return;
 						}
 */
-			elseif ( $args['type'] == 'color' ) {
+			elseif ($args['type'] == 'color') {
 				$type = 'ColorPicker';
 				$onchange = "";
 				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
+				if (!empty($args['disable_alpha'])) {
 					$extra .= "disableAlpha: true,";
 				}
 				$onchangecomplete = "onChangeComplete: function($key) {
@@ -3718,7 +3718,7 @@ 
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
+			}elseif ($args['type'] == 'gradient') {
 				$type = 'GradientPicker';
 				$extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
@@ -3757,7 +3757,7 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+			}elseif ($args['type'] == 'image') {
 //                print_r($args);
 
 				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
@@ -3819,7 +3819,7 @@ 
 				$onchange = "";
 
 				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
+			} else if ($args['type'] == 'images') {
 				$img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
@@ -3832,7 +3832,7 @@ 
 			el('i',{
 				className: 'fas fa-times-circle text-danger position-absolute  ml-n2 mt-n1 bg-white rounded-circle c-pointer',
 				onClick: function() {
-					aui_confirm('".esc_attr__('Are you sure?')."', '".esc_attr__('Delete')."', '".esc_attr__('Cancel')."', true).then(function(confirmed) {
+					aui_confirm('" . esc_attr__('Are you sure?') . "', '" . esc_attr__('Delete') . "', '" . esc_attr__('Cancel') . "', true).then(function(confirmed) {
 						if (confirmed) {
 							let new_uploads = JSON.parse('['+props.attributes.$key+']');
 							new_uploads.splice(index, 1);
@@ -3895,36 +3895,36 @@ 
 
 				//$inside_elements = ",el('div',{},'file upload')";
 			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			elseif ($args['type'] == 'checkbox') {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
+			} elseif ($args['type'] == 'textarea') {
 				$type = 'TextareaControl';
 
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+			} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
 				$type = 'SelectControl';
 
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				if ($args['name'] == 'category' && !empty($args['post_type_linked'])) {
+					$options .= "options: taxonomies_" . str_replace("-", "_", $this->id) . ",";
+				}elseif ($args['name'] == 'sort_by' && !empty($args['post_type_linked'])) {
+					$options .= "options: sort_by_" . str_replace("-", "_", $this->id) . ",";
+				} else {
 
-					if ( ! empty( $args['options'] ) ) {
+					if (!empty($args['options'])) {
 						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
+						foreach ($args['options'] as $option_val => $option_label) {
+							$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . esc_js(addslashes($option_label)) . "' },";
 						}
 						$options .= "],";
 					}
 				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+				if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
 				}
 
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+				if ($args['type'] == 'multiselect' || (isset($args['multiple']) && $args['multiple'])) {
+					$after_elements .= "props.attributes.$key && el( wp.components.Button, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3936,7 +3936,7 @@ 
 									'Clear'
 							),";
 				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+			} elseif ($args['type'] == 'tagselect') {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3971,19 +3971,19 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-			} else if ( $args['type'] == 'alignment' ) {
+			} else if ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else if ( $args['type'] == 'margins' ) {
+			} else if ($args['type'] == 'margins') {
 
-			} else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+			} else if ($args['type'] == 'visibility_conditions' && (function_exists('wp_is_block_theme') && wp_is_block_theme())) {
 				$type = 'TextControl';
 				$value = "(props.attributes.$key ? props.attributes.$key : '')";
 				$args['type'] = 'text';
 				$options .= 'disabled:true,';
-				$bsvc_title = esc_attr( addslashes( $args['title'] ) );
-				$bsvc_body = $this->block_visibility_fields( $args );
+				$bsvc_title = esc_attr(addslashes($args['title']));
+				$bsvc_body = $this->block_visibility_fields($args);
 				// @TODO reset button
-				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __('Reset', 'ayecode-connect') . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __('Close', 'ayecode-connect') . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __('Save Rules', 'ayecode-connect') . '</button>';
 				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
 						className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
 						onClick: function() {
@@ -4002,25 +4002,25 @@ 
 									jQuery('.bs-vc-modal-form').trigger('change');
 								}
 							});
-							aui_modal('" . $bsvc_title . "', '" . addslashes( $bsvc_body ) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
+							aui_modal('" . $bsvc_title . "', '" . addslashes($bsvc_body) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
 							jQuery(document).off('change', '#bsvc_raw_value').on('change', '#bsvc_raw_value', function(e) {
 								props.setAttributes({" . $key . ": e.target.value});
 							});
 						}
 					},
-					'" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
+					'" . addslashes(!empty($args['button_title']) ? $args['button_title'] : $args['title']) . "'
 				) ),";
 			} else {
-				return;// if we have not implemented the control then don't break the JS.
+				return; // if we have not implemented the control then don't break the JS.
 			}
 
 			// color input does not show the labels so we add them
-			if($args['type']=='color'){
+			if ($args['type'] == 'color') {
 				// add show only if advanced
 				echo $require_advanced;
 				// add setting require if defined
 				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+				echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes($args['title']) . "'),";
 			}
 
 			// add show only if advanced
@@ -4032,22 +4032,22 @@ 
 			// icon
 			echo $icon;
 			?>
-			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
-			label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( empty( $args['row'] ) && ! empty( $args['device_type'] ) ) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),<?php if ( $device_type_icon ) { ?>deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
-			} else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
-			help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( addslashes( $args['desc'] ) ) ) . "'}})" : "''" ); ?>,
+			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type : "wp.components." . $type; ?>, {
+			label: <?php if (empty($args['title'])) { echo "''"; } else if (empty($args['row']) && !empty($args['device_type'])) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['title']) ?>'}}),<?php if ($device_type_icon) { ?>deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
+			} else { ?>'<?php echo addslashes(trim(esc_html($args['title']))); ?>'<?php } ?>,
+			help: <?php echo (isset($args['desc']) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim(wp_kses_post(addslashes($args['desc']))) . "'}})" : "''"); ?>,
 			value: <?php echo $value; ?>,
-			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
+			<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+				echo "type: '" . addslashes($args['type']) . "',";
 			} ?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . esc_js(addslashes(trim(esc_html($args['placeholder'])))) . "',";
 			} ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
 			<?php echo $onchangecomplete; ?>
-			<?php if ( $onchange ) { ?>
+			<?php if ($onchange) { ?>
 			onChange: function ( <?php echo $key; ?> ) {
 				<?php echo $onchange; ?>
 			}
@@ -4066,15 +4066,15 @@ 
 		 *@todo there is prob a faster way to do this, also we could add some validation here.
 		 *
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
+		public function array_to_attributes($custom_attributes, $html = false) {
 			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+			if (!empty($custom_attributes)) {
 
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
+				foreach ($custom_attributes as $key => $val) {
+					if (is_array($val)) {
+						$attributes .= $key . ': {' . $this->array_to_attributes($val, $html) . '},';
+					} else {
+						$attributes .= $html ? " $key='$val' " : "'$key': '$val',";
 					}
 				}
 
@@ -4092,113 +4092,113 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args, $save = false ) {
+		public function block_element($args, $save = false) {
 
 //            print_r($args);echo '###';exit;
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+			if (!empty($args)) {
+				foreach ($args as $element => $new_args) {
 
-					if ( is_array( $new_args ) ) { // its an element
+					if (is_array($new_args)) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+						if (isset($new_args['element'])) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
+							if (isset($new_args['element_require'])) {
+								echo str_replace(array(
 										"'+",
 										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+								unset($new_args['element_require']);
 							}
 
-							if($new_args['element']=='InnerBlocks'){
+							if ($new_args['element'] == 'InnerBlocks') {
 								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
+							}elseif ($new_args['element'] == 'innerBlocksProps') {
 								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
 							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
 								echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
 								echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+								echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
 								echo "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element($new_args['innerBlocksProps'], $save) : '';
 							//    echo '###';
 
 							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
+							}elseif ($new_args['element'] == 'BlocksProps') {
 
-								if ( isset($new_args['if_inner_element']) ) {
+								if (isset($new_args['if_inner_element'])) {
 									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+								} else {
+									$element = isset($new_args['inner_element']) ? "'" . esc_attr($new_args['inner_element']) . "'" : "'div'";
 								}
 
 								unset($new_args['inner_element']);
 								echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+								echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
 
 							   // echo "} ),";
 
-							}else{
+							} else {
 								echo "\n el( '" . $new_args['element'] . "', {";
 							}
 
 
 							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+							foreach ($new_args as $new_key => $new_value) {
 
 
-								if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 									// do nothing
 								} else {
-									echo $this->block_element( array( $new_key => $new_value ),$save );
+									echo $this->block_element(array($new_key => $new_value), $save);
 								}
 							}
 
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+							echo $new_args['element'] == 'BlocksProps' ? '} ),' : "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || $new_key === 'if_content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $new_value  );
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
+									} else if ($new_key === 'if_content') {
+										echo  $this->block_props_replace($new_value);
 									}
 
-									if ( is_array( $new_value ) ) {
+									if (is_array($new_value)) {
 
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
+										if (isset($new_value['element_require'])) {
+											echo str_replace(array(
 													"'+",
 													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+											unset($new_value['element_require']);
 										}
 
-										if ( isset( $new_value['element_repeat'] ) ) {
+										if (isset($new_value['element_repeat'])) {
 											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ),$save );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value), $save);
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ),$save );
+											$this->block_element(array('' => $new_value), $save);
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
+							if ($new_args['element'] == 'innerBlocksProps' || $new_args['element'] == 'xBlocksProps') {
+								echo "))"; // end content
+							} else {
+								echo ")"; // end content
 							}
 
 
@@ -4207,26 +4207,26 @@ 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
+						if (substr($element, 0, 3) === "if_") {
 							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+							if (strpos($new_args, '[%WrapClass%]') !== false) {
+								$new_args = str_replace('[%WrapClass%]"', '" + sd_build_aui_class(props.attributes)', $new_args);
+								$new_args = str_replace('[%WrapClass%]', '+ sd_build_aui_class(props.attributes)', $new_args);
 							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-							$new_args = str_replace('[%WrapStyle%]','',$new_args);
-							echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style' && strpos($new_args, '[%WrapStyle%]') !== false) {
+							$new_args = str_replace('[%WrapStyle%]', '', $new_args);
+							echo $element . ": {..." . $this->block_props_replace($new_args) . " , ...sd_build_aui_styles(props.attributes) },";
 //                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-							$new_args = str_replace('[%WrapClass%]','',$new_args);
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
+						} elseif (($element == 'class' || $element == 'className') && strpos($new_args, '[%WrapClass%]') !== false) {
+							$new_args = str_replace('[%WrapClass%]', '', $new_args);
+							echo $element . ": '" . $this->block_props_replace($new_args) . "' + sd_build_aui_class(props.attributes),";
+						} elseif ($element == 'template' && $new_args) {
 							echo $element . ": $new_args,";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -4241,11 +4241,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+		public function block_props_replace($string, $no_wrap = false) {
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]", "%:checked]"), array("props.attributes.", "", ""), $string);
 			} else {
-				$string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+				$string = str_replace(array("![%", "[%", "%]", "%:checked]"), array("'+!props.attributes.", "'+props.attributes.", "+'", "+'"), $string);
 			}
 
 			return $string;
@@ -4257,65 +4257,65 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
-			if ( ! is_array( $args ) ) {
+		public function widget($args, $instance) {
+			if (!is_array($args)) {
 				$args = array();
 			}
 
 			// Get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+			$argument_values = $this->argument_values($instance);
+			$argument_values = $this->string_to_bool($argument_values);
+			$output          = $this->output($argument_values, $args);
 
 			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+			if (isset($argument_values['no_wrap']) && $argument_values['no_wrap']) {
 				$no_wrap = true;
 			}
 
 			ob_start();
-			if ( $output && ! $no_wrap ) {
+			if ($output && !$no_wrap) {
 
 				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+				$class = $this->options['widget_ops']['classname'] . " sdel-" . $this->get_instance_hash();
 
 				// Before widget
-				$before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+				$before_widget = !empty($args['before_widget']) ? $args['before_widget'] : '';
+				$before_widget = $before_widget ? str_replace($class_original, $class, $before_widget) : $before_widget;
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
 
 				// After widget
-				$after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+				$after_widget = !empty($args['after_widget']) ? $args['after_widget'] : '';
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
 
 				echo $before_widget;
 				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+					$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+					$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+					$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+					$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+					echo "<span class='" . esc_attr($class) . "' " . $attrs . ">";
 				}
-				echo $this->output_title( $args, $instance );
+				echo $this->output_title($args, $instance);
 				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					echo "</span>";
 				}
 				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			} elseif ($this->is_preview() && $output == '') {// if preview show a placeholder if empty
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 				echo $output;
-			} elseif ( $output && $no_wrap ) {
+			} elseif ($output && $no_wrap) {
 				echo $output;
 			}
 			$output = ob_get_clean();
 
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+			$output = apply_filters('wp_super_duper_widget_output', $output, $instance, $args, $this);
 
 			echo $output;
 		}
@@ -4328,7 +4328,7 @@ 
 		 */
 		public function is_elementor_widget_output() {
 			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+			if (defined('ELEMENTOR_VERSION') && isset($this->number) && $this->number == 'REPLACE_TO_ID') {
 				$result = true;
 			}
 
@@ -4343,7 +4343,7 @@ 
 		 */
 		public function is_elementor_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+			if (isset($_REQUEST['elementor-preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') || (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor_ajax')) {
 				$result = true;
 			}
 
@@ -4358,7 +4358,7 @@ 
 		 */
 		public function is_divi_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+			if (isset($_REQUEST['et_fb']) || isset($_REQUEST['et_pb_preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor')) {
 				$result = true;
 			}
 
@@ -4373,7 +4373,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -4388,7 +4388,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -4403,7 +4403,7 @@ 
 		 */
 		public function is_cornerstone_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+			if (!empty($_REQUEST['cornerstone_preview']) || basename($_SERVER['REQUEST_URI']) == 'cornerstone-endpoint') {
 				$result = true;
 			}
 
@@ -4418,7 +4418,7 @@ 
 		 */
 		public function is_fusion_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+			if (!empty($_REQUEST['fb-edit']) || !empty($_REQUEST['fusion_load_nonce'])) {
 				$result = true;
 			}
 
@@ -4433,7 +4433,7 @@ 
 		 */
 		public function is_oxygen_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+			if (!empty($_REQUEST['ct_builder']) || (!empty($_REQUEST['action']) && (substr($_REQUEST['action'], 0, 11) === "oxy_render_" || substr($_REQUEST['action'], 0, 10) === "ct_render_"))) {
 				$result = true;
 			}
 
@@ -4450,7 +4450,7 @@ 
 		public function is_kallyas_zion_preview() {
 			$result = false;
 
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+			if (function_exists('znhg_kallyas_theme_config') && !empty($_REQUEST['zn_pb_edit'])) {
 				$result = true;
 			}
 
@@ -4467,7 +4467,7 @@ 
 		public function is_bricks_preview() {
 			$result = false;
 
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+			if (function_exists('bricks_is_builder') && (bricks_is_builder() || bricks_is_builder_call())) {
 				$result = true;
 			}
 
@@ -4482,25 +4482,25 @@ 
 		 */
 		public function is_preview() {
 			$preview = false;
-			if ( $this->is_divi_preview() ) {
+			if ($this->is_divi_preview()) {
 				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
+			} elseif ($this->is_elementor_preview()) {
 				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
+			} elseif ($this->is_beaver_preview()) {
 				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
+			} elseif ($this->is_siteorigin_preview()) {
 				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
+			} elseif ($this->is_cornerstone_preview()) {
 				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
+			} elseif ($this->is_fusion_preview()) {
 				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
+			} elseif ($this->is_oxygen_preview()) {
 				$preview = true;
-			} elseif( $this->is_kallyas_zion_preview() ) {
+			} elseif ($this->is_kallyas_zion_preview()) {
 				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
+			} elseif ($this->is_block_content_call()) {
 				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
+			} elseif ($this->is_bricks_preview()) {
 				$preview = true;
 			}
 
@@ -4515,44 +4515,44 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 
-				if ( empty( $instance['widget_title_tag'] ) ) {
-					if ( ! isset( $args['before_title'] ) ) {
+				if (empty($instance['widget_title_tag'])) {
+					if (!isset($args['before_title'])) {
 						$args['before_title'] = '';
 					}
 
-					if ( ! isset( $args['after_title'] ) ) {
+					if (!isset($args['after_title'])) {
 						$args['after_title'] = '';
 					}
 
 					$output = $args['before_title'] . $title . $args['after_title'];
 				} else {
-					$tag 			= esc_attr( $instance['widget_title_tag'] );
-					$allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
-					$title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
+					$tag 			= esc_attr($instance['widget_title_tag']);
+					$allowed_tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p');
+					$title_tag = in_array($tag, $allowed_tags, true) ? esc_attr($tag) : 'h2';
 
 					// classes
 					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+					$title_classes[] = !empty($instance['widget_title_size_class']) ? sanitize_html_class($instance['widget_title_size_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_align_class']) ? sanitize_html_class($instance['widget_title_align_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_color_class']) ? "text-" . sanitize_html_class($instance['widget_title_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_class']) ? sanitize_html_class($instance['widget_title_border_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_color_class']) ? "border-" . sanitize_html_class($instance['widget_title_border_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mt_class']) ? "mt-" . absint($instance['widget_title_mt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mr_class']) ? "mr-" . absint($instance['widget_title_mr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mb_class']) ? "mb-" . absint($instance['widget_title_mb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_ml_class']) ? "ml-" . absint($instance['widget_title_ml_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pt_class']) ? "pt-" . absint($instance['widget_title_pt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pr_class']) ? "pr-" . absint($instance['widget_title_pr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pb_class']) ? "pb-" . absint($instance['widget_title_pb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pl_class']) ? "pl-" . absint($instance['widget_title_pl_class']) : '';
+
+					$class = !empty($title_classes) ? implode(" ", $title_classes) : '';
 					$output = "<$title_tag class='$class' >$title</$title_tag>";
 				}
 
@@ -4566,7 +4566,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -4574,20 +4574,20 @@ 
 			// set it as a SD widget
 			echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+			echo "<p>" . esc_attr($this->options['widget_ops']['description']) . "</p>";
 			$arguments_raw = $this->get_arguments();
 
-			if ( is_array( $arguments_raw ) ) {
+			if (is_array($arguments_raw)) {
 
-				$arguments = $this->group_arguments( $arguments_raw );
+				$arguments = $this->group_arguments($arguments_raw);
 
 				// Do we have sections?
 				$has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
+				if ($has_sections) {
 					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 
 						?>
 						<script>
@@ -4597,26 +4597,26 @@ 
 
 						$hide       = $panel_count ? ' style="display:none;" ' : '';
 						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes($key) . "'>" . esc_attr($key) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes($key) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+						foreach ($args as $k => $a) {
 
 							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
+							$this->widget_inputs($a, $instance);
 							$this->widget_inputs_row_end($k, $a);
 
 						}
 
 						echo "</div>";
 
-						$panel_count ++;
+						$panel_count++;
 
 					}
 				} else {
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
+						$this->widget_inputs($args, $instance);
 						$this->widget_inputs_row_end($key, $args);
 					}
 				}
@@ -4624,28 +4624,28 @@ 
 			}
 		}
 
-		public function widget_inputs_row_start( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
+		public function widget_inputs_row_start($key, $args) {
+			if (!empty($args['row'])) {
 				// Maybe open
-				if ( ! empty( $args['row']['open'] ) ) {
+				if (!empty($args['row']['open'])) {
 					?>
-					<div class='bsui sd-argument' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
-					<?php if ( ! empty( $args['row']['title'] ) ) { ?>
+					<div class='bsui sd-argument' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php echo (!empty($args['row']['element_require']) ? $this->convert_element_require($args['row']['element_require']) : ''); ?>'>
+					<?php if (!empty($args['row']['title'])) { ?>
 					<?php
-						if ( isset( $args['row']['icon'] ) ) {
+						if (isset($args['row']['icon'])) {
 							$args['row']['icon'] = '';
 						}
 
-						if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+						if (!isset($args['row']['device_type']) && isset($args['device_type'])) {
 							$args['row']['device_type'] = $args['device_type'];
 						}
 					?>
-					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<label class="mb-0"><?php echo $this->widget_field_title($args['row']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php } ?>
-					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
+					<div class='row<?php echo (!empty($args['row']['class']) ? ' ' . esc_attr($args['row']['class']) : ''); ?>'>
 					<div class='col pr-2'>
 					<?php
-				} else if ( ! empty( $args['row']['close'] ) ) {
+				} else if (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0 ps-0'>";
 				} else {
 					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
@@ -4653,10 +4653,10 @@ 
 			}
 		}
 
-		public function widget_inputs_row_end( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
+		public function widget_inputs_row_end($key, $args) {
+			if (!empty($args['row'])) {
 				// Maybe close
-				if ( ! empty( $args['row']['close'] ) ) {
+				if (!empty($args['row']['close'])) {
 					echo "</div></div>";
 				}
 				echo "</div>";
@@ -4671,7 +4671,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -4691,14 +4691,14 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+		public function convert_element_require($input) {
+			$input = str_replace("'", '"', $input); // we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]", "%:checked]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()",
 				"\"]').find('input:checked').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -4709,48 +4709,48 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>" data-argument='<?php echo esc_attr( $args['name'] ); ?>' data-element_require='<?php if ( $element_require ) { echo $this->convert_element_require( $element_require );} ?>'>
+			<p class="sd-argument <?php echo esc_attr($class); ?>" data-argument='<?php echo esc_attr($args['name']); ?>' data-element_require='<?php if ($element_require) { echo $this->convert_element_require($element_require); } ?>'>
 			<?php
-			switch ( $args['type'] ) {
+			switch ($args['type']) {
 				//array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
@@ -4760,33 +4760,33 @@ 
 				case "url":
 				case "color":
 					?>
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
-					<input <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="<?php echo esc_attr( $args['type'] ); ?>" value="<?php echo esc_attr( $value ); ?>">
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
+					<input <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="<?php echo esc_attr($args['type']); ?>" value="<?php echo esc_attr($value); ?>">
 					<?php
 
 					break;
 				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
+					$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+					if ($multiple) {
+						if (empty($value)) {
 							$value = array();
 						}
 					}
 					?>
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
-					<select <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); if ( $multiple ) { echo "[]"; } ?>"
-						<?php if ( $multiple ) {
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
+					<select <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); if ($multiple) { echo "[]"; } ?>"
+						<?php if ($multiple) {
 							echo "multiple";
 						} //@todo not implemented yet due to gutenberg not supporting it
 						?>>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+						if (!empty($args['options'])) {
+							foreach ($args['options'] as $val => $label) {
+								if ($multiple) {
+									$selected = in_array($val, $value) ? 'selected="selected"' : '';
 								} else {
-									$selected = selected( $value, $val, false );
+									$selected = selected($value, $val, false);
 								}
 								echo "<option value='$val' " . $selected . ">$label</option>";
 							}
@@ -4797,20 +4797,20 @@ 
 					break;
 				case "checkbox":
 					?>
-					<input <?php echo $placeholder; ?> <?php checked( 1, $value, true ) ?> <?php echo $custom_attributes; ?> class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox" value="1">
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+					<input <?php echo $placeholder; ?> <?php checked(1, $value, true) ?> <?php echo $custom_attributes; ?> class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox" value="1">
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<?php
 					break;
 				case "textarea":
 					?>
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
-					<textarea <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"><?php echo esc_attr( $value ); ?></textarea>
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
+					<textarea <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"><?php echo esc_attr($value); ?></textarea>
 					<?php
 
 					break;
 				case "hidden":
 					?>
-					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden" value="<?php echo esc_attr( $value ); ?>">
+					<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden" value="<?php echo esc_attr($value); ?>">
 					<?php
 					break;
 				default:
@@ -4820,15 +4820,15 @@ 
 			?></p><?php
 		}
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+		public function get_widget_icon($icon = 'box-top', $title = '') {
+			if ($icon == 'box-top') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-right') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-bottom') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+			}elseif ($icon == 'box-left') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}
 
@@ -4840,14 +4840,14 @@ 
 		 * @return string
 		 * @todo, need to make its own tooltip script
 		 */
-		public function widget_field_desc( $args ) {
+		public function widget_field_desc($args) {
 
 			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
+			if (isset($args['desc']) && $args['desc']) {
+				if (isset($args['desc_tip']) && $args['desc_tip']) {
+					$description = $this->desc_tip($args['desc']);
 				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+					$description = '<span class="description">' . wp_kses_post($args['desc']) . '</span>';
 				}
 			}
 
@@ -4861,18 +4861,18 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 			$title = '';
 
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( ! empty( $args['device_type'] ) ) {
+			if (isset($args['title']) && $args['title']) {
+				if (!empty($args['device_type'])) {
 					$args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
 				}
 
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
+				if (isset($args['icon']) && $args['icon']) {
+					$title = self::get_widget_icon($args['icon'], $args['title']);
 				} else {
-					$title = esc_attr( $args['title'] );
+					$title = esc_attr($args['title']);
 				}
 			}
 
@@ -4887,11 +4887,11 @@ 
 		 *
 		 * @return string
 		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
+		function desc_tip($tip, $allow_html = false) {
+			if ($allow_html) {
+				$tip = $this->sanitize_tooltip($tip);
 			} else {
-				$tip = esc_attr( $tip );
+				$tip = esc_attr($tip);
 			}
 
 			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -4904,8 +4904,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+		public function sanitize_tooltip($var) {
+			return htmlspecialchars(wp_kses(html_entity_decode($var), array(
 				'br'     => array(),
 				'em'     => array(),
 				'strong' => array(),
@@ -4915,7 +4915,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -4927,30 +4927,30 @@ 
 		 * @return array
 		 * @todo we should add some sanitation here.
 		 */
-		public function update( $new_instance, $old_instance ) {
+		public function update($new_instance, $old_instance) {
 
 			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
+			$instance = array_merge((array) $old_instance, (array) $new_instance);
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->get_arguments();
 			}
 
 			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $argument) {
+					if (isset($argument['type']) && $argument['type'] == 'checkbox' && !isset($new_instance[$argument['name']])) {
+						$instance[$argument['name']] = '0';
 					}
 				}
 			}
 
             // maybe sanitize widget title
-            if(!empty($instance['title'])) {
-                $instance['title'] = wp_kses_post( $instance['title'] );
+            if (!empty($instance['title'])) {
+                $instance['title'] = wp_kses_post($instance['title']);
             }
 
 			return $instance;
@@ -4966,7 +4966,7 @@ 
 		 */
 		public function is_block_content_call() {
 			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+			if (wp_doing_ajax() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'super_duper_output_shortcode') {
 				$result = true;
 			}
 
@@ -4979,9 +4979,9 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
+		public function get_instance_hash() {
+			$instance_string = $this->base_id . serialize($this->instance);
+			return hash('crc32b', $instance_string);
 		}
 
 		/**
@@ -4992,14 +4992,14 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		public function get_instance_style($rules = array()){
+		public function get_instance_style($rules = array()) {
 			$css = '';
 
-			if(!empty($rules)){
+			if (!empty($rules)) {
 				$rules = array_unique($rules);
 				$instance_hash = $this->get_instance_hash();
 				$css .= "<style>";
-				foreach($rules as $rule){
+				foreach ($rules as $rule) {
 					$css .= ".sdel-$instance_hash $rule";
 				}
 				$css .= "</style>";
@@ -5017,9 +5017,9 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function encode_shortcodes( $content ) {
+		public function encode_shortcodes($content) {
 			// Avoids existing encoded tags.
-			$trans   = array(
+			$trans = array(
 				'&#91;' => '&#091;',
 				'&#93;' => '&#093;',
 				'&amp;#91;' => '&#091;',
@@ -5030,7 +5030,7 @@ 
 				'&amp;gt;' => '&0gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'[' => '&#91;',
@@ -5041,7 +5041,7 @@ 
 				"'" => '&#39;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
@@ -5055,8 +5055,8 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
+		public function decode_shortcodes($content) {
+			$trans = array(
 				'&#91;' => '[',
 				'&#93;' => ']',
 				'&amp;#91;' => '[',
@@ -5069,7 +5069,7 @@ 
 				'&apos;' => "'",
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'&#091;' => '&#91;',
@@ -5082,31 +5082,31 @@ 
 				'&amp;0gt;' => '&gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
 
-		public function block_visibility_fields( $args ) {
-			$value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+		public function block_visibility_fields($args) {
+			$value = !empty($args['value']) ? esc_attr($args['value']) : '';
 			$content = '<div class="bs-vc-rule-template d-none">';
 				$content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
 					$content .= '<div class="row">';
 						$content .= '<div class="col-sm-12">';
-							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__('Remove Rule', 'ayecode-connect') . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
 							$content .= aui()->select(
 								array(
 									'id'          => 'bsvc_rule_BSVCINDEX',
 									'name'        => 'bsvc_rule_BSVCINDEX',
-									'label'       => __( 'Rule', 'ayecode-connect' ),
-									'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+									'label'       => __('Rule', 'ayecode-connect'),
+									'placeholder' => __('Select Rule...', 'ayecode-connect'),
 									'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
 									'options'     => sd_visibility_rules_options(),
 									'default'     => '',
 									'value'       => '',
 									'label_type'  => '',
 									'select2'     => false,
-									'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+									'input_group_left' => __('Rule:', 'ayecode-connect'),
 									'extra_attributes' => array(
 										'data-minimum-results-for-search' => '-1'
 									)
@@ -5115,15 +5115,15 @@ 
 
 						$content .= '</div>';
 
-						if ( class_exists( 'GeoDirectory' ) ) {
+						if (class_exists('GeoDirectory')) {
 							$content .= '<div class="col-md-7 col-sm-12">';
 
 								$content .= aui()->select(
 									array(
 										'id'          => 'bsvc_gd_field_BSVCINDEX',
 										'name'        => 'bsvc_gd_field_BSVCINDEX',
-										'label'       => __( 'FIELD', 'ayecode-connect' ),
-										'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+										'label'       => __('FIELD', 'ayecode-connect'),
+										'placeholder' => __('FIELD', 'ayecode-connect'),
 										'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
 										'options'     => sd_visibility_gd_field_options(),
 										'default'     => '',
@@ -5144,8 +5144,8 @@ 
 									array(
 										'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
 										'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-										'label'       => __( 'CONDITION', 'ayecode-connect' ),
-										'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+										'label'       => __('CONDITION', 'ayecode-connect'),
+										'placeholder' => __('CONDITION', 'ayecode-connect'),
 										'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
 										'options'     => sd_visibility_field_condition_options(),
 										'default'     => '',
@@ -5167,9 +5167,9 @@ 
 										'type'            => 'text',
 										'id'              => 'bsvc_gd_field_search_BSVCINDEX',
 										'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-										'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+										'label'           => __('VALUE TO MATCH', 'ayecode-connect'),
 										'class'           => 'bsvc_gd_field_search form-control-sm',
-										'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+										'placeholder'     => __('VALUE TO MATCH', 'ayecode-connect'),
 										'label_type'      => '',
 										'value'           => '',
 										'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
@@ -5179,15 +5179,15 @@ 
 							$content .= '</div>';
 						}
 
-                        $content .= apply_filters( 'sd_block_visibility_fields', '', $args );
+                        $content .= apply_filters('sd_block_visibility_fields', '', $args);
 
 					$content .= '</div>';
 
-					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __('Select User Roles:', 'ayecode-connect') . '</label>';
 						$role_options = sd_user_roles_options();
 
 						$role_option_i = 0;
-						foreach ( $role_options as $role_option_key => $role_option_name ) {
+						foreach ($role_options as $role_option_key => $role_option_name) {
 							$role_option_i++;
 
 							$content .= '<div class="col-sm-6">';
@@ -5207,19 +5207,19 @@ 
 							$content .= '</div>';
 						}
 					$content .= '</div>';
-					$content .= '<div class="bs-vc-sep-wrap text-center position-absolute top-0 mt-n3"><div class="bs-vc-sep-cond d-inline-block badge text-dark bg-gray mt-1">' . esc_html__( 'AND', 'ayecode-connect' ) . '</div></div>';
+					$content .= '<div class="bs-vc-sep-wrap text-center position-absolute top-0 mt-n3"><div class="bs-vc-sep-cond d-inline-block badge text-dark bg-gray mt-1">' . esc_html__('AND', 'ayecode-connect') . '</div></div>';
 				$content .= '</div>';
 			$content .= '</div>';
 			$content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
 			$content .= '<div class="bs-vc-rule-sets"></div>';
-			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __('Add Rule', 'ayecode-connect') . '</button></div></div>';
 			$content .= '<div class="row"><div class="col-md-6 col-sm-12">';
 			$content .= aui()->select(
 				array(
 					'id'          => 'bsvc_output',
 					'name'        => 'bsvc_output',
-					'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Show Block', 'ayecode-connect' ),
+					'label'       => __('What should happen if rules met.', 'ayecode-connect'),
+					'placeholder' => __('Show Block', 'ayecode-connect'),
 					'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
 					'options'     => sd_visibility_output_options(),
 					'default'     => '',
@@ -5238,8 +5238,8 @@ 
 				array(
 					'id'              => 'bsvc_page',
 					'name'            => 'bsvc_page',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+					'label'           => __('Page Content', 'ayecode-connect'),
+					'placeholder'     => __('Select Page ID...', 'ayecode-connect'),
 					'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
 					'options'         => sd_template_page_options(),
 					'default'         => '',
@@ -5254,8 +5254,8 @@ 
 				array(
 					'id'          => 'bsvc_tmpl_part',
 					'name'        => 'bsvc_tmpl_part',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+					'label'       => __('Template Part', 'ayecode-connect'),
+					'placeholder' => __('Select Template Part...', 'ayecode-connect'),
 					'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
 					'options'     => sd_template_part_options(),
 					'default'     => '',
@@ -5273,8 +5273,8 @@ 
 				array(
 					'id'               => 'bsvc_message_type',
 					'name'             => 'bsvc_message_type',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+					'label'            => __('Custom Message Type', 'ayecode-connect'),
+					'placeholder'      => __('Default (none)', 'ayecode-connect'),
 					'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
 					'options'          => sd_aui_colors(),
 					'default'          => '',
@@ -5297,7 +5297,7 @@ 
 					'name'            => 'bsvc_message',
 					'label'           => '',
 					'class'           => 'bsvc_message form-control-sm mb-3',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+					'placeholder'     => __('CUSTOM MESSAGE TO SHOW', 'ayecode-connect'),
 					'label_type'      => '',
 					'value'           => '',
 					'form_group_class' => ' ',
@@ -5310,8 +5310,8 @@ 
 				array(
 					'id'          => 'bsvc_output_n',
 					'name'        => 'bsvc_output_n',
-					'label'       => __( 'What should happen if rules NOT met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Show Block', 'ayecode-connect' ),
+					'label'       => __('What should happen if rules NOT met.', 'ayecode-connect'),
+					'placeholder' => __('Show Block', 'ayecode-connect'),
 					'class'       => 'bsvc_output_n form-select-sm no-select2 mw-100',
 					'options'     => sd_visibility_output_options(),
 					'default'     => '',
@@ -5330,8 +5330,8 @@ 
 				array(
 					'id'              => 'bsvc_page_n',
 					'name'            => 'bsvc_page_n',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+					'label'           => __('Page Content', 'ayecode-connect'),
+					'placeholder'     => __('Select Page ID...', 'ayecode-connect'),
 					'class'           => 'bsvc_page_n form-select-sm no-select2 mw-100',
 					'options'         => sd_template_page_options(),
 					'default'         => '',
@@ -5346,8 +5346,8 @@ 
 				array(
 					'id'          => 'bsvc_tmpl_part_n',
 					'name'        => 'bsvc_tmpl_part_n',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+					'label'       => __('Template Part', 'ayecode-connect'),
+					'placeholder' => __('Select Template Part...', 'ayecode-connect'),
 					'class'       => 'bsvc_tmpl_part_n form-select-sm no-select2 mw-100',
 					'options'     => sd_template_part_options(),
 					'default'     => '',
@@ -5365,8 +5365,8 @@ 
 				array(
 					'id'               => 'bsvc_message_type_n',
 					'name'             => 'bsvc_message_type_n',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+					'label'            => __('Custom Message Type', 'ayecode-connect'),
+					'placeholder'      => __('Default (none)', 'ayecode-connect'),
 					'class'            => 'bsvc_message_type_n form-select-sm no-select2 mw-100',
 					'options'          => sd_aui_colors(),
 					'default'          => '',
@@ -5389,7 +5389,7 @@ 
 					'name'            => 'bsvc_message_n',
 					'label'           => '',
 					'class'           => 'bsvc_message_n form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+					'placeholder'     => __('CUSTOM MESSAGE TO SHOW', 'ayecode-connect'),
 					'label_type'      => '',
 					'value'           => '',
 					'form_group_class' => ' ',
@@ -5411,7 +5411,7 @@ 
 			global $shortcode_insert_button_once;
 
 			// Fix conflicts with UpSolution Core in header template edit element.
-			if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
+			if (defined('US_CORE_DIR') && !empty($_REQUEST['action']) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html') {
 				$shortcode_insert_button_once = true;
 			}
 		}

Switch Indentation +2011 added lines, -2011 removed lines

@@ -1,13 +1,13 @@ 
-<?php
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    <?php
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+    if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	define( 'SUPER_DUPER_VER', '1.2.25' );
+	    define( 'SUPER_DUPER_VER', '1.2.25' );
 
-	/**
+	    /**
 	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
 	 *
 	 * Should not be called direct but extended instead.
@@ -16,397 +16,397 @@ 
 	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
 	 * @ver 1.1.1
 	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = SUPER_DUPER_VER;
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $settings_hash;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
+	    class WP_Super_Duper extends WP_Widget {
+
+		    public $version = SUPER_DUPER_VER;
+		    public $font_awesome_icon_version = "5.11.2";
+		    public $block_code;
+		    public $options;
+		    public $base_id;
+		    public $settings_hash;
+		    public $arguments = array();
+		    public $instance = array();
+		    private $class_name;
+
+		    /**
 		 * The relative url to the current folder.
 		 *
 		 * @var string
 		 */
-		public $url = '';
+		    public $url = '';
 
-		/**
+		    /**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name'],
-				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
-			);
-			$this->base_id                     = $options['base_id'];
-			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-
-			// nested blocks can't work as a widget
-			if(!empty($this->options['nested-block'])){
-				if(empty($this->options['output_types'])){
-					$this->options['output_types'] = array('shortcode','block');
-				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
-					unset($this->options['output_types'][$key]);
-				}
-			}
-
-			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
-			}
-
-
-			if ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
-
-				// register shortcode, this needs to be done even for blocks and widgets
-				$this->register_shortcode();
-
-
-				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
-				}
-
-                // maybe load the Bricks transformer class
-                if( class_exists('\Bricks\Elements', false) ){
-					add_action( 'init', array( $this, 'load_bricks_element_class' ) );
-                }
-
-				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-				}
-			}
-
-			// add the CSS and JS we need ONCE
-			global $sd_widget_scripts;
-
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
-
-				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
-
-				$sd_widget_scripts = true;
-
-				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
-				}
-
-				/* Load script on Divi theme builder page */
-				if ( ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) || ( function_exists( 'et_builder_d5_enabled' ) && et_builder_d5_enabled() && isset( $_GET['et_fb'] ) && '1' === $_GET['et_fb'] && et_pb_is_allowed( 'use_visual_builder' ) ) ) {
-					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
-				}
-
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
-					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
-
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
-
-				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
-			}
-
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
-
-        /**
+		    public function __construct( $options ) {
+			    global $sd_widgets;
+
+			    $sd_widgets[ $options['base_id'] ] = array(
+				    'name'       => $options['name'],
+				    'class_name' => $options['class_name'],
+				    'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
+			    );
+			    $this->base_id                     = $options['base_id'];
+			    // lets filter the options before we do anything
+			    $options       = apply_filters( "wp_super_duper_options", $options );
+			    $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
+			    $options       = $this->add_name_from_key( $options );
+			    $this->options = $options;
+
+			    $this->base_id   = $options['base_id'];
+			    $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+
+			    // nested blocks can't work as a widget
+			    if(!empty($this->options['nested-block'])){
+				    if(empty($this->options['output_types'])){
+					    $this->options['output_types'] = array('shortcode','block');
+				    }elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
+					    unset($this->options['output_types'][$key]);
+				    }
+			    }
+
+			    // init parent
+			    if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+				    parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			    }
+
+
+			    if ( isset( $options['class_name'] ) ) {
+				    // register widget
+				    $this->class_name = $options['class_name'];
+
+				    // register shortcode, this needs to be done even for blocks and widgets
+				    $this->register_shortcode();
+
+
+				    // Fusion Builder (avada) support
+				    if ( function_exists( 'fusion_builder_map' ) ) {
+					    add_action( 'init', array( $this, 'register_fusion_element' ) );
+				    }
+
+                    // maybe load the Bricks transformer class
+                    if( class_exists('\Bricks\Elements', false) ){
+					    add_action( 'init', array( $this, 'load_bricks_element_class' ) );
+                    }
+
+				    // register block
+				    if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
+					    add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				    }
+			    }
+
+			    // add the CSS and JS we need ONCE
+			    global $sd_widget_scripts;
+
+			    if ( ! $sd_widget_scripts ) {
+				    wp_add_inline_script( 'admin-widgets', $this->widget_js() );
+				    wp_add_inline_script( 'customize-controls', $this->widget_js() );
+				    wp_add_inline_style( 'widgets', $this->widget_css() );
+
+				    // maybe add elementor editor styles
+				    add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+
+				    $sd_widget_scripts = true;
+
+				    // add shortcode insert button once
+				    add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
+				    add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				    // generatepress theme sections compatibility
+				    if ( function_exists( 'generate_sections_sections_metabox' ) ) {
+					    add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				    }
+
+				    /* Load script on Divi theme builder page */
+				    if ( ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) || ( function_exists( 'et_builder_d5_enabled' ) && et_builder_d5_enabled() && isset( $_GET['et_fb'] ) && '1' === $_GET['et_fb'] && et_pb_is_allowed( 'use_visual_builder' ) ) ) {
+					    add_thickbox();
+					    add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+				    }
+
+				    if ( $this->is_preview() ) {
+					    add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+					    // this makes the insert button work for elementor
+					    add_action( 'elementor/editor/after_enqueue_scripts', array(
+						    $this,
+						    'shortcode_insert_button_script'
+					    ) ); // for elementor
+				    }
+				    // this makes the insert button work for cornerstone
+				    add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+
+				    add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+				    add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+
+				    // add generator text to head
+				    add_action( 'admin_head', array( $this, 'generator' ), 99 );
+				    add_action( 'wp_head', array( $this, 'generator' ), 99 );
+			    }
+
+			    do_action( 'wp_super_duper_widget_init', $options, $this );
+		    }
+
+            /**
          * Load the Bricks conversion class if we are running Bricks.
          * @return void
          */
-        public function load_bricks_element_class() {
-                    include_once __DIR__ . '/includes/class-super-duper-bricks-element.php';
-        }
+            public function load_bricks_element_class() {
+                        include_once __DIR__ . '/includes/class-super-duper-bricks-element.php';
+            }
 
-		/**
+		    /**
 		 * The register widget function
 		 * @return void
 		 */
-		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::_register();
-			}
-		}
+		    public function _register() {
+			    if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+				    parent::_register();
+			    }
+		    }
 
-		/**
+		    /**
 		 * Add our widget CSS to elementor editor.
 		 */
-		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
-		}
-
-		public function register_fusion_element() {
-
-			$options = $this->options;
-
-			if ( $this->base_id ) {
-
-				$params = $this->get_fusion_params();
-
-				$args = array(
-					'name'            => $options['name'],
-					'shortcode'       => $this->base_id,
-					'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-					'allow_generator' => true,
-				);
-
-				if ( ! empty( $params ) ) {
-					$args['params'] = $params;
-				}
-
-				fusion_builder_map( $args );
-			}
-
-		}
-
-		public function get_fusion_params() {
-			$params    = array();
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
-					$param = array();
-					// type
-					$param['type'] = str_replace(
-						array(
-							"text",
-							"number",
-							"email",
-							"color",
-							"checkbox"
-						),
-						array(
-							"textfield",
-							"textfield",
-							"textfield",
-							"colorpicker",
-							"select",
-
-						),
-						$val['type'] );
-
-					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-						$param['type']     = 'multiple_select';
-						$param['multiple'] = true;
-					}
-
-					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
-
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
-
-					// param_name
-					$param['param_name'] = $key;
-
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
-
-					// Group
-					if ( isset( $val['group'] ) ) {
-						$param['group'] = $val['group'];
-					}
-
-					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
-						}
-						$param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
-					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
-					}
-
-					// setup the param
-					$params[] = $param;
-
-				}
-			}
-
-
-			return $params;
-		}
-
-		/**
+		    public function elementor_editor_styles() {
+			    wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+		    }
+
+		    public function register_fusion_element() {
+
+			    $options = $this->options;
+
+			    if ( $this->base_id ) {
+
+				    $params = $this->get_fusion_params();
+
+				    $args = array(
+					    'name'            => $options['name'],
+					    'shortcode'       => $this->base_id,
+					    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+					    'allow_generator' => true,
+				    );
+
+				    if ( ! empty( $params ) ) {
+					    $args['params'] = $params;
+				    }
+
+				    fusion_builder_map( $args );
+			    }
+
+		    }
+
+		    public function get_fusion_params() {
+			    $params    = array();
+			    $arguments = $this->get_arguments();
+
+			    if ( ! empty( $arguments ) ) {
+				    foreach ( $arguments as $key => $val ) {
+					    $param = array();
+					    // type
+					    $param['type'] = str_replace(
+						    array(
+							    "text",
+							    "number",
+							    "email",
+							    "color",
+							    "checkbox"
+						    ),
+						    array(
+							    "textfield",
+							    "textfield",
+							    "textfield",
+							    "colorpicker",
+							    "select",
+
+						    ),
+						    $val['type'] );
+
+					    // multiselect
+					    if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+						    $param['type']     = 'multiple_select';
+						    $param['multiple'] = true;
+					    }
+
+					    // heading
+					    $param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+
+					    // description
+					    $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+
+					    // param_name
+					    $param['param_name'] = $key;
+
+					    // Default
+					    $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+
+					    // Group
+					    if ( isset( $val['group'] ) ) {
+						    $param['group'] = $val['group'];
+					    }
+
+					    // value
+					    if ( $val['type'] == 'checkbox' ) {
+						    if ( isset( $val['default'] ) && $val['default'] == '0' ) {
+							    unset( $param['default'] );
+						    }
+						    $param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
+					    } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
+						    $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+					    } else {
+						    $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+					    }
+
+					    // setup the param
+					    $params[] = $param;
+
+				    }
+			    }
+
+
+			    return $params;
+		    }
+
+		    /**
 		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 		 */
-		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
-				self::shortcode_insert_button_script();
-			}
-		}
+		    public static function maybe_cornerstone_builder() {
+			    if ( did_action( 'cornerstone_before_boot_app' ) ) {
+				    self::shortcode_insert_button_script();
+			    }
+		    }
 
-		/**
+		    /**
 		 * A function to ge the shortcode builder picker html.
 		 *
 		 * @param string $editor_id
 		 *
 		 * @return string
 		 */
-		public static function get_picker( $editor_id = '' ) {
+		    public static function get_picker( $editor_id = '' ) {
 
-			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
+			    ob_start();
+			    if ( isset( $_POST['editor_id'] ) ) {
+				    $editor_id = esc_attr( $_POST['editor_id'] );
+			    } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+				    $editor_id = 'main_content_content_vb_tiny_mce';
+			    }
 
-			global $sd_widgets;
+			    global $sd_widgets;
 
-//			print_r($sd_widgets);exit;
-			?>
+    //			print_r($sd_widgets);exit;
+			    ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
-
-				}
-				?>
+				    ksort( $sd_widgets );
+				    //				print_r($sd_widgets);exit;
+				    if ( ! empty( $sd_widgets ) ) {
+					    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+					    echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
+					    foreach ( $sd_widgets as $shortcode => $class ) {
+						    if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
+						    echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					    }
+					    echo "</select>";
+
+				    }
+				    ?>
 				<div class="sd-shortcode-settings"></div>
 			</div>
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
 					<?php if ( $editor_id != '' ) { ?>
-						<button class="button sd-insert-shortcode-button" onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) { echo "'" . $editor_id . "'"; } ?>)"><?php esc_html_e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
+    						<button class="button sd-insert-shortcode-button" onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) { echo "'" . $editor_id . "'"; } ?>)"><?php esc_html_e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
 					<?php } ?>
-					<button class="button" onclick="sd_copy_to_clipboard()"><?php esc_html_e( 'Copy shortcode' ); ?></button>
+    					<button class="button" onclick="sd_copy_to_clipboard()"><?php esc_html_e( 'Copy shortcode' ); ?></button>
 				</div>
 			</div>
 			<?php
-			$html = ob_get_clean();
-
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
-
-				// some builder get the editor via ajax so we should not die on those occasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
-
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
-
-				if ( $should_die ) {
-					wp_die();
-				}
-			} else {
-				return $html;
-			}
-
-			return '';
-		}
-
-		/**
+			    $html = ob_get_clean();
+
+			    if ( wp_doing_ajax() ) {
+				    echo $html;
+				    $should_die = true;
+
+				    // some builder get the editor via ajax so we should not die on those occasions
+				    $dont_die = array(
+					    'parent_tag',// WP Bakery
+					    'avia_request' // enfold
+				    );
+
+				    foreach ( $dont_die as $request ) {
+					    if ( isset( $_REQUEST[ $request ] ) ) {
+						    $should_die = false;
+					    }
+				    }
+
+				    if ( $should_die ) {
+					    wp_die();
+				    }
+			    } else {
+				    return $html;
+			    }
+
+			    return '';
+		    }
+
+		    /**
 		 * Output the version in the header.
 		 */
-		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme of SD
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
-
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
-
-		/**
+		    public function generator() {
+			    $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+			    $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+			    // Find source plugin/theme of SD
+			    $source = array();
+			    if ( strpos( $file, $plugins_dir ) !== false ) {
+				    $source = explode( "/", plugin_basename( $file ) );
+			    } else if ( function_exists( 'get_theme_root' ) ) {
+				    $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+				    if ( strpos( $file, $themes_dir ) !== false ) {
+					    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				    }
+			    }
+
+			    echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+		    }
+
+		    /**
 		 * Get widget settings.
 		 *
 		 * @since 1.0.0
 		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
-				wp_die();
-			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
-
-			// invoke an instance method
-			$widget = new $class_name;
-
-			ob_start();
-			$widget->form( array() );
-			$form = ob_get_clean();
-			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
-			echo "<style>" . $widget->widget_css() . "</style>";
-			echo "<script>" . $widget->widget_js() . "</script>";
-			?>
-			<?php
-			wp_die();
-		}
-
-		/**
+		    public static function get_widget_settings() {
+			    global $sd_widgets;
+
+			    $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
+			    if ( ! $shortcode ) {
+				    wp_die();
+			    }
+			    $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
+			    if ( ! $widget_args ) {
+				    wp_die();
+			    }
+			    $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			    if ( ! $class_name ) {
+				    wp_die();
+			    }
+
+			    // invoke an instance method
+			    $widget = new $class_name;
+
+			    ob_start();
+			    $widget->form( array() );
+			    $form = ob_get_clean();
+			    echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
+			    echo "<style>" . $widget->widget_css() . "</style>";
+			    echo "<script>" . $widget->widget_js() . "</script>";
+			    ?>
+    			<?php
+			    wp_die();
+		    }
+
+		    /**
 		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
 		 *
 		 * @param string $editor_id Optional. Shortcode editor id. Default null.
@@ -415,38 +415,38 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
-
-			/**
+		    public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+			    global $sd_widgets, $shortcode_insert_button_once;
+			    if ( $shortcode_insert_button_once ) {
+				    return;
+			    }
+			    add_thickbox();
+
+			    /**
 			 * Cornerstone makes us play dirty tricks :/
 			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
 			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '<span id="insert-media-button">';
-			}
+			    if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+				    echo '<span id="insert-media-button">';
+			    }
 
-			echo self::shortcode_button( 'this', 'true' );
+			    echo self::shortcode_button( 'this', 'true' );
 
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
+			    // see opening note
+			    if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+				    echo '</span>'; // end #insert-media-button
+			    }
 
-			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
-			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			}
+			    // Add separate script for generatepress theme sections
+			    if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			    } else {
+				    self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+			    }
 
-			$shortcode_insert_button_once = true;
-		}
+			    $shortcode_insert_button_once = true;
+		    }
 
-		/**
+		    /**
 		 * Gets the shortcode insert button html.
 		 *
 		 * @param string $id
@@ -454,14 +454,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+		    public static function shortcode_button( $id = '', $search_for_id = '' ) {
+			    ob_start();
+			    ?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
-					echo "," . $search_for_id;
-				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
+				    if ( $search_for_id ) {
+					    echo "," . $search_for_id;
+				    } ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
 					<span style="vertical-align: middle;line-height: 18px;font-size: 20px;"
 						  class="dashicons dashicons-screenoptions"></span>
@@ -472,21 +472,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
+			    $html = ob_get_clean();
 
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
+			    // remove line breaks so we can use it in js
+			    return preg_replace( "/\r|\n/", "", trim( $html ) );
+		    }
 
-		/**
+		    /**
 		 * Makes SD work with the siteOrigin page builder.
 		 *
 		 * @return mixed
 		 *@since 1.0.6
 		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+		    public static function siteorigin_js() {
+			    ob_start();
+			    ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -560,19 +560,19 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', $output );
+		    }
 
-		/**
+		    /**
 		 * Output the JS and CSS for the shortcode insert button.
 		 *
 		 * @param string $editor_id
@@ -581,8 +581,8 @@ 
 		 *@since 1.0.6
 		 *
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+		    public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+			    ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -705,40 +705,40 @@ 
 					display: inline;
 				}
 				<?php } ?>
-				<?php if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) { ?>
-				body.divi_page_et_theme_builder div#TB_window.gd-tb-window{z-index:9999999}
+    				<?php if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) { ?>
+    				body.divi_page_et_theme_builder div#TB_window.gd-tb-window{z-index:9999999}
 				<?php } ?>
-			</style>
+    			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
-			<script>
+			    if ( class_exists( 'SiteOrigin_Panels' ) ) {
+				    echo "<script>" . self::siteorigin_js() . "</script>";
+			    }
+			    ?>
+    			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
+				    if(! empty( $insert_shortcode_function )){
+					    echo $insert_shortcode_function;
+				    }else{
 
-				/**
+				    /**
 				 * Function for super duper insert shortcode.
 				 *
 				 * @since 1.0.0
 				 */
-				?>
+				    ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-							} else {
-								echo '$editor_id = "#wp-content-editor-container textarea";';
-							}
-							?>
+							    if ( isset( $_REQUEST['et_fb'] ) ) {
+								    echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+							    } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+								    echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+							    } else {
+								    echo '$editor_id = "#wp-content-editor-container textarea";';
+							    }
+							    ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -1069,19 +1069,19 @@ 
 				}
 			</script>
 			<?php
-		}
+		    }
 
-		/**
+		    /**
 		 * Gets some CSS for the widgets screen.
 		 *
 		 * @param bool $advanced If we should include advanced CSS.
 		 *
 		 * @return mixed
 		 */
-		public function widget_css( $advanced = true ) {
-			ob_start();
-			?>
-			<style>
+		    public function widget_css( $advanced = true ) {
+			    ob_start();
+			    ?>
+    			<style>
 				<?php if( $advanced ){ ?>
 				.sd-advanced-setting {
 					display: none;
@@ -1120,26 +1120,26 @@ 
 				.elementor-control .sd-argument select[multiple] option{padding:3px}
 			</style>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<style>',
+				    '</style>'
+			    ), '', $output );
+		    }
 
-		/**
+		    /**
 		 * Gets some JS for the widgets screen.
 		 *
 		 * @return mixed
 		 */
-		public function widget_js() {
-			ob_start();
-			?>
+		    public function widget_js() {
+			    ob_start();
+			    ?>
 			<script>
 
 				/**
@@ -1288,110 +1288,110 @@ 
 
 				}
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
-			</script>
+    			</script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', $output );
+		    }
 
 
-		/**
+		    /**
 		 * Set the name from the argument key.
 		 *
 		 * @param $options
 		 *
 		 * @return mixed
 		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
-				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
+		    private function add_name_from_key( $options, $arguments = false ) {
+			    if ( ! empty( $options['arguments'] ) ) {
+				    foreach ( $options['arguments'] as $key => $val ) {
+					    $options['arguments'][ $key ]['name'] = $key;
+				    }
+			    } elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
+				    foreach ( $options as $key => $val ) {
+					    $options[ $key ]['name'] = $key;
+				    }
+			    }
+
+			    return $options;
+		    }
+
+		    /**
 		 * Register the parent shortcode.
 		 *
 		 * @since 1.0.0
 		 */
-		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
-		}
+		    public function register_shortcode() {
+			    add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
+			    add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+		    }
 
-		/**
+		    /**
 		 * Render the shortcode via ajax so we can return it to Gutenberg.
 		 *
 		 * @since 1.0.0
 		 */
-		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die();
-			}
-
-			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
-					global $post;
-					$post = $post_obj;
-				}
-			}
-
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
-						}
-
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
-
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
-
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
-
-				$content = do_shortcode( $shortcode );
-
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
-
-				echo $content;
-			}
-			wp_die();
-		}
-
-		/**
+		    public function render_shortcode() {
+			    check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+			    if ( ! current_user_can( 'manage_options' ) ) {
+				    wp_die();
+			    }
+
+			    // we might need the $post value here so lets set it.
+			    if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
+				    $post_obj = get_post( absint( $_POST['post_id'] ) );
+				    if ( ! empty( $post_obj ) && empty( $post ) ) {
+					    global $post;
+					    $post = $post_obj;
+				    }
+			    }
+
+			    if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+				    $is_preview = $this->is_preview();
+				    $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+				    $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+				    $attributes       = '';
+				    if ( ! empty( $attributes_array ) ) {
+					    foreach ( $attributes_array as $key => $value ) {
+						    if ( is_array( $value ) ) {
+							    $value = implode( ",", $value );
+						    }
+
+						    if ( ! empty( $value ) ) {
+							    $value = wp_unslash( $value );
+
+							    // Encode [ and ].
+							    if ( $is_preview ) {
+								    $value = $this->encode_shortcodes( $value );
+							    }
+						    }
+						    $attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+					    }
+				    }
+
+				    $shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+
+				    $content = do_shortcode( $shortcode );
+
+				    // Decode [ and ].
+				    if ( ! empty( $content ) && $is_preview ) {
+					    $content = $this->decode_shortcodes( $content );
+				    }
+
+				    echo $content;
+			    }
+			    wp_die();
+		    }
+
+		    /**
 		 * Output the shortcode.
 		 *
 		 * @param array $args
@@ -1399,22 +1399,22 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$_instance = $args;
+		    public function shortcode_output( $args = array(), $content = '' ) {
+			    $_instance = $args;
 
-			$args = $this->argument_values( $args );
+			    $args = $this->argument_values( $args );
 
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
+			    // add extra argument so we know its a output to gutenberg
+			    //$args
+			    $args = $this->string_to_bool( $args );
 
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
-				$args['html'] = $content;
-			}
+			    // if we have a enclosed shortcode we add it to the special `html` argument
+			    if ( ! empty( $content ) ) {
+				    $args['html'] = $content;
+			    }
 
-			if ( ! $this->is_preview() ) {
-				/**
+			    if ( ! $this->is_preview() ) {
+				    /**
 				 * Filters the settings for a particular widget args.
 				 *
 				 * @param array          $args      The current widget instance's settings.
@@ -1424,95 +1424,95 @@ 
 				 *@since 1.0.28
 				 *
 				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
-
-				if ( ! is_array( $args ) ) {
-					return $args;
-				}
-			}
-
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
-
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-			$shortcode_args = array();
-			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
-				$no_wrap = true;
-			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
-				// wrap the shortcode in a div with the same class as the widget
-				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
-					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
-						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
-									$shortcode_args['before_title'] = $sidebar['before_title'];
-									$shortcode_args['after_title']  = $sidebar['after_title'];
-									break;
-								}
-							}
-						}
-					}
-					$output .= $this->output_title( $shortcode_args, $args );
-				}
-				$output .= $main_content;
-				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
-				$output .= $main_content;
-			}
-
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-			}
-
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
-		}
-
-		/**
+				    $args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+
+				    if ( ! is_array( $args ) ) {
+					    return $args;
+				    }
+			    }
+
+			    $class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+			    $class .= " sdel-".$this->get_instance_hash();
+
+			    $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+			    $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+			    $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+			    $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+			    $shortcode_args = array();
+			    $output         = '';
+			    $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+			    if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+				    $no_wrap = true;
+			    }
+			    $main_content = $this->output( $args, $shortcode_args, $content );
+			    if ( $main_content && ! $no_wrap ) {
+				    // wrap the shortcode in a div with the same class as the widget
+				    $output .= '<div class="' . $class . '" ' . $attrs . '>';
+				    if ( ! empty( $args['title'] ) ) {
+					    // if its a shortcode and there is a title try to grab the title wrappers
+					    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
+					    if ( empty( $instance ) ) {
+						    global $wp_registered_sidebars;
+						    if ( ! empty( $wp_registered_sidebars ) ) {
+							    foreach ( $wp_registered_sidebars as $sidebar ) {
+								    if ( ! empty( $sidebar['before_title'] ) ) {
+									    $shortcode_args['before_title'] = $sidebar['before_title'];
+									    $shortcode_args['after_title']  = $sidebar['after_title'];
+									    break;
+								    }
+							    }
+						    }
+					    }
+					    $output .= $this->output_title( $shortcode_args, $args );
+				    }
+				    $output .= $main_content;
+				    $output .= '</div>';
+			    } elseif ( $main_content && $no_wrap ) {
+				    $output .= $main_content;
+			    }
+
+			    // if preview show a placeholder if empty
+			    if ( $this->is_preview() && $output == '' ) {
+				    $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			    }
+
+			    return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+		    }
+
+		    /**
 		 * Placeholder text to show if output is empty and we are on a preview/builder page.
 		 *
 		 * @param string $name
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
-		}
+		    public function preview_placeholder_text( $name = '' ) {
+			    return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+		    }
 
-		/**
+		    /**
 		 * Sometimes booleans values can be turned to strings, so we fix that.
 		 *
 		 * @param $options
 		 *
 		 * @return mixed
 		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
+		    public function string_to_bool( $options ) {
+			    // convert bool strings to booleans
+			    foreach ( $options as $key => $val ) {
+				    if ( $val == 'false' ) {
+					    $options[ $key ] = false;
+				    } elseif ( $val == 'true' ) {
+					    $options[ $key ] = true;
+				    }
+			    }
+
+			    return $options;
+		    }
+
+		    /**
 		 * Get the argument values that are also filterable.
 		 *
 		 * @param $instance
@@ -1521,163 +1521,163 @@ 
 		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
 		 *
 		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
-						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
-
-			return $argument_values;
-		}
-
-		/**
+		    public function argument_values( $instance ) {
+			    $argument_values = array();
+
+			    // set widget instance
+			    $this->instance = $instance;
+
+			    if ( empty( $this->arguments ) ) {
+				    $this->arguments = $this->get_arguments();
+			    }
+
+			    if ( ! empty( $this->arguments ) ) {
+				    foreach ( $this->arguments as $key => $args ) {
+					    // set the input name from the key
+					    $args['name'] = $key;
+					    //
+					    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+					    if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+						    // don't set default for an empty checkbox
+					    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+						    $argument_values[ $key ] = $args['default'];
+					    }
+				    }
+			    }
+
+			    return $argument_values;
+		    }
+
+		    /**
 		 * Set arguments in super duper.
 		 *
 		 * @return array Set arguments.
 		 *@since 1.0.0
 		 *
 		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
+		    public function set_arguments() {
+			    return $this->arguments;
+		    }
 
-		/**
+		    /**
 		 * Get arguments in super duper.
 		 *
 		 * @return array Get arguments.
 		 *@since 1.0.0
 		 *
 		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
+		    public function get_arguments() {
+			    if ( empty( $this->arguments ) ) {
+				    $this->arguments = $this->set_arguments();
+			    }
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			    $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+			    $this->arguments = $this->add_name_from_key( $this->arguments, true );
 
-            if( !empty( $this->arguments['title']['value'] ) ){
-                $this->arguments['title']['value'] = wp_kses_post( $this->arguments['title']['value'] );
-            }
+                if( !empty( $this->arguments['title']['value'] ) ){
+                    $this->arguments['title']['value'] = wp_kses_post( $this->arguments['title']['value'] );
+                }
 
-			return $this->arguments;
-		}
+			    return $this->arguments;
+		    }
 
-		/**
+		    /**
 		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
 		 *
 		 * @param array $args
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+		    public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-		}
+		    }
 
-		/**
+		    /**
 		 * Add the dynamic block code inline when the wp-block in enqueued.
 		 */
-		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
-			}
-		}
-
-		/**
+		    public function register_block() {
+			    wp_add_inline_script( 'wp-blocks', $this->block() );
+			    if ( class_exists( 'SiteOrigin_Panels' ) ) {
+				    wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+			    }
+		    }
+
+		    /**
 		 * Check if we need to show advanced options.
 		 *
 		 * @return bool
 		 */
-		public function block_show_advanced() {
+		    public function block_show_advanced() {
 
-			$show      = false;
-			$arguments = $this->get_arguments();
+			    $show      = false;
+			    $arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
+			    if ( ! empty( $arguments ) ) {
+				    foreach ( $arguments as $argument ) {
+					    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+						    $show = true;
+						    break; // no need to continue if we know we have it
+					    }
+				    }
+			    }
 
-			return $show;
-		}
+			    return $show;
+		    }
 
-		/**
+		    /**
 		 * Get the url path to the current folder.
 		 *
 		 * @return string
 		 */
-		public function get_url() {
-			$url = $this->url;
+		    public function get_url() {
+			    $url = $this->url;
 
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
+			    if ( ! $url ) {
+				    $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+				    $content_url = untrailingslashit( WP_CONTENT_URL );
 
-				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
-				}
+				    // Replace http:// to https://.
+				    if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+					    $content_url = str_replace( 'http://', 'https://', $content_url );
+				    }
 
-				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
-				$this->url = $url;
-			}
+				    // Check if we are inside a plugin
+				    $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+				    $url = str_replace( $content_dir, $content_url, $file_dir );
+				    $url = trailingslashit( $url );
+				    $this->url = $url;
+			    }
 
-			return $url;
-		}
+			    return $url;
+		    }
 
-		/**
+		    /**
 		 * Get the url path to the current folder.
 		 *
 		 * @return string
 		 */
-		public function get_url_old() {
+		    public function get_url_old() {
 
-			$url = $this->url;
+			    $url = $this->url;
 
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+			    if ( ! $url ) {
+				    // check if we are inside a plugin
+				    $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+				    $dir_parts = explode( "/wp-content/", $file_dir );
+				    $url_parts = explode( "/wp-content/", plugins_url() );
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $url;
-				}
-			}
+				    if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+					    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+					    $this->url = $url;
+				    }
+			    }
 
 
-			return $url;
-		}
+			    return $url;
+		    }
 
-		/**
+		    /**
 		 * Generate the block icon.
 		 *
 		 * Enables the use of Font Awesome icons.
@@ -1689,99 +1689,99 @@ 
 		 * @return string
 		 *@since 1.1.0
 		 */
-		public function get_block_icon( $icon ) {
-
-			// check if we have a Font Awesome icon
-			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
-				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
-				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
-				$fa_type = 'brands';
-			} else {
-				$icon = "'" . $icon . "'";
-			}
+		    public function get_block_icon( $icon ) {
+
+			    // check if we have a Font Awesome icon
+			    $fa_type = '';
+			    if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+				    $fa_type = 'solid';
+			    } elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+				    $fa_type = 'regular';
+			    } elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+				    $fa_type = 'brands';
+			    } else {
+				    $icon = "'" . $icon . "'";
+			    }
+
+			    // set the icon if we found one
+			    if ( $fa_type ) {
+				    $fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+				    $icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
+			    }
+
+			    return $icon;
+		    }
+
+		    public function group_arguments( $arguments ) {
+			    if ( ! empty( $arguments ) ) {
+				    $temp_arguments = array();
+				    $general        = __( "General", 'ayecode-connect' );
+				    $add_sections   = false;
+				    foreach ( $arguments as $key => $args ) {
+					    if ( isset( $args['group'] ) ) {
+						    $temp_arguments[ $args['group'] ][ $key ] = $args;
+						    $add_sections                             = true;
+					    } else {
+						    $temp_arguments[ $general ][ $key ] = $args;
+					    }
+				    }
+
+				    // only add sections if more than one
+				    if ( $add_sections ) {
+					    $arguments = $temp_arguments;
+				    }
+			    }
+
+			    return $arguments;
+		    }
+
+		    /**
+		 * Parse used group tabs.
+		 *
+		 * @since 1.1.17
+		 */
+		    public function group_block_tabs( $tabs, $arguments ) {
+			    if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+				    $has_sections = false;
 
-			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
-				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
-			}
+				    foreach ( $this->arguments as $key => $args ) {
+					    if ( isset( $args['group'] ) ) {
+						    $has_sections = true;
+						    break;
+					    }
+				    }
 
-			return $icon;
-		}
-
-		public function group_arguments( $arguments ) {
-			if ( ! empty( $arguments ) ) {
-				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
-				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
-						$add_sections                             = true;
-					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
-					}
-				}
-
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
-
-			return $arguments;
-		}
-
-		/**
-		 * Parse used group tabs.
-		 *
-		 * @since 1.1.17
-		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
-				$has_sections = false;
-
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$has_sections = true;
-						break;
-					}
-				}
+				    if ( ! $has_sections ) {
+					    return $tabs;
+				    }
 
-				if ( ! $has_sections ) {
-					return $tabs;
-				}
-
-				$new_tabs = array();
+				    $new_tabs = array();
 
-				foreach ( $tabs as $tab_key => $tab ) {
-					$new_groups = array();
+				    foreach ( $tabs as $tab_key => $tab ) {
+					    $new_groups = array();
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
-								$new_groups[] = $group;
-							}
-						}
-					}
+					    if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
+						    foreach ( $tab['groups'] as $group ) {
+							    if ( isset( $arguments[ $group ] ) ) {
+								    $new_groups[] = $group;
+							    }
+						    }
+					    }
 
-					if ( ! empty( $new_groups ) ) {
-						$tab['groups'] = $new_groups;
+					    if ( ! empty( $new_groups ) ) {
+						    $tab['groups'] = $new_groups;
 
-						$new_tabs[ $tab_key ] = $tab;
-					}
-				}
+						    $new_tabs[ $tab_key ] = $tab;
+					    }
+				    }
 
-				$tabs = $new_tabs;
-			}
+				    $tabs = $new_tabs;
+			    }
 
-			return $tabs;
-		}
+			    return $tabs;
+		    }
 
-		/**
+		    /**
 		 * Output the JS for building the dynamic Guntenberg block.
 		 *
 		 * @return mixed
@@ -1789,18 +1789,18 @@ 
 		 * @since 1.1.0 Font Awesome classes can be used for icons.
 		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
 		 */
-		public function block() {
-			global $sd_is_js_functions_loaded, $aui_bs5;
+		    public function block() {
+			    global $sd_is_js_functions_loaded, $aui_bs5;
 
-			$show_advanced = $this->block_show_advanced();
+			    $show_advanced = $this->block_show_advanced();
 
-			ob_start();
-			?>
-			<script>
+			    ob_start();
+			    ?>
+    			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
-				$sd_is_js_functions_loaded = true;
-			?>
+			    if ( ! $sd_is_js_functions_loaded ) {
+				    $sd_is_js_functions_loaded = true;
+			    ?>
 function sd_show_view_options($this){
 	if(jQuery($this).html().length){
 		jQuery($this).html('');
@@ -2300,8 +2300,8 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
-					?>
+				    if($aui_bs5){
+					    ?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
 				$p_mr = 'me-';
@@ -2309,8 +2309,8 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
-						?>
+				    }else{
+						    ?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
 				$p_mr = 'mr-';
@@ -2318,8 +2318,8 @@ 
 				$p_pl = 'pl-';
 				$p_pr = 'pr-';
 					<?php
-				}
-				?>
+				    }
+				    ?>
 
 				// margins
 				if ( $args['mt'] !== undefined && $args['mt'] !== '' ) { $classes.push( "mt-" + $args['mt'] );  $mt = $args['mt']; }else{$mt = null;}
@@ -2503,12 +2503,12 @@ 
 			<?php
 
 
-			}
+			    }
 
-			if(method_exists($this,'block_global_js')){
-					echo $this->block_global_js();
-			}
-			?>
+			    if(method_exists($this,'block_global_js')){
+					    echo $this->block_global_js();
+			    }
+			    ?>
 
 jQuery(function() {
 
@@ -2561,13 +2561,13 @@ 
 						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if(!isset($this->options['block-supports']['renaming'])){
-								$this->options['block-supports']['renaming'] = false;
-							}
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+							    if(!isset($this->options['block-supports']['renaming'])){
+								    $this->options['block-supports']['renaming'] = false;
+							    }
+							    if ( isset( $this->options['block-supports'] ) ) {
+								    echo $this->array_to_attributes( $this->options['block-supports'] );
+							    }
+							    ?>
 						},
 						__experimentalLabel( attributes, { context } ) {
 							var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
@@ -2577,162 +2577,162 @@ 
 						},
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
-						}
-
-
-						// block hover preview.
-						$example_args = array();
-						if(!empty($this->arguments)){
-							foreach($this->arguments as $key => $a_args){
-								if(isset($a_args['example'])){
-									$example_args[$key] = $a_args['example'];
-								}
-							}
-						}
-						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
-						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
-							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
-							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
-							unset($this->options['example']['viewportWidth']);
-							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
-							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
-							}
-							if($viewport_width){
-								$example_parts[] = $viewport_width;
-							}
-							if($example_inner_blocks){
-								$example_parts[] = $example_inner_blocks;
-							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
-							}
-						}else{
-							echo 'example : {viewportWidth: 500},';
-						}
-
-
-
-						// limit to parent
-						if( !empty( $this->options['parent'] ) ){
-							echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
-						}
-
-						// limit allowed blocks
-						if( !empty( $this->options['allowed-blocks'] ) ){
-							echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
-						}
-
-						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
-							$no_wrap = true;
-						}
-						if ( $no_wrap ) {
-							$this->options['block-wrap'] = '';
-						}
-
-						// Maybe load the drag/drop functions.
-						$img_drag_drop = false;
-						$show_alignment = false;
+						    echo "keywords : " . $this->options['block-keywords'] . ",";
+						    }
+
+
+						    // block hover preview.
+						    $example_args = array();
+						    if(!empty($this->arguments)){
+							    foreach($this->arguments as $key => $a_args){
+								    if(isset($a_args['example'])){
+									    $example_args[$key] = $a_args['example'];
+								    }
+							    }
+						    }
+						    $viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+						    $example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
+						    if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+							    // no preview if set to false
+						    }elseif( !empty( $example_args ) ){
+							    echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
+						    }elseif( !empty( $this->options['example'] ) ){
+							    unset($this->options['example']['viewportWidth']);
+							    unset($this->options['example']['innerBlocks']);
+							    $example_atts = $this->array_to_attributes( $this->options['example'] );
+							    $example_parts = array();
+							    if($example_atts){
+								    $example_parts[] = rtrim($example_atts,",");
+							    }
+							    if($viewport_width){
+								    $example_parts[] = $viewport_width;
+							    }
+							    if($example_inner_blocks){
+								    $example_parts[] = $example_inner_blocks;
+							    }
+							    if(!empty($example_parts)){
+								    echo "example : {".implode(',', $example_parts)."},";
+							    }
+						    }else{
+							    echo 'example : {viewportWidth: 500},';
+						    }
+
+
+
+						    // limit to parent
+						    if( !empty( $this->options['parent'] ) ){
+							    echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+						    }
+
+						    // limit allowed blocks
+						    if( !empty( $this->options['allowed-blocks'] ) ){
+							    echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+						    }
+
+						    // maybe set no_wrap
+						    $no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+						    if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+							    $no_wrap = true;
+						    }
+						    if ( $no_wrap ) {
+							    $this->options['block-wrap'] = '';
+						    }
+
+						    // Maybe load the drag/drop functions.
+						    $img_drag_drop = false;
+						    $show_alignment = false;
 	
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "  type: 'boolean',";
-								echo "  default: false";
-								echo "},";
-							}
-
-							// Block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
-								echo "block_wrap: {";
-								echo "  type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "'";
-								echo "},";
-							}
-
-							if ( ! empty( $this->arguments ) ) {
-								foreach ( $this->arguments as $key => $args ) {
-									if ( $args['type'] == 'image' ||  $args['type'] == 'images' ) {
-										$img_drag_drop = true;
-									}
-
-									// Set if we should show alignment.
-									if ( $key == 'alignment' ) {
-										$show_alignment = true;
-									}
-
-									$extra = '';
-									$_default = isset( $args['default'] ) && ! is_null( $args['default'] ) ? $args['default'] : '';
-
-									if ( ! empty( $_default ) ) {
-										$_default = wp_slash( $_default );
-									}
-
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
-										continue;
-									} else if ( $args['type'] == 'checkbox' ) {
-										$type    = 'boolean';
-										$default = $_default ? 'true' : 'false';
-									} else if ( $args['type'] == 'number' ) {
-										$type    = 'number';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-										$type = 'array';
-										if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-											$default = ! empty( $_default ) ? "['" . implode( "','", $_default ) . "']" : "[]";
-										} else {
-											$default = "'" . $_default . "'";
-										}
-									} else if ( $args['type'] == 'tagselect' ) {
-										$type    = 'array';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'multiselect' ) {
-										$type    = 'array';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image_xy' ) {
-										$type    = 'object';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image' ) {
-										$type    = 'string';
-										$default = "'" . $_default . "'";
-									} else {
-										$type    = ! empty( $args['hidden_type'] ) ? esc_attr( $args['hidden_type'] ) : 'string';
-										$default = "'" . $_default . "'";
-									}
-
-									echo $key . " : {";
-									echo "type : '$type',";
-									echo "default : $default";
-									echo "},";
-								}
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "sd_shortcode : {type : 'string',default: ''},";
-
-							if ( ! empty( $this->options['nested-block'] ) || ! empty( $this->arguments['html'] ) ) {
-								echo "sd_shortcode_close : {type : 'string',default: ''},";
-							}
-
-							echo "className: { type: 'string', default: '' }";
-							echo "},";
-						?>
+							    echo "attributes : {";
+
+							    if ( $show_advanced ) {
+								    echo "show_advanced: {";
+								    echo "  type: 'boolean',";
+								    echo "  default: false";
+								    echo "},";
+							    }
+
+							    // Block wrap element
+							    if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+								    echo "block_wrap: {";
+								    echo "  type: 'string',";
+								    echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "'";
+								    echo "},";
+							    }
+
+							    if ( ! empty( $this->arguments ) ) {
+								    foreach ( $this->arguments as $key => $args ) {
+									    if ( $args['type'] == 'image' ||  $args['type'] == 'images' ) {
+										    $img_drag_drop = true;
+									    }
+
+									    // Set if we should show alignment.
+									    if ( $key == 'alignment' ) {
+										    $show_alignment = true;
+									    }
+
+									    $extra = '';
+									    $_default = isset( $args['default'] ) && ! is_null( $args['default'] ) ? $args['default'] : '';
+
+									    if ( ! empty( $_default ) ) {
+										    $_default = wp_slash( $_default );
+									    }
+
+									    if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+										    continue;
+									    } else if ( $args['type'] == 'checkbox' ) {
+										    $type    = 'boolean';
+										    $default = $_default ? 'true' : 'false';
+									    } else if ( $args['type'] == 'number' ) {
+										    $type    = 'number';
+										    $default = "'" . $_default . "'";
+									    } else if ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+										    $type = 'array';
+										    if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+											    $default = ! empty( $_default ) ? "['" . implode( "','", $_default ) . "']" : "[]";
+										    } else {
+											    $default = "'" . $_default . "'";
+										    }
+									    } else if ( $args['type'] == 'tagselect' ) {
+										    $type    = 'array';
+										    $default = "'" . $_default . "'";
+									    } else if ( $args['type'] == 'multiselect' ) {
+										    $type    = 'array';
+										    $default = "'" . $_default . "'";
+									    } else if ( $args['type'] == 'image_xy' ) {
+										    $type    = 'object';
+										    $default = "'" . $_default . "'";
+									    } else if ( $args['type'] == 'image' ) {
+										    $type    = 'string';
+										    $default = "'" . $_default . "'";
+									    } else {
+										    $type    = ! empty( $args['hidden_type'] ) ? esc_attr( $args['hidden_type'] ) : 'string';
+										    $default = "'" . $_default . "'";
+									    }
+
+									    echo $key . " : {";
+									    echo "type : '$type',";
+									    echo "default : $default";
+									    echo "},";
+								    }
+							    }
+
+							    echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+							    echo "sd_shortcode : {type : 'string',default: ''},";
+
+							    if ( ! empty( $this->options['nested-block'] ) || ! empty( $this->arguments['html'] ) ) {
+								    echo "sd_shortcode_close : {type : 'string',default: ''},";
+							    }
+
+							    echo "className: { type: 'string', default: '' }";
+							    echo "},";
+						    ?>
 						// The "edit" property must be a valid function.
 						edit: function (props) {
 							const selectedBlock = wp.data.select('core/block-editor').getSelectedBlock();
 <?php
-// only include the drag/drop functions if required.
-if ( $img_drag_drop ) {
-?>
+    // only include the drag/drop functions if required.
+    if ( $img_drag_drop ) {
+    ?>
 
 function enableDragSort(listClass) {
 	setTimeout(function(){
@@ -2796,10 +2796,10 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
-								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
-							?>
+							    if(!empty($this->options['block-edit-raw'])) {
+								    echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
+							    }else{
+							    ?>
 
 function hasSelectedInnerBlock(props) {
 	const select = wp.data.select('core/editor');
@@ -2821,9 +2821,9 @@ 
 
 	var $value = '';
 	<?php
-	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
-	?>
+	    // if we have a post_type and a category then link them
+	    if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+	    ?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined' && selectedBlock && selectedBlock.clientId === props.clientId){
 		$pt = props.attributes.post_type;
 		if(post_type_rest_slugs.length){
@@ -2836,12 +2836,12 @@ 
 			term_query_type = $pt;
 		}
 <?php
-	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
-	}
-?>
+	    $cat_path = '';
+	    if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
+		    $cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
+		    $cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+	    }
+    ?>
 		/* taxonomies */
 		if($value && 'post_type' in prev_attributes[props.clientId] && 'category' in prev_attributes[props.clientId] && run){
 			if (!window.gdCPTCats) {
@@ -2929,12 +2929,12 @@ 
 		}
 	}
 	<?php } ?>
-<?php
-$current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
-if(!empty($current_screen->base) && $current_screen->base==='widgets'){
-	echo 'const { deviceType } = "";';
+    <?php
+    $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
+    if(!empty($current_screen->base) && $current_screen->base==='widgets'){
+	    echo 'const { deviceType } = "";';
 }else{
-?>
+    ?>
 /** Get device type const. */
 const wpVersion = '<?php global $wp_version; echo esc_attr($wp_version); ?>';
 const { deviceType } = typeof wp.data.useSelect !== 'undefined' ? wp.data.useSelect(select => {
@@ -2986,8 +2986,8 @@ 
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}else{echo '0';}?>,
+										    echo $post->ID;
+									    }else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -3000,20 +3000,20 @@ 
 										}
 
 										 <?php
-										if(!empty($this->options['nested-block'])){
-											?>
+										    if(!empty($this->options['nested-block'])){
+											    ?>
 											// props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
-										?>
+										    }else{
+										    ?>
 										props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 										<?php
-										}
-										?>
+										    }
+										    ?>
 
 										// if AUI is active call the js init function
 										if (typeof aui_init === "function") {
@@ -3026,29 +3026,29 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-js'])) {
-								echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
-							}
+							    if(!empty($this->options['block-edit-js'])) {
+								    echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+							    }
 
-							if(empty($this->options['block-save-return'])){
-							?>
+							    if(empty($this->options['block-save-return'])){
+							    ?>
 								///////////////////////////////////////////////////////////////////////
 
 								// build the shortcode.
 								shortcode = "[<?php echo $this->options['base_id'];?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+								    if(! empty( $this->arguments )){
 
-								foreach($this->arguments as $key => $args){
-								   // if($args['type']=='tabs'){continue;}
+								    foreach($this->arguments as $key => $args){
+								       // if($args['type']=='tabs'){continue;}
 
-								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
-									   continue;
-								   }
-								?>
-								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
+								       // don't add metadata arguments
+								       if (substr($key, 0, 9 ) === 'metadata_') {
+									       continue;
+								       }
+								    ?>
+    								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 									if ('<?php echo esc_attr( $key );?>' == 'html') {
 									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
 										shortcode += props.attributes.<?php echo esc_attr( $key );?>.length && ( props.attributes.<?php echo esc_attr( $key );?>.x.length || props.attributes.<?php echo esc_attr( $key );?>.y.length ) ? " <?php echo esc_attr( $key );?>='{x:" + props.attributes.<?php echo esc_attr( $key );?>.x + ",y:"+props.attributes.<?php echo esc_attr( $key );?>.y +"}' " : "";
@@ -3058,10 +3058,10 @@ 
 									}
 								}
 								<?php
-								}
-								}
+								    }
+								    }
 
-								?>
+								    ?>
 								shortcode += "]";
 
 								if(shortcode){
@@ -3073,17 +3073,17 @@ 
 
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
-									}
-									?>
+									    if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+										    echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+									    }
+									    ?>
 								}
 
 
 							///////////////////////////////////////////////////////////////////////
 							<?php
-							} // end nested block check
-							?>
+							    } // end nested block check
+							    ?>
 
 							return [
 
@@ -3107,10 +3107,10 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+									    if(! empty( $this->arguments )){
 
-									if ( $show_advanced ) {
-									?>
+									    if ( $show_advanced ) {
+									    ?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
 										},
@@ -3127,133 +3127,133 @@ 
 									)
 									,
 									<?php
-									}
-
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
-
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
-
-									if($has_sections){
-									$panel_count = 0;
-									$open_tab = '';
-
-									$open_tab_groups = array();
-									$used_tabs = array();
-
-									foreach ( $arguments as $key => $args ) {
-										$close_tab = false;
-										$close_tabs = false;
-
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
-													$open_tab_groups[] = $key;
-
-													if ( $open_tab != $tab_name ) {
-														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
-														$tab_args['tab']['open'] = true;
-
-														$this->block_tab_start( '', $tab_args );
-														$open_tab = $tab_name;
-														$used_tabs[] = $tab_name;
-													}
-
-													if ( $open_tab_groups == $tab_args['groups'] ) {
-														$close_tab = true;
-														$open_tab_groups = array();
-
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
-															$close_tabs = true;
-														}
-													}
-												}
-											}
-										}
-										?>
+									    }
+
+									    $arguments = $this->group_arguments( $this->arguments );
+									    $block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+
+									    // Do we have sections?
+									    $has_sections = $arguments == $this->arguments ? false : true;
+
+									    if($has_sections){
+									    $panel_count = 0;
+									    $open_tab = '';
+
+									    $open_tab_groups = array();
+									    $used_tabs = array();
+
+									    foreach ( $arguments as $key => $args ) {
+										    $close_tab = false;
+										    $close_tabs = false;
+
+										     if ( ! empty( $block_group_tabs ) ) {
+											    foreach ( $block_group_tabs as $tab_name => $tab_args ) {
+												    if ( in_array( $key, $tab_args['groups'] ) ) {
+													    $open_tab_groups[] = $key;
+
+													    if ( $open_tab != $tab_name ) {
+														    $tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
+														    $tab_args['tab']['open'] = true;
+
+														    $this->block_tab_start( '', $tab_args );
+														    $open_tab = $tab_name;
+														    $used_tabs[] = $tab_name;
+													    }
+
+													    if ( $open_tab_groups == $tab_args['groups'] ) {
+														    $close_tab = true;
+														    $open_tab_groups = array();
+
+														    if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+															    $close_tabs = true;
+														    }
+													    }
+												    }
+											    }
+										    }
+										    ?>
 										el(wp.components.PanelBody, {
 												title: '<?php esc_attr_e( $key ); ?>',
 												initialOpen: <?php if ( $panel_count ) {
-												echo "false";
-											} else {
-												echo "true";
-											}?>
-											},
+												    echo "false";
+											    } else {
+												    echo "true";
+											    }?>
+    											},
 											<?php
-											foreach ( $args as $k => $a ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
-											}
-											?>
-										),
+											    foreach ( $args as $k => $a ) {
+												    $this->block_tab_start( $k, $a );
+												    $this->block_row_start( $k, $a );
+												    $this->build_block_arguments( $k, $a );
+												    $this->block_row_end( $k, $a );
+												    $this->block_tab_end( $k, $a );
+											    }
+											    ?>
+    										),
 										<?php
-										$panel_count ++;
-
-										if($close_tab || $close_tabs){
-											$tab_args = array(
-												'tab'	=> array(
-													'tabs_close' => $close_tabs,
-												'close' => true,
-												)
-
-											);
-											$this->block_tab_end( '', $tab_args );
-//											echo '###close'; print_r($tab_args);
-											$panel_count = 0;
-										}
-//
-
-									}
-									}else {
-									?>
+										    $panel_count ++;
+
+										    if($close_tab || $close_tabs){
+											    $tab_args = array(
+												    'tab'	=> array(
+													    'tabs_close' => $close_tabs,
+												    'close' => true,
+												    )
+
+											    );
+											    $this->block_tab_end( '', $tab_args );
+    //											echo '###close'; print_r($tab_args);
+											    $panel_count = 0;
+										    }
+    //
+
+									    }
+									    }else {
+									    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
-										}
-										?>
-									),
+										    foreach ( $this->arguments as $key => $args ) {
+											    $this->block_row_start( $key, $args );
+											    $this->build_block_arguments( $key, $args );
+											    $this->block_row_end( $key, $args );
+										    }
+										    ?>
+    									),
 									<?php
-									}
+									    }
 
-									}
-									?>
+									    }
+									    ?>
 
 								),
 
 								<?php
-								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
-								   echo $this->options['block-edit-return'];
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
-								?>
-								el('<?php echo esc_attr($block_edit_wrap_tag); ?>', wp.blockEditor.useBlockProps({
+								    // If the user sets block-output array then build it
+								    if ( ! empty( $this->options['block-output'] ) ) {
+								    $this->block_element( $this->options['block-output'] );
+							    }elseif(!empty($this->options['block-edit-return'])){
+								       echo $this->options['block-edit-return'];
+							    }else{
+								    // if no block-output is set then we try and get the shortcode html output via ajax.
+								    $block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
+								    ?>
+    								el('<?php echo esc_attr($block_edit_wrap_tag); ?>', wp.blockEditor.useBlockProps({
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
 									<?php //if(isset($this->arguments['visibility_conditions'])){ echo 'dataVisibilityConditionSD: props.visibility_conditions ? true : false,';} //@todo we need to implement this in the other outputs also ?>
 									style: {'minHeight': '30px'}
 								}))
 								<?php
-								}
-								?>
-							]; // end return
+								    }
+								    ?>
+    							]; // end return
 
 							<?php
-							} // end block-edit-raw else
-							?>
+							    } // end block-edit-raw else
+							    ?>
 						},
 
 						// The "save" property must be specified and must be a valid function.
@@ -3267,17 +3267,17 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							    if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							   // if($args['type']=='tabs'){continue;}
+							    foreach($this->arguments as $key => $args){
+							       // if($args['type']=='tabs'){continue;}
 
-							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
-								   continue;
-							   }
-							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
+							       // don't add metadata arguments
+							       if (substr($key, 0, 9 ) === 'metadata_') {
+								       continue;
+							       }
+							    ?>
+    							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if ('<?php echo esc_attr( $key );?>' == 'html') {
 									$html = attr.<?php echo esc_attr( $key );?>;
 								} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
@@ -3287,20 +3287,20 @@ 
 								}
 							}
 							<?php
-							}
-							}
+							    }
+							    }
 
-							?>
+							    ?>
 							content += "]";
 							 content = '';
 
 							<?php
-//                            if(!empty($this->options['nested-block'])){
-//                                ?>
+    //                            if(!empty($this->options['nested-block'])){
+    //                                ?>
 //                                $html = 'el( InnerBlocks.Content )';
 //                                <?php
-//                            }
-							?>
+    //                            }
+							    ?>
 							// if has html element
 							if ($html) {
 								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
@@ -3320,38 +3320,38 @@ 
 							}
 
 							<?php
-//							if(!empty($this->options['nested-block'])){
-//                                ?x>
-//                              return el(
-//                                    'div',
-//                                    { className: props.className,
-//                                        style: {'minHeight': '300px','position':'relative','overflow':'hidden','backgroundImage': 'url(https://s.w.org/images/core/5.5/don-quixote-06.jpg)'}
-//                                    },
-//                                    el( InnerBlocks.Content ),
-//                                    el('div', {dangerouslySetInnerHTML: {__html: content}, className: align})
-//                                );
-//                                <x?php
-//							}else
-
-							if(!empty($this->options['block-output'])){
-//                               echo "return";
-//                               $this->block_element( $this->options['block-output'], true );
-//                               echo ";";
-
-							   ?>
+    //							if(!empty($this->options['nested-block'])){
+    //                                ?x>
+    //                              return el(
+    //                                    'div',
+    //                                    { className: props.className,
+    //                                        style: {'minHeight': '300px','position':'relative','overflow':'hidden','backgroundImage': 'url(https://s.w.org/images/core/5.5/don-quixote-06.jpg)'}
+    //                                    },
+    //                                    el( InnerBlocks.Content ),
+    //                                    el('div', {dangerouslySetInnerHTML: {__html: content}, className: align})
+    //                                );
+    //                                <x?php
+    //							}else
+
+							    if(!empty($this->options['block-output'])){
+    //                               echo "return";
+    //                               $this->block_element( $this->options['block-output'], true );
+    //                               echo ";";
+
+							       ?>
 							  return el(
 								   '',
 								   {},
 								  // el('', {dangerouslySetInnerHTML: {__html: content}}),
 								   <?php $this->block_element( $this->options['block-output'], true ); ?>
-								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+    								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
-								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
-								?>
+							    }elseif(!empty($this->options['block-save-return'])){
+								       echo 'return ' . $this->options['block-save-return'];
+							    }elseif(!empty($this->options['nested-block'])){
+								    ?>
 							  return el(
 								   '',
 								   {},
@@ -3360,22 +3360,22 @@ 
 								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
-							return content;
+							    }elseif(!empty( $this->options['block-save-return'] ) ){
+								    echo "return ". $this->options['block-edit-return'].";";
+							    }elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							    ?>
+    							return content;
 							<?php
-							}else{
-							?>
+							    }else{
+							    ?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, wp.blockEditor.useBlockProps.save( {dangerouslySetInnerHTML: {__html: content}, className: align} ));
 							<?php
-							}
-							?>
+							    }
+							    ?>
 
 
 						}
@@ -3389,43 +3389,43 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', $output );
+		    }
 
 
 
-		public function block_row_start($key, $args){
+		    public function block_row_start($key, $args){
 
-			// check for row
-			if(!empty($args['row'])){
+			    // check for row
+			    if(!empty($args['row'])){
 
-				if(!empty($args['row']['open'])){
+				    if(!empty($args['row']['open'])){
 
-				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-				$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-				$device_type_icon = '';
-				if($device_type=='Desktop'){
-					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
-					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
-					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}
-				echo $element_require;
-				echo $device_type_require;
+				    // element require
+				    $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+				    $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+				    $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+				    $device_type_icon = '';
+				    if($device_type=='Desktop'){
+					    $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+				    }elseif($device_type=='Tablet'){
+					    $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+				    }elseif($device_type=='Mobile'){
+					    $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+				    }
+				    echo $element_require;
+				    echo $device_type_require;
 
-					if(false){?><script><?php }?>
+					    if(false){?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
@@ -3436,15 +3436,15 @@ 
 								},
 								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['row']['title'] ) ?>'}}),
 								<?php if($device_type_icon){ ?>
-									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
+    									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
-								}
-								?>
+								    }
+								    ?>
 
 
 							),
 							<?php }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+    							<?php if(!empty($args['row']['desc'])){ ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
@@ -3463,51 +3463,51 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+					    if(false){?></script><?php }
+				    }elseif(!empty($args['row']['close'])){
+					    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+					    if(false){?></script><?php }
+				    }else{
+					    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0 pr-2 pe-2',
 							},
 					<?php
-					if(false){?></script><?php }
-				}
+					    if(false){?></script><?php }
+				    }
 
-			}
+			    }
 
-		}
+		    }
 
-		public function block_row_end($key, $args){
+		    public function block_row_end($key, $args){
 
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "))";
-				}
+			    if(!empty($args['row'])){
+				    // maybe close
+				    if(!empty($args['row']['close'])){
+					    echo "))";
+				    }
 
-				echo "),";
-			}
-		}
+				    echo "),";
+			    }
+		    }
 
-		public function block_tab_start($key, $args){
+		    public function block_tab_start($key, $args){
 
-			// check for row
-			if(!empty($args['tab'])){
+			    // check for row
+			    if(!empty($args['tab'])){
 
-				if(!empty($args['tab']['tabs_open'])){
+				    if(!empty($args['tab']['tabs_open'])){
 
-					if(false){?><script><?php }?>
+					    if(false){?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3520,12 +3520,12 @@ 
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
-				}
+					    if(false){?></script><?php }
+				    }
 
-				if(!empty($args['tab']['open'])){
+				    if(!empty($args['tab']['open'])){
 
-					if(false){?><script><?php }?>
+					    if(false){?><script><?php }?>
 							{
 												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
 												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
@@ -3534,125 +3534,125 @@ 
 									className: 'components-base-control__help mb-0',
 									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
-				}
+					    if(false){?></script><?php }
+				    }
 
-			}
+			    }
 
-		}
+		    }
 
-		public function block_tab_end($key, $args){
+		    public function block_tab_end($key, $args){
 
-			if(!empty($args['tab'])){
-				// maybe close
-				if(!empty($args['tab']['close'])){
-					echo ")}, /* tab close */";
-				}
+			    if(!empty($args['tab'])){
+				    // maybe close
+				    if(!empty($args['tab']['close'])){
+					    echo ")}, /* tab close */";
+				    }
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+				    if(!empty($args['tab']['tabs_close'])){
+					    if(false){?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
 					<?php if(false){ ?></script><?php }
-				}
-			}
-		}
-
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options           = '';
-			$extra             = '';
-			$require           = '';
-			$inside_elements   = '';
-			$after_elements	   = '';
-
-			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
-				return;
-			}
-
-			$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-			$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-			$device_type_icon = '';
-			if($device_type=='Desktop'){
-				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
-				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
-				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}
-
-			// icon
-			$icon = '';
-			if( !empty( $args['icon'] ) ){
-				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
-									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
-								$icon .= "}),";
-
-				// blank title as its added to the icon.
-				$args['title'] = '';
-			}
-
-			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
-
-			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-
-
-			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
-			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
-				$type = 'TextControl';
-				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
-					$onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
-				}
-
-				if (substr($key, 0, 9 ) === 'metadata_') {
-					$real_key = str_replace('metadata_','', $key );
-					$onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-					$value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
-				}
-			}
-//			else if ( $args['type'] == 'popup' ) {
-//				$type = 'TextControl';
-//				$args['type'] == 'text';
-//				$after_elements .= "el( wp.components.Button, {
-//                          className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
-//                          onClick: function(){
-//							  aui_modal('','<input id=\'zzz\' value= />');
-//							  const source = document.getElementById('zzz');
-//							  source.value = props.attributes.$key;
-//							  source.addEventListener('input', function(e){props.setAttributes({ $key: e.target.value });});
-//                          }
-//                        },
-//                        'test'
-//                        ),";
-//
-//				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-//			}
-			else if ( $args['type'] == 'styleid' ) {
-				$type = 'TextControl';
-				$args['type'] == 'text';
-				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
-
-				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
-				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
-
-				$notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
-				echo $notice_message ? $element_require . $notice : '';
-				return;
-			}
-			/*
+				    }
+			    }
+		    }
+
+		    public function build_block_arguments( $key, $args ) {
+			    $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+			    $options           = '';
+			    $extra             = '';
+			    $require           = '';
+			    $inside_elements   = '';
+			    $after_elements	   = '';
+
+			    // `content` is a protected and special argument
+			    if ( $key == 'content' ) {
+				    return;
+			    }
+
+			    $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+			    $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+			    $device_type_icon = '';
+			    if($device_type=='Desktop'){
+				    $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+			    }elseif($device_type=='Tablet'){
+				    $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+			    }elseif($device_type=='Mobile'){
+				    $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+			    }
+
+			    // icon
+			    $icon = '';
+			    if( !empty( $args['icon'] ) ){
+				    $icon .= "el('div', {";
+									    $icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									    $icon .= "className: 'text-center',";
+									    $icon .= "title: '".addslashes( $args['title'] )."',";
+								    $icon .= "}),";
+
+				    // blank title as its added to the icon.
+				    $args['title'] = '';
+			    }
+
+			    // require advanced
+			    $require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+
+			    // element require
+			    $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+
+
+			    $onchange  = "props.setAttributes({ $key: $key } )";
+			    $onchangecomplete  = "";
+			    $value     = "props.attributes.$key";
+			    $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
+			    if ( in_array( $args['type'], $text_type ) ) {
+				    $type = 'TextControl';
+				    // Save numbers as numbers and not strings
+				    if ( $args['type'] == 'number' ) {
+					    $onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
+				    }
+
+				    if (substr($key, 0, 9 ) === 'metadata_') {
+					    $real_key = str_replace('metadata_','', $key );
+					    $onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
+					    $value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+				    }
+			    }
+    //			else if ( $args['type'] == 'popup' ) {
+    //				$type = 'TextControl';
+    //				$args['type'] == 'text';
+    //				$after_elements .= "el( wp.components.Button, {
+    //                          className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
+    //                          onClick: function(){
+    //							  aui_modal('','<input id=\'zzz\' value= />');
+    //							  const source = document.getElementById('zzz');
+    //							  source.value = props.attributes.$key;
+    //							  source.addEventListener('input', function(e){props.setAttributes({ $key: e.target.value });});
+    //                          }
+    //                        },
+    //                        'test'
+    //                        ),";
+    //
+    //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
+    //			}
+			    else if ( $args['type'] == 'styleid' ) {
+				    $type = 'TextControl';
+				    $args['type'] == 'text';
+				    // Save numbers as numbers and not strings
+				    $value     = "props.attributes.$key ? props.attributes.$key : ''";
+			    }else if ( $args['type'] == 'notice' ) {
+
+				    $notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
+				    $notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
+
+				    $notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
+				    echo $notice_message ? $element_require . $notice : '';
+				    return;
+			    }
+			    /*
 			 * https://www.wptricks.com/question/set-current-tab-on-a-gutenberg-tabpanel-component-from-outside-that-component/ es5 layout
 						elseif($args['type']=='tabs'){
 							?>
@@ -3705,22 +3705,22 @@ 
 							return;
 						}
 */
-			elseif ( $args['type'] == 'color' ) {
-				$type = 'ColorPicker';
-				$onchange = "";
-				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
-					$extra .= "disableAlpha: true,";
-				}
-				$onchangecomplete = "onChangeComplete: function($key) {
+			    elseif ( $args['type'] == 'color' ) {
+				    $type = 'ColorPicker';
+				    $onchange = "";
+				    $extra = "color: $value,";
+				    if(!empty($args['disable_alpha'])){
+					    $extra .= "disableAlpha: true,";
+				    }
+				    $onchangecomplete = "onChangeComplete: function($key) {
 				value =  $key.rgb.a && $key.rgb.a < 1 ? \"rgba(\"+$key.rgb.r+\",\"+$key.rgb.g+\",\"+$key.rgb.b+\",\"+$key.rgb.a+\")\" : $key.hex;
 						props.setAttributes({
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
-				$type = 'GradientPicker';
-				$extra .= "gradients: [{
+			    }elseif ( $args['type'] == 'gradient' ) {
+				    $type = 'GradientPicker';
+				    $extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
 			gradient:
 				'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
@@ -3757,10 +3757,10 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
-//                print_r($args);
+			    }elseif ( $args['type'] == 'image' ) {
+    //                print_r($args);
 
-				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
+				    $img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
 							url:  props.attributes.{$key}_use_featured === true ? 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxzdmcgYmFzZVByb2ZpbGU9InRpbnkiIGhlaWdodD0iNDAwIiB2ZXJzaW9uPSIxLjIiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6ZXY9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEveG1sLWV2ZW50cyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzIC8+PHJlY3QgZmlsbD0iI2QzZDNkMyIgaGVpZ2h0PSI0MDAiIHdpZHRoPSI0MDAiIHg9IjAiIHk9IjAiIC8+PGxpbmUgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIxMCIgeDE9IjAiIHgyPSI0MDAiIHkxPSIwIiB5Mj0iNDAwIiAvPjxsaW5lIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMTAiIHgxPSIwIiB4Mj0iNDAwIiB5MT0iNDAwIiB5Mj0iMCIgLz48cmVjdCBmaWxsPSIjZDNkM2QzIiBoZWlnaHQ9IjUwIiB3aWR0aD0iMjE4LjAiIHg9IjkxLjAiIHk9IjE3NS4wIiAvPjx0ZXh0IGZpbGw9IndoaXRlIiBmb250LXNpemU9IjMwIiBmb250LXdlaWdodD0iYm9sZCIgdGV4dC1hbmNob3I9Im1pZGRsZSIgeD0iMjAwLjAiIHk9IjIwNy41Ij5QTEFDRUhPTERFUjwvdGV4dD48L3N2Zz4='  : props.attributes.$key,
 							value: props.attributes.{$key}_xy.x !== undefined && props.attributes.{$key}_xy.x >= 0 ? props.attributes.{$key}_xy  : {x: 0.5,y: 0.5,},
 //                            value: props.attributes.{$key}_xy,
@@ -3781,16 +3781,16 @@ 
 						}), ";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+				    $value = '""';
+				    $type = 'MediaUpload';
+				    $extra .= "onSelect: function(media){
 					  return props.setAttributes({
 						  $key: media.url,
 						  {$key}_id: media.id
 						});
 					  },";
-				   $extra .= "type: 'image',";
-				   $extra .= "render: function (obj) {
+				       $extra .= "type: 'image',";
+				       $extra .= "render: function (obj) {
 						return el( 'div',{},
 						( !props.attributes.$key && !props.attributes.{$key}_use_featured ) && el( wp.components.Button, {
 						  className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
@@ -3816,11 +3816,11 @@ 
 
 
 					  }";
-				$onchange = "";
+				    $onchange = "";
 
-				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
-				$img_preview = "props.attributes.$key && (function() {
+				    //$inside_elements = ",el('div',{},'file upload')";
+			    } else if ( $args['type'] == 'images' ) {
+				    $img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
 	uploads.map((upload, index) => (
@@ -3847,9 +3847,9 @@ 
 })(),";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+				    $value = '""';
+				    $type = 'MediaUpload';
+				    $extra .= "onSelect: function(media){
 	let slim_images = props.attributes.$key ? JSON.parse('['+props.attributes.$key+']') : [];
 	if(media.length){
 		for (var i=0; i < media.length; i++) {
@@ -3862,9 +3862,9 @@ 
 	}
 	return props.setAttributes({ $key: slimImagesV});
 },";
-				$extra .= "type: 'image',";
-				$extra .= "multiple: true,";
-				$extra .= "render: function (obj) {
+				    $extra .= "type: 'image',";
+				    $extra .= "multiple: true,";
+				    $extra .= "render: function (obj) {
 	/* Init the sort */
 	enableDragSort('sd-sortable');
 	return el( 'div',{},
@@ -3891,40 +3891,40 @@ 
 		)
 	)
 }";
-				$onchange = "";
-
-				//$inside_elements = ",el('div',{},'file upload')";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
-				$type = 'CheckboxControl';
-				$extra .= "checked: props.attributes.$key,";
-				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
-				$type = 'TextareaControl';
-
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-				$type = 'SelectControl';
-
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
-
-					if ( ! empty( $args['options'] ) ) {
-						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
-						}
-						$options .= "],";
-					}
-				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
-				}
-
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+				    $onchange = "";
+
+				    //$inside_elements = ",el('div',{},'file upload')";
+			    }
+			    elseif ( $args['type'] == 'checkbox' ) {
+				    $type = 'CheckboxControl';
+				    $extra .= "checked: props.attributes.$key,";
+				    $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+			    } elseif ( $args['type'] == 'textarea' ) {
+				    $type = 'TextareaControl';
+
+			    } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+				    $type = 'SelectControl';
+
+				    if($args['name'] == 'category' && !empty($args['post_type_linked'])){
+					    $options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
+				    }elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+					    $options .= "options: sort_by_".str_replace("-","_", $this->id).",";
+				    }else {
+
+					    if ( ! empty( $args['options'] ) ) {
+						    $options .= "options: [";
+						    foreach ( $args['options'] as $option_val => $option_label ) {
+							    $options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
+						    }
+						    $options .= "],";
+					    }
+				    }
+				    if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+					    $extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
+				    }
+
+				    if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
+					    $after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3935,56 +3935,56 @@ 
 									},
 									'Clear'
 							),";
-				}
-			} elseif ( $args['type'] == 'tagselect' ) {
-//				$type = 'FormTokenField';
-//
-//				if ( ! empty( $args['options'] ) ) {
-//						$options .= "suggestions: [";
-//						foreach ( $args['options'] as $option_val => $option_label ) {
-//							$options .= "{ value: '" . esc_attr( $option_val ) . "', title: '" . addslashes( $option_label ) . "' },";
-////							$options .= "'" . esc_attr( $option_val ) . "':'" . addslashes( $option_label ) . "',";
-//						}
-//						$options .= "],";
-//				}
-//
-//				$onchangex  = "{ ( selectedItems ) => {
-//						// Build array of selected posts.
-//						let selectedPostsArray = [];
-//						selectedPosts.map(
-//							( postName ) => {
-//								const matchingPost = posts.find( ( post ) => {
-//									return post.title.raw === postName;
-//
-//								} );
-//								if ( matchingPost !== undefined ) {
-//									selectedPostsArray.push( matchingPost.id );
-//								}
-//							}
-//						)
-//
-//						setAttributes( { selectedPosts: selectedPostsArray } );
-//					} } ";
-//				$onchange  = '';// "props.setAttributes({ $key: [ props.attributes.$key ] } )";
-//
-////				$options  = "";
-//				$value     = "[]";
-//				$extra .= ' __experimentalExpandOnFocus: true,';
-
-			} else if ( $args['type'] == 'alignment' ) {
-				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else if ( $args['type'] == 'margins' ) {
-
-			} else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
-				$type = 'TextControl';
-				$value = "(props.attributes.$key ? props.attributes.$key : '')";
-				$args['type'] = 'text';
-				$options .= 'disabled:true,';
-				$bsvc_title = esc_attr( addslashes( $args['title'] ) );
-				$bsvc_body = $this->block_visibility_fields( $args );
-				// @TODO reset button
-				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
-				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
+				    }
+			    } elseif ( $args['type'] == 'tagselect' ) {
+    //				$type = 'FormTokenField';
+    //
+    //				if ( ! empty( $args['options'] ) ) {
+    //						$options .= "suggestions: [";
+    //						foreach ( $args['options'] as $option_val => $option_label ) {
+    //							$options .= "{ value: '" . esc_attr( $option_val ) . "', title: '" . addslashes( $option_label ) . "' },";
+    ////							$options .= "'" . esc_attr( $option_val ) . "':'" . addslashes( $option_label ) . "',";
+    //						}
+    //						$options .= "],";
+    //				}
+    //
+    //				$onchangex  = "{ ( selectedItems ) => {
+    //						// Build array of selected posts.
+    //						let selectedPostsArray = [];
+    //						selectedPosts.map(
+    //							( postName ) => {
+    //								const matchingPost = posts.find( ( post ) => {
+    //									return post.title.raw === postName;
+    //
+    //								} );
+    //								if ( matchingPost !== undefined ) {
+    //									selectedPostsArray.push( matchingPost.id );
+    //								}
+    //							}
+    //						)
+    //
+    //						setAttributes( { selectedPosts: selectedPostsArray } );
+    //					} } ";
+    //				$onchange  = '';// "props.setAttributes({ $key: [ props.attributes.$key ] } )";
+    //
+    ////				$options  = "";
+    //				$value     = "[]";
+    //				$extra .= ' __experimentalExpandOnFocus: true,';
+
+			    } else if ( $args['type'] == 'alignment' ) {
+				    $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+			    } else if ( $args['type'] == 'margins' ) {
+
+			    } else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+				    $type = 'TextControl';
+				    $value = "(props.attributes.$key ? props.attributes.$key : '')";
+				    $args['type'] = 'text';
+				    $options .= 'disabled:true,';
+				    $bsvc_title = esc_attr( addslashes( $args['title'] ) );
+				    $bsvc_body = $this->block_visibility_fields( $args );
+				    // @TODO reset button
+				    $bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+				    $after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
 						className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
 						onClick: function() {
 							var sValue = props.attributes." . $key . ";
@@ -4010,54 +4010,54 @@ 
 					},
 					'" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
 				) ),";
-			} else {
-				return;// if we have not implemented the control then don't break the JS.
-			}
-
-			// color input does not show the labels so we add them
-			if($args['type']=='color'){
-				// add show only if advanced
-				echo $require_advanced;
-				// add setting require if defined
-				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
-			}
-
-			// add show only if advanced
-			echo $require_advanced;
-			// add setting require if defined
-			echo $element_require;
-			echo $device_type_require;
-
-			// icon
-			echo $icon;
-			?>
-			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
+			    } else {
+				    return;// if we have not implemented the control then don't break the JS.
+			    }
+
+			    // color input does not show the labels so we add them
+			    if($args['type']=='color'){
+				    // add show only if advanced
+				    echo $require_advanced;
+				    // add setting require if defined
+				    echo $element_require;
+				    echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+			    }
+
+			    // add show only if advanced
+			    echo $require_advanced;
+			    // add setting require if defined
+			    echo $element_require;
+			    echo $device_type_require;
+
+			    // icon
+			    echo $icon;
+			    ?>
+    			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
 			label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( empty( $args['row'] ) && ! empty( $args['device_type'] ) ) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),<?php if ( $device_type_icon ) { ?>deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
-			} else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
+			    } else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
 			help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( addslashes( $args['desc'] ) ) ) . "'}})" : "''" ); ?>,
 			value: <?php echo $value; ?>,
 			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
-			} ?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
-			} ?>
-			<?php echo $options; ?>
-			<?php echo $extra; ?>
-			<?php echo $custom_attributes; ?>
-			<?php echo $onchangecomplete; ?>
-			<?php if ( $onchange ) { ?>
-			onChange: function ( <?php echo $key; ?> ) {
+				    echo "type: '" . addslashes( $args['type'] ) . "',";
+			    } ?>
+    			<?php if ( ! empty( $args['placeholder'] ) ) {
+				    echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+			    } ?>
+    			<?php echo $options; ?>
+    			<?php echo $extra; ?>
+    			<?php echo $custom_attributes; ?>
+    			<?php echo $onchangecomplete; ?>
+    			<?php if ( $onchange ) { ?>
+    			onChange: function ( <?php echo $key; ?> ) {
 				<?php echo $onchange; ?>
-			}
+    			}
 			<?php } ?>
-		} <?php echo $inside_elements; ?> ),
+    		} <?php echo $inside_elements; ?> ),
 			<?php
-			echo $after_elements;
-		}
+			    echo $after_elements;
+		    }
 
-		/**
+		    /**
 		 * Convert an array of attributes to block string.
 		 *
 		 * @param $custom_attributes
@@ -4066,448 +4066,448 @@ 
 		 *@todo there is prob a faster way to do this, also we could add some validation here.
 		 *
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+		    public function array_to_attributes( $custom_attributes, $html = false ) {
+			    $attributes = '';
+			    if ( ! empty( $custom_attributes ) ) {
 
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
-					}
-				}
+				    foreach ( $custom_attributes as $key => $val ) {
+					    if(is_array($val)){
+						    $attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
+					    }else{
+						    $attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
+					    }
+				    }
 
-			}
+			    }
 
-			return $attributes;
-		}
+			    return $attributes;
+		    }
 
 
 
-		/**
+		    /**
 		 * A self looping function to create the output for JS block elements.
 		 *
 		 * This is what is output in the WP Editor visual view.
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args, $save = false ) {
-
-//            print_r($args);echo '###';exit;
-
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+		    public function block_element( $args, $save = false ) {
+
+    //            print_r($args);echo '###';exit;
+
+			    if ( ! empty( $args ) ) {
+				    foreach ( $args as $element => $new_args ) {
+
+					    if ( is_array( $new_args ) ) { // its an element
+
 
-					if ( is_array( $new_args ) ) { // its an element
+						    if ( isset( $new_args['element'] ) ) {
 
-
-						if ( isset( $new_args['element'] ) ) {
-
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
-
-							if($new_args['element']=='InnerBlocks'){
-								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
-								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
-							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
-//                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-								echo "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
-							//    echo '###';
-
-							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
-
-								if ( isset($new_args['if_inner_element']) ) {
-									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
-								}
-
-								unset($new_args['inner_element']);
-								echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-
-							   // echo "} ),";
-
-							}else{
-								echo "\n el( '" . $new_args['element'] . "', {";
-							}
-
-
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
-
-
-								if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ),$save );
-								}
-							}
-
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $new_value  );
-									}
-
-									if ( is_array( $new_value ) ) {
-
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ),$save );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ),$save );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
-							}
-
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
-							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-							$new_args = str_replace('[%WrapStyle%]','',$new_args);
-							echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
-//                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-							$new_args = str_replace('[%WrapClass%]','',$new_args);
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
-							echo $element . ": $new_args,";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
+							    if ( isset( $new_args['element_require'] ) ) {
+								    echo str_replace( array(
+										    "'+",
+										    "+'"
+									    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+								    unset( $new_args['element_require'] );
+							    }
+
+							    if($new_args['element']=='InnerBlocks'){
+								    echo "\n el( InnerBlocks, {";
+							    }elseif($new_args['element']=='innerBlocksProps'){
+								    $element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
+							      //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
+    //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
+								    echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
+								    echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
+								    echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+								    echo "} ), {";
+								    echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+							    //    echo '###';
+
+							      //  echo '###';
+							    }elseif($new_args['element']=='BlocksProps'){
+
+								    if ( isset($new_args['if_inner_element']) ) {
+									    $element = $new_args['if_inner_element'];
+								    }else {
+									    $element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+								    }
+
+								    unset($new_args['inner_element']);
+								    echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
+								    echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+
+							       // echo "} ),";
+
+							    }else{
+								    echo "\n el( '" . $new_args['element'] . "', {";
+							    }
+
+
+							    // get the attributes
+							    foreach ( $new_args as $new_key => $new_value ) {
+
+
+								    if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+									    // do nothing
+								    } else {
+									    echo $this->block_element( array( $new_key => $new_value ),$save );
+								    }
+							    }
+
+							    echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+
+							    // get the content
+							    $first_item = 0;
+							    foreach ( $new_args as $new_key => $new_value ) {
+								    if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+
+									    if ( $new_key === 'content' ) {
+										    echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+									    }else if ( $new_key === 'if_content' ) {
+										    echo  $this->block_props_replace(  $new_value  );
+									    }
+
+									    if ( is_array( $new_value ) ) {
+
+										    if ( isset( $new_value['element_require'] ) ) {
+											    echo str_replace( array(
+													    "'+",
+													    "+'"
+												    ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+											    unset( $new_value['element_require'] );
+										    }
+
+										    if ( isset( $new_value['element_repeat'] ) ) {
+											    $x = 1;
+											    while ( $x <= absint( $new_value['element_repeat'] ) ) {
+												    $this->block_element( array( '' => $new_value ),$save );
+												    $x ++;
+											    }
+										    } else {
+											    $this->block_element( array( '' => $new_value ),$save );
+										    }
+									    }
+									    $first_item ++;
+								    }
+							    }
+
+							    if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
+								    echo "))";// end content
+							    }else{
+								    echo ")";// end content
+							    }
+
+
+							    echo ", \n";
+
+						    }
+					    } else {
+
+						    if ( substr( $element, 0, 3 ) === "if_" ) {
+							    $extra = '';
+							    if( strpos($new_args, '[%WrapClass%]') !== false ){
+								    $new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
+								    $new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+							    }
+							    echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+						    } elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
+							    $new_args = str_replace('[%WrapStyle%]','',$new_args);
+							    echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+    //                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+						    } elseif ( $element == 'style' ) {
+							    echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+						    } elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
+							    $new_args = str_replace('[%WrapClass%]','',$new_args);
+							    echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
+						    } elseif ( $element == 'template' && $new_args ) {
+							    echo $element . ": $new_args,";
+						    } else {
+							    echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+						    }
+
+					    }
+				    }
+			    }
+		    }
+
+		    /**
 		 * Replace block attributes placeholders with the proper naming.
 		 *
 		 * @param $string
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
-			} else {
-				$string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
-			}
+		    public function block_props_replace( $string, $no_wrap = false ) {
+			    if ( $no_wrap ) {
+				    $string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+			    } else {
+				    $string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+			    }
 
-			return $string;
-		}
+			    return $string;
+		    }
 
-		/**
+		    /**
 		 * Outputs the content of the widget
 		 *
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
-			if ( ! is_array( $args ) ) {
-				$args = array();
-			}
-
-			// Get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
-
-			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
-				$no_wrap = true;
-			}
-
-			ob_start();
-			if ( $output && ! $no_wrap ) {
-
-				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
-
-				// Before widget
-				$before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
-
-				// After widget
-				$after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
-
-				echo $before_widget;
-				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
-				}
-				echo $this->output_title( $args, $instance );
-				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo "</span>";
-				}
-				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-				echo $output;
-			} elseif ( $output && $no_wrap ) {
-				echo $output;
-			}
-			$output = ob_get_clean();
-
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
-
-			echo $output;
-		}
-
-		/**
+		    public function widget( $args, $instance ) {
+			    if ( ! is_array( $args ) ) {
+				    $args = array();
+			    }
+
+			    // Get the filtered values
+			    $argument_values = $this->argument_values( $instance );
+			    $argument_values = $this->string_to_bool( $argument_values );
+			    $output          = $this->output( $argument_values, $args );
+
+			    $no_wrap = false;
+			    if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+				    $no_wrap = true;
+			    }
+
+			    ob_start();
+			    if ( $output && ! $no_wrap ) {
+
+				    $class_original = $this->options['widget_ops']['classname'];
+				    $class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+
+				    // Before widget
+				    $before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
+				    $before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
+				    $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+				    $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+
+				    // After widget
+				    $after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
+				    $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+				    $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+
+				    echo $before_widget;
+				    // elementor strips the widget wrapping div so we check for and add it back if needed
+				    if ( $this->is_elementor_widget_output() ) {
+					    // Filter class & attrs for elementor widget output.
+					    $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+					    $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+					    $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+					    $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+					    echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+				    }
+				    echo $this->output_title( $args, $instance );
+				    echo $output;
+				    if ( $this->is_elementor_widget_output() ) {
+					    echo "</span>";
+				    }
+				    echo $after_widget;
+			    } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+				    $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+				    echo $output;
+			    } elseif ( $output && $no_wrap ) {
+				    echo $output;
+			    }
+			    $output = ob_get_clean();
+
+			    $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+
+			    echo $output;
+		    }
+
+		    /**
 		 * Tests if the current output is inside a elementor container.
 		 *
 		 * @return bool
 		 *@since 1.0.4
 		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
+		    public function is_elementor_widget_output() {
+			    $result = false;
+			    if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a elementor preview.
 		 *
 		 * @return bool
 		 *@since 1.0.4
 		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
+		    public function is_elementor_preview() {
+			    $result = false;
+			    if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Divi preview.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
+		    public function is_divi_preview() {
+			    $result = false;
+			    if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Beaver builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
+		    public function is_beaver_preview() {
+			    $result = false;
+			    if ( isset( $_REQUEST['fl_builder'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a siteorigin builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
+		    public function is_siteorigin_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a cornerstone builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.8
 		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
+		    public function is_cornerstone_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a fusion builder preview.
 		 *
 		 * @return bool
 		 *@since 1.1.0
 		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
+		    public function is_fusion_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Oxygen builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.18
 		 */
-		public function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
+		    public function is_oxygen_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Check for Kallyas theme Zion builder preview.
 		 *
 		 * @since 1.1.22
 		 *
 		 * @return bool True when preview page otherwise false.
 		 */
-		public function is_kallyas_zion_preview() {
-			$result = false;
+		    public function is_kallyas_zion_preview() {
+			    $result = false;
 
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
+			    if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Check for Bricks theme builder preview.
 		 *
 		 * @since 1.1.31
 		 *
 		 * @return bool True when preview page otherwise false.
 		 */
-		public function is_bricks_preview() {
-			$result = false;
+		    public function is_bricks_preview() {
+			    $result = false;
 
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
+			    if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * General function to check if we are in a preview situation.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( $this->is_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
-				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-
-		/**
+		    public function is_preview() {
+			    $preview = false;
+			    if ( $this->is_divi_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_elementor_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_beaver_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_siteorigin_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_cornerstone_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_fusion_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_oxygen_preview() ) {
+				    $preview = true;
+			    } elseif( $this->is_kallyas_zion_preview() ) {
+				    $preview = true;
+			    } elseif( $this->is_block_content_call() ) {
+				    $preview = true;
+			    } elseif( $this->is_bricks_preview() ) {
+				    $preview = true;
+			    }
+
+			    return $preview;
+		    }
+
+		    /**
 		 * Output the super title.
 		 *
 		 * @param $args
@@ -4515,174 +4515,174 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-				if ( empty( $instance['widget_title_tag'] ) ) {
-					if ( ! isset( $args['before_title'] ) ) {
-						$args['before_title'] = '';
-					}
-
-					if ( ! isset( $args['after_title'] ) ) {
-						$args['after_title'] = '';
-					}
-
-					$output = $args['before_title'] . $title . $args['after_title'];
-				} else {
-					$tag 			= esc_attr( $instance['widget_title_tag'] );
-					$allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
-					$title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
-
-					// classes
-					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
-					$output = "<$title_tag class='$class' >$title</$title_tag>";
-				}
-
-			}
-
-			return $output;
-		}
-
-		/**
+		    public function output_title( $args, $instance = array() ) {
+			    $output = '';
+			    if ( ! empty( $instance['title'] ) ) {
+				    /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+				    $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+
+				    if ( empty( $instance['widget_title_tag'] ) ) {
+					    if ( ! isset( $args['before_title'] ) ) {
+						    $args['before_title'] = '';
+					    }
+
+					    if ( ! isset( $args['after_title'] ) ) {
+						    $args['after_title'] = '';
+					    }
+
+					    $output = $args['before_title'] . $title . $args['after_title'];
+				    } else {
+					    $tag 			= esc_attr( $instance['widget_title_tag'] );
+					    $allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
+					    $title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
+
+					    // classes
+					    $title_classes = array();
+					    $title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
+					    $title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
+
+					    $class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+					    $output = "<$title_tag class='$class' >$title</$title_tag>";
+				    }
+
+			    }
+
+			    return $output;
+		    }
+
+		    /**
 		 * Outputs the options form inputs for the widget.
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		    public function form( $instance ) {
 
-			// set widget instance
-			$this->instance = $instance;
+			    // set widget instance
+			    $this->instance = $instance;
 
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
+			    // set it as a SD widget
+			    echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
-			$arguments_raw = $this->get_arguments();
+			    echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+			    $arguments_raw = $this->get_arguments();
 
-			if ( is_array( $arguments_raw ) ) {
+			    if ( is_array( $arguments_raw ) ) {
 
-				$arguments = $this->group_arguments( $arguments_raw );
+				    $arguments = $this->group_arguments( $arguments_raw );
 
-				// Do we have sections?
-				$has_sections = $arguments == $arguments_raw ? false : true;
+				    // Do we have sections?
+				    $has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
-					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+				    if ( $has_sections ) {
+					    $panel_count = 0;
+					    foreach ( $arguments as $key => $args ) {
 
-						?>
+						    ?>
 						<script>
 							//							jQuery(this).find("i").toggleClass("fas fa-chevron-up fas fa-chevron-down");jQuery(this).next().toggle();
 						</script>
 						<?php
 
-						$hide       = $panel_count ? ' style="display:none;" ' : '';
-						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+						    $hide       = $panel_count ? ' style="display:none;" ' : '';
+						    $icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
+						    echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+						    echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+						    foreach ( $args as $k => $a ) {
 
-							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
-							$this->widget_inputs_row_end($k, $a);
+							    $this->widget_inputs_row_start($k, $a);
+							    $this->widget_inputs( $a, $instance );
+							    $this->widget_inputs_row_end($k, $a);
 
-						}
+						    }
 
-						echo "</div>";
+						    echo "</div>";
 
-						$panel_count ++;
+						    $panel_count ++;
 
-					}
-				} else {
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
-						$this->widget_inputs_row_end($key, $args);
-					}
-				}
+					    }
+				    } else {
+					    foreach ( $arguments as $key => $args ) {
+						    $this->widget_inputs_row_start($key, $args);
+						    $this->widget_inputs( $args, $instance );
+						    $this->widget_inputs_row_end($key, $args);
+					    }
+				    }
 
-			}
-		}
+			    }
+		    }
 
-		public function widget_inputs_row_start( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe open
-				if ( ! empty( $args['row']['open'] ) ) {
-					?>
-					<div class='bsui sd-argument' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
+		    public function widget_inputs_row_start( $key, $args ) {
+			    if ( ! empty( $args['row'] ) ) {
+				    // Maybe open
+				    if ( ! empty( $args['row']['open'] ) ) {
+					    ?>
+    					<div class='bsui sd-argument' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
 					<?php if ( ! empty( $args['row']['title'] ) ) { ?>
-					<?php
-						if ( isset( $args['row']['icon'] ) ) {
-							$args['row']['icon'] = '';
-						}
-
-						if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
-							$args['row']['device_type'] = $args['device_type'];
-						}
-					?>
-					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+    					<?php
+						    if ( isset( $args['row']['icon'] ) ) {
+							    $args['row']['icon'] = '';
+						    }
+
+						    if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+							    $args['row']['device_type'] = $args['device_type'];
+						    }
+					    ?>
+    					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
 					<?php } ?>
-					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
+    					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
 					<div class='col pr-2'>
 					<?php
-				} else if ( ! empty( $args['row']['close'] ) ) {
-					echo "<div class='col pl-0 ps-0'>";
-				} else {
-					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
-				}
-			}
-		}
-
-		public function widget_inputs_row_end( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe close
-				if ( ! empty( $args['row']['close'] ) ) {
-					echo "</div></div>";
-				}
-				echo "</div>";
-			}
-		}
-
-		/**
+				    } else if ( ! empty( $args['row']['close'] ) ) {
+					    echo "<div class='col pl-0 ps-0'>";
+				    } else {
+					    echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
+				    }
+			    }
+		    }
+
+		    public function widget_inputs_row_end( $key, $args ) {
+			    if ( ! empty( $args['row'] ) ) {
+				    // Maybe close
+				    if ( ! empty( $args['row']['close'] ) ) {
+					    echo "</div></div>";
+				    }
+				    echo "</div>";
+			    }
+		    }
+
+		    /**
 		 * Get the hidden input that when added makes the advanced button show on widget settings.
 		 *
 		 * @return string
 		 */
-		public function widget_advanced_toggle() {
+		    public function widget_advanced_toggle() {
 
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
+			    $output = '';
+			    if ( $this->block_show_advanced() ) {
+				    $val = 1;
+			    } else {
+				    $val = 0;
+			    }
 
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+			    $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
 
-			return $output;
-		}
+			    return $output;
+		    }
 
-		/**
+		    /**
 		 * Convert require element.
 		 *
 		 * @param string $input Input element.
@@ -4691,67 +4691,67 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+		    public function convert_element_require( $input ) {
+			    $input = str_replace( "'", '"', $input );// we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()",
-				"\"]').find('input:checked').val()"
-			), $input ) );
+			    $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+				    "jQuery(form).find('[data-argument=\"",
+				    "\"]').find('input,select,textarea').val()",
+				    "\"]').find('input:checked').val()"
+			    ), $input ) );
 
-			return $output;
-		}
+			    return $output;
+		    }
 
-		/**
+		    /**
 		 * Builds the inputs for the widget options.
 		 *
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
-
-			$class             = "";
-			$element_require   = "";
-			$custom_attributes = "";
-
-			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
-			} else {
-				$value = '';
-			}
-
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
-
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
-
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
-
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
-
-			// before wrapper
-			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>" data-argument='<?php echo esc_attr( $args['name'] ); ?>' data-element_require='<?php if ( $element_require ) { echo $this->convert_element_require( $element_require );} ?>'>
+		    public function widget_inputs( $args, $instance ) {
+
+			    $class             = "";
+			    $element_require   = "";
+			    $custom_attributes = "";
+
+			    // get value
+			    if ( isset( $instance[ $args['name'] ] ) ) {
+				    $value = $instance[ $args['name'] ];
+			    } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+				    $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			    } else {
+				    $value = '';
+			    }
+
+			    // get placeholder
+			    if ( ! empty( $args['placeholder'] ) ) {
+				    $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			    } else {
+				    $placeholder = '';
+			    }
+
+			    // get if advanced
+			    if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+				    $class .= " sd-advanced-setting ";
+			    }
+
+			    // element_require
+			    if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+				    $element_require = $args['element_require'];
+			    }
+
+			    // custom_attributes
+			    if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+				    $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			    }
+
+			    // before wrapper
+			    ?>
+    			<p class="sd-argument <?php echo esc_attr( $class ); ?>" data-argument='<?php echo esc_attr( $args['name'] ); ?>' data-element_require='<?php if ( $element_require ) { echo $this->convert_element_require( $element_require );} ?>'>
 			<?php
-			switch ( $args['type'] ) {
-				//array('text','password','number','email','tel','url','color')
+			    switch ( $args['type'] ) {
+				    //array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
 				case "number":
@@ -4815,7 +4815,7 @@ 
 					break;
 				default:
 					echo "No input type found!"; // @todo we need to add more input types.
-			}
+			    }
 			// after wrapper
 			?></p><?php
 		}