Inspection of "fix taxes not recalculated when updating vat numbe..." - AyeCode/invoicing - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 3509e3...039fc1 )

by Brian

created 2023-09-18 09:38 UTC

Status

Spacing +98 added lines, -98 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,79 +21,79 @@  discard block
 block discarded – undo
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+		$invoice  = new WPInv_Invoice($post);
+		$customer = $invoice->exists() ? $invoice->get_user_id('edit') : get_current_user_id();
+		$customer = new WP_User($customer);
+		$display  = sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email);
+		wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
 		// Address fields.
 		$address_fields = array(
 			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
+				'label' => __('First Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
+				'label' => __('Last Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
+				'label' => __('Company', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
+				'label' => __('VAT Number', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
+				'label' => __('Address', 'invoicing'),
 				'type'  => 'text',
 			),
 			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
+				'label' => __('City', 'invoicing'),
 				'type'  => 'text',
 			),
 			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
+				'label'       => __('Country', 'invoicing'),
 				'type'        => 'select',
 				'class'       => 'getpaid-recalculate-prices-on-change',
 				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
+				'placeholder' => __('Choose a country', 'invoicing'),
 			),
 			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
+				'label' => __('State', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
+				'label' => __('Zip', 'invoicing'),
 				'type'  => 'text',
 			),
 			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
+				'label' => __('Phone', 'invoicing'),
 				'type'  => 'text',
 			),
 		);
 
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+		$states = wpinv_get_country_states($invoice->get_country('edit'));
 
-		if ( ! empty( $states ) ) {
+		if (!empty($states)) {
 			$address_fields['state']['type']        = 'select';
 			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+			$address_fields['state']['placeholder'] = __('Choose a state', 'invoicing');
 		}
 
 		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
+		if (!wpinv_use_taxes()) {
+			unset($address_fields['vat_number']);
 		}
 
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+		$address_fields = apply_filters('getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice);
 		?>
 
 		<style>
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
 						<div class="col-12 col-sm-6">
 							<div id="getpaid-invoice-user-id-wrapper" class="form-group mb-3">
 								<div>
-									<label for="post_author_override"><?php esc_html_e( 'Customer', 'invoicing' ); ?></label>
+									<label for="post_author_override"><?php esc_html_e('Customer', 'invoicing'); ?></label>
 								</div>
 								<div>
-									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e( 'Search for a customer by email or name', 'invoicing' ); ?>">
-										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html( $display ); ?> </option>)
+									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e('Search for a customer by email or name', 'invoicing'); ?>">
+										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html($display); ?> </option>)
 									</select>
 								</div>
 							</div>
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
 											'type'        => 'text',
 											'id'          => 'getpaid-invoice-new-user-email',
 											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+											'label'       => __('Email', 'invoicing') . '<span class="required">*</span>',
 											'label_type'  => 'vertical',
 											'placeholder' => '[email protected]',
 											'class'       => 'form-control-sm',
@@ -135,36 +135,36 @@  discard block
 block discarded – undo
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
-							<?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
+							<?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
 								<a id="getpaid-invoice-fill-user-details" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-refresh"></i>
