AyeCode /
invoicing
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // don't load directly |
| 3 | -if ( !defined('ABSPATH') ) |
|
| 3 | +if (!defined('ABSPATH')) |
|
| 4 | 4 | die('-1'); |
| 5 | 5 | |
| 6 | -$email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text' ) ); |
|
| 7 | -$email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : ''; |
|
| 6 | +$email_footer = apply_filters('wpinv_email_footer_text', wpinv_get_option('email_footer_text')); |
|
| 7 | +$email_footer = $email_footer ? wpautop(wp_kses_post(wptexturize($email_footer))) : ''; |
|
| 8 | 8 | ?> |
| 9 | 9 | </div> |
| 10 | 10 | </td> |
@@ -1,7 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // don't load directly |
| 3 | -if ( !defined('ABSPATH') ) |
|
| 3 | +if ( !defined('ABSPATH') ) { |
|
| 4 | 4 | die('-1'); |
| 5 | +} |
|
| 5 | 6 | |
| 6 | 7 | $email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text' ) ); |
| 7 | 8 | $email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : ''; |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | // don't load directly |
| 3 | -if ( !defined('ABSPATH') ) |
|
| 3 | +if (!defined('ABSPATH')) |
|
| 4 | 4 | die('-1'); |
| 5 | 5 | |
| 6 | -if ( !isset( $email_heading ) ) { |
|
| 6 | +if (!isset($email_heading)) { |
|
| 7 | 7 | global $email_heading; |
| 8 | 8 | } |
| 9 | 9 | ?> |
| 10 | 10 | <!DOCTYPE html> |
| 11 | 11 | <html dir="<?php echo is_rtl() ? 'rtl' : 'ltr'?>"> |
| 12 | 12 | <head> |
| 13 | - <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo( 'charset' ); ?>" /> |
|
| 13 | + <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" /> |
|
| 14 | 14 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
| 15 | 15 | <meta name="robots" content="noindex,nofollow"> |
| 16 | 16 | <title><?php echo wpinv_get_blogname(); ?></title> |
@@ -22,13 +22,13 @@ discard block |
||
| 22 | 22 | <td align="center" valign="top"> |
| 23 | 23 | <div id="template_header_image"> |
| 24 | 24 | <?php |
| 25 | - if ( $img = wpinv_get_option( 'email_header_image' ) ) { |
|
| 26 | - echo '<p style="margin-top:0;"><img style="max-width:100%" src="' . esc_url( $img ) . '" alt="' . esc_attr( wpinv_get_blogname() ) . '" /></p>'; |
|
| 25 | + if ($img = wpinv_get_option('email_header_image')) { |
|
| 26 | + echo '<p style="margin-top:0;"><img style="max-width:100%" src="' . esc_url($img) . '" alt="' . esc_attr(wpinv_get_blogname()) . '" /></p>'; |
|
| 27 | 27 | } |
| 28 | 28 | ?> |
| 29 | 29 | </div> |
| 30 | 30 | <table border="0" cellpadding="0" cellspacing="0" width="100%" id="template_container"> |
| 31 | - <?php if ( !empty( $email_heading ) ) { ?> |
|
| 31 | + <?php if (!empty($email_heading)) { ?> |
|
| 32 | 32 | <tr> |
| 33 | 33 | <td align="center" valign="top"> |
| 34 | 34 | <!-- Header --> |
@@ -1,7 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // don't load directly |
| 3 | -if ( !defined('ABSPATH') ) |
|
| 3 | +if ( !defined('ABSPATH') ) { |
|
| 4 | 4 | die('-1'); |
| 5 | +} |
|
| 5 | 6 | |
| 6 | 7 | if ( !isset( $email_heading ) ) { |
| 7 | 8 | global $email_heading; |
@@ -1,7 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // don't load directly |
| 3 | -if ( !defined('ABSPATH') ) |
|
| 3 | +if ( !defined('ABSPATH') ) { |
|
| 4 | 4 | die('-1'); |
| 5 | +} |
|
| 5 | 6 | |
| 6 | 7 | do_action( 'wpinv_email_before_billing_details', $invoice ); ?> |
| 7 | 8 | <div id="wpinv-email-billing"> |
@@ -1,41 +1,41 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // don't load directly |
| 3 | -if ( !defined('ABSPATH') ) |
|
| 3 | +if (!defined('ABSPATH')) |
|
| 4 | 4 | die('-1'); |
| 5 | 5 | |
| 6 | -do_action( 'wpinv_email_before_billing_details', $invoice ); ?> |
|
| 6 | +do_action('wpinv_email_before_billing_details', $invoice); ?> |
|
| 7 | 7 | <div id="wpinv-email-billing"> |
| 8 | - <h3 class="wpinv-address-t"><?php echo apply_filters( 'wpinv_email_billing_title', __( 'Billing Details', 'invoicing' ) ); ?></h3> |
|
| 8 | + <h3 class="wpinv-address-t"><?php echo apply_filters('wpinv_email_billing_title', __('Billing Details', 'invoicing')); ?></h3> |
|
| 9 | 9 | |
| 10 | 10 | <table class="table table-bordered table-sm wpi-billing-details"> |
| 11 | 11 | <tbody> |
| 12 | - <?php do_action( 'wpinv_email_billing_fields_first', $invoice ); ?> |
|
| 12 | + <?php do_action('wpinv_email_billing_fields_first', $invoice); ?> |
|
| 13 | 13 | <tr class="wpi-receipt-name"> |
| 14 | - <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th> |
|
| 15 | - <td><?php if ( $sent_to_admin && $invoice->get_user_id() ) { ?><a href="<?php echo esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), self_admin_url( 'user-edit.php' ) ) ) ;?>"><?php echo esc_html( $invoice->get_user_full_name() ); ?></a><?php } else { echo esc_html( $invoice->get_user_full_name() ); } ?></td> |
|
| 14 | + <th class="text-left"><?php _e('Name', 'invoicing'); ?></th> |
|
| 15 | + <td><?php if ($sent_to_admin && $invoice->get_user_id()) { ?><a href="<?php echo esc_url(add_query_arg('user_id', $invoice->get_user_id(), self_admin_url('user-edit.php'))); ?>"><?php echo esc_html($invoice->get_user_full_name()); ?></a><?php } else { echo esc_html($invoice->get_user_full_name()); } ?></td> |
|
| 16 | 16 | </tr> |
| 17 | 17 | <tr class="wpi-receipt-email"> |
| 18 | - <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th> |
|
| 19 | - <td><?php echo $invoice->get_email() ;?></td> |
|
| 18 | + <th class="text-left"><?php _e('Email', 'invoicing'); ?></th> |
|
| 19 | + <td><?php echo $invoice->get_email(); ?></td> |
|
| 20 | 20 | </tr> |
| 21 | - <?php if ( $invoice->get_company() ) { ?> |
|
| 21 | + <?php if ($invoice->get_company()) { ?> |
|
| 22 | 22 | <tr class="wpi-receipt-company"> |
| 23 | - <th class="text-left"><?php _e( 'Company', 'invoicing' ); ?></th> |
|
| 24 | - <td><?php echo esc_html( $invoice->get_company() ) ;?></td> |
|
| 23 | + <th class="text-left"><?php _e('Company', 'invoicing'); ?></th> |
|
| 24 | + <td><?php echo esc_html($invoice->get_company()); ?></td> |
|
| 25 | 25 | </tr> |
| 26 | 26 | <?php } ?> |
| 27 | 27 | <tr class="wpi-receipt-address"> |
| 28 | - <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th> |
|
| 29 | - <td><?php echo wpinv_get_invoice_address_markup( $invoice->get_user_info() ) ;?></td> |
|
| 28 | + <th class="text-left"><?php _e('Address', 'invoicing'); ?></th> |
|
| 29 | + <td><?php echo wpinv_get_invoice_address_markup($invoice->get_user_info()); ?></td> |
|
| 30 | 30 | </tr> |
| 31 | - <?php if ( $invoice->get_phone() ) { ?> |
|
| 31 | + <?php if ($invoice->get_phone()) { ?> |
|
| 32 | 32 | <tr class="wpi-receipt-phone"> |
| 33 | - <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th> |
|
| 34 | - <td><?php echo esc_html( $invoice->get_phone() ) ;?></td> |
|
| 33 | + <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th> |
|
| 34 | + <td><?php echo esc_html($invoice->get_phone()); ?></td> |
|
| 35 | 35 | </tr> |
| 36 | 36 | <?php } ?> |
| 37 | - <?php do_action( 'wpinv_email_billing_fields_last', $invoice ); ?> |
|
| 37 | + <?php do_action('wpinv_email_billing_fields_last', $invoice); ?> |
|
| 38 | 38 | </tbody> |
| 39 | 39 | </table> |
| 40 | 40 | </div> |
| 41 | -<?php do_action( 'wpinv_email_after_billing_details', $invoice ); ?> |
|
| 42 | 41 | \ No newline at end of file |
| 42 | +<?php do_action('wpinv_email_after_billing_details', $invoice); ?> |
|
| 43 | 43 | \ No newline at end of file |
@@ -348,7 +348,7 @@ |
||
| 348 | 348 | |
| 349 | 349 | $query_args = array( 'user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true ); |
| 350 | 350 | if ( !empty( $status ) && $status != 'all' ) { |
| 351 | - $query_args['status'] = $status; |
|
| 351 | + $query_args['status'] = $status; |
|
| 352 | 352 | } |
| 353 | 353 | $invoices = wpinv_get_invoices( apply_filters( 'wpinv_bp_user_invoices_query', $query_args ) ); |
| 354 | 354 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 2 | +if (!defined('ABSPATH')) { |
|
| 3 | 3 | exit; // Exit if accessed directly |
| 4 | 4 | } |
| 5 | 5 | |
@@ -9,42 +9,42 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | public function __construct() { |
| 11 | 11 | |
| 12 | - if ( !defined( 'WPINV_BP_SLUG' ) ) { |
|
| 13 | - define( 'WPINV_BP_SLUG', 'invoices' ); |
|
| 12 | + if (!defined('WPINV_BP_SLUG')) { |
|
| 13 | + define('WPINV_BP_SLUG', 'invoices'); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | - add_action( 'wp_ajax_invoicing_filter', array( $this, 'invoices_content' ) ); |
|
| 17 | - add_action( 'wp_ajax_nopriv_invoicing_filter', array( $this, 'invoices_content' ) ); |
|
| 18 | - add_filter( 'wpinv_settings_sections_general', array( $this, 'bp_section' ), 10, 1 ); |
|
| 19 | - add_filter( 'wpinv_settings_general', array( $this, 'bp_settings' ), 10, 1 ); |
|
| 20 | - add_filter( 'wp_nav_menu_objects', array( $this, 'wp_nav_menu_objects' ), 10, 2 ); |
|
| 16 | + add_action('wp_ajax_invoicing_filter', array($this, 'invoices_content')); |
|
| 17 | + add_action('wp_ajax_nopriv_invoicing_filter', array($this, 'invoices_content')); |
|
| 18 | + add_filter('wpinv_settings_sections_general', array($this, 'bp_section'), 10, 1); |
|
| 19 | + add_filter('wpinv_settings_general', array($this, 'bp_settings'), 10, 1); |
|
| 20 | + add_filter('wp_nav_menu_objects', array($this, 'wp_nav_menu_objects'), 10, 2); |
|
| 21 | 21 | add_action('bp_setup_nav', array($this, 'setup_nav'), 15); |
| 22 | 22 | |
| 23 | - $position = wpinv_get_option( 'wpinv_menu_position' ); |
|
| 23 | + $position = wpinv_get_option('wpinv_menu_position'); |
|
| 24 | 24 | $position = $position !== '' && $position !== false ? $position : 91; |
| 25 | - $this->position = apply_filters( 'wpinv_bp_nav_position', $position ); |
|
| 26 | - $this->id = WPINV_BP_SLUG; |
|
| 25 | + $this->position = apply_filters('wpinv_bp_nav_position', $position); |
|
| 26 | + $this->id = WPINV_BP_SLUG; |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | public function setup_nav() { |
| 30 | 30 | |
| 31 | - if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) || !is_user_logged_in()) { |
|
| 31 | + if (wpinv_get_option('wpinv_bp_hide_menu') || !is_user_logged_in()) { |
|
| 32 | 32 | return; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - if(bp_displayed_user_id() != bp_loggedin_user_id() && !current_user_can('administrator')){ |
|
| 35 | + if (bp_displayed_user_id() != bp_loggedin_user_id() && !current_user_can('administrator')) { |
|
| 36 | 36 | return; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | $count = $this->get_invoice_count(); |
| 40 | - $class = ( 0 === $count ) ? 'no-count' : 'count'; |
|
| 40 | + $class = (0 === $count) ? 'no-count' : 'count'; |
|
| 41 | 41 | |
| 42 | 42 | $main_nav_name = sprintf( |
| 43 | - __( 'My Invoices %s', 'invoicing' ), |
|
| 43 | + __('My Invoices %s', 'invoicing'), |
|
| 44 | 44 | sprintf( |
| 45 | 45 | '<span class="%s">%s</span>', |
| 46 | - esc_attr( $class ), |
|
| 47 | - bp_core_number_format( $count ) |
|
| 46 | + esc_attr($class), |
|
| 47 | + bp_core_number_format($count) |
|
| 48 | 48 | ) |
| 49 | 49 | ); |
| 50 | 50 | |
@@ -52,31 +52,31 @@ discard block |
||
| 52 | 52 | 'name' => $main_nav_name, |
| 53 | 53 | 'slug' => WPINV_BP_SLUG, |
| 54 | 54 | 'position' => $this->position, |
| 55 | - 'screen_function' => array( $this, 'invoices_screen' ), |
|
| 55 | + 'screen_function' => array($this, 'invoices_screen'), |
|
| 56 | 56 | 'default_subnav_slug' => 'invoices', |
| 57 | 57 | 'item_css_id' => $this->id |
| 58 | 58 | ); |
| 59 | 59 | |
| 60 | - bp_core_new_nav_item( $main_nav ); |
|
| 60 | + bp_core_new_nav_item($main_nav); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | public function invoices_screen() { |
| 64 | - if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) ) { |
|
| 64 | + if (wpinv_get_option('wpinv_bp_hide_menu')) { |
|
| 65 | 65 | return; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - add_action( 'bp_template_content', array( $this, 'invoices_content' ) ); |
|
| 68 | + add_action('bp_template_content', array($this, 'invoices_content')); |
|
| 69 | 69 | |
| 70 | - $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' ); |
|
| 70 | + $template = apply_filters('bp_core_template_plugin', 'members/single/plugins'); |
|
| 71 | 71 | |
| 72 | - bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) ); |
|
| 72 | + bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template)); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | public function invoices_content() { |
| 76 | - if ( $this->has_invoices( bp_ajax_querystring( 'invoices' ) ) ) { |
|
| 76 | + if ($this->has_invoices(bp_ajax_querystring('invoices'))) { |
|
| 77 | 77 | global $invoices_template; |
| 78 | 78 | |
| 79 | - do_action( 'wpinv_bp_invoices_before_content' ); |
|
| 79 | + do_action('wpinv_bp_invoices_before_content'); |
|
| 80 | 80 | ?> |
| 81 | 81 | <div class="wpi-g wpi-bp-invoices invoices invoicing" style="position:relative"> |
| 82 | 82 | <div id="pag-top" class="pagination"> |
@@ -90,61 +90,61 @@ discard block |
||
| 90 | 90 | <table class="table table-bordered table-hover table-responsive wpi-user-invoices" style="margin:0"> |
| 91 | 91 | <thead> |
| 92 | 92 | <tr> |
| 93 | - <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?> |
|
| 94 | - <th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th> |
|
| 93 | + <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?> |
|
| 94 | + <th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th> |
|
| 95 | 95 | <?php endforeach; ?> |
| 96 | 96 | </tr> |
| 97 | 97 | </thead> |
| 98 | 98 | <tbody> |
| 99 | - <?php foreach ( $invoices_template->invoices as $invoice ) { |
|
| 99 | + <?php foreach ($invoices_template->invoices as $invoice) { |
|
| 100 | 100 | ?> |
| 101 | 101 | <tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>"> |
| 102 | - <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?> |
|
| 103 | - <td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>"> |
|
| 104 | - <?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?> |
|
| 105 | - <?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?> |
|
| 106 | - |
|
| 107 | - <?php elseif ( 'invoice-number' === $column_id ) : ?> |
|
| 108 | - <a href="<?php echo esc_url( $invoice->get_view_url() ); ?>"> |
|
| 109 | - <?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?> |
|
| 102 | + <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?> |
|
| 103 | + <td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>"> |
|
| 104 | + <?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?> |
|
| 105 | + <?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?> |
|
| 106 | + |
|
| 107 | + <?php elseif ('invoice-number' === $column_id) : ?> |
|
| 108 | + <a href="<?php echo esc_url($invoice->get_view_url()); ?>"> |
|
| 109 | + <?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?> |
|
| 110 | 110 | </a> |
| 111 | 111 | |
| 112 | - <?php elseif ( 'created-date' === $column_id ) : $date = wpinv_get_date_created( $invoice->ID ); $dateYMD = wpinv_get_date_created( $invoice->ID, 'Y-m-d H:i:s' ); ?> |
|
| 113 | - <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time> |
|
| 112 | + <?php elseif ('created-date' === $column_id) : $date = wpinv_get_date_created($invoice->ID); $dateYMD = wpinv_get_date_created($invoice->ID, 'Y-m-d H:i:s'); ?> |
|
| 113 | + <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time> |
|
| 114 | 114 | |
| 115 | - <?php elseif ( 'payment-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID, '', false ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s', false ); ?> |
|
| 116 | - <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time> |
|
| 115 | + <?php elseif ('payment-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID, '', false); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s', false); ?> |
|
| 116 | + <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time> |
|
| 117 | 117 | |
| 118 | - <?php elseif ( 'invoice-status' === $column_id ) : ?> |
|
| 119 | - <?php echo $invoice->get_status_label_html() ; ?> |
|
| 118 | + <?php elseif ('invoice-status' === $column_id) : ?> |
|
| 119 | + <?php echo $invoice->get_status_label_html(); ?> |
|
| 120 | 120 | |
| 121 | - <?php elseif ( 'invoice-total' === $column_id ) : ?> |
|
| 122 | - <?php echo $invoice->get_total( true ); ?> |
|
| 121 | + <?php elseif ('invoice-total' === $column_id) : ?> |
|
| 122 | + <?php echo $invoice->get_total(true); ?> |
|
| 123 | 123 | |
| 124 | - <?php elseif ( 'invoice-actions' === $column_id ) : ?> |
|
| 124 | + <?php elseif ('invoice-actions' === $column_id) : ?> |
|
| 125 | 125 | <?php |
| 126 | 126 | $actions = array( |
| 127 | 127 | 'pay' => array( |
| 128 | 128 | 'url' => $invoice->get_checkout_payment_url(), |
| 129 | - 'name' => __( 'Pay Now', 'invoicing' ), |
|
| 129 | + 'name' => __('Pay Now', 'invoicing'), |
|
| 130 | 130 | 'class' => 'btn-success' |
| 131 | 131 | ), |
| 132 | 132 | 'print' => array( |
| 133 | 133 | 'url' => $invoice->get_view_url(), |
| 134 | - 'name' => __( 'Print', 'invoicing' ), |
|
| 134 | + 'name' => __('Print', 'invoicing'), |
|
| 135 | 135 | 'class' => 'btn-primary', |
| 136 | 136 | 'attrs' => 'target="_blank"' |
| 137 | 137 | ) |
| 138 | 138 | ); |
| 139 | 139 | |
| 140 | - if ( ! $invoice->needs_payment() ) { |
|
| 141 | - unset( $actions['pay'] ); |
|
| 140 | + if (!$invoice->needs_payment()) { |
|
| 141 | + unset($actions['pay']); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) { |
|
| 145 | - foreach ( $actions as $key => $action ) { |
|
| 144 | + if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) { |
|
| 145 | + foreach ($actions as $key => $action) { |
|
| 146 | 146 | $class = !empty($action['class']) ? sanitize_html_class($action['class']) : ''; |
| 147 | - echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>'; |
|
| 147 | + echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>'; |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | ?> |
@@ -172,64 +172,64 @@ discard block |
||
| 172 | 172 | </div> |
| 173 | 173 | <?php |
| 174 | 174 | |
| 175 | - do_action( 'wpinv_bp_invoices_after_content' ); |
|
| 175 | + do_action('wpinv_bp_invoices_after_content'); |
|
| 176 | 176 | } else { |
| 177 | 177 | ?> |
| 178 | 178 | <div id="message" class="info"> |
| 179 | - <p><?php _e( 'No invoice has been made yet.', 'invoicing' ); ?></p> |
|
| 179 | + <p><?php _e('No invoice has been made yet.', 'invoicing'); ?></p> |
|
| 180 | 180 | </div> |
| 181 | 181 | <?php |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - if ( defined( 'DOING_AJAX' ) ) { |
|
| 184 | + if (defined('DOING_AJAX')) { |
|
| 185 | 185 | exit; |
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - public function has_invoices( $args = '' ) { |
|
| 189 | + public function has_invoices($args = '') { |
|
| 190 | 190 | global $invoices_template; |
| 191 | 191 | |
| 192 | - $per_page = absint( wpinv_get_option( 'wpinv_bp_per_page' ) ); |
|
| 192 | + $per_page = absint(wpinv_get_option('wpinv_bp_per_page')); |
|
| 193 | 193 | // Parse arguments. |
| 194 | - $r = bp_parse_args( $args, array( |
|
| 194 | + $r = bp_parse_args($args, array( |
|
| 195 | 195 | 'status' => 'all', |
| 196 | 196 | 'page_arg' => 'bpage', |
| 197 | 197 | 'page' => 1, |
| 198 | 198 | 'per_page' => $per_page > 0 ? $per_page : 20, |
| 199 | 199 | 'max' => false, |
| 200 | 200 | 'user_id' => bp_displayed_user_id(), |
| 201 | - ), 'has_invoices' ); |
|
| 201 | + ), 'has_invoices'); |
|
| 202 | 202 | |
| 203 | 203 | |
| 204 | - if ( ! empty( $r['max'] ) && ( (int)$r['per_page'] > (int)$r['max'] ) ) { |
|
| 205 | - $r['per_page'] = (int)$r['max']; |
|
| 204 | + if (!empty($r['max']) && ((int) $r['per_page'] > (int) $r['max'])) { |
|
| 205 | + $r['per_page'] = (int) $r['max']; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | // Get the invoices. |
| 209 | - $invoices_template = new WPInv_BP_Invoices_Template( $r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg'] ); |
|
| 209 | + $invoices_template = new WPInv_BP_Invoices_Template($r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg']); |
|
| 210 | 210 | |
| 211 | - return apply_filters( 'wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r ); |
|
| 211 | + return apply_filters('wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | public function get_invoice_count() { |
| 215 | - $query = apply_filters( 'wpinv_user_invoices_count_query', array( 'status' => 'all','user' => bp_displayed_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false ) ); |
|
| 216 | - $invoices = wpinv_get_invoices( $query ); |
|
| 215 | + $query = apply_filters('wpinv_user_invoices_count_query', array('status' => 'all', 'user' => bp_displayed_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false)); |
|
| 216 | + $invoices = wpinv_get_invoices($query); |
|
| 217 | 217 | |
| 218 | - return !empty( $invoices ) ? count( $invoices ) : 0; |
|
| 218 | + return !empty($invoices) ? count($invoices) : 0; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | public function pagination_count() { |
| 222 | 222 | global $invoices_template; |
| 223 | 223 | |
| 224 | - $start_num = intval( ( $invoices_template->pag_page - 1 ) * $invoices_template->pag_num ) + 1; |
|
| 225 | - $from_num = bp_core_number_format( $start_num ); |
|
| 226 | - $to_num = bp_core_number_format( ( $start_num + ( $invoices_template->pag_num - 1 ) > $invoices_template->total_invoice_count ) ? $invoices_template->total_invoice_count : $start_num + ( $invoices_template->pag_num - 1 ) ); |
|
| 227 | - $total = bp_core_number_format( $invoices_template->total_invoice_count ); |
|
| 224 | + $start_num = intval(($invoices_template->pag_page - 1) * $invoices_template->pag_num) + 1; |
|
| 225 | + $from_num = bp_core_number_format($start_num); |
|
| 226 | + $to_num = bp_core_number_format(($start_num + ($invoices_template->pag_num - 1) > $invoices_template->total_invoice_count) ? $invoices_template->total_invoice_count : $start_num + ($invoices_template->pag_num - 1)); |
|
| 227 | + $total = bp_core_number_format($invoices_template->total_invoice_count); |
|
| 228 | 228 | |
| 229 | - if ( 1 == $invoices_template->total_invoice_count ) { |
|
| 230 | - $message = __( 'Viewing 1 invoice', 'invoicing' ); |
|
| 229 | + if (1 == $invoices_template->total_invoice_count) { |
|
| 230 | + $message = __('Viewing 1 invoice', 'invoicing'); |
|
| 231 | 231 | } else { |
| 232 | - $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing' ), $from_num, $to_num, $total ); |
|
| 232 | + $message = sprintf(_n('Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing'), $from_num, $to_num, $total); |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | return $message; |
@@ -238,32 +238,32 @@ discard block |
||
| 238 | 238 | function pagination_links() { |
| 239 | 239 | global $invoices_template; |
| 240 | 240 | |
| 241 | - return apply_filters( 'wpinv_bp_get_pagination_links', $invoices_template->pag_links ); |
|
| 241 | + return apply_filters('wpinv_bp_get_pagination_links', $invoices_template->pag_links); |
|
| 242 | 242 | } |
| 243 | 243 | |
| 244 | - public function bp_section( $settings = array() ) { |
|
| 245 | - $settings['wpinv_bp'] = __( 'BuddyPress Integration', 'invoicing' ); |
|
| 244 | + public function bp_section($settings = array()) { |
|
| 245 | + $settings['wpinv_bp'] = __('BuddyPress Integration', 'invoicing'); |
|
| 246 | 246 | return $settings; |
| 247 | 247 | } |
| 248 | 248 | |
| 249 | - public function bp_settings( $settings = array() ) { |
|
| 249 | + public function bp_settings($settings = array()) { |
|
| 250 | 250 | $settings['wpinv_bp'] = array( |
| 251 | 251 | 'wpinv_bp_labels' => array( |
| 252 | 252 | 'id' => 'wpinv_bp_settings', |
| 253 | - 'name' => '<h3>' . __( 'BuddyPress Integration', 'invoicing' ) . '</h3>', |
|
| 253 | + 'name' => '<h3>' . __('BuddyPress Integration', 'invoicing') . '</h3>', |
|
| 254 | 254 | 'desc' => '', |
| 255 | 255 | 'type' => 'header', |
| 256 | 256 | ), |
| 257 | 257 | 'wpinv_bp_hide_menu' => array( |
| 258 | 258 | 'id' => 'wpinv_bp_hide_menu', |
| 259 | - 'name' => __( 'Hide Invoices link', 'invoicing' ), |
|
| 260 | - 'desc' => __( 'Hide Invoices link from BP Profile menu.', 'invoicing' ), |
|
| 259 | + 'name' => __('Hide Invoices link', 'invoicing'), |
|
| 260 | + 'desc' => __('Hide Invoices link from BP Profile menu.', 'invoicing'), |
|
| 261 | 261 | 'type' => 'checkbox', |
| 262 | 262 | ), |
| 263 | 263 | 'wpinv_menu_position' => array( |
| 264 | 264 | 'id' => 'wpinv_menu_position', |
| 265 | - 'name' => __( 'Menu position', 'invoicing' ), |
|
| 266 | - 'desc' => __( 'Menu position for the Invoices link in BP Profile menu.', 'invoicing' ), |
|
| 265 | + 'name' => __('Menu position', 'invoicing'), |
|
| 266 | + 'desc' => __('Menu position for the Invoices link in BP Profile menu.', 'invoicing'), |
|
| 267 | 267 | 'type' => 'number', |
| 268 | 268 | 'size' => 'small', |
| 269 | 269 | 'min' => '1', |
@@ -273,8 +273,8 @@ discard block |
||
| 273 | 273 | ), |
| 274 | 274 | 'wpinv_bp_per_page' => array( |
| 275 | 275 | 'id' => 'wpinv_bp_per_page', |
| 276 | - 'name' => __( 'Max invoices per page', 'invoicing' ), |
|
| 277 | - 'desc' => __( 'Enter a number to lists the invoices for each page.', 'invoicing' ), |
|
| 276 | + 'name' => __('Max invoices per page', 'invoicing'), |
|
| 277 | + 'desc' => __('Enter a number to lists the invoices for each page.', 'invoicing'), |
|
| 278 | 278 | 'type' => 'number', |
| 279 | 279 | 'size' => 'small', |
| 280 | 280 | 'min' => '1', |
@@ -287,20 +287,20 @@ discard block |
||
| 287 | 287 | return $settings; |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | - public function wp_nav_menu_objects($items, $args){ |
|
| 291 | - if(!is_user_logged_in()){ |
|
| 290 | + public function wp_nav_menu_objects($items, $args) { |
|
| 291 | + if (!is_user_logged_in()) { |
|
| 292 | 292 | return $items; |
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - if(!apply_filters('wpinv_bp_invoice_history_redirect', true, $items, $args)){ |
|
| 295 | + if (!apply_filters('wpinv_bp_invoice_history_redirect', true, $items, $args)) { |
|
| 296 | 296 | return $items; |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | $user_id = get_current_user_id(); |
| 300 | - $link = bp_core_get_user_domain( $user_id ).WPINV_BP_SLUG; |
|
| 300 | + $link = bp_core_get_user_domain($user_id) . WPINV_BP_SLUG; |
|
| 301 | 301 | $history_link = wpinv_get_history_page_uri(); |
| 302 | - foreach ( $items as $item ) { |
|
| 303 | - $item->url = str_replace( $history_link, $link, $item->url ); |
|
| 302 | + foreach ($items as $item) { |
|
| 303 | + $item->url = str_replace($history_link, $link, $item->url); |
|
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | return $items; |
@@ -318,78 +318,78 @@ discard block |
||
| 318 | 318 | public $pag_links = ''; |
| 319 | 319 | public $total_invoice_count = 0; |
| 320 | 320 | |
| 321 | - public function __construct( $status, $page, $per_page, $max, $user_id, $page_arg = 'bpage' ) { |
|
| 322 | - $this->invoices = array( 'invoices' => array(), 'total' => 0 ); |
|
| 321 | + public function __construct($status, $page, $per_page, $max, $user_id, $page_arg = 'bpage') { |
|
| 322 | + $this->invoices = array('invoices' => array(), 'total' => 0); |
|
| 323 | 323 | |
| 324 | - $this->pag_arg = sanitize_key( $page_arg ); |
|
| 325 | - $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page ); |
|
| 326 | - $this->pag_num = bp_sanitize_pagination_arg( 'num', $per_page ); |
|
| 324 | + $this->pag_arg = sanitize_key($page_arg); |
|
| 325 | + $this->pag_page = bp_sanitize_pagination_arg($this->pag_arg, $page); |
|
| 326 | + $this->pag_num = bp_sanitize_pagination_arg('num', $per_page); |
|
| 327 | 327 | |
| 328 | - $query_args = array( 'user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true ); |
|
| 329 | - if ( !empty( $status ) && $status != 'all' ) { |
|
| 328 | + $query_args = array('user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true); |
|
| 329 | + if (!empty($status) && $status != 'all') { |
|
| 330 | 330 | $query_args['status'] = $status; |
| 331 | 331 | } |
| 332 | - $invoices = wpinv_get_invoices( apply_filters( 'wpinv_bp_user_invoices_query', $query_args ) ); |
|
| 332 | + $invoices = wpinv_get_invoices(apply_filters('wpinv_bp_user_invoices_query', $query_args)); |
|
| 333 | 333 | |
| 334 | - if ( !empty( $invoices ) && !empty( $invoices->found_posts ) ) { |
|
| 335 | - $this->invoices['invoices'] = array_map( 'wpinv_get_invoice', $invoices->posts ); |
|
| 334 | + if (!empty($invoices) && !empty($invoices->found_posts)) { |
|
| 335 | + $this->invoices['invoices'] = array_map('wpinv_get_invoice', $invoices->posts); |
|
| 336 | 336 | $this->invoices['total'] = $invoices->found_posts; |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | - if ( empty( $max ) || ( $max >= (int)$this->invoices['total'] ) ) { |
|
| 340 | - $this->total_invoice_count = (int)$this->invoices['total']; |
|
| 339 | + if (empty($max) || ($max >= (int) $this->invoices['total'])) { |
|
| 340 | + $this->total_invoice_count = (int) $this->invoices['total']; |
|
| 341 | 341 | } else { |
| 342 | - $this->total_invoice_count = (int)$max; |
|
| 342 | + $this->total_invoice_count = (int) $max; |
|
| 343 | 343 | } |
| 344 | 344 | |
| 345 | 345 | $this->invoices = $this->invoices['invoices']; |
| 346 | 346 | |
| 347 | - $invoice_count = count( $this->invoices ); |
|
| 347 | + $invoice_count = count($this->invoices); |
|
| 348 | 348 | |
| 349 | - if ( empty( $max ) || ( $max >= (int)$invoice_count ) ) { |
|
| 350 | - $this->invoice_count = (int)$invoice_count; |
|
| 349 | + if (empty($max) || ($max >= (int) $invoice_count)) { |
|
| 350 | + $this->invoice_count = (int) $invoice_count; |
|
| 351 | 351 | } else { |
| 352 | - $this->invoice_count = (int)$max; |
|
| 352 | + $this->invoice_count = (int) $max; |
|
| 353 | 353 | } |
| 354 | 354 | |
| 355 | - if ( ! empty( $this->total_invoice_count ) && ! empty( $this->pag_num ) ) { |
|
| 356 | - $this->pag_links = paginate_links( array( |
|
| 357 | - 'base' => add_query_arg( $this->pag_arg, '%#%' ), |
|
| 355 | + if (!empty($this->total_invoice_count) && !empty($this->pag_num)) { |
|
| 356 | + $this->pag_links = paginate_links(array( |
|
| 357 | + 'base' => add_query_arg($this->pag_arg, '%#%'), |
|
| 358 | 358 | 'format' => '', |
| 359 | - 'total' => ceil( (int)$this->total_invoice_count / (int)$this->pag_num ), |
|
| 360 | - 'current' => (int)$this->pag_page, |
|
| 361 | - 'prev_text' => _x( '←', 'Invoice pagination previous text', 'invoicing' ), |
|
| 362 | - 'next_text' => _x( '→', 'Invoice pagination next text', 'invoicing' ), |
|
| 359 | + 'total' => ceil((int) $this->total_invoice_count / (int) $this->pag_num), |
|
| 360 | + 'current' => (int) $this->pag_page, |
|
| 361 | + 'prev_text' => _x('←', 'Invoice pagination previous text', 'invoicing'), |
|
| 362 | + 'next_text' => _x('→', 'Invoice pagination next text', 'invoicing'), |
|
| 363 | 363 | 'mid_size' => 1, |
| 364 | 364 | 'add_args' => array(), |
| 365 | - ) ); |
|
| 365 | + )); |
|
| 366 | 366 | } |
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | public function has_invoices() { |
| 370 | - return (bool) ! empty( $this->invoice_count ); |
|
| 370 | + return (bool) !empty($this->invoice_count); |
|
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | public function next_invoice() { |
| 374 | 374 | $this->current_invoice++; |
| 375 | - $this->invoice = $this->invoices[ $this->current_invoice ]; |
|
| 375 | + $this->invoice = $this->invoices[$this->current_invoice]; |
|
| 376 | 376 | |
| 377 | 377 | return $this->invoice; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | public function rewind_invoices() { |
| 381 | 381 | $this->current_invoice = -1; |
| 382 | - if ( $this->invoice_count > 0 ) { |
|
| 382 | + if ($this->invoice_count > 0) { |
|
| 383 | 383 | $this->invoice = $this->invoices[0]; |
| 384 | 384 | } |
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | public function invoices() { |
| 388 | - if ( ( $this->current_invoice + 1 ) < $this->invoice_count ) { |
|
| 388 | + if (($this->current_invoice + 1) < $this->invoice_count) { |
|
| 389 | 389 | return true; |
| 390 | - } elseif ( ( $this->current_invoice + 1 ) === $this->invoice_count ) { |
|
| 390 | + } elseif (($this->current_invoice + 1) === $this->invoice_count) { |
|
| 391 | 391 | |
| 392 | - do_action( 'wpinv_bp_invoice_loop_end' ); |
|
| 392 | + do_action('wpinv_bp_invoice_loop_end'); |
|
| 393 | 393 | |
| 394 | 394 | $this->rewind_invoices(); |
| 395 | 395 | } |
@@ -403,19 +403,19 @@ discard block |
||
| 403 | 403 | $this->in_the_loop = true; |
| 404 | 404 | $this->invoice = $this->next_invoice(); |
| 405 | 405 | |
| 406 | - if ( 0 === $this->current_invoice ) { |
|
| 407 | - do_action( 'wpinv_bp_invoice_loop_start' ); |
|
| 406 | + if (0 === $this->current_invoice) { |
|
| 407 | + do_action('wpinv_bp_invoice_loop_start'); |
|
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | function wpinv_bp_setup_component() { |
| 413 | 413 | |
| 414 | - if(!class_exists( 'BuddyPress' )){ |
|
| 414 | + if (!class_exists('BuddyPress')) { |
|
| 415 | 415 | return; |
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | new WPInv_BP_Component(); |
| 419 | 419 | |
| 420 | 420 | } |
| 421 | -add_action( 'bp_loaded', 'wpinv_bp_setup_component' ); |
|
| 422 | 421 | \ No newline at end of file |
| 422 | +add_action('bp_loaded', 'wpinv_bp_setup_component'); |
|
| 423 | 423 | \ No newline at end of file |
@@ -196,8 +196,9 @@ |
||
| 196 | 196 | foreach ( $types as $name => $type ) { |
| 197 | 197 | echo '<option value="' . esc_attr( $name ) . '"'; |
| 198 | 198 | |
| 199 | - if ( isset( $_GET['discount_type'] ) ) |
|
| 200 | - selected( $name, $_GET['discount_type'] ); |
|
| 199 | + if ( isset( $_GET['discount_type'] ) ) { |
|
| 200 | + selected( $name, $_GET['discount_type'] ); |
|
| 201 | + } |
|
| 201 | 202 | |
| 202 | 203 | echo '>' . esc_html__( $type, 'invoicing' ) . '</option>'; |
| 203 | 204 | } |
@@ -63,8 +63,8 @@ discard block |
||
| 63 | 63 | 'getpaid-nonce' |
| 64 | 64 | ) |
| 65 | 65 | ); |
| 66 | - $anchor = __( 'Deactivate', 'invoicing' ); |
|
| 67 | - $title = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' ); |
|
| 66 | + $anchor = __( 'Deactivate', 'invoicing' ); |
|
| 67 | + $title = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' ); |
|
| 68 | 68 | $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>"; |
| 69 | 69 | |
| 70 | 70 | } else if( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) ) { |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | 'getpaid-nonce' |
| 82 | 82 | ) |
| 83 | 83 | ); |
| 84 | - $anchor = __( 'Activate', 'invoicing' ); |
|
| 85 | - $title = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' ); |
|
| 84 | + $anchor = __( 'Activate', 'invoicing' ); |
|
| 85 | + $title = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' ); |
|
| 86 | 86 | $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>"; |
| 87 | 87 | |
| 88 | 88 | } |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | 'getpaid-nonce' |
| 100 | 100 | ) |
| 101 | 101 | ); |
| 102 | - $anchor = __( 'Delete', 'invoicing' ); |
|
| 103 | - $title = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' ); |
|
| 102 | + $anchor = __( 'Delete', 'invoicing' ); |
|
| 103 | + $title = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' ); |
|
| 104 | 104 | $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>"; |
| 105 | 105 | |
| 106 | 106 | $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount ); |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | // MUST have WordPress. |
| 3 | -if ( !defined( 'WPINC' ) ) { |
|
| 4 | - exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) ); |
|
| 3 | +if (!defined('WPINC')) { |
|
| 4 | + exit('Do NOT access this file directly: ' . basename(__FILE__)); |
|
| 5 | 5 | } |
| 6 | 6 | |
| 7 | -add_action( 'manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column' ); |
|
| 8 | -function wpinv_discount_custom_column( $column ) { |
|
| 7 | +add_action('manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column'); |
|
| 8 | +function wpinv_discount_custom_column($column) { |
|
| 9 | 9 | global $post; |
| 10 | 10 | |
| 11 | - $discount = new WPInv_Discount( $post ); |
|
| 11 | + $discount = new WPInv_Discount($post); |
|
| 12 | 12 | |
| 13 | - switch ( $column ) { |
|
| 13 | + switch ($column) { |
|
| 14 | 14 | case 'code' : |
| 15 | 15 | echo $discount->get_code(); |
| 16 | 16 | break; |
@@ -21,37 +21,37 @@ discard block |
||
| 21 | 21 | echo $discount->get_usage(); |
| 22 | 22 | break; |
| 23 | 23 | case 'start_date' : |
| 24 | - echo getpaid_format_date_value( $discount->get_start_date() ); |
|
| 24 | + echo getpaid_format_date_value($discount->get_start_date()); |
|
| 25 | 25 | break; |
| 26 | 26 | case 'expiry_date' : |
| 27 | - echo getpaid_format_date_value( $discount->get_expiration_date(), __( 'Never', 'invoicing' ) ); |
|
| 27 | + echo getpaid_format_date_value($discount->get_expiration_date(), __('Never', 'invoicing')); |
|
| 28 | 28 | break; |
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | -add_filter( 'post_row_actions', 'wpinv_post_row_actions', 9999, 2 ); |
|
| 33 | -function wpinv_post_row_actions( $actions, $post ) { |
|
| 34 | - $post_type = !empty( $post->post_type ) ? $post->post_type : ''; |
|
| 32 | +add_filter('post_row_actions', 'wpinv_post_row_actions', 9999, 2); |
|
| 33 | +function wpinv_post_row_actions($actions, $post) { |
|
| 34 | + $post_type = !empty($post->post_type) ? $post->post_type : ''; |
|
| 35 | 35 | |
| 36 | - if ( $post_type == 'wpi_invoice' ) { |
|
| 36 | + if ($post_type == 'wpi_invoice') { |
|
| 37 | 37 | $actions = array(); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - if ( $post_type == 'wpi_discount' ) { |
|
| 41 | - $actions = wpinv_discount_row_actions( $post, $actions ); |
|
| 40 | + if ($post_type == 'wpi_discount') { |
|
| 41 | + $actions = wpinv_discount_row_actions($post, $actions); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | return $actions; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | -function wpinv_discount_row_actions( $discount, $row_actions ) { |
|
| 48 | - $row_actions = array(); |
|
| 49 | - $edit_link = get_edit_post_link( $discount->ID ); |
|
| 50 | - $row_actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit', 'invoicing' ) . '</a>'; |
|
| 47 | +function wpinv_discount_row_actions($discount, $row_actions) { |
|
| 48 | + $row_actions = array(); |
|
| 49 | + $edit_link = get_edit_post_link($discount->ID); |
|
| 50 | + $row_actions['edit'] = '<a href="' . esc_url($edit_link) . '">' . __('Edit', 'invoicing') . '</a>'; |
|
| 51 | 51 | |
| 52 | - if ( in_array( strtolower( $discount->post_status ), array( 'publish' ) ) ) { |
|
| 52 | + if (in_array(strtolower($discount->post_status), array('publish'))) { |
|
| 53 | 53 | |
| 54 | - $url = esc_url( |
|
| 54 | + $url = esc_url( |
|
| 55 | 55 | wp_nonce_url( |
| 56 | 56 | add_query_arg( |
| 57 | 57 | array( |
@@ -63,13 +63,13 @@ discard block |
||
| 63 | 63 | 'getpaid-nonce' |
| 64 | 64 | ) |
| 65 | 65 | ); |
| 66 | - $anchor = __( 'Deactivate', 'invoicing' ); |
|
| 67 | - $title = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' ); |
|
| 66 | + $anchor = __('Deactivate', 'invoicing'); |
|
| 67 | + $title = esc_attr__('Are you sure you want to deactivate this discount?', 'invoicing'); |
|
| 68 | 68 | $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>"; |
| 69 | 69 | |
| 70 | - } else if( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) ) { |
|
| 70 | + } else if (in_array(strtolower($discount->post_status), array('pending', 'draft'))) { |
|
| 71 | 71 | |
| 72 | - $url = esc_url( |
|
| 72 | + $url = esc_url( |
|
| 73 | 73 | wp_nonce_url( |
| 74 | 74 | add_query_arg( |
| 75 | 75 | array( |
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | 'getpaid-nonce' |
| 82 | 82 | ) |
| 83 | 83 | ); |
| 84 | - $anchor = __( 'Activate', 'invoicing' ); |
|
| 85 | - $title = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' ); |
|
| 84 | + $anchor = __('Activate', 'invoicing'); |
|
| 85 | + $title = esc_attr__('Are you sure you want to activate this discount?', 'invoicing'); |
|
| 86 | 86 | $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>"; |
| 87 | 87 | |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - $url = esc_url( |
|
| 90 | + $url = esc_url( |
|
| 91 | 91 | wp_nonce_url( |
| 92 | 92 | add_query_arg( |
| 93 | 93 | array( |
@@ -99,11 +99,11 @@ discard block |
||
| 99 | 99 | 'getpaid-nonce' |
| 100 | 100 | ) |
| 101 | 101 | ); |
| 102 | - $anchor = __( 'Delete', 'invoicing' ); |
|
| 103 | - $title = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' ); |
|
| 102 | + $anchor = __('Delete', 'invoicing'); |
|
| 103 | + $title = esc_attr__('Are you sure you want to delete this discount?', 'invoicing'); |
|
| 104 | 104 | $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>"; |
| 105 | 105 | |
| 106 | - $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount ); |
|
| 106 | + $row_actions = apply_filters('wpinv_discount_row_actions', $row_actions, $discount); |
|
| 107 | 107 | |
| 108 | 108 | return $row_actions; |
| 109 | 109 | } |
@@ -111,68 +111,68 @@ discard block |
||
| 111 | 111 | function wpinv_restrict_manage_posts() { |
| 112 | 112 | global $typenow; |
| 113 | 113 | |
| 114 | - if( 'wpi_discount' == $typenow ) { |
|
| 114 | + if ('wpi_discount' == $typenow) { |
|
| 115 | 115 | wpinv_discount_filters(); |
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | -add_action( 'restrict_manage_posts', 'wpinv_restrict_manage_posts', 10 ); |
|
| 118 | +add_action('restrict_manage_posts', 'wpinv_restrict_manage_posts', 10); |
|
| 119 | 119 | |
| 120 | 120 | function wpinv_discount_filters() { |
| 121 | 121 | |
| 122 | 122 | ?> |
| 123 | 123 | <select name="discount_type" id="dropdown_wpinv_discount_type"> |
| 124 | - <option value=""><?php _e( 'Show all types', 'invoicing' ); ?></option> |
|
| 124 | + <option value=""><?php _e('Show all types', 'invoicing'); ?></option> |
|
| 125 | 125 | <?php |
| 126 | 126 | $types = wpinv_get_discount_types(); |
| 127 | 127 | |
| 128 | - foreach ( $types as $name => $type ) { |
|
| 129 | - echo '<option value="' . esc_attr( $name ) . '"'; |
|
| 128 | + foreach ($types as $name => $type) { |
|
| 129 | + echo '<option value="' . esc_attr($name) . '"'; |
|
| 130 | 130 | |
| 131 | - if ( isset( $_GET['discount_type'] ) ) |
|
| 132 | - selected( $name, $_GET['discount_type'] ); |
|
| 131 | + if (isset($_GET['discount_type'])) |
|
| 132 | + selected($name, $_GET['discount_type']); |
|
| 133 | 133 | |
| 134 | - echo '>' . esc_html__( $type, 'invoicing' ) . '</option>'; |
|
| 134 | + echo '>' . esc_html__($type, 'invoicing') . '</option>'; |
|
| 135 | 135 | } |
| 136 | 136 | ?> |
| 137 | 137 | </select> |
| 138 | 138 | <?php |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | -function wpinv_request( $vars ) { |
|
| 141 | +function wpinv_request($vars) { |
|
| 142 | 142 | global $typenow, $wp_post_statuses; |
| 143 | 143 | |
| 144 | - if ( getpaid_is_invoice_post_type( $typenow ) ) { |
|
| 145 | - if ( ! isset( $vars['post_status'] ) ) { |
|
| 146 | - $post_statuses = wpinv_get_invoice_statuses( false, false, $typenow ); |
|
| 144 | + if (getpaid_is_invoice_post_type($typenow)) { |
|
| 145 | + if (!isset($vars['post_status'])) { |
|
| 146 | + $post_statuses = wpinv_get_invoice_statuses(false, false, $typenow); |
|
| 147 | 147 | |
| 148 | - foreach ( $post_statuses as $status => $value ) { |
|
| 149 | - if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) { |
|
| 150 | - unset( $post_statuses[ $status ] ); |
|
| 148 | + foreach ($post_statuses as $status => $value) { |
|
| 149 | + if (isset($wp_post_statuses[$status]) && false === $wp_post_statuses[$status]->show_in_admin_all_list) { |
|
| 150 | + unset($post_statuses[$status]); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - $vars['post_status'] = array_keys( $post_statuses ); |
|
| 154 | + $vars['post_status'] = array_keys($post_statuses); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - } else if ( 'wpi_discount' == $typenow ) { |
|
| 158 | - $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array(); |
|
| 157 | + } else if ('wpi_discount' == $typenow) { |
|
| 158 | + $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array(); |
|
| 159 | 159 | // Filter vat rule type |
| 160 | - if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) { |
|
| 160 | + if (isset($_GET['discount_type']) && $_GET['discount_type'] !== '') { |
|
| 161 | 161 | $meta_query[] = array( |
| 162 | 162 | 'key' => '_wpi_discount_type', |
| 163 | - 'value' => sanitize_text_field( $_GET['discount_type'] ), |
|
| 163 | + 'value' => sanitize_text_field($_GET['discount_type']), |
|
| 164 | 164 | 'compare' => '=' |
| 165 | 165 | ); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - if ( !empty( $meta_query ) ) { |
|
| 168 | + if (!empty($meta_query)) { |
|
| 169 | 169 | $vars['meta_query'] = $meta_query; |
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | return $vars; |
| 174 | 174 | } |
| 175 | -add_filter( 'request', 'wpinv_request' ); |
|
| 175 | +add_filter('request', 'wpinv_request'); |
|
| 176 | 176 | |
| 177 | 177 | /** |
| 178 | 178 | * Create a page and store the ID in an option. |
@@ -184,19 +184,19 @@ discard block |
||
| 184 | 184 | * @param int $post_parent (default: 0) Parent for the new page |
| 185 | 185 | * @return int page ID |
| 186 | 186 | */ |
| 187 | -function wpinv_create_page( $slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0 ) { |
|
| 187 | +function wpinv_create_page($slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0) { |
|
| 188 | 188 | global $wpdb; |
| 189 | 189 | |
| 190 | - $option_value = wpinv_get_option( $option ); |
|
| 190 | + $option_value = wpinv_get_option($option); |
|
| 191 | 191 | |
| 192 | - if ( $option_value > 0 && ( $page_object = get_post( $option_value ) ) ) { |
|
| 193 | - if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) { |
|
| 192 | + if ($option_value > 0 && ($page_object = get_post($option_value))) { |
|
| 193 | + if ('page' === $page_object->post_type && !in_array($page_object->post_status, array('pending', 'trash', 'future', 'auto-draft'))) { |
|
| 194 | 194 | // Valid page is already in place |
| 195 | 195 | return $page_object->ID; |
| 196 | 196 | } |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - if(!empty($post_parent)){ |
|
| 199 | + if (!empty($post_parent)) { |
|
| 200 | 200 | $page = get_page_by_path($post_parent); |
| 201 | 201 | if ($page) { |
| 202 | 202 | $post_parent = $page->ID; |
@@ -205,40 +205,40 @@ discard block |
||
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - if ( strlen( $page_content ) > 0 ) { |
|
| 208 | + if (strlen($page_content) > 0) { |
|
| 209 | 209 | // Search for an existing page with the specified page content (typically a shortcode) |
| 210 | - $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) ); |
|
| 210 | + $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%")); |
|
| 211 | 211 | } else { |
| 212 | 212 | // Search for an existing page with the specified page slug |
| 213 | - $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_name = %s LIMIT 1;", $slug ) ); |
|
| 213 | + $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_name = %s LIMIT 1;", $slug)); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - $valid_page_found = apply_filters( 'wpinv_create_page_id', $valid_page_found, $slug, $page_content ); |
|
| 216 | + $valid_page_found = apply_filters('wpinv_create_page_id', $valid_page_found, $slug, $page_content); |
|
| 217 | 217 | |
| 218 | - if ( $valid_page_found ) { |
|
| 219 | - if ( $option ) { |
|
| 220 | - wpinv_update_option( $option, $valid_page_found ); |
|
| 218 | + if ($valid_page_found) { |
|
| 219 | + if ($option) { |
|
| 220 | + wpinv_update_option($option, $valid_page_found); |
|
| 221 | 221 | } |
| 222 | 222 | return $valid_page_found; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | // Search for a matching valid trashed page |
| 226 | - if ( strlen( $page_content ) > 0 ) { |
|
| 226 | + if (strlen($page_content) > 0) { |
|
| 227 | 227 | // Search for an existing page with the specified page content (typically a shortcode) |
| 228 | - $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) ); |
|
| 228 | + $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%")); |
|
| 229 | 229 | } else { |
| 230 | 230 | // Search for an existing page with the specified page slug |
| 231 | - $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug ) ); |
|
| 231 | + $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug)); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - if ( $trashed_page_found ) { |
|
| 234 | + if ($trashed_page_found) { |
|
| 235 | 235 | $page_id = $trashed_page_found; |
| 236 | 236 | $page_data = array( |
| 237 | 237 | 'ID' => $page_id, |
| 238 | 238 | 'post_status' => 'publish', |
| 239 | 239 | 'post_parent' => $post_parent, |
| 240 | 240 | ); |
| 241 | - wp_update_post( $page_data ); |
|
| 241 | + wp_update_post($page_data); |
|
| 242 | 242 | } else { |
| 243 | 243 | $page_data = array( |
| 244 | 244 | 'post_status' => 'publish', |
@@ -250,11 +250,11 @@ discard block |
||
| 250 | 250 | 'post_parent' => $post_parent, |
| 251 | 251 | 'comment_status' => 'closed', |
| 252 | 252 | ); |
| 253 | - $page_id = wp_insert_post( $page_data ); |
|
| 253 | + $page_id = wp_insert_post($page_data); |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | - if ( $option ) { |
|
| 257 | - wpinv_update_option( $option, (int)$page_id ); |
|
| 256 | + if ($option) { |
|
| 257 | + wpinv_update_option($option, (int) $page_id); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | return $page_id; |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) { |
| 311 | 311 | if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){ |
| 312 | 312 | $enabled_gateway = wpinv_get_default_gateway(); |
| 313 | - }else{ |
|
| 313 | + } else{ |
|
| 314 | 314 | $enabled_gateway = $gateways[0]; |
| 315 | 315 | } |
| 316 | 316 | |
@@ -336,8 +336,9 @@ discard block |
||
| 336 | 336 | |
| 337 | 337 | $payments = new WP_Query( $args ); |
| 338 | 338 | |
| 339 | - if( $payments ) |
|
| 340 | - $ret = $payments->post_count; |
|
| 339 | + if( $payments ) { |
|
| 340 | + $ret = $payments->post_count; |
|
| 341 | + } |
|
| 341 | 342 | return $ret; |
| 342 | 343 | } |
| 343 | 344 | |
@@ -232,26 +232,26 @@ discard block |
||
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | function wpinv_get_chosen_gateway( $invoice_id = 0 ) { |
| 235 | - $gateways = array_keys( wpinv_get_enabled_payment_gateways() ); |
|
| 235 | + $gateways = array_keys( wpinv_get_enabled_payment_gateways() ); |
|
| 236 | 236 | |
| 237 | 237 | $chosen = false; |
| 238 | 238 | if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) { |
| 239 | 239 | $chosen = $invoice->get_gateway(); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | - $chosen = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen; |
|
| 242 | + $chosen = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen; |
|
| 243 | 243 | |
| 244 | - if ( false !== $chosen ) { |
|
| 245 | - $chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen ); |
|
| 246 | - } |
|
| 244 | + if ( false !== $chosen ) { |
|
| 245 | + $chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen ); |
|
| 246 | + } |
|
| 247 | 247 | |
| 248 | - if ( ! empty ( $chosen ) ) { |
|
| 249 | - $enabled_gateway = urldecode( $chosen ); |
|
| 250 | - } else if ( !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) { |
|
| 251 | - $enabled_gateway = 'manual'; |
|
| 252 | - } else { |
|
| 253 | - $enabled_gateway = wpinv_get_default_gateway(); |
|
| 254 | - } |
|
| 248 | + if ( ! empty ( $chosen ) ) { |
|
| 249 | + $enabled_gateway = urldecode( $chosen ); |
|
| 250 | + } else if ( !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) { |
|
| 251 | + $enabled_gateway = 'manual'; |
|
| 252 | + } else { |
|
| 253 | + $enabled_gateway = wpinv_get_default_gateway(); |
|
| 254 | + } |
|
| 255 | 255 | |
| 256 | 256 | if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) { |
| 257 | 257 | if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){ |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | - return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway ); |
|
| 265 | + return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway ); |
|
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | function wpinv_record_gateway_error( $title = '', $message = '' ) { |
@@ -270,21 +270,21 @@ discard block |
||
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) { |
| 273 | - $ret = 0; |
|
| 274 | - $args = array( |
|
| 275 | - 'meta_key' => '_wpinv_gateway', |
|
| 276 | - 'meta_value' => $gateway_id, |
|
| 277 | - 'nopaging' => true, |
|
| 278 | - 'post_type' => 'wpi_invoice', |
|
| 279 | - 'post_status' => $status, |
|
| 280 | - 'fields' => 'ids' |
|
| 281 | - ); |
|
| 282 | - |
|
| 283 | - $payments = new WP_Query( $args ); |
|
| 284 | - |
|
| 285 | - if( $payments ) |
|
| 286 | - $ret = $payments->post_count; |
|
| 287 | - return $ret; |
|
| 273 | + $ret = 0; |
|
| 274 | + $args = array( |
|
| 275 | + 'meta_key' => '_wpinv_gateway', |
|
| 276 | + 'meta_value' => $gateway_id, |
|
| 277 | + 'nopaging' => true, |
|
| 278 | + 'post_type' => 'wpi_invoice', |
|
| 279 | + 'post_status' => $status, |
|
| 280 | + 'fields' => 'ids' |
|
| 281 | + ); |
|
| 282 | + |
|
| 283 | + $payments = new WP_Query( $args ); |
|
| 284 | + |
|
| 285 | + if( $payments ) |
|
| 286 | + $ret = $payments->post_count; |
|
| 287 | + return $ret; |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | function wpinv_settings_update_gateways( $input ) { |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Contains gateway functions. |
| 4 | 4 | * |
| 5 | 5 | */ |
| 6 | -defined( 'ABSPATH' ) || exit; |
|
| 6 | +defined('ABSPATH') || exit; |
|
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | 9 | * Returns an array of payment gateways. |
@@ -11,82 +11,82 @@ discard block |
||
| 11 | 11 | * @return array |
| 12 | 12 | */ |
| 13 | 13 | function wpinv_get_payment_gateways() { |
| 14 | - return apply_filters( 'wpinv_payment_gateways', array() ); |
|
| 14 | + return apply_filters('wpinv_payment_gateways', array()); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | -function wpinv_payment_gateway_titles( $all_gateways ) { |
|
| 17 | +function wpinv_payment_gateway_titles($all_gateways) { |
|
| 18 | 18 | global $wpinv_options; |
| 19 | 19 | |
| 20 | 20 | $gateways = array(); |
| 21 | - foreach ( $all_gateways as $key => $gateway ) { |
|
| 22 | - if ( !empty( $wpinv_options[$key . '_title'] ) ) { |
|
| 23 | - $all_gateways[$key]['checkout_label'] = __( $wpinv_options[$key . '_title'], 'invoicing' ); |
|
| 21 | + foreach ($all_gateways as $key => $gateway) { |
|
| 22 | + if (!empty($wpinv_options[$key . '_title'])) { |
|
| 23 | + $all_gateways[$key]['checkout_label'] = __($wpinv_options[$key . '_title'], 'invoicing'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - $gateways[$key] = isset( $wpinv_options[$key . '_ordering'] ) ? $wpinv_options[$key . '_ordering'] : ( isset( $gateway['ordering'] ) ? $gateway['ordering'] : '' ); |
|
| 26 | + $gateways[$key] = isset($wpinv_options[$key . '_ordering']) ? $wpinv_options[$key . '_ordering'] : (isset($gateway['ordering']) ? $gateway['ordering'] : ''); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - asort( $gateways ); |
|
| 29 | + asort($gateways); |
|
| 30 | 30 | |
| 31 | - foreach ( $gateways as $gateway => $key ) { |
|
| 31 | + foreach ($gateways as $gateway => $key) { |
|
| 32 | 32 | $gateways[$gateway] = $all_gateways[$gateway]; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | return $gateways; |
| 36 | 36 | } |
| 37 | -add_filter( 'wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1 ); |
|
| 37 | +add_filter('wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1); |
|
| 38 | 38 | |
| 39 | -function wpinv_get_enabled_payment_gateways( $sort = false ) { |
|
| 39 | +function wpinv_get_enabled_payment_gateways($sort = false) { |
|
| 40 | 40 | $gateways = wpinv_get_payment_gateways(); |
| 41 | - $enabled = wpinv_get_option( 'gateways', false ); |
|
| 41 | + $enabled = wpinv_get_option('gateways', false); |
|
| 42 | 42 | |
| 43 | 43 | $gateway_list = array(); |
| 44 | 44 | |
| 45 | - foreach ( $gateways as $key => $gateway ) { |
|
| 46 | - if ( isset( $enabled[ $key ] ) && $enabled[ $key ] == 1 ) { |
|
| 47 | - $gateway_list[ $key ] = $gateway; |
|
| 45 | + foreach ($gateways as $key => $gateway) { |
|
| 46 | + if (isset($enabled[$key]) && $enabled[$key] == 1) { |
|
| 47 | + $gateway_list[$key] = $gateway; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - if ( true === $sort ) { |
|
| 52 | - uasort( $gateway_list, 'wpinv_sort_gateway_order' ); |
|
| 51 | + if (true === $sort) { |
|
| 52 | + uasort($gateway_list, 'wpinv_sort_gateway_order'); |
|
| 53 | 53 | |
| 54 | 54 | // Reorder our gateways so the default is first |
| 55 | 55 | $default_gateway_id = wpinv_get_default_gateway(); |
| 56 | 56 | |
| 57 | - if ( wpinv_is_gateway_active( $default_gateway_id ) ) { |
|
| 58 | - $default_gateway = array( $default_gateway_id => $gateway_list[ $default_gateway_id ] ); |
|
| 59 | - unset( $gateway_list[ $default_gateway_id ] ); |
|
| 57 | + if (wpinv_is_gateway_active($default_gateway_id)) { |
|
| 58 | + $default_gateway = array($default_gateway_id => $gateway_list[$default_gateway_id]); |
|
| 59 | + unset($gateway_list[$default_gateway_id]); |
|
| 60 | 60 | |
| 61 | - $gateway_list = array_merge( $default_gateway, $gateway_list ); |
|
| 61 | + $gateway_list = array_merge($default_gateway, $gateway_list); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - return apply_filters( 'wpinv_enabled_payment_gateways', $gateway_list ); |
|
| 65 | + return apply_filters('wpinv_enabled_payment_gateways', $gateway_list); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | -function wpinv_sort_gateway_order( $a, $b ) { |
|
| 68 | +function wpinv_sort_gateway_order($a, $b) { |
|
| 69 | 69 | return $a['ordering'] - $b['ordering']; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | -function wpinv_is_gateway_active( $gateway ) { |
|
| 72 | +function wpinv_is_gateway_active($gateway) { |
|
| 73 | 73 | $gateways = wpinv_get_enabled_payment_gateways(); |
| 74 | 74 | |
| 75 | - $ret = is_array($gateways) && $gateway ? array_key_exists( $gateway, $gateways ) : false; |
|
| 75 | + $ret = is_array($gateways) && $gateway ? array_key_exists($gateway, $gateways) : false; |
|
| 76 | 76 | |
| 77 | - return apply_filters( 'wpinv_is_gateway_active', $ret, $gateway, $gateways ); |
|
| 77 | + return apply_filters('wpinv_is_gateway_active', $ret, $gateway, $gateways); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | function wpinv_get_default_gateway() { |
| 81 | - $default = wpinv_get_option( 'default_gateway', 'paypal' ); |
|
| 81 | + $default = wpinv_get_option('default_gateway', 'paypal'); |
|
| 82 | 82 | |
| 83 | - if ( !wpinv_is_gateway_active( $default ) ) { |
|
| 83 | + if (!wpinv_is_gateway_active($default)) { |
|
| 84 | 84 | $gateways = wpinv_get_enabled_payment_gateways(); |
| 85 | - $gateways = array_keys( $gateways ); |
|
| 86 | - $default = reset( $gateways ); |
|
| 85 | + $gateways = array_keys($gateways); |
|
| 86 | + $default = reset($gateways); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - return apply_filters( 'wpinv_default_gateway', $default ); |
|
| 89 | + return apply_filters('wpinv_default_gateway', $default); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -95,17 +95,17 @@ discard block |
||
| 95 | 95 | * @param string $gateway The gateway to key. |
| 96 | 96 | * @return string |
| 97 | 97 | */ |
| 98 | -function wpinv_get_gateway_admin_label( $gateway ) { |
|
| 98 | +function wpinv_get_gateway_admin_label($gateway) { |
|
| 99 | 99 | |
| 100 | - if ( empty( $gateway ) || 'none' == $gateway ) { |
|
| 101 | - return esc_html__( 'No Gateway', 'invoicing' ); |
|
| 100 | + if (empty($gateway) || 'none' == $gateway) { |
|
| 101 | + return esc_html__('No Gateway', 'invoicing'); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | $gateways = wpinv_get_payment_gateways(); |
| 105 | - $label = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['admin_label'] : $gateway; |
|
| 106 | - $gateway = apply_filters( 'wpinv_gateway_admin_label', $label, $gateway ); |
|
| 105 | + $label = isset($gateways[$gateway]) ? $gateways[$gateway]['admin_label'] : $gateway; |
|
| 106 | + $gateway = apply_filters('wpinv_gateway_admin_label', $label, $gateway); |
|
| 107 | 107 | |
| 108 | - return wpinv_clean( $gateway ); |
|
| 108 | + return wpinv_clean($gateway); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -113,49 +113,49 @@ discard block |
||
| 113 | 113 | * |
| 114 | 114 | * @param string $gateway |
| 115 | 115 | */ |
| 116 | -function wpinv_get_gateway_description( $gateway ) { |
|
| 116 | +function wpinv_get_gateway_description($gateway) { |
|
| 117 | 117 | global $wpinv_options; |
| 118 | 118 | |
| 119 | - $description = ! empty( $wpinv_options[$gateway . '_desc'] ) ? $wpinv_options[$gateway . '_desc'] : ''; |
|
| 119 | + $description = !empty($wpinv_options[$gateway . '_desc']) ? $wpinv_options[$gateway . '_desc'] : ''; |
|
| 120 | 120 | |
| 121 | - return apply_filters( 'wpinv_gateway_description', $description, $gateway ); |
|
| 121 | + return apply_filters('wpinv_gateway_description', $description, $gateway); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | -function wpinv_get_gateway_button_label( $gateway ) { |
|
| 125 | - return apply_filters( 'wpinv_gateway_' . $gateway . '_button_label', '' ); |
|
| 124 | +function wpinv_get_gateway_button_label($gateway) { |
|
| 125 | + return apply_filters('wpinv_gateway_' . $gateway . '_button_label', ''); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | -function wpinv_get_gateway_checkout_label( $gateway ) { |
|
| 128 | +function wpinv_get_gateway_checkout_label($gateway) { |
|
| 129 | 129 | $gateways = wpinv_get_payment_gateways(); |
| 130 | - $label = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['checkout_label'] : $gateway; |
|
| 130 | + $label = isset($gateways[$gateway]) ? $gateways[$gateway]['checkout_label'] : $gateway; |
|
| 131 | 131 | |
| 132 | - if ( $gateway == 'none' ) { |
|
| 133 | - $label = __( 'None', 'invoicing' ); |
|
| 132 | + if ($gateway == 'none') { |
|
| 133 | + $label = __('None', 'invoicing'); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - return apply_filters( 'wpinv_gateway_checkout_label', ucfirst( $label ), $gateway ); |
|
| 136 | + return apply_filters('wpinv_gateway_checkout_label', ucfirst($label), $gateway); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | -function wpinv_settings_sections_gateways( $settings ) { |
|
| 139 | +function wpinv_settings_sections_gateways($settings) { |
|
| 140 | 140 | $gateways = wpinv_get_payment_gateways(); |
| 141 | 141 | |
| 142 | 142 | if (!empty($gateways)) { |
| 143 | - foreach ($gateways as $key => $gateway) { |
|
| 143 | + foreach ($gateways as $key => $gateway) { |
|
| 144 | 144 | $settings[$key] = $gateway['admin_label']; |
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | return $settings; |
| 149 | 149 | } |
| 150 | -add_filter( 'wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1 ); |
|
| 150 | +add_filter('wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1); |
|
| 151 | 151 | |
| 152 | 152 | /** |
| 153 | 153 | * Adds GateWay settings. |
| 154 | 154 | */ |
| 155 | -function wpinv_settings_gateways( $settings ) { |
|
| 155 | +function wpinv_settings_gateways($settings) { |
|
| 156 | 156 | |
| 157 | 157 | // Loop through each gateway. |
| 158 | - foreach ( wpinv_get_payment_gateways() as $key => $gateway ) { |
|
| 158 | + foreach (wpinv_get_payment_gateways() as $key => $gateway) { |
|
| 159 | 159 | |
| 160 | 160 | $gateway_settings = array( |
| 161 | 161 | |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | "{$key}_header" => array( |
| 164 | 164 | |
| 165 | 165 | 'id' => "{$key}_gateway_header", |
| 166 | - 'name' => '<h3>' . wp_sprintf( __( '%s Settings', 'invoicing' ), $gateway['admin_label'] ) . '</h3>', |
|
| 166 | + 'name' => '<h3>' . wp_sprintf(__('%s Settings', 'invoicing'), $gateway['admin_label']) . '</h3>', |
|
| 167 | 167 | 'custom' => $key, |
| 168 | 168 | 'type' => 'gateway_header', |
| 169 | 169 | |
@@ -172,56 +172,56 @@ discard block |
||
| 172 | 172 | // Activate/Deactivate a gateway. |
| 173 | 173 | "{$key}_active" => array( |
| 174 | 174 | 'id' => $key . '_active', |
| 175 | - 'name' => __( 'Activate', 'invoicing' ), |
|
| 176 | - 'desc' => wp_sprintf( __( 'Enable %s', 'invoicing' ), $gateway['admin_label'] ), |
|
| 175 | + 'name' => __('Activate', 'invoicing'), |
|
| 176 | + 'desc' => wp_sprintf(__('Enable %s', 'invoicing'), $gateway['admin_label']), |
|
| 177 | 177 | 'type' => 'checkbox', |
| 178 | 178 | ), |
| 179 | 179 | |
| 180 | 180 | // Activate/Deactivate sandbox. |
| 181 | 181 | "{$key}_sandbox" => array( |
| 182 | 182 | 'id' => $key . '_sandbox', |
| 183 | - 'name' => __( 'Sandbox', 'invoicing' ), |
|
| 184 | - 'desc' => __( 'Enable sandbox to test payments', 'invoicing' ), |
|
| 183 | + 'name' => __('Sandbox', 'invoicing'), |
|
| 184 | + 'desc' => __('Enable sandbox to test payments', 'invoicing'), |
|
| 185 | 185 | 'type' => 'checkbox', |
| 186 | 186 | ), |
| 187 | 187 | |
| 188 | 188 | // Checkout title. |
| 189 | 189 | "{$key}_title" => array( |
| 190 | 190 | 'id' => $key . '_title', |
| 191 | - 'name' => __( 'Checkout Title', 'invoicing' ), |
|
| 192 | - 'std' => isset( $gateway['checkout_label'] ) ? $gateway['checkout_label'] : '', |
|
| 191 | + 'name' => __('Checkout Title', 'invoicing'), |
|
| 192 | + 'std' => isset($gateway['checkout_label']) ? $gateway['checkout_label'] : '', |
|
| 193 | 193 | 'type' => 'text', |
| 194 | 194 | ), |
| 195 | 195 | |
| 196 | 196 | // Checkout description. |
| 197 | 197 | "{$key}_desc" => array( |
| 198 | 198 | 'id' => $key . '_desc', |
| 199 | - 'name' => __( 'Checkout Description', 'invoicing' ), |
|
| 200 | - 'std' => apply_filters( "getpaid_default_{$key}_checkout_description", '' ), |
|
| 199 | + 'name' => __('Checkout Description', 'invoicing'), |
|
| 200 | + 'std' => apply_filters("getpaid_default_{$key}_checkout_description", ''), |
|
| 201 | 201 | 'type' => 'text', |
| 202 | 202 | ), |
| 203 | 203 | |
| 204 | 204 | // Checkout order. |
| 205 | 205 | "{$key}_ordering" => array( |
| 206 | 206 | 'id' => $key . '_ordering', |
| 207 | - 'name' => __( 'Priority', 'invoicing' ), |
|
| 208 | - 'std' => apply_filters( "getpaid_default_{$key}_checkout_description", '' ), |
|
| 207 | + 'name' => __('Priority', 'invoicing'), |
|
| 208 | + 'std' => apply_filters("getpaid_default_{$key}_checkout_description", ''), |
|
| 209 | 209 | 'type' => 'number', |
| 210 | 210 | 'step' => '1', |
| 211 | 211 | 'min' => '-100000', |
| 212 | 212 | 'max' => '100000', |
| 213 | - 'std' => isset( $gateway['ordering'] ) ? $gateway['ordering'] : '10', |
|
| 213 | + 'std' => isset($gateway['ordering']) ? $gateway['ordering'] : '10', |
|
| 214 | 214 | ), |
| 215 | 215 | |
| 216 | 216 | ); |
| 217 | 217 | |
| 218 | 218 | // Maybe remove the sandbox. |
| 219 | - if ( ! apply_filters( "wpinv_{$key}_supports_sandbox", false ) ) { |
|
| 220 | - unset( $gateway_settings["{$key}_sandbox"] ); |
|
| 219 | + if (!apply_filters("wpinv_{$key}_supports_sandbox", false)) { |
|
| 220 | + unset($gateway_settings["{$key}_sandbox"]); |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - $gateway_settings = apply_filters( 'wpinv_gateway_settings', $gateway_settings, $key, $gateway ); |
|
| 224 | - $gateway_settings = apply_filters( 'wpinv_gateway_settings_' . $key, $gateway_settings, $gateway ); |
|
| 223 | + $gateway_settings = apply_filters('wpinv_gateway_settings', $gateway_settings, $key, $gateway); |
|
| 224 | + $gateway_settings = apply_filters('wpinv_gateway_settings_' . $key, $gateway_settings, $gateway); |
|
| 225 | 225 | |
| 226 | 226 | $settings[$key] = $gateway_settings; |
| 227 | 227 | } |
@@ -229,57 +229,57 @@ discard block |
||
| 229 | 229 | return $settings; |
| 230 | 230 | |
| 231 | 231 | } |
| 232 | -add_filter( 'wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1 ); |
|
| 232 | +add_filter('wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1); |
|
| 233 | 233 | |
| 234 | -function wpinv_gateway_header_callback( $args ) { |
|
| 235 | - echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr( $args['custom'] ) . '" />'; |
|
| 234 | +function wpinv_gateway_header_callback($args) { |
|
| 235 | + echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr($args['custom']) . '" />'; |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | -function wpinv_get_gateway_supports( $gateway ) { |
|
| 238 | +function wpinv_get_gateway_supports($gateway) { |
|
| 239 | 239 | $gateways = wpinv_get_enabled_payment_gateways(); |
| 240 | - $supports = isset( $gateways[ $gateway ]['supports'] ) ? $gateways[ $gateway ]['supports'] : array(); |
|
| 241 | - return apply_filters( 'wpinv_gateway_supports', $supports, $gateway ); |
|
| 240 | + $supports = isset($gateways[$gateway]['supports']) ? $gateways[$gateway]['supports'] : array(); |
|
| 241 | + return apply_filters('wpinv_gateway_supports', $supports, $gateway); |
|
| 242 | 242 | } |
| 243 | 243 | |
| 244 | -function wpinv_get_chosen_gateway( $invoice_id = 0 ) { |
|
| 245 | - $gateways = array_keys( wpinv_get_enabled_payment_gateways() ); |
|
| 244 | +function wpinv_get_chosen_gateway($invoice_id = 0) { |
|
| 245 | + $gateways = array_keys(wpinv_get_enabled_payment_gateways()); |
|
| 246 | 246 | |
| 247 | 247 | $chosen = false; |
| 248 | - if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) { |
|
| 248 | + if ($invoice_id > 0 && $invoice = wpinv_get_invoice($invoice_id)) { |
|
| 249 | 249 | $chosen = $invoice->get_gateway(); |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - $chosen = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen; |
|
| 252 | + $chosen = isset($_REQUEST['payment-mode']) ? sanitize_text_field($_REQUEST['payment-mode']) : $chosen; |
|
| 253 | 253 | |
| 254 | - if ( false !== $chosen ) { |
|
| 255 | - $chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen ); |
|
| 254 | + if (false !== $chosen) { |
|
| 255 | + $chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen); |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | - if ( ! empty ( $chosen ) ) { |
|
| 259 | - $enabled_gateway = urldecode( $chosen ); |
|
| 260 | - } else if ( !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) { |
|
| 258 | + if (!empty ($chosen)) { |
|
| 259 | + $enabled_gateway = urldecode($chosen); |
|
| 260 | + } else if (!empty($invoice) && (float) $invoice->get_subtotal() <= 0) { |
|
| 261 | 261 | $enabled_gateway = 'manual'; |
| 262 | 262 | } else { |
| 263 | 263 | $enabled_gateway = wpinv_get_default_gateway(); |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | - if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) { |
|
| 267 | - if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){ |
|
| 266 | + if (!wpinv_is_gateway_active($enabled_gateway) && !empty($gateways)) { |
|
| 267 | + if (wpinv_is_gateway_active(wpinv_get_default_gateway())) { |
|
| 268 | 268 | $enabled_gateway = wpinv_get_default_gateway(); |
| 269 | - }else{ |
|
| 269 | + } else { |
|
| 270 | 270 | $enabled_gateway = $gateways[0]; |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | - return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway ); |
|
| 275 | + return apply_filters('wpinv_chosen_gateway', $enabled_gateway); |
|
| 276 | 276 | } |
| 277 | 277 | |
| 278 | -function wpinv_record_gateway_error( $title = '', $message = '' ) { |
|
| 279 | - return wpinv_error_log( $message, $title ); |
|
| 278 | +function wpinv_record_gateway_error($title = '', $message = '') { |
|
| 279 | + return wpinv_error_log($message, $title); |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | -function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) { |
|
| 282 | +function wpinv_count_sales_by_gateway($gateway_id = 'paypal', $status = 'publish') { |
|
| 283 | 283 | $ret = 0; |
| 284 | 284 | $args = array( |
| 285 | 285 | 'meta_key' => '_wpinv_gateway', |
@@ -290,48 +290,48 @@ discard block |
||
| 290 | 290 | 'fields' => 'ids' |
| 291 | 291 | ); |
| 292 | 292 | |
| 293 | - $payments = new WP_Query( $args ); |
|
| 293 | + $payments = new WP_Query($args); |
|
| 294 | 294 | |
| 295 | - if( $payments ) |
|
| 295 | + if ($payments) |
|
| 296 | 296 | $ret = $payments->post_count; |
| 297 | 297 | return $ret; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | -function wpinv_settings_update_gateways( $input ) { |
|
| 300 | +function wpinv_settings_update_gateways($input) { |
|
| 301 | 301 | global $wpinv_options; |
| 302 | 302 | |
| 303 | - if ( !empty( $input['save_gateway'] ) ) { |
|
| 304 | - $gateways = wpinv_get_option( 'gateways', false ); |
|
| 303 | + if (!empty($input['save_gateway'])) { |
|
| 304 | + $gateways = wpinv_get_option('gateways', false); |
|
| 305 | 305 | $gateways = !empty($gateways) ? $gateways : array(); |
| 306 | 306 | $gateway = $input['save_gateway']; |
| 307 | 307 | |
| 308 | - if ( !empty( $input[$gateway . '_active'] ) ) { |
|
| 308 | + if (!empty($input[$gateway . '_active'])) { |
|
| 309 | 309 | $gateways[$gateway] = 1; |
| 310 | 310 | } else { |
| 311 | - if ( isset( $gateways[$gateway] ) ) { |
|
| 312 | - unset( $gateways[$gateway] ); |
|
| 311 | + if (isset($gateways[$gateway])) { |
|
| 312 | + unset($gateways[$gateway]); |
|
| 313 | 313 | } |
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | $input['gateways'] = $gateways; |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | - if ( !empty( $input['default_gateway'] ) ) { |
|
| 319 | + if (!empty($input['default_gateway'])) { |
|
| 320 | 320 | $gateways = wpinv_get_payment_gateways(); |
| 321 | 321 | |
| 322 | - foreach ( $gateways as $key => $gateway ) { |
|
| 323 | - $active = 0; |
|
| 324 | - if ( !empty( $input['gateways'] ) && !empty( $input['gateways'][$key] ) ) { |
|
| 322 | + foreach ($gateways as $key => $gateway) { |
|
| 323 | + $active = 0; |
|
| 324 | + if (!empty($input['gateways']) && !empty($input['gateways'][$key])) { |
|
| 325 | 325 | $active = 1; |
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | $input[$key . '_active'] = $active; |
| 329 | 329 | |
| 330 | - if ( empty( $wpinv_options[$key . '_title'] ) ) { |
|
| 330 | + if (empty($wpinv_options[$key . '_title'])) { |
|
| 331 | 331 | $input[$key . '_title'] = $gateway['checkout_label']; |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - if ( !isset( $wpinv_options[$key . '_ordering'] ) && isset( $gateway['ordering'] ) ) { |
|
| 334 | + if (!isset($wpinv_options[$key . '_ordering']) && isset($gateway['ordering'])) { |
|
| 335 | 335 | $input[$key . '_ordering'] = $gateway['ordering']; |
| 336 | 336 | } |
| 337 | 337 | } |
@@ -339,27 +339,27 @@ discard block |
||
| 339 | 339 | |
| 340 | 340 | return $input; |
| 341 | 341 | } |
| 342 | -add_filter( 'wpinv_settings_tab_gateways_sanitize', 'wpinv_settings_update_gateways', 10, 1 ); |
|
| 342 | +add_filter('wpinv_settings_tab_gateways_sanitize', 'wpinv_settings_update_gateways', 10, 1); |
|
| 343 | 343 | |
| 344 | 344 | // PayPal Standard settings |
| 345 | -function wpinv_gateway_settings_paypal( $setting ) { |
|
| 346 | - $setting['paypal_active']['desc'] = $setting['paypal_active']['desc'] . ' ' . __( '( Supported Currencies: AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, NOK, NZD, PHP, PLN, GBP, SGD, SEK, CHF, TWD, THB, USD )', 'invoicing' ); |
|
| 347 | - $setting['paypal_desc']['std'] = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' ); |
|
| 345 | +function wpinv_gateway_settings_paypal($setting) { |
|
| 346 | + $setting['paypal_active']['desc'] = $setting['paypal_active']['desc'] . ' ' . __('( Supported Currencies: AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, NOK, NZD, PHP, PLN, GBP, SGD, SEK, CHF, TWD, THB, USD )', 'invoicing'); |
|
| 347 | + $setting['paypal_desc']['std'] = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing'); |
|
| 348 | 348 | |
| 349 | 349 | $setting['paypal_sandbox'] = array( |
| 350 | 350 | 'type' => 'checkbox', |
| 351 | 351 | 'id' => 'paypal_sandbox', |
| 352 | - 'name' => __( 'PayPal Sandbox', 'invoicing' ), |
|
| 353 | - 'desc' => __( 'PayPal sandbox can be used to test payments.', 'invoicing' ), |
|
| 352 | + 'name' => __('PayPal Sandbox', 'invoicing'), |
|
| 353 | + 'desc' => __('PayPal sandbox can be used to test payments.', 'invoicing'), |
|
| 354 | 354 | 'std' => 1 |
| 355 | 355 | ); |
| 356 | 356 | |
| 357 | 357 | $setting['paypal_email'] = array( |
| 358 | 358 | 'type' => 'text', |
| 359 | 359 | 'id' => 'paypal_email', |
| 360 | - 'name' => __( 'PayPal Email', 'invoicing' ), |
|
| 361 | - 'desc' => __( 'Please enter your PayPal account\'s email address. Ex: [email protected]', 'invoicing' ), |
|
| 362 | - 'std' => __( '[email protected]', 'invoicing' ), |
|
| 360 | + 'name' => __('PayPal Email', 'invoicing'), |
|
| 361 | + 'desc' => __('Please enter your PayPal account\'s email address. Ex: [email protected]', 'invoicing'), |
|
| 362 | + 'std' => __('[email protected]', 'invoicing'), |
|
| 363 | 363 | ); |
| 364 | 364 | /* |
| 365 | 365 | $setting['paypal_ipn_url'] = array( |
@@ -373,18 +373,18 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | return $setting; |
| 375 | 375 | } |
| 376 | -add_filter( 'wpinv_gateway_settings_paypal', 'wpinv_gateway_settings_paypal', 10, 1 ); |
|
| 376 | +add_filter('wpinv_gateway_settings_paypal', 'wpinv_gateway_settings_paypal', 10, 1); |
|
| 377 | 377 | |
| 378 | 378 | /** |
| 379 | 379 | * Displays the ipn url field. |
| 380 | 380 | */ |
| 381 | -function wpinv_ipn_url_callback( $args ) { |
|
| 382 | - $sanitize_id = wpinv_sanitize_key( $args['id'] ); |
|
| 381 | +function wpinv_ipn_url_callback($args) { |
|
| 382 | + $sanitize_id = wpinv_sanitize_key($args['id']); |
|
| 383 | 383 | |
| 384 | 384 | $attrs = $args['readonly'] ? ' readonly' : ''; |
| 385 | 385 | |
| 386 | - $html = '<input class="regular-text" type="text" ' . $attrs . ' value="' . esc_attr( $args['std'] ) . '" name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . ']" onClick="this.select()">'; |
|
| 387 | - $html .= '<label for="wpinv_settings[' . $sanitize_id . ']">' . $args['desc'] . '</label>'; |
|
| 386 | + $html = '<input class="regular-text" type="text" ' . $attrs . ' value="' . esc_attr($args['std']) . '" name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . ']" onClick="this.select()">'; |
|
| 387 | + $html .= '<label for="wpinv_settings[' . $sanitize_id . ']">' . $args['desc'] . '</label>'; |
|
| 388 | 388 | |
| 389 | 389 | echo $html; |
| 390 | 390 | } |
@@ -396,9 +396,9 @@ discard block |
||
| 396 | 396 | * |
| 397 | 397 | * @return bool |
| 398 | 398 | */ |
| 399 | -function wpinv_is_test_mode( $gateway = '' ) { |
|
| 400 | - $sandbox = empty( $gateway ) ? false : wpinv_get_option( "{$gateway}_sandbox", false ); |
|
| 401 | - return apply_filters( 'wpinv_is_test_mode', $sandbox, $gateway ); |
|
| 399 | +function wpinv_is_test_mode($gateway = '') { |
|
| 400 | + $sandbox = empty($gateway) ? false : wpinv_get_option("{$gateway}_sandbox", false); |
|
| 401 | + return apply_filters('wpinv_is_test_mode', $sandbox, $gateway); |
|
| 402 | 402 | } |
| 403 | 403 | |
| 404 | 404 | /** |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | * |
| 410 | 410 | * @return string |
| 411 | 411 | */ |
| 412 | -function wpinv_get_ipn_url( $gateway = false, $args = array() ) { |
|
| 412 | +function wpinv_get_ipn_url($gateway = false, $args = array()) { |
|
| 413 | 413 | $args = wp_parse_args( |
| 414 | 414 | array( |
| 415 | 415 | 'wpi-listener' => 'IPN', |
@@ -418,37 +418,37 @@ discard block |
||
| 418 | 418 | $args |
| 419 | 419 | ); |
| 420 | 420 | |
| 421 | - return apply_filters( 'wpinv_ipn_url', add_query_arg( $args, home_url( 'index.php' ) ), $gateway, $args ); |
|
| 421 | + return apply_filters('wpinv_ipn_url', add_query_arg($args, home_url('index.php')), $gateway, $args); |
|
| 422 | 422 | |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | /** |
| 426 | 426 | * Retrieves request data with slashes removed slashes. |
| 427 | 427 | */ |
| 428 | -function wpinv_get_post_data( $method = 'request' ) { |
|
| 428 | +function wpinv_get_post_data($method = 'request') { |
|
| 429 | 429 | |
| 430 | - if ( $method == 'post' ) { |
|
| 431 | - return wp_unslash( $_POST ); |
|
| 430 | + if ($method == 'post') { |
|
| 431 | + return wp_unslash($_POST); |
|
| 432 | 432 | } |
| 433 | 433 | |
| 434 | - if ( $method == 'get' ) { |
|
| 435 | - return wp_unslash( $_GET ); |
|
| 434 | + if ($method == 'get') { |
|
| 435 | + return wp_unslash($_GET); |
|
| 436 | 436 | } |
| 437 | 437 | |
| 438 | - return wp_unslash( $_REQUEST ); |
|
| 438 | + return wp_unslash($_REQUEST); |
|
| 439 | 439 | |
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | /** |
| 443 | 443 | * Checks if a given gateway supports subscription payments. |
| 444 | 444 | */ |
| 445 | -function wpinv_gateway_support_subscription( $gateway ) { |
|
| 445 | +function wpinv_gateway_support_subscription($gateway) { |
|
| 446 | 446 | $supports = false; |
| 447 | 447 | |
| 448 | - if ( wpinv_is_gateway_active( $gateway ) ) { |
|
| 449 | - $supports = apply_filters( 'wpinv_' . $gateway . '_support_subscription', $supports ); |
|
| 448 | + if (wpinv_is_gateway_active($gateway)) { |
|
| 449 | + $supports = apply_filters('wpinv_' . $gateway . '_support_subscription', $supports); |
|
| 450 | 450 | |
| 451 | - $supports = apply_filters( 'getapid_gateway_supports_subscription', $supports, $gateway ); |
|
| 451 | + $supports = apply_filters('getapid_gateway_supports_subscription', $supports, $gateway); |
|
| 452 | 452 | } |
| 453 | 453 | |
| 454 | 454 | return $supports; |
@@ -460,14 +460,14 @@ discard block |
||
| 460 | 460 | * @param array $gateways an array of gateways. |
| 461 | 461 | * @param GetPaid_Payment_Form $form payment form. |
| 462 | 462 | */ |
| 463 | -function wpinv_payment_gateways_on_cart( $gateways, $form ) { |
|
| 463 | +function wpinv_payment_gateways_on_cart($gateways, $form) { |
|
| 464 | 464 | |
| 465 | - if ( $form->is_recurring() ) { |
|
| 465 | + if ($form->is_recurring()) { |
|
| 466 | 466 | |
| 467 | - foreach ( array_keys( $gateways ) as $gateway ) { |
|
| 467 | + foreach (array_keys($gateways) as $gateway) { |
|
| 468 | 468 | |
| 469 | - if ( ! wpinv_gateway_support_subscription( $gateway ) ) { |
|
| 470 | - unset( $gateways[$gateway] ); |
|
| 469 | + if (!wpinv_gateway_support_subscription($gateway)) { |
|
| 470 | + unset($gateways[$gateway]); |
|
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | } |
@@ -476,4 +476,4 @@ discard block |
||
| 476 | 476 | |
| 477 | 477 | return $gateways; |
| 478 | 478 | } |
| 479 | -add_filter( 'getpaid_payment_form_gateways', 'wpinv_payment_gateways_on_cart', 10, 2 ); |
|
| 479 | +add_filter('getpaid_payment_form_gateways', 'wpinv_payment_gateways_on_cart', 10, 2); |
|
@@ -70,8 +70,9 @@ discard block |
||
| 70 | 70 | if( !empty( $tax_rates ) ) { |
| 71 | 71 | // Locate the tax rate for this country / state, if it exists |
| 72 | 72 | foreach( $tax_rates as $key => $tax_rate ) { |
| 73 | - if( $country != $tax_rate['country'] ) |
|
| 74 | - continue; |
|
| 73 | + if( $country != $tax_rate['country'] ) { |
|
| 74 | + continue; |
|
| 75 | + } |
|
| 75 | 76 | |
| 76 | 77 | if( !empty( $tax_rate['global'] ) ) { |
| 77 | 78 | if( !empty( $tax_rate['rate'] ) ) { |
@@ -79,8 +80,9 @@ discard block |
||
| 79 | 80 | } |
| 80 | 81 | } else { |
| 81 | 82 | |
| 82 | - if( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) ) |
|
| 83 | - continue; |
|
| 83 | + if( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) ) { |
|
| 84 | + continue; |
|
| 85 | + } |
|
| 84 | 86 | |
| 85 | 87 | $state_rate = $tax_rate['rate']; |
| 86 | 88 | if( 0 !== $state_rate || !empty( $state_rate ) ) { |
@@ -183,8 +185,9 @@ discard block |
||
| 183 | 185 | } |
| 184 | 186 | |
| 185 | 187 | function wpinv_cart_needs_tax_address_fields() { |
| 186 | - if( !wpinv_is_cart_taxed() ) |
|
| 187 | - return false; |
|
| 188 | + if( !wpinv_is_cart_taxed() ) { |
|
| 189 | + return false; |
|
| 190 | + } |
|
| 188 | 191 | |
| 189 | 192 | return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' ); |
| 190 | 193 | } |
@@ -618,10 +618,10 @@ |
||
| 618 | 618 | |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | - if ( empty( $iso ) ) { |
|
| 622 | - return false; |
|
| 623 | - } |
|
| 621 | + if ( empty( $iso ) ) { |
|
| 622 | + return false; |
|
| 623 | + } |
|
| 624 | 624 | |
| 625 | - return compact( 'iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit' ); |
|
| 625 | + return compact( 'iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit' ); |
|
| 626 | 626 | |
| 627 | 627 | } |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | // MUST have WordPress. |
| 3 | -if ( !defined( 'WPINC' ) ) { |
|
| 4 | - exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) ); |
|
| 3 | +if (!defined('WPINC')) { |
|
| 4 | + exit('Do NOT access this file directly: ' . basename(__FILE__)); |
|
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | /** |
@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | * |
| 19 | 19 | * @return bool |
| 20 | 20 | */ |
| 21 | -function getpaid_is_eu_state( $country ) { |
|
| 22 | - return WPInv_EUVat::is_eu_state( $country ); |
|
| 21 | +function getpaid_is_eu_state($country) { |
|
| 22 | + return WPInv_EUVat::is_eu_state($country); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -27,8 +27,8 @@ discard block |
||
| 27 | 27 | * |
| 28 | 28 | * @return bool |
| 29 | 29 | */ |
| 30 | -function getpaid_is_gst_country( $country ) { |
|
| 31 | - return WPInv_EUVat::is_gst_country( $country ); |
|
| 30 | +function getpaid_is_gst_country($country) { |
|
| 31 | + return WPInv_EUVat::is_gst_country($country); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -42,117 +42,117 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | function wpinv_use_taxes() { |
| 45 | - $ret = wpinv_get_option( 'enable_taxes', false ); |
|
| 45 | + $ret = wpinv_get_option('enable_taxes', false); |
|
| 46 | 46 | |
| 47 | - return (bool) apply_filters( 'wpinv_use_taxes', $ret ); |
|
| 47 | + return (bool) apply_filters('wpinv_use_taxes', $ret); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | function wpinv_get_tax_rates() { |
| 51 | - $rates = get_option( 'wpinv_tax_rates', array() ); |
|
| 51 | + $rates = get_option('wpinv_tax_rates', array()); |
|
| 52 | 52 | |
| 53 | - return apply_filters( 'wpinv_get_tax_rates', $rates ); |
|
| 53 | + return apply_filters('wpinv_get_tax_rates', $rates); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -function wpinv_get_tax_rate( $country = false, $state = false, $item_id = 0 ) { |
|
| 56 | +function wpinv_get_tax_rate($country = false, $state = false, $item_id = 0) { |
|
| 57 | 57 | global $wpinv_euvat, $wpi_tax_rates, $wpi_userID; |
| 58 | - $wpi_tax_rates = !empty( $wpi_tax_rates ) ? $wpi_tax_rates : array(); |
|
| 58 | + $wpi_tax_rates = !empty($wpi_tax_rates) ? $wpi_tax_rates : array(); |
|
| 59 | 59 | |
| 60 | - if ( !empty( $wpi_tax_rates ) && !empty( $item_id ) && isset( $wpi_tax_rates[$item_id] ) ) { |
|
| 60 | + if (!empty($wpi_tax_rates) && !empty($item_id) && isset($wpi_tax_rates[$item_id])) { |
|
| 61 | 61 | return $wpi_tax_rates[$item_id]; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if ( !$wpinv_euvat->item_is_taxable( $item_id, $country, $state ) ) { |
|
| 64 | + if (!$wpinv_euvat->item_is_taxable($item_id, $country, $state)) { |
|
| 65 | 65 | $wpi_tax_rates[$item_id] = 0; |
| 66 | 66 | return 0; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | $is_global = false; |
| 70 | - if ( $item_id == 'global' ) { |
|
| 70 | + if ($item_id == 'global') { |
|
| 71 | 71 | $is_global = true; |
| 72 | 72 | $item_id = 0; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - $rate = (float)wpinv_get_option( 'tax_rate', 0 ); |
|
| 76 | - $user_address = wpinv_get_user_address( $wpi_userID ); |
|
| 75 | + $rate = (float) wpinv_get_option('tax_rate', 0); |
|
| 76 | + $user_address = wpinv_get_user_address($wpi_userID); |
|
| 77 | 77 | |
| 78 | - if( empty( $country ) ) { |
|
| 79 | - if( !empty( $_POST['wpinv_country'] ) ) { |
|
| 78 | + if (empty($country)) { |
|
| 79 | + if (!empty($_POST['wpinv_country'])) { |
|
| 80 | 80 | $country = $_POST['wpinv_country']; |
| 81 | - } elseif( !empty( $_POST['wpinv_country'] ) ) { |
|
| 81 | + } elseif (!empty($_POST['wpinv_country'])) { |
|
| 82 | 82 | $country = $_POST['wpinv_country']; |
| 83 | - } elseif( !empty( $_POST['country'] ) ) { |
|
| 83 | + } elseif (!empty($_POST['country'])) { |
|
| 84 | 84 | $country = $_POST['country']; |
| 85 | - } elseif( is_user_logged_in() && !empty( $user_address ) ) { |
|
| 85 | + } elseif (is_user_logged_in() && !empty($user_address)) { |
|
| 86 | 86 | $country = $user_address['country']; |
| 87 | 87 | } |
| 88 | - $country = !empty( $country ) ? $country : wpinv_get_default_country(); |
|
| 88 | + $country = !empty($country) ? $country : wpinv_get_default_country(); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - if( empty( $state ) ) { |
|
| 92 | - if( !empty( $_POST['wpinv_state'] ) ) { |
|
| 91 | + if (empty($state)) { |
|
| 92 | + if (!empty($_POST['wpinv_state'])) { |
|
| 93 | 93 | $state = $_POST['wpinv_state']; |
| 94 | - } elseif( !empty( $_POST['wpinv_state'] ) ) { |
|
| 94 | + } elseif (!empty($_POST['wpinv_state'])) { |
|
| 95 | 95 | $state = $_POST['wpinv_state']; |
| 96 | - } elseif( !empty( $_POST['state'] ) ) { |
|
| 96 | + } elseif (!empty($_POST['state'])) { |
|
| 97 | 97 | $state = $_POST['state']; |
| 98 | - } elseif( is_user_logged_in() && !empty( $user_address ) ) { |
|
| 98 | + } elseif (is_user_logged_in() && !empty($user_address)) { |
|
| 99 | 99 | $state = $user_address['state']; |
| 100 | 100 | } |
| 101 | - $state = !empty( $state ) ? $state : wpinv_get_default_state(); |
|
| 101 | + $state = !empty($state) ? $state : wpinv_get_default_state(); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - if( !empty( $country ) ) { |
|
| 105 | - $tax_rates = wpinv_get_tax_rates(); |
|
| 104 | + if (!empty($country)) { |
|
| 105 | + $tax_rates = wpinv_get_tax_rates(); |
|
| 106 | 106 | |
| 107 | - if( !empty( $tax_rates ) ) { |
|
| 107 | + if (!empty($tax_rates)) { |
|
| 108 | 108 | // Locate the tax rate for this country / state, if it exists |
| 109 | - foreach( $tax_rates as $key => $tax_rate ) { |
|
| 110 | - if( $country != $tax_rate['country'] ) |
|
| 109 | + foreach ($tax_rates as $key => $tax_rate) { |
|
| 110 | + if ($country != $tax_rate['country']) |
|
| 111 | 111 | continue; |
| 112 | 112 | |
| 113 | - if( !empty( $tax_rate['global'] ) ) { |
|
| 114 | - if( !empty( $tax_rate['rate'] ) ) { |
|
| 115 | - $rate = number_format( $tax_rate['rate'], 4 ); |
|
| 113 | + if (!empty($tax_rate['global'])) { |
|
| 114 | + if (!empty($tax_rate['rate'])) { |
|
| 115 | + $rate = number_format($tax_rate['rate'], 4); |
|
| 116 | 116 | } |
| 117 | 117 | } else { |
| 118 | 118 | |
| 119 | - if( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) ) |
|
| 119 | + if (empty($tax_rate['state']) || strtolower($state) != strtolower($tax_rate['state'])) |
|
| 120 | 120 | continue; |
| 121 | 121 | |
| 122 | 122 | $state_rate = $tax_rate['rate']; |
| 123 | - if( 0 !== $state_rate || !empty( $state_rate ) ) { |
|
| 124 | - $rate = number_format( $state_rate, 4 ); |
|
| 123 | + if (0 !== $state_rate || !empty($state_rate)) { |
|
| 124 | + $rate = number_format($state_rate, 4); |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - $rate = apply_filters( 'wpinv_tax_rate', $rate, $country, $state, $item_id ); |
|
| 131 | + $rate = apply_filters('wpinv_tax_rate', $rate, $country, $state, $item_id); |
|
| 132 | 132 | |
| 133 | - if ( !empty( $item_id ) ) { |
|
| 133 | + if (!empty($item_id)) { |
|
| 134 | 134 | $wpi_tax_rates[$item_id] = $rate; |
| 135 | - } else if ( $is_global ) { |
|
| 135 | + } else if ($is_global) { |
|
| 136 | 136 | $wpi_tax_rates['global'] = $rate; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | return $rate; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | -function wpinv_get_formatted_tax_rate( $country = false, $state = false, $item_id ) { |
|
| 143 | - $rate = wpinv_get_tax_rate( $country, $state, $item_id ); |
|
| 144 | - $rate = round( $rate, 4 ); |
|
| 142 | +function wpinv_get_formatted_tax_rate($country = false, $state = false, $item_id) { |
|
| 143 | + $rate = wpinv_get_tax_rate($country, $state, $item_id); |
|
| 144 | + $rate = round($rate, 4); |
|
| 145 | 145 | $formatted = $rate .= '%'; |
| 146 | - return apply_filters( 'wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id ); |
|
| 146 | + return apply_filters('wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | -function wpinv_calculate_tax( $amount = 0, $country = false, $state = false, $item_id = 0 ) { |
|
| 150 | - $rate = wpinv_get_tax_rate( $country, $state, $item_id ); |
|
| 149 | +function wpinv_calculate_tax($amount = 0, $country = false, $state = false, $item_id = 0) { |
|
| 150 | + $rate = wpinv_get_tax_rate($country, $state, $item_id); |
|
| 151 | 151 | $tax = 0.00; |
| 152 | 152 | |
| 153 | - if ( wpinv_use_taxes() ) { |
|
| 154 | - if ( wpinv_prices_include_tax() ) { |
|
| 155 | - $pre_tax = ( $amount / ( ( 1 + $rate ) * 0.01 ) ); |
|
| 153 | + if (wpinv_use_taxes()) { |
|
| 154 | + if (wpinv_prices_include_tax()) { |
|
| 155 | + $pre_tax = ($amount / ((1 + $rate) * 0.01)); |
|
| 156 | 156 | $tax = $amount - $pre_tax; |
| 157 | 157 | } else { |
| 158 | 158 | $tax = $amount * $rate * 0.01; |
@@ -160,46 +160,46 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - return apply_filters( 'wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id ); |
|
| 163 | + return apply_filters('wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | function wpinv_prices_include_tax() { |
| 167 | 167 | return false; // TODO |
| 168 | - $ret = ( wpinv_get_option( 'prices_include_tax', false ) == 'yes' && wpinv_use_taxes() ); |
|
| 168 | + $ret = (wpinv_get_option('prices_include_tax', false) == 'yes' && wpinv_use_taxes()); |
|
| 169 | 169 | |
| 170 | - return apply_filters( 'wpinv_prices_include_tax', $ret ); |
|
| 170 | + return apply_filters('wpinv_prices_include_tax', $ret); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | -function wpinv_sales_tax_for_year( $year = null ) { |
|
| 174 | - return wpinv_price( wpinv_format_amount( wpinv_get_sales_tax_for_year( $year ) ) ); |
|
| 173 | +function wpinv_sales_tax_for_year($year = null) { |
|
| 174 | + return wpinv_price(wpinv_format_amount(wpinv_get_sales_tax_for_year($year))); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | -function wpinv_get_sales_tax_for_year( $year = null ) { |
|
| 177 | +function wpinv_get_sales_tax_for_year($year = null) { |
|
| 178 | 178 | global $wpdb; |
| 179 | 179 | |
| 180 | 180 | // Start at zero |
| 181 | 181 | $tax = 0; |
| 182 | 182 | |
| 183 | - if ( ! empty( $year ) ) { |
|
| 183 | + if (!empty($year)) { |
|
| 184 | 184 | $args = array( |
| 185 | 185 | 'post_type' => 'wpi_invoice', |
| 186 | - 'post_status' => array( 'publish' ), |
|
| 186 | + 'post_status' => array('publish'), |
|
| 187 | 187 | 'posts_per_page' => -1, |
| 188 | 188 | 'year' => $year, |
| 189 | 189 | 'fields' => 'ids' |
| 190 | 190 | ); |
| 191 | 191 | |
| 192 | - $payments = get_posts( $args ); |
|
| 193 | - $payment_ids = implode( ',', $payments ); |
|
| 192 | + $payments = get_posts($args); |
|
| 193 | + $payment_ids = implode(',', $payments); |
|
| 194 | 194 | |
| 195 | - if ( count( $payments ) > 0 ) { |
|
| 195 | + if (count($payments) > 0) { |
|
| 196 | 196 | $sql = "SELECT SUM( meta_value ) FROM $wpdb->postmeta WHERE meta_key = '_wpinv_tax' AND post_id IN( $payment_ids )"; |
| 197 | - $tax = $wpdb->get_var( $sql ); |
|
| 197 | + $tax = $wpdb->get_var($sql); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - return apply_filters( 'wpinv_get_sales_tax_for_year', $tax, $year ); |
|
| 202 | + return apply_filters('wpinv_get_sales_tax_for_year', $tax, $year); |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | function wpinv_is_cart_taxed() { |
@@ -208,33 +208,33 @@ discard block |
||
| 208 | 208 | |
| 209 | 209 | function wpinv_prices_show_tax_on_checkout() { |
| 210 | 210 | return false; // TODO |
| 211 | - $ret = ( wpinv_get_option( 'checkout_include_tax', false ) == 'yes' && wpinv_use_taxes() ); |
|
| 211 | + $ret = (wpinv_get_option('checkout_include_tax', false) == 'yes' && wpinv_use_taxes()); |
|
| 212 | 212 | |
| 213 | - return apply_filters( 'wpinv_taxes_on_prices_on_checkout', $ret ); |
|
| 213 | + return apply_filters('wpinv_taxes_on_prices_on_checkout', $ret); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | function wpinv_display_tax_rate() { |
| 217 | - $ret = wpinv_use_taxes() && wpinv_get_option( 'display_tax_rate', false ); |
|
| 217 | + $ret = wpinv_use_taxes() && wpinv_get_option('display_tax_rate', false); |
|
| 218 | 218 | |
| 219 | - return apply_filters( 'wpinv_display_tax_rate', $ret ); |
|
| 219 | + return apply_filters('wpinv_display_tax_rate', $ret); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | function wpinv_cart_needs_tax_address_fields() { |
| 223 | - if( !wpinv_is_cart_taxed() ) |
|
| 223 | + if (!wpinv_is_cart_taxed()) |
|
| 224 | 224 | return false; |
| 225 | 225 | |
| 226 | - return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' ); |
|
| 226 | + return !did_action('wpinv_after_cc_fields', 'wpinv_default_cc_address_fields'); |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | -function wpinv_item_is_tax_exclusive( $item_id = 0 ) { |
|
| 230 | - $ret = (bool)get_post_meta( $item_id, '_wpinv_tax_exclusive', false ); |
|
| 231 | - return apply_filters( 'wpinv_is_tax_exclusive', $ret, $item_id ); |
|
| 229 | +function wpinv_item_is_tax_exclusive($item_id = 0) { |
|
| 230 | + $ret = (bool) get_post_meta($item_id, '_wpinv_tax_exclusive', false); |
|
| 231 | + return apply_filters('wpinv_is_tax_exclusive', $ret, $item_id); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | -function wpinv_currency_decimal_filter( $decimals = 2 ) { |
|
| 234 | +function wpinv_currency_decimal_filter($decimals = 2) { |
|
| 235 | 235 | $currency = wpinv_get_currency(); |
| 236 | 236 | |
| 237 | - switch ( $currency ) { |
|
| 237 | + switch ($currency) { |
|
| 238 | 238 | case 'RIAL' : |
| 239 | 239 | case 'JPY' : |
| 240 | 240 | case 'TWD' : |
@@ -243,50 +243,50 @@ discard block |
||
| 243 | 243 | break; |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - return apply_filters( 'wpinv_currency_decimal_count', $decimals, $currency ); |
|
| 246 | + return apply_filters('wpinv_currency_decimal_count', $decimals, $currency); |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | function wpinv_tax_amount() { |
| 250 | 250 | $output = 0.00; |
| 251 | 251 | |
| 252 | - return apply_filters( 'wpinv_tax_amount', $output ); |
|
| 252 | + return apply_filters('wpinv_tax_amount', $output); |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | // VAT Settings |
| 256 | -function wpinv_vat_rate_add_callback( $args ) { |
|
| 256 | +function wpinv_vat_rate_add_callback($args) { |
|
| 257 | 257 | ?> |
| 258 | - <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e( 'Add', 'invoicing' );?>" class="button button-primary" /> <i style="display:none;" class="fa fa-refresh fa-spin"></i></p> |
|
| 258 | + <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e('Add', 'invoicing'); ?>" class="button button-primary" /> <i style="display:none;" class="fa fa-refresh fa-spin"></i></p> |
|
| 259 | 259 | <?php |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | -function wpinv_vat_rate_delete_callback( $args ) { |
|
| 262 | +function wpinv_vat_rate_delete_callback($args) { |
|
| 263 | 263 | global $wpinv_euvat; |
| 264 | 264 | |
| 265 | 265 | $vat_classes = $wpinv_euvat->get_rate_classes(); |
| 266 | - $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : ''; |
|
| 267 | - if ( isset( $vat_classes[$vat_class] ) ) { |
|
| 266 | + $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : ''; |
|
| 267 | + if (isset($vat_classes[$vat_class])) { |
|
| 268 | 268 | ?> |
| 269 | - <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf( esc_attr__( 'Delete class "%s"', 'invoicing' ), $vat_classes[$vat_class] );?>" class="button button-primary" /> <i style="display:none;" class="fa fa-refresh fa-spin"></i></p> |
|
| 269 | + <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf(esc_attr__('Delete class "%s"', 'invoicing'), $vat_classes[$vat_class]); ?>" class="button button-primary" /> <i style="display:none;" class="fa fa-refresh fa-spin"></i></p> |
|
| 270 | 270 | <?php |
| 271 | 271 | } |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | -function wpinv_vat_rates_callback( $args ) { |
|
| 274 | +function wpinv_vat_rates_callback($args) { |
|
| 275 | 275 | global $wpinv_euvat; |
| 276 | 276 | |
| 277 | 277 | $vat_classes = $wpinv_euvat->get_rate_classes(); |
| 278 | - $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '_standard'; |
|
| 278 | + $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '_standard'; |
|
| 279 | 279 | |
| 280 | 280 | $eu_states = $wpinv_euvat->get_eu_states(); |
| 281 | 281 | $countries = wpinv_get_country_list(); |
| 282 | 282 | $vat_groups = $wpinv_euvat->get_vat_groups(); |
| 283 | - $rates = $wpinv_euvat->get_vat_rates( $vat_class ); |
|
| 283 | + $rates = $wpinv_euvat->get_vat_rates($vat_class); |
|
| 284 | 284 | ob_start(); |
| 285 | 285 | ?> |
| 286 | 286 | </td><tr> |
| 287 | 287 | <td colspan="2" class="wpinv_vat_tdbox"> |
| 288 | - <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class;?>" /> |
|
| 289 | - <p><?php echo ( isset( $args['desc'] ) ? $args['desc'] : '' ); ?></p> |
|
| 288 | + <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class; ?>" /> |
|
| 289 | + <p><?php echo (isset($args['desc']) ? $args['desc'] : ''); ?></p> |
|
| 290 | 290 | <table id="wpinv_vat_rates" class="wp-list-table widefat fixed posts"> |
| 291 | 291 | <colgroup> |
| 292 | 292 | <col width="50px" /> |
@@ -298,43 +298,43 @@ discard block |
||
| 298 | 298 | </colgroup> |
| 299 | 299 | <thead> |
| 300 | 300 | <tr> |
| 301 | - <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e( 'Country', 'invoicing' ); ?></th> |
|
| 302 | - <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e( 'Apply rate to whole country', 'invoicing' ); ?>"><?php _e( 'Country Wide', 'invoicing' ); ?></th> |
|
| 303 | - <th scope="col" class="wpinv_vat_rate"><?php _e( 'Rate %', 'invoicing' ); ?></th> |
|
| 304 | - <th scope="col" class="wpinv_vat_name"><?php _e( 'VAT Name', 'invoicing' ); ?></th> |
|
| 305 | - <th scope="col" class="wpinv_vat_group"><?php _e( 'Tax Group', 'invoicing' ); ?></th> |
|
| 301 | + <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e('Country', 'invoicing'); ?></th> |
|
| 302 | + <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e('Apply rate to whole country', 'invoicing'); ?>"><?php _e('Country Wide', 'invoicing'); ?></th> |
|
| 303 | + <th scope="col" class="wpinv_vat_rate"><?php _e('Rate %', 'invoicing'); ?></th> |
|
| 304 | + <th scope="col" class="wpinv_vat_name"><?php _e('VAT Name', 'invoicing'); ?></th> |
|
| 305 | + <th scope="col" class="wpinv_vat_group"><?php _e('Tax Group', 'invoicing'); ?></th> |
|
| 306 | 306 | </tr> |
| 307 | 307 | </thead> |
| 308 | 308 | <tbody> |
| 309 | - <?php if( !empty( $eu_states ) ) { ?> |
|
| 309 | + <?php if (!empty($eu_states)) { ?> |
|
| 310 | 310 | <?php |
| 311 | - foreach ( $eu_states as $state ) { |
|
| 312 | - $country_name = isset( $countries[$state] ) ? $countries[$state] : ''; |
|
| 311 | + foreach ($eu_states as $state) { |
|
| 312 | + $country_name = isset($countries[$state]) ? $countries[$state] : ''; |
|
| 313 | 313 | |
| 314 | 314 | // Filter the rate for each country |
| 315 | - $country_rate = array_filter( $rates, function( $rate ) use( $state ) { return $rate['country'] === $state; } ); |
|
| 315 | + $country_rate = array_filter($rates, function($rate) use($state) { return $rate['country'] === $state; } ); |
|
| 316 | 316 | |
| 317 | 317 | // If one does not exist create a default |
| 318 | - $country_rate = is_array( $country_rate ) && count( $country_rate ) > 0 ? reset( $country_rate ) : array(); |
|
| 318 | + $country_rate = is_array($country_rate) && count($country_rate) > 0 ? reset($country_rate) : array(); |
|
| 319 | 319 | |
| 320 | - $vat_global = isset( $country_rate['global'] ) ? !empty( $country_rate['global'] ) : true; |
|
| 321 | - $vat_rate = isset( $country_rate['rate'] ) ? $country_rate['rate'] : ''; |
|
| 322 | - $vat_name = !empty( $country_rate['name'] ) ? esc_attr( stripslashes( $country_rate['name'] ) ) : ''; |
|
| 323 | - $vat_group = !empty( $country_rate['group'] ) ? $country_rate['group'] : ( $vat_class === '_standard' ? 'standard' : 'reduced' ); |
|
| 320 | + $vat_global = isset($country_rate['global']) ? !empty($country_rate['global']) : true; |
|
| 321 | + $vat_rate = isset($country_rate['rate']) ? $country_rate['rate'] : ''; |
|
| 322 | + $vat_name = !empty($country_rate['name']) ? esc_attr(stripslashes($country_rate['name'])) : ''; |
|
| 323 | + $vat_group = !empty($country_rate['group']) ? $country_rate['group'] : ($vat_class === '_standard' ? 'standard' : 'reduced'); |
|
| 324 | 324 | ?> |
| 325 | 325 | <tr> |
| 326 | 326 | <td class="wpinv_vat_country"><?php echo $state; ?><input type="hidden" name="vat_rates[<?php echo $state; ?>][country]" value="<?php echo $state; ?>" /><input type="hidden" name="vat_rates[<?php echo $state; ?>][state]" value="" /></td> |
| 327 | 327 | <td class="wpinv_vat_country_name"><?php echo $country_name; ?></td> |
| 328 | 328 | <td class="wpinv_vat_global"> |
| 329 | - <input type="checkbox" name="vat_rates[<?php echo $state;?>][global]" id="vat_rates[<?php echo $state;?>][global]" value="1" <?php checked( true, $vat_global );?> disabled="disabled" /> |
|
| 330 | - <label for="tax_rates[<?php echo $state;?>][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label> |
|
| 331 | - <input type="hidden" name="vat_rates[<?php echo $state;?>][global]" value="1" checked="checked" /> |
|
| 329 | + <input type="checkbox" name="vat_rates[<?php echo $state; ?>][global]" id="vat_rates[<?php echo $state; ?>][global]" value="1" <?php checked(true, $vat_global); ?> disabled="disabled" /> |
|
| 330 | + <label for="tax_rates[<?php echo $state; ?>][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label> |
|
| 331 | + <input type="hidden" name="vat_rates[<?php echo $state; ?>][global]" value="1" checked="checked" /> |
|
| 332 | 332 | </td> |
| 333 | - <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state;?>][rate]" value="<?php echo $vat_rate; ?>" /></td> |
|
| 334 | - <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state;?>][name]" value="<?php echo $vat_name; ?>" /></td> |
|
| 333 | + <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state; ?>][rate]" value="<?php echo $vat_rate; ?>" /></td> |
|
| 334 | + <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state; ?>][name]" value="<?php echo $vat_name; ?>" /></td> |
|
| 335 | 335 | <td class="wpinv_vat_group"> |
| 336 | 336 | <?php |
| 337 | - echo wpinv_html_select( array( |
|
| 337 | + echo wpinv_html_select(array( |
|
| 338 | 338 | 'name' => 'vat_rates[' . $state . '][group]', |
| 339 | 339 | 'selected' => $vat_group, |
| 340 | 340 | 'id' => 'vat_rates[' . $state . '][group]', |
@@ -343,14 +343,14 @@ discard block |
||
| 343 | 343 | 'multiple' => false, |
| 344 | 344 | 'show_option_all' => false, |
| 345 | 345 | 'show_option_none' => false |
| 346 | - ) ); |
|
| 346 | + )); |
|
| 347 | 347 | ?> |
| 348 | 348 | </td> |
| 349 | 349 | </tr> |
| 350 | 350 | <?php } ?> |
| 351 | 351 | <tr> |
| 352 | 352 | <td colspan="6" style="background-color:#fafafa;"> |
| 353 | - <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e( 'Update EU VAT Rates', 'invoicing' ); ?>" /> <i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span> |
|
| 353 | + <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e('Update EU VAT Rates', 'invoicing'); ?>" /> <i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span> |
|
| 354 | 354 | </td> |
| 355 | 355 | </tr> |
| 356 | 356 | <?php } ?> |
@@ -362,35 +362,35 @@ discard block |
||
| 362 | 362 | echo $content; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | -function wpinv_vat_number_callback( $args ) { |
|
| 365 | +function wpinv_vat_number_callback($args) { |
|
| 366 | 366 | global $wpinv_euvat; |
| 367 | 367 | |
| 368 | 368 | $vat_number = $wpinv_euvat->get_vat_number(); |
| 369 | 369 | $vat_valid = $wpinv_euvat->is_vat_validated(); |
| 370 | 370 | |
| 371 | - $size = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'regular'; |
|
| 372 | - $validated_text = $vat_valid ? __( 'VAT number validated', 'invoicing' ) : __( 'VAT number not validated', 'invoicing' ); |
|
| 371 | + $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular'; |
|
| 372 | + $validated_text = $vat_valid ? __('VAT number validated', 'invoicing') : __('VAT number not validated', 'invoicing'); |
|
| 373 | 373 | $disabled = $vat_valid ? 'disabled="disabled"' : " "; |
| 374 | 374 | |
| 375 | - $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr( stripslashes( $vat_number ) ) . '"/>'; |
|
| 376 | - $html .= '<span> <input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__( 'Validate VAT Number', 'invoicing' ) . '" /></span>'; |
|
| 377 | - $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int)$vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>'; |
|
| 378 | - $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __( 'Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing' ).'</p>' . '</label>'; |
|
| 379 | - $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce( 'vat_validation' ) . '">'; |
|
| 375 | + $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr(stripslashes($vat_number)) . '"/>'; |
|
| 376 | + $html .= '<span> <input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__('Validate VAT Number', 'invoicing') . '" /></span>'; |
|
| 377 | + $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int) $vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>'; |
|
| 378 | + $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __('Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing') . '</p>' . '</label>'; |
|
| 379 | + $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce('vat_validation') . '">'; |
|
| 380 | 380 | |
| 381 | 381 | echo $html; |
| 382 | 382 | } |
| 383 | 383 | |
| 384 | -function wpinv_eu_fallback_rate_callback( $args ) { |
|
| 384 | +function wpinv_eu_fallback_rate_callback($args) { |
|
| 385 | 385 | global $wpinv_options; |
| 386 | 386 | |
| 387 | - $value = isset( $wpinv_options[$args['id']] ) ? $wpinv_options[ $args['id'] ] : ( isset( $args['std'] ) ? $args['std'] : '' ); |
|
| 388 | - $size = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'small'; |
|
| 387 | + $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : ''); |
|
| 388 | + $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'small'; |
|
| 389 | 389 | |
| 390 | - $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr( stripslashes( $value ) ) . '" />'; |
|
| 391 | - $html .= '<span> <input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Add EU Member States', 'invoicing' ) . '" /></span>'; |
|
| 392 | - $html .= '<span> <input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Remove EU Member States', 'invoicing' ) . '" /></span>'; |
|
| 393 | - $html .= '<span> <input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__( 'Update EU VAT Rates', 'invoicing' ) . '" /> <i style="display:none" class="fa fa-refresh fa-spin"></i></span>'; |
|
| 390 | + $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr(stripslashes($value)) . '" />'; |
|
| 391 | + $html .= '<span> <input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Add EU Member States', 'invoicing') . '" /></span>'; |
|
| 392 | + $html .= '<span> <input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Remove EU Member States', 'invoicing') . '" /></span>'; |
|
| 393 | + $html .= '<span> <input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__('Update EU VAT Rates', 'invoicing') . '" /> <i style="display:none" class="fa fa-refresh fa-spin"></i></span>'; |
|
| 394 | 394 | $html .= '<p><label for="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '">' . $args['desc'] . '</label></p>'; |
| 395 | 395 | echo $html; |
| 396 | 396 | ?> |
@@ -398,36 +398,36 @@ discard block |
||
| 398 | 398 | <?php |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | -function wpinv_vat_ip_lookup_callback( $args ) { |
|
| 401 | +function wpinv_vat_ip_lookup_callback($args) { |
|
| 402 | 402 | global $wpinv_options, $wpinv_euvat; |
| 403 | 403 | |
| 404 | - $value = isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ] : ( isset( $args['std'] ) ? $args['std'] : 'default' ); |
|
| 404 | + $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : 'default'); |
|
| 405 | 405 | |
| 406 | 406 | $options = array(); |
| 407 | - if ( function_exists( 'geoip_country_code_by_name' ) ) { |
|
| 408 | - $options['geoip'] = __( 'PHP GeoIP extension', 'invoicing' ); |
|
| 407 | + if (function_exists('geoip_country_code_by_name')) { |
|
| 408 | + $options['geoip'] = __('PHP GeoIP extension', 'invoicing'); |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | $geoip2_database = $wpinv_euvat->geoip2_country_dbfile(); |
| 412 | 412 | |
| 413 | - if ( !function_exists( 'bcadd' ) ) { |
|
| 414 | - $geoip2_message = __( 'GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing' ); |
|
| 413 | + if (!function_exists('bcadd')) { |
|
| 414 | + $geoip2_message = __('GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing'); |
|
| 415 | 415 | } else { |
| 416 | - $geoip2_message = ini_get('safe_mode') ? __( 'GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing' ) : ''; |
|
| 416 | + $geoip2_message = ini_get('safe_mode') ? __('GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing') : ''; |
|
| 417 | 417 | } |
| 418 | 418 | |
| 419 | - if ( $geoip2_database !== false && empty( $geoip2_message ) ) { |
|
| 420 | - $options['geoip2'] = __( 'GeoIP2 Database', 'invoicing' ); |
|
| 419 | + if ($geoip2_database !== false && empty($geoip2_message)) { |
|
| 420 | + $options['geoip2'] = __('GeoIP2 Database', 'invoicing'); |
|
| 421 | 421 | } |
| 422 | 422 | |
| 423 | - if ( function_exists( 'simplexml_load_file' ) ) { |
|
| 424 | - $options['geoplugin'] = __( 'geoPlugin Web Service', 'invoicing' ); |
|
| 423 | + if (function_exists('simplexml_load_file')) { |
|
| 424 | + $options['geoplugin'] = __('geoPlugin Web Service', 'invoicing'); |
|
| 425 | 425 | } |
| 426 | 426 | |
| 427 | - $options['site'] = __( 'Use default country', 'invoicing' ); |
|
| 428 | - $options['default'] = __( 'Auto', 'invoicing' ); |
|
| 427 | + $options['site'] = __('Use default country', 'invoicing'); |
|
| 428 | + $options['default'] = __('Auto', 'invoicing'); |
|
| 429 | 429 | |
| 430 | - $html = wpinv_html_select( array( |
|
| 430 | + $html = wpinv_html_select(array( |
|
| 431 | 431 | 'name' => "wpinv_settings[{$args['id']}]", |
| 432 | 432 | 'selected' => $value, |
| 433 | 433 | 'id' => "wpinv_settings[{$args['id']}]", |
@@ -439,23 +439,23 @@ discard block |
||
| 439 | 439 | )); |
| 440 | 440 | |
| 441 | 441 | $desc = '<label for="wpinv_settings[' . $args['id'] . ']">'; |
| 442 | - $desc .= __( 'Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing' ); |
|
| 442 | + $desc .= __('Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing'); |
|
| 443 | 443 | $desc .= '<p>'; |
| 444 | - if ( empty( $geoip2_message ) ) { |
|
| 445 | - if ( $geoip2_database ) { |
|
| 444 | + if (empty($geoip2_message)) { |
|
| 445 | + if ($geoip2_database) { |
|
| 446 | 446 | $last_updated = ''; |
| 447 | - if ( $time_updated = wpinv_get_option( 'wpinv_geoip2_date_updated' ) ) { |
|
| 448 | - $date_updated = date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $time_updated ); |
|
| 449 | - $last_updated = '<br>' . sprintf( __( 'The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing' ), $date_updated ); |
|
| 447 | + if ($time_updated = wpinv_get_option('wpinv_geoip2_date_updated')) { |
|
| 448 | + $date_updated = date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $time_updated); |
|
| 449 | + $last_updated = '<br>' . sprintf(__('The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing'), $date_updated); |
|
| 450 | 450 | } |
| 451 | - $desc .= __( 'GeoIP2 database exists:', 'invoicing' ) . $last_updated . ' <input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __( 'Update GeoIP2 database now (~30MB)', 'invoicing' ) . '"></input>'; |
|
| 451 | + $desc .= __('GeoIP2 database exists:', 'invoicing') . $last_updated . ' <input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __('Update GeoIP2 database now (~30MB)', 'invoicing') . '"></input>'; |
|
| 452 | 452 | } else { |
| 453 | - $desc .= __( 'GeoIP2 database does not exist:', 'invoicing' ) . ' <input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __( 'Download GeoIP2 database now', 'invoicing' ) . ' (~30MB)"></input><br>' . __( 'After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing' ); |
|
| 453 | + $desc .= __('GeoIP2 database does not exist:', 'invoicing') . ' <input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __('Download GeoIP2 database now', 'invoicing') . ' (~30MB)"></input><br>' . __('After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing'); |
|
| 454 | 454 | } |
| 455 | 455 | } else { |
| 456 | 456 | $desc .= $geoip2_message; |
| 457 | 457 | } |
| 458 | - $desc .= '</p><p>'. __( 'geoPlugin is a great free service please consider supporting them: ', 'invoicing' ) . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>'; |
|
| 458 | + $desc .= '</p><p>' . __('geoPlugin is a great free service please consider supporting them: ', 'invoicing') . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>'; |
|
| 459 | 459 | $desc .= '</label>'; |
| 460 | 460 | |
| 461 | 461 | $html .= $desc; |
@@ -471,39 +471,39 @@ discard block |
||
| 471 | 471 | * |
| 472 | 472 | * @param string|bool|null $vat_rule |
| 473 | 473 | */ |
| 474 | -function getpaid_filter_vat_rule( $vat_rule ) { |
|
| 474 | +function getpaid_filter_vat_rule($vat_rule) { |
|
| 475 | 475 | |
| 476 | - if ( empty( $vat_rule ) ) { |
|
| 476 | + if (empty($vat_rule)) { |
|
| 477 | 477 | return getpaid_tax()->allow_vat_rules() ? 'digital' : 'physical'; |
| 478 | 478 | } |
| 479 | 479 | |
| 480 | 480 | return $vat_rule; |
| 481 | 481 | } |
| 482 | -add_filter( 'wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule' ); |
|
| 482 | +add_filter('wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule'); |
|
| 483 | 483 | |
| 484 | 484 | /** |
| 485 | 485 | * Filters the VAT class to ensure that each item has a VAT class. |
| 486 | 486 | * |
| 487 | 487 | * @param string|bool|null $vat_rule |
| 488 | 488 | */ |
| 489 | -function getpaid_filter_vat_class( $vat_class ) { |
|
| 490 | - return empty( $vat_class ) ? '_standard' : $vat_class; |
|
| 489 | +function getpaid_filter_vat_class($vat_class) { |
|
| 490 | + return empty($vat_class) ? '_standard' : $vat_class; |
|
| 491 | 491 | } |
| 492 | -add_filter( 'wpinv_get_item_vat_class', 'getpaid_filter_vat_class' ); |
|
| 492 | +add_filter('wpinv_get_item_vat_class', 'getpaid_filter_vat_class'); |
|
| 493 | 493 | |
| 494 | 494 | /** |
| 495 | 495 | * Returns the ip address location url. |
| 496 | 496 | * |
| 497 | 497 | */ |
| 498 | -function getpaid_ip_location_url( $ip_address ) { |
|
| 498 | +function getpaid_ip_location_url($ip_address) { |
|
| 499 | 499 | |
| 500 | 500 | return add_query_arg( |
| 501 | 501 | array( |
| 502 | 502 | 'action' => 'wpinv_ip_geolocation', |
| 503 | 503 | 'ip' => $ip_address, |
| 504 | - '_wpnonce' => wp_create_nonce( 'getpaid-ip-location' ) |
|
| 504 | + '_wpnonce' => wp_create_nonce('getpaid-ip-location') |
|
| 505 | 505 | ), |
| 506 | - admin_url( 'admin-ajax.php' ) |
|
| 506 | + admin_url('admin-ajax.php') |
|
| 507 | 507 | ); |
| 508 | 508 | |
| 509 | 509 | } |
@@ -513,59 +513,59 @@ discard block |
||
| 513 | 513 | * |
| 514 | 514 | * @return array|bool |
| 515 | 515 | */ |
| 516 | -function getpaid_geolocate_ip_address( $ip_address ) { |
|
| 516 | +function getpaid_geolocate_ip_address($ip_address) { |
|
| 517 | 517 | |
| 518 | 518 | // Do we have an ip address? |
| 519 | - if ( empty( $ip_address ) ) { |
|
| 519 | + if (empty($ip_address)) { |
|
| 520 | 520 | return false; |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | 523 | /** |
| 524 | 524 | * Retrieve ip address using max mind. |
| 525 | 525 | */ |
| 526 | - if ( wpinv_get_option( 'vat_ip_lookup' ) == 'geoip2' && $geoip2_city = getpaid_tax()->geoip2_city_record( $ip_address ) ) { |
|
| 526 | + if (wpinv_get_option('vat_ip_lookup') == 'geoip2' && $geoip2_city = getpaid_tax()->geoip2_city_record($ip_address)) { |
|
| 527 | 527 | |
| 528 | 528 | try { |
| 529 | 529 | $iso = $geoip2_city->country->isoCode; |
| 530 | 530 | $country = $geoip2_city->country->name; |
| 531 | - $region = ! empty( $geoip2_city->subdivisions ) && ! empty( $geoip2_city->subdivisions[0]->name ) ? $geoip2_city->subdivisions[0]->name : ''; |
|
| 531 | + $region = !empty($geoip2_city->subdivisions) && !empty($geoip2_city->subdivisions[0]->name) ? $geoip2_city->subdivisions[0]->name : ''; |
|
| 532 | 532 | $city = $geoip2_city->city->name; |
| 533 | 533 | $longitude = $geoip2_city->location->longitude; |
| 534 | 534 | $latitude = $geoip2_city->location->latitude; |
| 535 | - $credit = __( 'Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing' ); |
|
| 536 | - } catch( Exception $e ) { |
|
| 537 | - wpinv_error_log( $e->getMessage(), 'MaxMind Exception', __FILE__, __LINE__ ); |
|
| 535 | + $credit = __('Geolocated using the information by MaxMind, available from <a href="http://www.maxmind.com" target="_blank">www.maxmind.com</a>', 'invoicing'); |
|
| 536 | + } catch (Exception $e) { |
|
| 537 | + wpinv_error_log($e->getMessage(), 'MaxMind Exception', __FILE__, __LINE__); |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | // If that fails, GeoLocate using GeoPlugin. |
| 543 | - if ( ( empty( $iso ) || empty( $longitude ) || empty( $latitude ) ) && function_exists( 'simplexml_load_file' ) ) { |
|
| 543 | + if ((empty($iso) || empty($longitude) || empty($latitude)) && function_exists('simplexml_load_file')) { |
|
| 544 | 544 | |
| 545 | 545 | try { |
| 546 | - $url = esc_url( add_query_arg( 'ip', urlencode( $ip_address ), 'http://www.geoplugin.net/xml.gp' ) ); |
|
| 547 | - $load_xml = simplexml_load_file( $url ); |
|
| 546 | + $url = esc_url(add_query_arg('ip', urlencode($ip_address), 'http://www.geoplugin.net/xml.gp')); |
|
| 547 | + $load_xml = simplexml_load_file($url); |
|
| 548 | 548 | |
| 549 | - if ( ! empty( $load_xml ) && isset( $load_xml->geoplugin_countryCode ) && ! empty( $load_xml->geoplugin_latitude ) && ! empty( $load_xml->geoplugin_longitude ) ) { |
|
| 549 | + if (!empty($load_xml) && isset($load_xml->geoplugin_countryCode) && !empty($load_xml->geoplugin_latitude) && !empty($load_xml->geoplugin_longitude)) { |
|
| 550 | 550 | $iso = $load_xml->geoplugin_countryCode; |
| 551 | 551 | $country = $load_xml->geoplugin_countryName; |
| 552 | - $region = ! empty( $load_xml->geoplugin_regionName ) ? $load_xml->geoplugin_regionName : ''; |
|
| 553 | - $city = ! empty( $load_xml->geoplugin_city ) ? $load_xml->geoplugin_city : ''; |
|
| 552 | + $region = !empty($load_xml->geoplugin_regionName) ? $load_xml->geoplugin_regionName : ''; |
|
| 553 | + $city = !empty($load_xml->geoplugin_city) ? $load_xml->geoplugin_city : ''; |
|
| 554 | 554 | $longitude = $load_xml->geoplugin_longitude; |
| 555 | 555 | $latitude = $load_xml->geoplugin_latitude; |
| 556 | 556 | $credit = $load_xml->geoplugin_credit; |
| 557 | - $credit = __( 'Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing' ) . '<br>' . $load_xml->geoplugin_credit; |
|
| 557 | + $credit = __('Geolocated using the information by geoPlugin, available from <a href="http://www.geoplugin.com" target="_blank">www.geoplugin.com</a>', 'invoicing') . '<br>' . $load_xml->geoplugin_credit; |
|
| 558 | 558 | } |
| 559 | - } catch( Exception $e ) { |
|
| 560 | - wpinv_error_log( $e->getMessage(), 'GeoPlugin Exception', __FILE__, __LINE__ ); |
|
| 559 | + } catch (Exception $e) { |
|
| 560 | + wpinv_error_log($e->getMessage(), 'GeoPlugin Exception', __FILE__, __LINE__); |
|
| 561 | 561 | } |
| 562 | 562 | |
| 563 | 563 | } |
| 564 | 564 | |
| 565 | - if ( empty( $iso ) ) { |
|
| 565 | + if (empty($iso)) { |
|
| 566 | 566 | return false; |
| 567 | 567 | } |
| 568 | 568 | |
| 569 | - return compact( 'iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit' ); |
|
| 569 | + return compact('iso', 'country', 'region', 'city', 'longitude', 'latitude', 'credit'); |
|
| 570 | 570 | |
| 571 | 571 | } |
@@ -130,7 +130,6 @@ |
||
| 130 | 130 | private function mostSpecificSubdivision() |
| 131 | 131 | { |
| 132 | 132 | return empty($this->subdivisions) ? |
| 133 | - new \GeoIp2\Record\Subdivision(array(), $this->locales) : |
|
| 134 | - end($this->subdivisions); |
|
| 133 | + new \GeoIp2\Record\Subdivision(array(), $this->locales) : end($this->subdivisions); |
|
| 135 | 134 | } |
| 136 | 135 | } |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | // This is for backwards compatibility. Do not remove except for a |
| 77 | 77 | // major version bump. |
| 78 | 78 | if (is_string($options)) { |
| 79 | - $options = array( 'host' => $options ); |
|
| 79 | + $options = array('host' => $options); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | if (!isset($options['host'])) { |