-									<?php esc_html_e( 'Fill User Details', 'invoicing' ); ?>
+									<?php esc_html_e('Fill User Details', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-create-new-user-button" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-plus"></i>
-									<?php esc_html_e( 'Add New User', 'invoicing' ); ?>
+									<?php esc_html_e('Add New User', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-cancel-create-new-user" class="button button-small button-secondary d-none" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-close"></i>
-									<?php esc_html_e( 'Cancel', 'invoicing' ); ?>
+									<?php esc_html_e('Cancel', 'invoicing'); ?>
 								</a>
 							<?php endif; ?>
 						</div>
 
-						<?php foreach ( $address_fields as $key => $field ) : ?>
-							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
+						<?php foreach ($address_fields as $key => $field) : ?>
+							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr($key); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
+									if ('select' === $field['type']) {
 										aui()->select(
 											array(
 												'id'               => 'wpinv_' . $key,
 												'name'             => 'wpinv_' . $key,
 												'label'            => $field['label'],
 												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
+												'placeholder'      => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'            => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'            => $invoice->get($key, 'edit'),
 												'options'          => $field['options'],
 												'data-allow-clear' => 'false',
 												'select2'          => true,
@@ -179,9 +179,9 @@  discard block
 block discarded – undo
 												'name'        => 'wpinv_' . $key,
 												'label'       => $field['label'],
 												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
+												'placeholder' => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'       => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'       => $invoice->get($key, 'edit'),
 											),
 											true
 										);
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
 						<?php endforeach; ?>
 					</div>
 
-					<?php if ( ! apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) : ?>
-						<?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+					<?php if (!apply_filters('getpaid_use_new_invoice_items_metabox', false)) : ?>
+						<?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
 						<div class="row">
 							<div class="col-12 col-sm-6">
@@ -202,14 +202,14 @@  discard block
 block discarded – undo
 										array(
 											'id'          => 'wpinv_template',
 											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
+											'label'       => __('Template', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
+											'placeholder' => __('Choose a template', 'invoicing'),
 											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
+											'value'       => $invoice->get_template('edit'),
 											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
+												'quantity' => __('Quantity', 'invoicing'),
+												'hours'    => __('Hours', 'invoicing'),
 											),
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -226,11 +226,11 @@  discard block
 block discarded – undo
 										array(
 											'id'          => 'wpinv_currency',
 											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
+											'label'       => __('Currency', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+											'placeholder' => __('Select Invoice Currency', 'invoicing'),
 											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
+											'value'       => $invoice->get_currency('edit'),
 											'required'    => false,
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
 							</div>
 						</div>
 
-						<?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+						<?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
 					<?php endif; ?>
 
 					<div class="row">
@@ -254,11 +254,11 @@  discard block
 block discarded – undo
 										'type'        => 'text',
 										'id'          => 'wpinv_company_id',
 										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
+										'label'       => __('Company ID', 'invoicing'),
 										'label_type'  => 'vertical',
 										'placeholder' => '',
 										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
+										'value'       => $invoice->get_company_id('edit'),
 									),
 									true
 								);
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
 						</div>
 					</div>
 
-					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
+					<?php do_action('getpaid_after_metabox_invoice_address', $invoice); ?>
 			</div>
 		<?php
 	}
@@ -277,51 +277,51 @@  discard block
 block discarded – undo
 	 * @param int $post_id
 	 * @param array $posted the posted data.
 	 */
-	public static function save( $post_id, $posted ) {
+	public static function save($post_id, $posted) {
 
 		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
 		// Load new data.
 		$invoice->set_props(
 			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+				'template'       => isset($posted['wpinv_template']) ? wpinv_clean($posted['wpinv_template']) : null,
+				'email_cc'       => isset($posted['wpinv_cc']) ? wpinv_clean($posted['wpinv_cc']) : null,
+				'disable_taxes'  => !empty($posted['disable_taxes']),
+				'currency'       => isset($posted['wpinv_currency']) ? wpinv_clean($posted['wpinv_currency']) : null,
+				'gateway'        => ($invoice->needs_payment() && isset($posted['wpinv_gateway'])) ? wpinv_clean($posted['wpinv_gateway']) : null,
+				'address'        => isset($posted['wpinv_address']) ? wpinv_clean($posted['wpinv_address']) : null,
+				'vat_number'     => isset($posted['wpinv_vat_number']) ? wpinv_clean($posted['wpinv_vat_number']) : null,
+				'company'        => isset($posted['wpinv_company']) ? wpinv_clean($posted['wpinv_company']) : null,
+				'company_id'     => isset($posted['wpinv_company_id']) ? wpinv_clean($posted['wpinv_company_id']) : null,
+				'zip'            => isset($posted['wpinv_zip']) ? wpinv_clean($posted['wpinv_zip']) : null,
+				'state'          => isset($posted['wpinv_state']) ? wpinv_clean($posted['wpinv_state']) : null,
+				'city'           => isset($posted['wpinv_city']) ? wpinv_clean($posted['wpinv_city']) : null,
+				'country'        => isset($posted['wpinv_country']) ? wpinv_clean($posted['wpinv_country']) : null,
+				'phone'          => isset($posted['wpinv_phone']) ? wpinv_clean($posted['wpinv_phone']) : null,
+				'first_name'     => isset($posted['wpinv_first_name']) ? wpinv_clean($posted['wpinv_first_name']) : null,
+				'last_name'      => isset($posted['wpinv_last_name']) ? wpinv_clean($posted['wpinv_last_name']) : null,
+				'author'         => isset($posted['post_author_override']) ? wpinv_clean($posted['post_author_override']) : null,
+				'date_created'   => isset($posted['date_created']) ? wpinv_clean($posted['date_created']) : null,
+				'date_completed' => isset($posted['wpinv_date_completed']) ? wpinv_clean($posted['wpinv_date_completed']) : null,
+				'due_date'       => isset($posted['wpinv_due_date']) ? wpinv_clean($posted['wpinv_due_date']) : null,
+				'number'         => isset($posted['wpinv_number']) ? wpinv_clean($posted['wpinv_number']) : null,
+				'status'         => isset($posted['wpinv_status']) ? wpinv_clean($posted['wpinv_status']) : null,
 			)
 		);
 
 		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+		if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+			if (isset($posted['wpinv_discount_code'])) {
+				$invoice->set_discount_code(wpinv_clean($posted['wpinv_discount_code']));
 			}
 
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if ($discount->exists()) {
+				$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			} else {
-				$invoice->remove_discount( 'discount_code' );
+				$invoice->remove_discount('discount_code');
 			}
 
 			// Recalculate totals.
@@ -330,16 +330,16 @@  discard block
 block discarded – undo
 		}
 
 		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+		if (!empty($posted['wpinv_new_user']) && is_email(stripslashes($posted['wpinv_email']))) {
 
 			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+			$user = wpinv_create_user(sanitize_email(stripslashes($posted['wpinv_email'])), $invoice->get_first_name() . $invoice->get_last_name());
 
 			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
+			if (is_numeric($user)) {
+				$invoice->set_author($user);
 			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+				wpinv_error_log($user->get_error_message(), __('Invoice add new user', 'invoicing'), __FILE__, __LINE__);
 			}
 		}
 
@@ -350,22 +350,22 @@  discard block
 block discarded – undo
 		$invoice->save();
 
 		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
+		getpaid_save_invoice_user_address($invoice);
 
 		// Undo do not send new invoice notifications.
 		$GLOBALS['wpinv_skip_invoice_notification'] = false;
 
 		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
+		$should_send_notification = wpinv_get_option('disable_new_user_emails');
+		if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification))) {
+			wp_send_new_user_notifications($user, 'user');
 		}
 
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+		if (!empty($posted['send_to_customer']) && !$invoice->is_draft()) {
+			getpaid()->get('invoice_emails')->user_invoice($invoice, true);
 		}
 
 		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
+		do_action('wpinv_invoice_metabox_saved', $invoice);
 	}
 }

Please login to merge, or discard this patch.

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	*
8	8	*/
9	9
10		-if ( ! defined( 'ABSPATH' ) ) {
	10	+if (!defined('ABSPATH')) {
11	11	exit; // Exit if accessed directly
12	12	}
13	13
		@@ -21,79 +21,79 @@ discard block
		block discarded – undo
21	21	*
22	22	* @param WP_Post $post
23	23	*/
24		- public static function output( $post ) {
	24	+ public static function output($post) {
25	25
26	26	// Prepare the invoice.
27		- $invoice = new WPInv_Invoice( $post );
28		- $customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
29		- $customer = new WP_User( $customer );
30		- $display = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
31		- wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
	27	+ $invoice = new WPInv_Invoice($post);
	28	+ $customer = $invoice->exists() ? $invoice->get_user_id('edit') : get_current_user_id();
	29	+ $customer = new WP_User($customer);
	30	+ $display = sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email);
	31	+ wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
32	32
33	33	// Address fields.
34	34	$address_fields = array(
35	35	'first_name' => array(
36		- 'label' => __( 'First Name', 'invoicing' ),
	36	+ 'label' => __('First Name', 'invoicing'),
37	37	'type' => 'text',
38	38	),
39	39	'last_name' => array(
40		- 'label' => __( 'Last Name', 'invoicing' ),
	40	+ 'label' => __('Last Name', 'invoicing'),
41	41	'type' => 'text',
42	42	),
43	43	'company' => array(
44		- 'label' => __( 'Company', 'invoicing' ),
	44	+ 'label' => __('Company', 'invoicing'),
45	45	'type' => 'text',
46	46	'class' => 'getpaid-recalculate-prices-on-change',
47	47	),
48	48	'vat_number' => array(
49		- 'label' => __( 'VAT Number', 'invoicing' ),
	49	+ 'label' => __('VAT Number', 'invoicing'),
50	50	'type' => 'text',
51	51	'class' => 'getpaid-recalculate-prices-on-change',
52	52	),
53	53	'address' => array(
54		- 'label' => __( 'Address', 'invoicing' ),
	54	+ 'label' => __('Address', 'invoicing'),
55	55	'type' => 'text',
56	56	),
57	57	'city' => array(
58		- 'label' => __( 'City', 'invoicing' ),
	58	+ 'label' => __('City', 'invoicing'),
59	59	'type' => 'text',
60	60	),
61	61	'country' => array(
62		- 'label' => __( 'Country', 'invoicing' ),
	62	+ 'label' => __('Country', 'invoicing'),
63	63	'type' => 'select',
64	64	'class' => 'getpaid-recalculate-prices-on-change',
65	65	'options' => wpinv_get_country_list(),
66		- 'placeholder' => __( 'Choose a country', 'invoicing' ),
	66	+ 'placeholder' => __('Choose a country', 'invoicing'),
67	67	),
68	68	'state' => array(
69		- 'label' => __( 'State', 'invoicing' ),
	69	+ 'label' => __('State', 'invoicing'),
70	70	'type' => 'text',
71	71	'class' => 'getpaid-recalculate-prices-on-change',
72	72	),
73	73	'zip' => array(
74		- 'label' => __( 'Zip', 'invoicing' ),
	74	+ 'label' => __('Zip', 'invoicing'),
75	75	'type' => 'text',
76	76	),
77	77	'phone' => array(
78		- 'label' => __( 'Phone', 'invoicing' ),
	78	+ 'label' => __('Phone', 'invoicing'),
79	79	'type' => 'text',
80	80	),
81	81	);
82	82
83		- $states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
	83	+ $states = wpinv_get_country_states($invoice->get_country('edit'));
84	84
85		- if ( ! empty( $states ) ) {
	85	+ if (!empty($states)) {
86	86	$address_fields['state']['type'] = 'select';
87	87	$address_fields['state']['options'] = $states;
88		- $address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
	88	+ $address_fields['state']['placeholder'] = __('Choose a state', 'invoicing');
89	89	}
90	90
91	91	// Maybe remove the VAT field.
92		- if ( ! wpinv_use_taxes() ) {
93		- unset( $address_fields['vat_number'] );
	92	+ if (!wpinv_use_taxes()) {
	93	+ unset($address_fields['vat_number']);
94	94	}
95	95
96		- $address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
	96	+ $address_fields = apply_filters('getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice);
97	97	?>
98	98
99	99	<style>
		@@ -107,11 +107,11 @@ discard block
		block discarded – undo
107	107	<div class="col-12 col-sm-6">
108	108	<div id="getpaid-invoice-user-id-wrapper" class="form-group mb-3">
109	109	<div>
110		- <label for="post_author_override"><?php esc_html_e( 'Customer', 'invoicing' ); ?></label>
	110	+ <label for="post_author_override"><?php esc_html_e('Customer', 'invoicing'); ?></label>
111	111	</div>
112	112	<div>
113		- <select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e( 'Search for a customer by email or name', 'invoicing' ); ?>">
114		- <option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html( $display ); ?> </option>)
	113	+ <select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e('Search for a customer by email or name', 'invoicing'); ?>">
	114	+ <option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html($display); ?> </option>)
115	115	</select>
116	116	</div>
117	117	</div>
		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	'type' => 'text',
125	125	'id' => 'getpaid-invoice-new-user-email',
126	126	'name' => 'wpinv_email',
127		- 'label' => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
	127	+ 'label' => __('Email', 'invoicing') . '<span class="required">*</span>',
128	128	'label_type' => 'vertical',
129	129	'placeholder' => '[email protected]',
130	130	'class' => 'form-control-sm',
		@@ -135,36 +135,36 @@ discard block
		block discarded – undo
135	135	</div>
136	136	</div>
137	137	<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
138		- <?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
	138	+ <?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
139	139	<a id="getpaid-invoice-fill-user-details" class="button button-small button-secondary" href="javascript:void(0)">
140	140	<i aria-hidden="true" class="fa fa-refresh"></i>
141		- <?php esc_html_e( 'Fill User Details', 'invoicing' ); ?>
	141	+ <?php esc_html_e('Fill User Details', 'invoicing'); ?>
142	142	</a>
143	143	<a id="getpaid-invoice-create-new-user-button" class="button button-small button-secondary" href="javascript:void(0)">
144	144	<i aria-hidden="true" class="fa fa-plus"></i>
145		- <?php esc_html_e( 'Add New User', 'invoicing' ); ?>
	145	+ <?php esc_html_e('Add New User', 'invoicing'); ?>
146	146	</a>
147	147	<a id="getpaid-invoice-cancel-create-new-user" class="button button-small button-secondary d-none" href="javascript:void(0)">
148	148	<i aria-hidden="true" class="fa fa-close"></i>
149		- <?php esc_html_e( 'Cancel', 'invoicing' ); ?>
	149	+ <?php esc_html_e('Cancel', 'invoicing'); ?>
150	150	</a>
151	151	<?php endif; ?>
152	152	</div>
153	153
154		- <?php foreach ( $address_fields as $key => $field ) : ?>
155		- <div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
	154	+ <?php foreach ($address_fields as $key => $field) : ?>
	155	+ <div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr($key); ?>--wrapper">
156	156	<?php
157	157
158		- if ( 'select' === $field['type'] ) {
	158	+ if ('select' === $field['type']) {
159	159	aui()->select(
160	160	array(
161	161	'id' => 'wpinv_' . $key,
162	162	'name' => 'wpinv_' . $key,
163	163	'label' => $field['label'],
164	164	'label_type' => 'vertical',
165		- 'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
166		- 'class' => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
167		- 'value' => $invoice->get( $key, 'edit' ),
	165	+ 'placeholder' => isset($field['placeholder']) ? $field['placeholder'] : '',
	166	+ 'class' => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
	167	+ 'value' => $invoice->get($key, 'edit'),
168	168	'options' => $field['options'],
169	169	'data-allow-clear' => 'false',
170	170	'select2' => true,
		@@ -179,9 +179,9 @@ discard block
		block discarded – undo
179	179	'name' => 'wpinv_' . $key,
180	180	'label' => $field['label'],
181	181	'label_type' => 'vertical',
182		- 'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
183		- 'class' => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
184		- 'value' => $invoice->get( $key, 'edit' ),
	182	+ 'placeholder' => isset($field['placeholder']) ? $field['placeholder'] : '',
	183	+ 'class' => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
	184	+ 'value' => $invoice->get($key, 'edit'),
185	185	),
186	186	true
187	187	);
		@@ -192,8 +192,8 @@ discard block
		block discarded – undo
192	192	<?php endforeach; ?>
193	193	</div>
194	194
195		- <?php if ( ! apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) : ?>
196		- <?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
	195	+ <?php if (!apply_filters('getpaid_use_new_invoice_items_metabox', false)) : ?>
	196	+ <?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
197	197
198	198	<div class="row">
199	199	<div class="col-12 col-sm-6">
		@@ -202,14 +202,14 @@ discard block
		block discarded – undo
202	202	array(
203	203	'id' => 'wpinv_template',
204	204	'name' => 'wpinv_template',
205		- 'label' => __( 'Template', 'invoicing' ),
	205	+ 'label' => __('Template', 'invoicing'),
206	206	'label_type' => 'vertical',
207		- 'placeholder' => __( 'Choose a template', 'invoicing' ),
	207	+ 'placeholder' => __('Choose a template', 'invoicing'),
208	208	'class' => 'form-control-sm',
209		- 'value' => $invoice->get_template( 'edit' ),
	209	+ 'value' => $invoice->get_template('edit'),
210	210	'options' => array(
211		- 'quantity' => __( 'Quantity', 'invoicing' ),
212		- 'hours' => __( 'Hours', 'invoicing' ),
	211	+ 'quantity' => __('Quantity', 'invoicing'),
	212	+ 'hours' => __('Hours', 'invoicing'),
213	213	),
214	214	'data-allow-clear' => 'false',
215	215	'select2' => true,
		@@ -226,11 +226,11 @@ discard block
		block discarded – undo
226	226	array(
227	227	'id' => 'wpinv_currency',
228	228	'name' => 'wpinv_currency',
229		- 'label' => __( 'Currency', 'invoicing' ),
	229	+ 'label' => __('Currency', 'invoicing'),
230	230	'label_type' => 'vertical',
231		- 'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
	231	+ 'placeholder' => __('Select Invoice Currency', 'invoicing'),
232	232	'class' => 'form-control-sm getpaid-recalculate-prices-on-change',
233		- 'value' => $invoice->get_currency( 'edit' ),
	233	+ 'value' => $invoice->get_currency('edit'),
234	234	'required' => false,
235	235	'data-allow-clear' => 'false',
236	236	'select2' => true,
		@@ -243,7 +243,7 @@ discard block
		block discarded – undo
243	243	</div>
244	244	</div>
245	245
246		- <?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
	246	+ <?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
247	247	<?php endif; ?>
248	248
249	249	<div class="row">
		@@ -254,11 +254,11 @@ discard block
		block discarded – undo
254	254	'type' => 'text',
255	255	'id' => 'wpinv_company_id',
256	256	'name' => 'wpinv_company_id',
257		- 'label' => __( 'Company ID', 'invoicing' ),
	257	+ 'label' => __('Company ID', 'invoicing'),
258	258	'label_type' => 'vertical',
259	259	'placeholder' => '',
260	260	'class' => 'form-control-sm',
261		- 'value' => $invoice->get_company_id( 'edit' ),
	261	+ 'value' => $invoice->get_company_id('edit'),
262	262	),
263	263	true
264	264	);
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	</div>
267	267	</div>
268	268
269		- <?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
	269	+ <?php do_action('getpaid_after_metabox_invoice_address', $invoice); ?>
270	270	</div>
271	271	<?php
272	272	}
		@@ -277,51 +277,51 @@ discard block
		block discarded – undo
277	277	* @param int $post_id
278	278	* @param array $posted the posted data.
279	279	*/
280		- public static function save( $post_id, $posted ) {
	280	+ public static function save($post_id, $posted) {
281	281
282	282	// Prepare the invoice.
283		- $invoice = new WPInv_Invoice( $post_id );
	283	+ $invoice = new WPInv_Invoice($post_id);
284	284
285	285	// Load new data.
286	286	$invoice->set_props(
287	287	array(
288		- 'template' => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
289		- 'email_cc' => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
290		- 'disable_taxes' => ! empty( $posted['disable_taxes'] ),
291		- 'currency' => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
292		- 'gateway' => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
293		- 'address' => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
294		- 'vat_number' => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
295		- 'company' => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
296		- 'company_id' => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
297		- 'zip' => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
298		- 'state' => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
299		- 'city' => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
300		- 'country' => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
301		- 'phone' => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
302		- 'first_name' => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
303		- 'last_name' => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
304		- 'author' => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
305		- 'date_created' => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
306		- 'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
307		- 'due_date' => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
308		- 'number' => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
309		- 'status' => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
	288	+ 'template' => isset($posted['wpinv_template']) ? wpinv_clean($posted['wpinv_template']) : null,
	289	+ 'email_cc' => isset($posted['wpinv_cc']) ? wpinv_clean($posted['wpinv_cc']) : null,
	290	+ 'disable_taxes' => !empty($posted['disable_taxes']),
	291	+ 'currency' => isset($posted['wpinv_currency']) ? wpinv_clean($posted['wpinv_currency']) : null,
	292	+ 'gateway' => ($invoice->needs_payment() && isset($posted['wpinv_gateway'])) ? wpinv_clean($posted['wpinv_gateway']) : null,
	293	+ 'address' => isset($posted['wpinv_address']) ? wpinv_clean($posted['wpinv_address']) : null,
	294	+ 'vat_number' => isset($posted['wpinv_vat_number']) ? wpinv_clean($posted['wpinv_vat_number']) : null,
	295	+ 'company' => isset($posted['wpinv_company']) ? wpinv_clean($posted['wpinv_company']) : null,
	296	+ 'company_id' => isset($posted['wpinv_company_id']) ? wpinv_clean($posted['wpinv_company_id']) : null,
	297	+ 'zip' => isset($posted['wpinv_zip']) ? wpinv_clean($posted['wpinv_zip']) : null,
	298	+ 'state' => isset($posted['wpinv_state']) ? wpinv_clean($posted['wpinv_state']) : null,
	299	+ 'city' => isset($posted['wpinv_city']) ? wpinv_clean($posted['wpinv_city']) : null,
	300	+ 'country' => isset($posted['wpinv_country']) ? wpinv_clean($posted['wpinv_country']) : null,
	301	+ 'phone' => isset($posted['wpinv_phone']) ? wpinv_clean($posted['wpinv_phone']) : null,
	302	+ 'first_name' => isset($posted['wpinv_first_name']) ? wpinv_clean($posted['wpinv_first_name']) : null,
	303	+ 'last_name' => isset($posted['wpinv_last_name']) ? wpinv_clean($posted['wpinv_last_name']) : null,
	304	+ 'author' => isset($posted['post_author_override']) ? wpinv_clean($posted['post_author_override']) : null,
	305	+ 'date_created' => isset($posted['date_created']) ? wpinv_clean($posted['date_created']) : null,
	306	+ 'date_completed' => isset($posted['wpinv_date_completed']) ? wpinv_clean($posted['wpinv_date_completed']) : null,
	307	+ 'due_date' => isset($posted['wpinv_due_date']) ? wpinv_clean($posted['wpinv_due_date']) : null,
	308	+ 'number' => isset($posted['wpinv_number']) ? wpinv_clean($posted['wpinv_number']) : null,
	309	+ 'status' => isset($posted['wpinv_status']) ? wpinv_clean($posted['wpinv_status']) : null,
310	310	)
311	311	);
312	312
313	313	// Discount code.
314		- if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
	314	+ if (!$invoice->is_paid() && !$invoice->is_refunded()) {
315	315
316		- if ( isset( $posted['wpinv_discount_code'] ) ) {
317		- $invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
	316	+ if (isset($posted['wpinv_discount_code'])) {
	317	+ $invoice->set_discount_code(wpinv_clean($posted['wpinv_discount_code']));
318	318	}
319	319
320		- $discount = new WPInv_Discount( $invoice->get_discount_code() );
321		- if ( $discount->exists() ) {
322		- $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
	320	+ $discount = new WPInv_Discount($invoice->get_discount_code());
	321	+ if ($discount->exists()) {
	322	+ $invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
323	323	} else {
324		- $invoice->remove_discount( 'discount_code' );
	324	+ $invoice->remove_discount('discount_code');
325	325	}
326	326
327	327	// Recalculate totals.
		@@ -330,16 +330,16 @@ discard block
		block discarded – undo
330	330	}
331	331
332	332	// If we're creating a new user...
333		- if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
	333	+ if (!empty($posted['wpinv_new_user']) && is_email(stripslashes($posted['wpinv_email']))) {
334	334
335	335	// Attempt to create the user.
336		- $user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
	336	+ $user = wpinv_create_user(sanitize_email(stripslashes($posted['wpinv_email'])), $invoice->get_first_name() . $invoice->get_last_name());
337	337
338	338	// If successful, update the invoice author.
339		- if ( is_numeric( $user ) ) {
340		- $invoice->set_author( $user );
	339	+ if (is_numeric($user)) {
	340	+ $invoice->set_author($user);
341	341	} else {
342		- wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
	342	+ wpinv_error_log($user->get_error_message(), __('Invoice add new user', 'invoicing'), __FILE__, __LINE__);
343	343	}
344	344	}
345	345
		@@ -350,22 +350,22 @@ discard block
		block discarded – undo
350	350	$invoice->save();
351	351
352	352	// Save the user address.
353		- getpaid_save_invoice_user_address( $invoice );
	353	+ getpaid_save_invoice_user_address($invoice);
354	354
355	355	// Undo do not send new invoice notifications.
356	356	$GLOBALS['wpinv_skip_invoice_notification'] = false;
357	357
358	358	// (Maybe) send new user notification.
359		- $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
360		- if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
361		- wp_send_new_user_notifications( $user, 'user' );
	359	+ $should_send_notification = wpinv_get_option('disable_new_user_emails');
	360	+ if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification))) {
	361	+ wp_send_new_user_notifications($user, 'user');
362	362	}
363	363
364		- if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
365		- getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
	364	+ if (!empty($posted['send_to_customer']) && !$invoice->is_draft()) {
	365	+ getpaid()->get('invoice_emails')->user_invoice($invoice, true);
366	366	}
367	367
368	368	// Fires after an invoice is saved.
369		- do_action( 'wpinv_invoice_metabox_saved', $invoice );
	369	+ do_action('wpinv_invoice_metabox_saved', $invoice);
370	370	}
371	371	}

AyeCode / invoicing

Push — master ( 3509e3...039fc1 )

Status

Category

Spacing +98 added lines, -98 removed lines patch added patch discarded remove patch