AyeCode / invoicing

includes/class-wpinv-notes.php

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,73 +14,73 @@ 
     }
     
     public function init() {
-        do_action( 'wpinv_class_notes_init', $this );
+        do_action('wpinv_class_notes_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_notes_includes', $this );
+        do_action('wpinv_class_notes_includes', $this);
     }
     
     public function actions() {
         // Secure inovice notes
-        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
+        add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
         
         // Count comments
-        add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 11, 2 );
+        add_filter('wp_count_comments', array($this, 'wp_count_comments'), 11, 2);
         
         // Delete comments count cache whenever there is a new comment or a comment status changes
-        add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-        add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+        add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
+        add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
         
-        do_action( 'wpinv_class_notes_actions', $this );
+        do_action('wpinv_class_notes_actions', $this);
     }
         
-    public function set_invoice_note_type( $query ) {
-        $post_ID        = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+    public function set_invoice_note_type($query) {
+        $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
         
-        if ( $post_ID && in_array(get_post_type( $post_ID ), array($this->invoice_post_type, 'wpi_quote' )) ) {
+        if ($post_ID && in_array(get_post_type($post_ID), array($this->invoice_post_type, 'wpi_quote'))) {
             $query->query_vars['type__in']      = $this->comment_type;
             $query->query_vars['type__not_in']  = '';
         } else {        
-            if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
-                if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
-                    $key = array_search( $this->comment_type, $type_in );
-                    unset( $query->query_vars['type__in'][$key] );
-                } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
+            if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
+                if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
+                    $key = array_search($this->comment_type, $type_in);
+                    unset($query->query_vars['type__in'][$key]);
+                } else if (!is_array($type_in) && $type_in == $this->comment_type) {
                     $query->query_vars['type__in'] = '';
                 }
             }
             
-            if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
-                if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
+            if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
+                if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
                     $query->query_vars['type__not_in'][] = $this->comment_type;
-                } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
+                } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
                     $query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
                     $query->query_vars['type__not_in'][] = $this->comment_type;
                 }
             } else {
-                $query->query_vars['type__not_in']  = $this->comment_type;
+                $query->query_vars['type__not_in'] = $this->comment_type;
             }
         }
         
         return $query;
     }
     
-    public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
+    public function get_invoice_notes($invoice_id = 0, $type = '') {
         $args = array( 
             'post_id'   => $invoice_id,
             'orderby'   => 'comment_ID',
             'order'     => 'ASC',
         );
         
-        if ( $type == 'customer' ) {
+        if ($type == 'customer') {
             $args['meta_key']   = '_wpi_customer_note';
             $args['meta_value'] = 1;
         }
         
-        $args   = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+        $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
         
-        return get_comments( $args );
+        return get_comments($args);
     }
     
     /**
@@ -91,7 +91,7 @@ 
      * @return void
      */
     public function delete_comments_count_cache() {
-        delete_transient( 'wpinv_count_comments' );
+        delete_transient('wpinv_count_comments');
     }
     
     /**
@@ -102,16 +102,16 @@ 
      * @param  int    $post_id Post ID.
      * @return object
      */
-    public function wp_count_comments( $stats, $post_id ) {
+    public function wp_count_comments($stats, $post_id) {
         global $wpdb;
 
-        if ( 0 === $post_id ) {
-            $stats = get_transient( 'wpinv_count_comments' );
+        if (0 === $post_id) {
+            $stats = get_transient('wpinv_count_comments');
 
-            if ( ! $stats ) {
+            if (!$stats) {
                 $stats = array();
 
-                $count = $wpdb->get_results( "SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A );
+                $count = $wpdb->get_results("SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A);
 
                 $total = 0;
                 $approved = array(
@@ -122,26 +122,26 @@ 
                     'post-trashed' => 'post-trashed',
                 );
 
-                foreach ( (array) $count as $row ) {
+                foreach ((array)$count as $row) {
                     // Do not count post-trashed toward totals.
-                    if ( 'post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved'] ) {
+                    if ('post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved']) {
                         $total += $row['num_comments'];
                     }
-                    if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-                        $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                    if (isset($approved[$row['comment_approved']])) {
+                        $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
                     }
                 }
 
                 $stats['total_comments'] = $total;
                 $stats['all'] = $total;
-                foreach ( $approved as $key ) {
-                    if ( empty( $stats[ $key ] ) ) {
-                        $stats[ $key ] = 0;
+                foreach ($approved as $key) {
+                    if (empty($stats[$key])) {
+                        $stats[$key] = 0;
                     }
                 }
 
-                $stats = (object) $stats;
-                set_transient( 'wpinv_count_comments', $stats );
+                $stats = (object)$stats;
+                set_transient('wpinv_count_comments', $stats);
             }
         }
 

templates/wpinv-invalid-access.php

Spacing +17 added lines, -17 removed lines

@@ -1,56 +1,56 @@
 <?php 
-if ( !defined('ABSPATH') ) {
+if (!defined('ABSPATH')) {
     exit;
 }
-do_action( 'wpinv_invalid_invoice_before_display' ); ?><!DOCTYPE html>
+do_action('wpinv_invalid_invoice_before_display'); ?><!DOCTYPE html>
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="UTF-8">
     <title><?php wp_title() ?></title>
-    <meta charset="<?php bloginfo( 'charset' ); ?>" />
+    <meta charset="<?php bloginfo('charset'); ?>" />
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="robots" content="noindex,nofollow">
-    <?php do_action( 'wpinv_invalid_invoice_head' ); ?>
+    <?php do_action('wpinv_invalid_invoice_head'); ?>
 </head>
 <body class="body wpinv wpinv-print wpinv-invalid-invoice">
-    <?php do_action( 'wpinv_invalid_invoice_body_start' ); ?>
+    <?php do_action('wpinv_invalid_invoice_body_start'); ?>
     <div class="container wpinv-wrap">
         <!-- ///// Start Header -->
         <htmlpageheader name="wpinv-pdf-header">
-            <?php do_action( 'wpinv_invalid_invoice_before_header' ); ?>
+            <?php do_action('wpinv_invalid_invoice_before_header'); ?>
             <div class="row wpinv-header">
                 <div class="col-xs-12 wpinv-business">
-                    <a target="_blank" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
-                        <?php if ( $logo = wpinv_get_business_logo() ) { ?>
-                        <img class="logo" src="<?php echo esc_url( $logo ); ?>">
+                    <a target="_blank" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
+                        <?php if ($logo = wpinv_get_business_logo()) { ?>
+                        <img class="logo" src="<?php echo esc_url($logo); ?>">
                         <?php } else { ?>
-                        <h1><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
+                        <h1><?php echo esc_html(wpinv_get_business_name()); ?></h1>
                         <?php } ?>
                     </a>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invalid_invoice_after_header' ); ?>
+            <?php do_action('wpinv_invalid_invoice_after_header'); ?>
         </htmlpageheader>
         <!-- End Header ///// -->
         
-        <?php do_action( 'wpinv_invalid_invoice_before_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_before_content'); ?>
 
-        <?php do_action( 'wpinv_invalid_invoice_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_content'); ?>
         
-        <?php do_action( 'wpinv_invalid_invoice_after_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_after_content'); ?>
         
         <!-- ///// Start Footer -->
         <htmlpagefooter name="wpinv-pdf-footer">
-            <?php do_action( 'wpinv_invalid_invoice_before_footer' ); ?>
+            <?php do_action('wpinv_invalid_invoice_before_footer'); ?>
             <div class="row wpinv-footer">
                 <div class="col-sm-12">
                     <div class="footer-text"><?php echo wpinv_get_business_footer(); ?></div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invalid_invoice_after_footer' ); ?>
+            <?php do_action('wpinv_invalid_invoice_after_footer'); ?>
         </htmlpagefooter>
         <!-- End Footer ///// -->
     </div>
-    <?php do_action( 'wpinv_invalid_invoice_body_end' ); ?>
+    <?php do_action('wpinv_invalid_invoice_body_end'); ?>
 </body>
 </html>
\ No newline at end of file

includes/class-wpinv-db.php

Spacing +39 added lines, -39 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 abstract class Wpinv_DB {
 
@@ -66,9 +66,9 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get( $row_id ) {
+	public function get($row_id) {
 		global $wpdb;
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -78,10 +78,10 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get_by( $column, $row_id ) {
+	public function get_by($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column( $column, $row_id ) {
+	public function get_column($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -104,11 +104,11 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
+	public function get_column_by($column, $column_where, $column_value) {
 		global $wpdb;
-		$column_where = esc_sql( $column_where );
-		$column       = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
+		$column_where = esc_sql($column_where);
+		$column       = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value));
 	}
 
 	/**
@@ -118,31 +118,31 @@ 
 	 * @since   1.0.0
 	 * @return  int
 	 */
-	public function insert( $data, $type = '' ) {
+	public function insert($data, $type = '') {
 		global $wpdb;
 
 		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
+		$data = wp_parse_args($data, $this->get_column_defaults());
 
-		do_action( 'wpinv_pre_insert_' . $type, $data );
+		do_action('wpinv_pre_insert_' . $type, $data);
 
 		// Initialise column format array
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		$wpdb->insert( $this->table_name, $data, $column_formats );
+		$wpdb->insert($this->table_name, $data, $column_formats);
 		$wpdb_insert_id = $wpdb->insert_id;
 
-		do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
+		do_action('wpinv_post_insert_' . $type, $wpdb_insert_id, $data);
 
 		return $wpdb_insert_id;
 	}
@@ -154,18 +154,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
+	public function update($row_id, $data = array(), $where = '') {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if( empty( $where ) ) {
+		if (empty($where)) {
 			$where = $this->primary_key;
 		}
 
@@ -173,16 +173,16 @@ 
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+		if (false === $wpdb->update($this->table_name, $data, array($where => $row_id), $column_formats)) {
 			return false;
 		}
 
@@ -196,18 +196,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function delete( $row_id = 0 ) {
+	public function delete($row_id = 0) {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+		if (false === $wpdb->query($wpdb->prepare("DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id))) {
 			return false;
 		}
 
@@ -221,11 +221,11 @@ 
 	 * @param  string $table The table name
 	 * @return bool          If the table name exists
 	 */
-	public function table_exists( $table ) {
+	public function table_exists($table) {
 		global $wpdb;
-		$table = sanitize_text_field( $table );
+		$table = sanitize_text_field($table);
 
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+		return $wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE '%s'", $table)) === $table;
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 * @return bool Returns if the customers table was installed and upgrade routine run
 	 */
 	public function installed() {
-		return $this->table_exists( $this->table_name );
+		return $this->table_exists($this->table_name);
 	}
 
 }

templates/emails/wpinv-email-styles.php

Spacing +35 added lines, -35 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 // Load colours
-$bg              = wpinv_get_option( 'email_background_color', '#f5f5f5' );
-$body            = wpinv_get_option( 'email_body_background_color', '#fdfdfd' );
-$base            = wpinv_get_option( 'email_base_color', '#557da2' );
-$base_text       = wpinv_light_or_dark( $base, '#202020', '#ffffff' );
-$text            = wpinv_get_option( 'email_text_color', '#505050' );
+$bg              = wpinv_get_option('email_background_color', '#f5f5f5');
+$body            = wpinv_get_option('email_body_background_color', '#fdfdfd');
+$base            = wpinv_get_option('email_base_color', '#557da2');
+$base_text       = wpinv_light_or_dark($base, '#202020', '#ffffff');
+$text            = wpinv_get_option('email_text_color', '#505050');
 
-$bg_darker_10    = wpinv_hex_darker( $bg, 10 );
-$body_darker_10  = wpinv_hex_darker( $body, 10 );
-$base_lighter_20 = wpinv_hex_lighter( $base, 20 );
-$base_lighter_40 = wpinv_hex_lighter( $base, 40 );
-$text_lighter_20 = wpinv_hex_lighter( $text, 20 );
+$bg_darker_10    = wpinv_hex_darker($bg, 10);
+$body_darker_10  = wpinv_hex_darker($body, 10);
+$base_lighter_20 = wpinv_hex_lighter($base, 20);
+$base_lighter_40 = wpinv_hex_lighter($base, 40);
+$text_lighter_20 = wpinv_hex_lighter($text, 20);
 
 // !important; is a gmail hack to prevent styles being stripped if it doesn't like something.
 ?>
 #wrapper {
-    background-color: <?php echo esc_attr( $bg ); ?>;
+    background-color: <?php echo esc_attr($bg); ?>;
     margin: 0;
     -webkit-text-size-adjust: none !important;
     padding: 3%;
@@ -40,15 +40,15 @@ 
 
 #template_container {
     box-shadow: 0 1px 4px rgba(0,0,0,0.1) !important;
-    background-color: <?php echo esc_attr( $body ); ?>;
-    border: 1px solid <?php echo esc_attr( $bg_darker_10 ); ?>;
+    background-color: <?php echo esc_attr($body); ?>;
+    border: 1px solid <?php echo esc_attr($bg_darker_10); ?>;
     border-radius: 3px !important;
 }
 
 #template_header {
-    background-color: <?php echo esc_attr( $base ); ?>;
+    background-color: <?php echo esc_attr($base); ?>;
     border-radius: 3px 3px 0 0 !important;
-    color: <?php echo esc_attr( $base_text ); ?>;
+    color: <?php echo esc_attr($base_text); ?>;
     border-bottom: 0;
     font-weight: bold;
     line-height: 100%;
@@ -61,7 +61,7 @@ 
 }
 
 #template_header h1 {
-    color: <?php echo esc_attr( $base_text ); ?>;
+    color: <?php echo esc_attr($base_text); ?>;
 }
 
 #template_footer td {
@@ -72,7 +72,7 @@ 
 
 #template_footer #credit {
     border:0;
-    color: <?php echo esc_attr( $base_lighter_40 ); ?>;
+    color: <?php echo esc_attr($base_lighter_40); ?>;
     font-family: Arial;
     font-size:12px;
     line-height:125%;
@@ -81,7 +81,7 @@ 
 }
 
 #body_content {
-    background-color: <?php echo esc_attr( $body ); ?>;
+    background-color: <?php echo esc_attr($body); ?>;
 }
 
 #body_content table td {
@@ -101,7 +101,7 @@ 
 }
 
 #body_content_inner {
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
+    color: <?php echo esc_attr($text_lighter_20); ?>;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 14px;
     line-height: 150%;
@@ -109,17 +109,17 @@ 
 }
 
 .td {
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
+    color: <?php echo esc_attr($text_lighter_20); ?>;
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
 }
 
 .text {
-    color: <?php echo esc_attr( $text ); ?>;
+    color: <?php echo esc_attr($text); ?>;
     font-family: Arial,Helvetica,sans-serif;
 }
 
 .link {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
 }
 
 #header_wrapper {
@@ -128,19 +128,19 @@ 
 }
 
 h1 {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 30px;
     font-weight: 300;
     line-height: 150%;
     margin: 0;
     text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
-    text-shadow: 0 1px 0 <?php echo esc_attr( $base_lighter_20 ); ?>;
+    text-shadow: 0 1px 0 <?php echo esc_attr($base_lighter_20); ?>;
     -webkit-font-smoothing: antialiased;
 }
 
 h2 {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     display: block;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 18px;
@@ -151,7 +151,7 @@ 
 }
 
 h3 {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     display: block;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 16px;
@@ -162,7 +162,7 @@ 
 }
 
 a {
-    color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base); ?>;
     font-weight: normal;
     text-decoration: underline;
 }
@@ -180,7 +180,7 @@ 
 }
 
 .table-bordered {
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
     border-collapse: collapse;
     border-spacing: 0;
     width: 100%;
@@ -188,8 +188,8 @@ 
 
 .table-bordered th,
 .table-bordered td {
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
+    color: <?php echo esc_attr($text_lighter_20); ?>;
     font-size: 14px;
 }
 .small {
@@ -288,9 +288,9 @@ 
   text-decoration: none;
 }
 .btn-default {
-    color: <?php echo esc_attr( $base_text ); ?>;
-    background-color: <?php echo esc_attr( $base ); ?>;
-    border-color: <?php echo esc_attr( $base ); ?>;
+    color: <?php echo esc_attr($base_text); ?>;
+    background-color: <?php echo esc_attr($base); ?>;
+    border-color: <?php echo esc_attr($base); ?>;
 }
 .btn-primary {
   color: #fff;

templates/emails/wpinv-email-invoice-items.php

Spacing +67 added lines, -67 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 global $wpinv_euvat, $ajax_cart_details;
@@ -11,152 +11,152 @@ 
 $quantities_enabled = wpinv_item_quantities_enabled();
 $use_taxes          = wpinv_use_taxes();
 $zero_tax           = !(float)$invoice->get_tax() > 0 ? true : false;
-$tax_label          = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __( 'Tax', 'invoicing' );
-$tax_title          = !$zero_tax && $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+$tax_label          = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __('Tax', 'invoicing');
+$tax_title          = !$zero_tax && $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
 
-do_action( 'wpinv_before_email_items', $invoice ); ?>
+do_action('wpinv_before_email_items', $invoice); ?>
 <div id="wpinv-email-items">
-    <h3 class="wpinv-items-t"><?php echo apply_filters( 'wpinv_email_items_title', __( 'Items', 'invoicing' ) ); ?></h3>
+    <h3 class="wpinv-items-t"><?php echo apply_filters('wpinv_email_items_title', __('Items', 'invoicing')); ?></h3>
     <table id="wpinv_checkout_cart" class="table table-bordered table-hover">
         <thead>
             <tr class="wpinv_cart_header_row">
-                <?php do_action( 'wpinv_email_items_table_header_first' ); ?>
-                <th class="wpinv_cart_item_name text-left"><?php _e( 'Item Name', 'invoicing' ); ?></th>
-                <th class="wpinv_cart_item_price text-right"><?php _e( 'Item Price', 'invoicing' ); ?></th>
-                <?php if ( $quantities_enabled ) { ?>
-                <th class="wpinv_cart_item_qty text-right"><?php _e( 'Qty', 'invoicing' ); ?></th>
+                <?php do_action('wpinv_email_items_table_header_first'); ?>
+                <th class="wpinv_cart_item_name text-left"><?php _e('Item Name', 'invoicing'); ?></th>
+                <th class="wpinv_cart_item_price text-right"><?php _e('Item Price', 'invoicing'); ?></th>
+                <?php if ($quantities_enabled) { ?>
+                <th class="wpinv_cart_item_qty text-right"><?php _e('Qty', 'invoicing'); ?></th>
                 <?php } ?>
-                <?php if ( !$zero_tax && $use_taxes ) { ?>
+                <?php if (!$zero_tax && $use_taxes) { ?>
                 <th class="wpinv_cart_item_tax text-right"><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></th>
                 <?php } ?>
-                <th class="wpinv_cart_item_subtotal text-right"><?php echo __( 'Item Total', 'invoicing' ) . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
-                <?php do_action( 'wpinv_email_items_table_header_last' ); ?>
+                <th class="wpinv_cart_item_subtotal text-right"><?php echo __('Item Total', 'invoicing') . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
+                <?php do_action('wpinv_email_items_table_header_last'); ?>
             </tr>
         </thead>
         <tbody>
             <?php
-                do_action( 'wpinv_email_items_before' );
-                if ( $cart_items ) {
-                    foreach ( $cart_items as $key => $item ) {
-                        $wpi_item = $item['id'] ? new WPInv_Item( $item['id'] ) : NULL;
+                do_action('wpinv_email_items_before');
+                if ($cart_items) {
+                    foreach ($cart_items as $key => $item) {
+                        $wpi_item = $item['id'] ? new WPInv_Item($item['id']) : NULL;
                     ?>
-                    <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr( $key ) . '_' . esc_attr( $item['id'] ); ?>" data-item-id="<?php echo esc_attr( $item['id'] ); ?>">
-                        <?php do_action( 'wpinv_email_items_table_body_first', $item ); ?>
+                    <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr($key) . '_' . esc_attr($item['id']); ?>" data-item-id="<?php echo esc_attr($item['id']); ?>">
+                        <?php do_action('wpinv_email_items_table_body_first', $item); ?>
                         <td class="wpinv_cart_item_name text-left">
                             <?php
-                                if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $item['id'] ) ) {
+                                if (current_theme_supports('post-thumbnails') && has_post_thumbnail($item['id'])) {
                                     echo '<div class="wpinv_cart_item_image">';
-                                        echo get_the_post_thumbnail( $item['id'], apply_filters( 'wpinv_checkout_image_size', array( 25,25 ) ) );
+                                        echo get_the_post_thumbnail($item['id'], apply_filters('wpinv_checkout_image_size', array(25, 25)));
                                     echo '</div>';
                                 }
-                                $item_title = esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $wpi_item );
+                                $item_title = esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($wpi_item);
                                 echo '<span class="wpinv_email_cart_item_title">' . $item_title . '</span>';
                                 
-                                $summary = apply_filters( 'wpinv_email_invoice_line_item_summary', '', $item, $wpi_item, $invoice );
-                                if ( !empty( $summary ) ) {
+                                $summary = apply_filters('wpinv_email_invoice_line_item_summary', '', $item, $wpi_item, $invoice);
+                                if (!empty($summary)) {
                                     echo '<p class="small">' . $summary . '</p>';
                                 }
     
-                                do_action( 'wpinv_email_cart_item_title_after', $item, $key );
+                                do_action('wpinv_email_cart_item_title_after', $item, $key);
                             ?>
                         </td>
                         <td class="wpinv_cart_item_price text-right">
                             <?php 
-                            echo wpinv_cart_item_price( $item );
-                            do_action( 'wpinv_email_cart_item_price_after', $item, $key );
+                            echo wpinv_cart_item_price($item);
+                            do_action('wpinv_email_cart_item_price_after', $item, $key);
                             ?>
                         </td>
-                        <?php if ( $quantities_enabled ) { ?>
+                        <?php if ($quantities_enabled) { ?>
                         <td class="wpinv_cart_item_qty text-right">
                             <?php
-                            echo wpinv_get_cart_item_quantity( $item );
-                            do_action( 'wpinv_email_item_quantitiy', $item, $key );
+                            echo wpinv_get_cart_item_quantity($item);
+                            do_action('wpinv_email_item_quantitiy', $item, $key);
                             ?>
                         </td>
                         <?php } ?>
-                        <?php if ( !$zero_tax && $use_taxes ) { ?>
+                        <?php if (!$zero_tax && $use_taxes) { ?>
                         <td class="wpinv_cart_item_tax text-right">
                             <?php
-                            echo wpinv_cart_item_tax( $item );
-                            do_action( 'wpinv_email_item_tax', $item, $key );
+                            echo wpinv_cart_item_tax($item);
+                            do_action('wpinv_email_item_tax', $item, $key);
                             ?>
                         </td>
                         <?php } ?>
                         <td class="wpinv_cart_item_subtotal text-right">
                             <?php
-                            echo wpinv_cart_item_subtotal( $item );
-                            do_action( 'wpinv_email_item_subtotal', $item, $key );
+                            echo wpinv_cart_item_subtotal($item);
+                            do_action('wpinv_email_item_subtotal', $item, $key);
                             ?>
                         </td>
-                        <?php do_action( 'wpinv_email_items_table_body_last', $item, $key ); ?>
+                        <?php do_action('wpinv_email_items_table_body_last', $item, $key); ?>
                     </tr>
                 <?php } ?>
             <?php } ?>
-            <?php do_action( 'wpinv_email_items_middle' ); ?>
-            <?php do_action( 'wpinv_email_items_after' ); ?>
+            <?php do_action('wpinv_email_items_middle'); ?>
+            <?php do_action('wpinv_email_items_after'); ?>
         </tbody>
         <tfoot>
-            <?php $cart_columns = wpinv_checkout_cart_columns(); if ( $zero_tax && $use_taxes ) { $cart_columns--; } ?>
-            <?php if ( has_action( 'wpinv_email_footer_buttons' ) ) { ?>
+            <?php $cart_columns = wpinv_checkout_cart_columns(); if ($zero_tax && $use_taxes) { $cart_columns--; } ?>
+            <?php if (has_action('wpinv_email_footer_buttons')) { ?>
                 <tr class="wpinv_cart_footer_row">
-                    <?php do_action( 'wpinv_email_items_table_buttons_first', $cart_items ); ?>
-                    <td colspan="<?php echo ( $cart_columns ); ?>">
-                        <?php do_action( 'wpinv_email_footer_buttons' ); ?>
+                    <?php do_action('wpinv_email_items_table_buttons_first', $cart_items); ?>
+                    <td colspan="<?php echo ($cart_columns); ?>">
+                        <?php do_action('wpinv_email_footer_buttons'); ?>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_buttons_first', $cart_items ); ?>
+                    <?php do_action('wpinv_email_items_table_buttons_first', $cart_items); ?>
                 </tr>
             <?php } ?>
 
-            <?php if ( !$zero_tax && $use_taxes && !wpinv_prices_include_tax() && wpinv_is_cart_taxed() ) { ?>
+            <?php if (!$zero_tax && $use_taxes && !wpinv_prices_include_tax() && wpinv_is_cart_taxed()) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row">
-                    <?php do_action( 'wpinv_email_items_table_subtotal_first', $cart_items ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
-                        <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
+                    <?php do_action('wpinv_email_items_table_subtotal_first', $cart_items); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_subtotal_label text-right">
+                        <strong><?php _e('Sub-Total', 'invoicing'); ?>:</strong>
                     </td>
                     <td class="wpinv_cart_subtotal text-right">
-                        <span class="wpinv_cart_subtotal_amount bold"><?php echo $invoice->get_subtotal( true ); ?></span>
+                        <span class="wpinv_cart_subtotal_amount bold"><?php echo $invoice->get_subtotal(true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_subtotal_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_email_items_table_subtotal_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
             
-            <?php if ( wpinv_discount( $invoice_id, false ) > 0 ) { ?>
+            <?php if (wpinv_discount($invoice_id, false) > 0) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_discount_row">
-                    <?php do_action( 'wpinv_receipt_items_table_discount_first', $cart_items, $invoice ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_discount_label text-right">
-                        <strong><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?>:</strong>
+                    <?php do_action('wpinv_receipt_items_table_discount_first', $cart_items, $invoice); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_discount_label text-right">
+                        <strong><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?>:</strong>
                     </td>
                     <td class="wpinv_cart_discount text-right">
-                        <span class="wpinv_cart_discount_amount"><?php echo wpinv_discount( $invoice_id, true, true ); ?></span>
+                        <span class="wpinv_cart_discount_amount"><?php echo wpinv_discount($invoice_id, true, true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_receipt_items_table_discount_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_receipt_items_table_discount_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
 
-            <?php if ( !$zero_tax && $use_taxes && wpinv_is_cart_taxed() ) { ?>
+            <?php if (!$zero_tax && $use_taxes && wpinv_is_cart_taxed()) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_tax_row">
-                    <?php do_action( 'wpinv_email_items_table_tax_first', $cart_items, $invoice ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
+                    <?php do_action('wpinv_email_items_table_tax_first', $cart_items, $invoice); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_tax_label text-right">
                         <strong><?php echo $tax_label; ?>:</strong>
                     </td>
                     <td class="wpinv_cart_tax text-right">
-                        <span class="wpinv_cart_tax_amount"><?php echo $invoice->get_tax( true ); ?></span>
+                        <span class="wpinv_cart_tax_amount"><?php echo $invoice->get_tax(true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_tax_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_email_items_table_tax_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
 
             <tr class="wpinv_cart_footer_row">
-                <?php do_action( 'wpinv_email_items_table_footer_first', $cart_items, $invoice ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_total_label text-right">
-                    <?php echo apply_filters( 'wpinv_email_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?>
+                <?php do_action('wpinv_email_items_table_footer_first', $cart_items, $invoice); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_total_label text-right">
+                    <?php echo apply_filters('wpinv_email_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?>
                 </td>
                 <td class="wpinv_cart_total text-right">
-                    <span class="wpinv_cart_amount bold"><?php echo $invoice->get_total( true ); ?></span>
+                    <span class="wpinv_cart_amount bold"><?php echo $invoice->get_total(true); ?></span>
                 </td>
-                <?php do_action( 'wpinv_email_items_table_footer_last', $cart_items, $invoice ); ?>
+                <?php do_action('wpinv_email_items_table_footer_last', $cart_items, $invoice); ?>
             </tr>
         </tfoot>
     </table>
 </div>
-<?php do_action( 'wpinv_after_email_items', $invoice ); ?>
\ No newline at end of file
+<?php do_action('wpinv_after_email_items', $invoice); ?>
\ No newline at end of file

templates/wpinv-checkout-cart.php

Spacing +58 added lines, -58 removed lines

@@ -5,138 +5,138 @@
 
 global $wpinv_euvat, $post, $ajax_cart_details, $wpi_cart_columns, $wpi_session;
 $invoice            = wpinv_get_invoice_cart();
-$cart_items         = !empty( $ajax_cart_details ) ? $ajax_cart_details : wpinv_get_cart_content_details();
+$cart_items         = !empty($ajax_cart_details) ? $ajax_cart_details : wpinv_get_cart_content_details();
 $quantities_enabled = wpinv_item_quantities_enabled();
 $use_taxes          = wpinv_use_taxes();
 $tax_label          = $wpinv_euvat->tax_label();
-$tax_title          = $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+$tax_title          = $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
 ?>
 <table id="wpinv_checkout_cart" class="table table-bordered table-hover">
     <thead>
         <tr class="wpinv_cart_header_row">
-            <?php do_action( 'wpinv_checkout_table_header_first' ); ?>
-            <th class="wpinv_cart_item_name text-left"><?php _e( 'Item Name', 'invoicing' ); ?></th>
-            <th class="wpinv_cart_item_price text-right"><?php _e( 'Item Price', 'invoicing' ); ?></th>
-            <?php if ( $quantities_enabled ) { ?>
-            <th class="wpinv_cart_item_qty text-right"><?php _e( 'Qty', 'invoicing' ); ?></th>
+            <?php do_action('wpinv_checkout_table_header_first'); ?>
+            <th class="wpinv_cart_item_name text-left"><?php _e('Item Name', 'invoicing'); ?></th>
+            <th class="wpinv_cart_item_price text-right"><?php _e('Item Price', 'invoicing'); ?></th>
+            <?php if ($quantities_enabled) { ?>
+            <th class="wpinv_cart_item_qty text-right"><?php _e('Qty', 'invoicing'); ?></th>
             <?php } ?>
-            <?php if ( $use_taxes ) { ?>
+            <?php if ($use_taxes) { ?>
             <th class="wpinv_cart_item_tax text-right"><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></th>
             <?php } ?>
-            <th class="wpinv_cart_item_subtotal text-right"><?php echo __( 'Item Total', 'invoicing' ) . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
-            <?php do_action( 'wpinv_checkout_table_header_last' ); ?>
+            <th class="wpinv_cart_item_subtotal text-right"><?php echo __('Item Total', 'invoicing') . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
+            <?php do_action('wpinv_checkout_table_header_last'); ?>
         </tr>
     </thead>
     <tbody>
         <?php
-            do_action( 'wpinv_cart_items_before' );
+            do_action('wpinv_cart_items_before');
             
-            if ( $cart_items ) {
-                foreach ( $cart_items as $key => $item ) {
-                    $wpi_item = !empty( $item['id'] ) ? new WPInv_Item( $item['id'] ) : NULL;
+            if ($cart_items) {
+                foreach ($cart_items as $key => $item) {
+                    $wpi_item = !empty($item['id']) ? new WPInv_Item($item['id']) : NULL;
                 ?>
-                <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr( $key ) . '_' . esc_attr( $item['id'] ); ?>" data-item-id="<?php echo esc_attr( $item['id'] ); ?>">
-                    <?php do_action( 'wpinv_checkout_table_body_first', $item ); ?>
+                <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr($key) . '_' . esc_attr($item['id']); ?>" data-item-id="<?php echo esc_attr($item['id']); ?>">
+                    <?php do_action('wpinv_checkout_table_body_first', $item); ?>
                     <td class="wpinv_cart_item_name text-left">
                         <?php
-                            if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $item['id'] ) ) {
+                            if (current_theme_supports('post-thumbnails') && has_post_thumbnail($item['id'])) {
                                 echo '<div class="wpinv_cart_item_image">';
-                                    echo get_the_post_thumbnail( $item['id'], apply_filters( 'wpinv_checkout_image_size', array( 25,25 ) ) );
+                                    echo get_the_post_thumbnail($item['id'], apply_filters('wpinv_checkout_image_size', array(25, 25)));
                                 echo '</div>';
                             }
-                            $item_title = esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $wpi_item );
+                            $item_title = esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($wpi_item);
                             echo '<span class="wpinv_checkout_cart_item_title">' . $item_title . '</span>';
-                            $summary = apply_filters( 'wpinv_checkout_cart_line_item_summary', '', $item, $wpi_item, $invoice );
-                            if ( !empty( $summary ) ) {
+                            $summary = apply_filters('wpinv_checkout_cart_line_item_summary', '', $item, $wpi_item, $invoice);
+                            if (!empty($summary)) {
                                 echo $summary;
                             }
                         ?>
                     </td>
                     <td class="wpinv_cart_item_price text-right">
                         <?php 
-                        echo wpinv_cart_item_price( $item );
-                        do_action( 'wpinv_checkout_cart_item_price_after', $item, $key );
+                        echo wpinv_cart_item_price($item);
+                        do_action('wpinv_checkout_cart_item_price_after', $item, $key);
                         ?>
                     </td>
-                    <?php if ( $quantities_enabled ) { ?>
+                    <?php if ($quantities_enabled) { ?>
                     <td class="wpinv_cart_item_qty text-right">
                         <?php
-                        echo wpinv_get_cart_item_quantity( $item );
-                        do_action( 'wpinv_cart_item_quantitiy', $item, $key );
+                        echo wpinv_get_cart_item_quantity($item);
+                        do_action('wpinv_cart_item_quantitiy', $item, $key);
                         ?>
                     </td>
                     <?php } ?>
-                    <?php if ( $use_taxes ) { ?>
+                    <?php if ($use_taxes) { ?>
                     <td class="wpinv_cart_item_tax text-right">
                         <?php
-                        echo wpinv_cart_item_tax( $item );
+                        echo wpinv_cart_item_tax($item);
                         //echo wpinv_get_cart_item_tax( $wpi_item->ID, $subtotal = '', $options = array() );
-                        do_action( 'wpinv_cart_item_tax', $item, $key );
+                        do_action('wpinv_cart_item_tax', $item, $key);
                         ?>
                     </td>
                     <?php } ?>
                     <td class="wpinv_cart_item_subtotal text-right">
                         <?php
-                        echo wpinv_cart_item_subtotal( $item );
-                        do_action( 'wpinv_cart_item_subtotal', $item, $key );
+                        echo wpinv_cart_item_subtotal($item);
+                        do_action('wpinv_cart_item_subtotal', $item, $key);
                         ?>
                     </td>
-                    <?php do_action( 'wpinv_checkout_table_body_last', $item, $key ); ?>
+                    <?php do_action('wpinv_checkout_table_body_last', $item, $key); ?>
                 </tr>
             <?php } ?>
         <?php } ?>
-        <?php do_action( 'wpinv_cart_items_middle' ); ?>
-        <?php do_action( 'wpinv_cart_items_after' ); ?>
+        <?php do_action('wpinv_cart_items_middle'); ?>
+        <?php do_action('wpinv_cart_items_after'); ?>
     </tbody>
     <tfoot>
         <?php $cart_columns = wpinv_checkout_cart_columns(); ?>
-        <?php if ( has_action( 'wpinv_cart_footer_buttons' ) ) { ?>
+        <?php if (has_action('wpinv_cart_footer_buttons')) { ?>
             <tr class="wpinv_cart_footer_row">
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
-                <td colspan="<?php echo ( $cart_columns ); ?>">
-                    <?php do_action( 'wpinv_cart_footer_buttons' ); ?>
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
+                <td colspan="<?php echo ($cart_columns); ?>">
+                    <?php do_action('wpinv_cart_footer_buttons'); ?>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
             </tr>
         <?php } ?>
 
-        <?php if ( $use_taxes && !wpinv_prices_include_tax() ) { ?>
-            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if ( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
-                <?php do_action( 'wpinv_checkout_table_subtotal_first', $cart_items ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
-                    <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
+        <?php if ($use_taxes && !wpinv_prices_include_tax()) { ?>
+            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
+                <?php do_action('wpinv_checkout_table_subtotal_first', $cart_items); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_subtotal_label text-right">
+                    <strong><?php _e('Sub-Total', 'invoicing'); ?>:</strong>
                 </td>
                 <td class="wpinv_cart_subtotal text-right">
-                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal( $cart_items ); ?></span>
+                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal($cart_items); ?></span>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_subtotal_last', $cart_items ); ?>
+                <?php do_action('wpinv_checkout_table_subtotal_last', $cart_items); ?>
             </tr>
         <?php } ?>
         
-        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html( $cart_items ); ?>
+        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html($cart_items); ?>
 
-        <?php if ( $use_taxes ) { ?>
-            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
-                <?php do_action( 'wpinv_checkout_table_tax_first' ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
+        <?php if ($use_taxes) { ?>
+            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
+                <?php do_action('wpinv_checkout_table_tax_first'); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_tax_label text-right">
                     <strong><?php echo $tax_label; ?>:</strong>
                 </td>
                 <td class="wpinv_cart_tax text-right">
-                    <span class="wpinv_cart_tax_amount" data-tax="<?php echo wpinv_get_cart_tax( $cart_items ); ?>"><?php echo esc_html( wpinv_cart_tax( $cart_items ) ); ?></span>
+                    <span class="wpinv_cart_tax_amount" data-tax="<?php echo wpinv_get_cart_tax($cart_items); ?>"><?php echo esc_html(wpinv_cart_tax($cart_items)); ?></span>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_tax_last' ); ?>
+                <?php do_action('wpinv_checkout_table_tax_last'); ?>
             </tr>
         <?php } ?>
 
         <tr class="wpinv_cart_footer_row wpinv_cart_total_row">
-            <?php do_action( 'wpinv_checkout_table_footer_first' ); ?>
-            <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_total_label text-right">
-                <?php echo apply_filters( 'wpinv_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?>
+            <?php do_action('wpinv_checkout_table_footer_first'); ?>
+            <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_total_label text-right">
+                <?php echo apply_filters('wpinv_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?>
             </td>
             <td class="wpinv_cart_total text-right">
-                <span class="wpinv_cart_amount bold" data-subtotal="<?php echo wpinv_get_cart_total( $cart_items ); ?>" data-total="<?php echo wpinv_get_cart_total( NULL, NULL, $invoice ); ?>"><?php wpinv_cart_total( $cart_items, true, $invoice ); ?></span>
+                <span class="wpinv_cart_amount bold" data-subtotal="<?php echo wpinv_get_cart_total($cart_items); ?>" data-total="<?php echo wpinv_get_cart_total(NULL, NULL, $invoice); ?>"><?php wpinv_cart_total($cart_items, true, $invoice); ?></span>
             </td>
-            <?php do_action( 'wpinv_checkout_table_footer_last' ); ?>
+            <?php do_action('wpinv_checkout_table_footer_last'); ?>
         </tr>
     </tfoot>
 </table>

includes/class-wpinv-item.php

Spacing +125 added lines, -125 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 class WPInv_Item {
     public $ID = 0;
@@ -47,26 +47,26 @@ 
     public $filter;
 
 
-    public function __construct( $_id = false, $_args = array() ) {
-        $item = WP_Post::get_instance( $_id );
-        return $this->setup_item( $item );
+    public function __construct($_id = false, $_args = array()) {
+        $item = WP_Post::get_instance($_id);
+        return $this->setup_item($item);
     }
 
-    private function setup_item( $item ) {
-        if( ! is_object( $item ) ) {
+    private function setup_item($item) {
+        if (!is_object($item)) {
             return false;
         }
 
-        if( ! is_a( $item, 'WP_Post' ) ) {
+        if (!is_a($item, 'WP_Post')) {
             return false;
         }
 
-        if( 'wpi_item' !== $item->post_type ) {
+        if ('wpi_item' !== $item->post_type) {
             return false;
         }
 
-        foreach ( $item as $key => $value ) {
-            switch ( $key ) {
+        foreach ($item as $key => $value) {
+            switch ($key) {
                 default:
                     $this->$key = $value;
                     break;
@@ -76,38 +76,38 @@ 
         return true;
     }
 
-    public function __get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ) );
+    public function __get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key));
         } else {
-            return new WP_Error( 'wpinv-item-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error('wpinv-item-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
         }
     }
 
-    public function create( $data = array(), $wp_error = false ) {
-        if ( $this->ID != 0 ) {
+    public function create($data = array(), $wp_error = false) {
+        if ($this->ID != 0) {
             return false;
         }
 
         $defaults = array(
             'post_type'   => 'wpi_item',
             'post_status' => 'draft',
-            'post_title'  => __( 'New Invoice Item', 'invoicing' )
+            'post_title'  => __('New Invoice Item', 'invoicing')
         );
 
-        $args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args($data, $defaults);
 
-        do_action( 'wpinv_item_pre_create', $args );
+        do_action('wpinv_item_pre_create', $args);
 
-        $id = wp_insert_post( $args, $wp_error );
+        $id = wp_insert_post($args, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
         
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
@@ -115,47 +115,47 @@ 
         }
         
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $this->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $this->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_create', $id, $args );
+        do_action('wpinv_item_create', $id, $args);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
     
-    public function update( $data = array(), $wp_error = false ) {
-        if ( !$this->ID > 0 ) {
+    public function update($data = array(), $wp_error = false) {
+        if (!$this->ID > 0) {
             return false;
         }
         
         $data['ID'] = $this->ID;
 
-        do_action( 'wpinv_item_pre_update', $data );
+        do_action('wpinv_item_pre_update', $data);
         
-        $id = wp_update_post( $data, $wp_error );
+        $id = wp_update_post($data, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
         
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
 
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
             $this->save_metas($data['meta']);
         }
         
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $this->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $this->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_update', $id, $data );
+        do_action('wpinv_item_update', $id, $data);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
 
     public function get_ID() {
@@ -163,119 +163,119 @@ 
     }
 
     public function get_name() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_title() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_status() {
-        return get_post_status( $this->ID );
+        return get_post_status($this->ID);
     }
     
     public function get_summary() {
-        return get_the_excerpt( $this->ID );
+        return get_the_excerpt($this->ID);
     }
 
     public function get_price() {
-        if ( ! isset( $this->price ) ) {
-            $this->price = get_post_meta( $this->ID, '_wpinv_price', true );
+        if (!isset($this->price)) {
+            $this->price = get_post_meta($this->ID, '_wpinv_price', true);
             
-            if ( $this->price ) {
-                $this->price = wpinv_sanitize_amount( $this->price );
+            if ($this->price) {
+                $this->price = wpinv_sanitize_amount($this->price);
             } else {
                 $this->price = 0;
             }
         }
         
-        return apply_filters( 'wpinv_get_item_price', $this->price, $this->ID );
+        return apply_filters('wpinv_get_item_price', $this->price, $this->ID);
     }
     
     public function get_vat_rule() {
         global $wpinv_euvat;
         
-        if( !isset( $this->vat_rule ) ) {
-            $this->vat_rule = get_post_meta( $this->ID, '_wpinv_vat_rule', true );
+        if (!isset($this->vat_rule)) {
+            $this->vat_rule = get_post_meta($this->ID, '_wpinv_vat_rule', true);
 
-            if ( empty( $this->vat_rule ) ) {        
+            if (empty($this->vat_rule)) {        
                 $this->vat_rule = $wpinv_euvat->allow_vat_rules() ? 'digital' : 'physical';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_rule', $this->vat_rule, $this->ID );
+        return apply_filters('wpinv_get_item_vat_rule', $this->vat_rule, $this->ID);
     }
     
     public function get_vat_class() {
-        if( !isset( $this->vat_class ) ) {
-            $this->vat_class = get_post_meta( $this->ID, '_wpinv_vat_class', true );
+        if (!isset($this->vat_class)) {
+            $this->vat_class = get_post_meta($this->ID, '_wpinv_vat_class', true);
 
-            if ( empty( $this->vat_class ) ) {        
+            if (empty($this->vat_class)) {        
                 $this->vat_class = '_standard';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_class', $this->vat_class, $this->ID );
+        return apply_filters('wpinv_get_item_vat_class', $this->vat_class, $this->ID);
     }
 
     public function get_type() {
-        if( ! isset( $this->type ) ) {
-            $this->type = get_post_meta( $this->ID, '_wpinv_type', true );
+        if (!isset($this->type)) {
+            $this->type = get_post_meta($this->ID, '_wpinv_type', true);
 
-            if ( empty( $this->type ) ) {
+            if (empty($this->type)) {
                 $this->type = 'custom';
             }
         }
 
-        return apply_filters( 'wpinv_get_item_type', $this->type, $this->ID );
+        return apply_filters('wpinv_get_item_type', $this->type, $this->ID);
     }
     
     public function get_custom_id() {
-        $custom_id = get_post_meta( $this->ID, '_wpinv_custom_id', true );
+        $custom_id = get_post_meta($this->ID, '_wpinv_custom_id', true);
 
-        return apply_filters( 'wpinv_get_item_custom_id', $custom_id, $this->ID );
+        return apply_filters('wpinv_get_item_custom_id', $custom_id, $this->ID);
     }
     
     public function get_custom_name() {
-        $custom_name = get_post_meta( $this->ID, '_wpinv_custom_name', true );
+        $custom_name = get_post_meta($this->ID, '_wpinv_custom_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_name', $custom_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_name', $custom_name, $this->ID);
     }
     
     public function get_custom_singular_name() {
-        $custom_singular_name = get_post_meta( $this->ID, '_wpinv_custom_singular_name', true );
+        $custom_singular_name = get_post_meta($this->ID, '_wpinv_custom_singular_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID);
     }
     
     public function get_editable() {
-        $editable = get_post_meta( $this->ID, '_wpinv_editable', true );
+        $editable = get_post_meta($this->ID, '_wpinv_editable', true);
 
-        return apply_filters( 'wpinv_item_get_editable', $editable, $this->ID );
+        return apply_filters('wpinv_item_get_editable', $editable, $this->ID);
     }
     
     public function get_excerpt() {
-        $excerpt = get_the_excerpt( $this->ID );
+        $excerpt = get_the_excerpt($this->ID);
         
-        return apply_filters( 'wpinv_item_get_excerpt', $excerpt, $this->ID );
+        return apply_filters('wpinv_item_get_excerpt', $excerpt, $this->ID);
     }
     
     public function get_is_recurring() {
-        $is_recurring = get_post_meta( $this->ID, '_wpinv_is_recurring', true );
+        $is_recurring = get_post_meta($this->ID, '_wpinv_is_recurring', true);
 
-        return apply_filters( 'wpinv_item_get_is_recurring', $is_recurring, $this->ID );
+        return apply_filters('wpinv_item_get_is_recurring', $is_recurring, $this->ID);
 
     }
     
-    public function get_recurring_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_recurring_period', true );
+    public function get_recurring_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_recurring_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -291,40 +291,40 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_recurring_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_recurring_period', $period, $full, $this->ID);
     }
     
     public function get_recurring_interval() {
-        $interval = (int)get_post_meta( $this->ID, '_wpinv_recurring_interval', true );
+        $interval = (int)get_post_meta($this->ID, '_wpinv_recurring_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_recurring_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_recurring_interval', $interval, $this->ID);
     }
     
     public function get_recurring_limit() {
-        $limit = get_post_meta( $this->ID, '_wpinv_recurring_limit', true );
+        $limit = get_post_meta($this->ID, '_wpinv_recurring_limit', true);
 
-        return (int)apply_filters( 'wpinv_item_recurring_limit', $limit, $this->ID );
+        return (int)apply_filters('wpinv_item_recurring_limit', $limit, $this->ID);
     }
     
     public function get_free_trial() {
-        $free_trial = get_post_meta( $this->ID, '_wpinv_free_trial', true );
+        $free_trial = get_post_meta($this->ID, '_wpinv_free_trial', true);
 
-        return apply_filters( 'wpinv_item_get_free_trial', $free_trial, $this->ID );
+        return apply_filters('wpinv_item_get_free_trial', $free_trial, $this->ID);
     }
     
-    public function get_trial_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_trial_period', true );
+    public function get_trial_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_trial_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -340,47 +340,47 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_trial_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_trial_period', $period, $full, $this->ID);
     }
     
     public function get_trial_interval() {
-        $interval = absint( get_post_meta( $this->ID, '_wpinv_trial_interval', true ) );
+        $interval = absint(get_post_meta($this->ID, '_wpinv_trial_interval', true));
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_trial_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_trial_interval', $interval, $this->ID);
     }
     
     public function get_the_price() {
-        $item_price = wpinv_price( wpinv_format_amount( $this->price ) );
+        $item_price = wpinv_price(wpinv_format_amount($this->price));
         
-        return apply_filters( 'wpinv_get_the_item_price', $item_price, $this->ID );
+        return apply_filters('wpinv_get_the_item_price', $item_price, $this->ID);
     }
     
     public function is_recurring() {
         $is_recurring = $this->get_is_recurring();
 
-        return (bool)apply_filters( 'wpinv_is_recurring_item', $is_recurring, $this->ID );
+        return (bool)apply_filters('wpinv_is_recurring_item', $is_recurring, $this->ID);
     }
     
     public function has_free_trial() {
         $free_trial = $this->is_recurring() && $this->get_free_trial() ? true : false;
 
-        return (bool)apply_filters( 'wpinv_item_has_free_trial', $free_trial, $this->ID );
+        return (bool)apply_filters('wpinv_item_has_free_trial', $free_trial, $this->ID);
     }
 
     public function is_free() {
         $is_free = false;
         
-        $price = get_post_meta( $this->ID, '_wpinv_price', true );
+        $price = get_post_meta($this->ID, '_wpinv_price', true);
 
-        if ( (float)$price == 0 ) {
+        if ((float)$price == 0) {
             $is_free = true;
         }
 
-        return (bool) apply_filters( 'wpinv_is_free_item', $is_free, $this->ID );
+        return (bool)apply_filters('wpinv_is_free_item', $is_free, $this->ID);
 
     }
     
@@ -389,15 +389,15 @@ 
 
         $is_editable = $editable === 0 || $editable === '0' ? false : true;
 
-        return (bool) apply_filters( 'wpinv_item_is_editable', $is_editable, $this->ID );
+        return (bool)apply_filters('wpinv_item_is_editable', $is_editable, $this->ID);
     }
     
-    public function save_metas( $metas = array() ) {
-        if ( empty( $metas ) ) {
+    public function save_metas($metas = array()) {
+        if (empty($metas)) {
             return false;
         }
         
-        foreach ( $metas as $meta_key => $meta_value ) {
+        foreach ($metas as $meta_key => $meta_value) {
             $meta_key = strpos($meta_key, '_wpinv_') !== 0 ? '_wpinv_' . $meta_key : $meta_key;
             
             $this->update_meta($meta_key, $meta_value);
@@ -406,66 +406,66 @@ 
         return true;
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
         
-        $meta_value = apply_filters( 'wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID);
 
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
     
-    public function get_fees( $type = 'fee', $item_id = 0 ) {
+    public function get_fees($type = 'fee', $item_id = 0) {
         global $wpi_session;
         
-        $fees = $wpi_session->get( 'wpi_cart_fees' );
+        $fees = $wpi_session->get('wpi_cart_fees');
 
-        if ( ! wpinv_get_cart_contents() ) {
+        if (!wpinv_get_cart_contents()) {
             // We can only get item type fees when the cart is empty
             $type = 'custom';
         }
 
-        if ( ! empty( $fees ) && ! empty( $type ) && 'all' !== $type ) {
-            foreach( $fees as $key => $fee ) {
-                if( ! empty( $fee['type'] ) && $type != $fee['type'] ) {
-                    unset( $fees[ $key ] );
+        if (!empty($fees) && !empty($type) && 'all' !== $type) {
+            foreach ($fees as $key => $fee) {
+                if (!empty($fee['type']) && $type != $fee['type']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) && ! empty( $item_id ) ) {
+        if (!empty($fees) && !empty($item_id)) {
             // Remove fees that don't belong to the specified Item
-            foreach ( $fees as $key => $fee ) {
-                if ( (int) $item_id !== (int)$fee['custom_id'] ) {
-                    unset( $fees[ $key ] );
+            foreach ($fees as $key => $fee) {
+                if ((int)$item_id !== (int)$fee['custom_id']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) ) {
+        if (!empty($fees)) {
             // Remove fees that belong to a specific item but are not in the cart
-            foreach( $fees as $key => $fee ) {
-                if( empty( $fee['custom_id'] ) ) {
+            foreach ($fees as $key => $fee) {
+                if (empty($fee['custom_id'])) {
                     continue;
                 }
 
-                if ( !wpinv_item_in_cart( $fee['custom_id'] ) ) {
-                    unset( $fees[ $key ] );
+                if (!wpinv_item_in_cart($fee['custom_id'])) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        return ! empty( $fees ) ? $fees : array();
+        return !empty($fees) ? $fees : array();
     }
     
     public function can_purchase() {
         $can_purchase = true;
 
-        if ( !current_user_can( 'edit_post', $this->ID ) && $this->post_status != 'publish' ) {
+        if (!current_user_can('edit_post', $this->ID) && $this->post_status != 'publish') {
             $can_purchase = false;
         }
 
-        return (bool)apply_filters( 'wpinv_can_purchase_item', $can_purchase, $this );
+        return (bool)apply_filters('wpinv_can_purchase_item', $can_purchase, $this);
     }
 }

uninstall.php

Spacing +19 added lines, -19 removed lines

@@ -9,58 +9,58 @@
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
     exit;
 }
 
 global $wpdb, $wp_version;
 
-$remove_data = get_option( 'wpinv_remove_data_on_invoice_unistall' );
+$remove_data = get_option('wpinv_remove_data_on_invoice_unistall');
 
 /*
  * Only remove ALL product and page data if WPINV_REMOVE_ALL_DATA constant is set to true in user's
  * wp-config.php. This is to prevent data loss when deleting the plugin from the backend
  * and to ensure only the site owner can perform this action.
  */
-if ( defined( 'WPINV_REMOVE_ALL_DATA' ) ) {
+if (defined('WPINV_REMOVE_ALL_DATA')) {
     $remove_data = true === WPINV_REMOVE_ALL_DATA ? true : false;
 }
 
-if ( $remove_data ) {
+if ($remove_data) {
     // Load Invoicing file.
-    include_once( 'invoicing.php' );
+    include_once('invoicing.php');
 
     // Roles + caps.
-    include_once( dirname( __FILE__ ) . '/includes/admin/install.php' );
+    include_once(dirname(__FILE__) . '/includes/admin/install.php');
     wpinv_remove_admin_caps();
     
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
     
     // Delete pages.
-    $wpi_pages = array( 'checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page', 'invoice_subscription_page' );
-    foreach ( $wpi_pages as $page ) {
-        if ( !empty( $page ) && !empty( $settings[ $page ] ) ) {
-            wp_delete_post( $settings[ $page ], true );
+    $wpi_pages = array('checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page', 'invoice_subscription_page');
+    foreach ($wpi_pages as $page) {
+        if (!empty($page) && !empty($settings[$page])) {
+            wp_delete_post($settings[$page], true);
         }
     }
     
     // Delete posts + data.
-    $wpdb->query( "DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );");
+    $wpdb->query("DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;");
     
     // Delete comments.
-    $wpdb->query( "DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';");
+    $wpdb->query("DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;");
     
     // Delete user meta.
-    $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';" );
+    $wpdb->query("DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';");
     
     // Cleanup Cron Schedule
-    wp_clear_scheduled_hook( 'wp_session_garbage_collection' );
-    wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+    wp_clear_scheduled_hook('wp_session_garbage_collection');
+    wp_clear_scheduled_hook('wpinv_register_schedule_event_twicedaily');
     
     // Delete options.
-    $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';" );
+    $wpdb->query("DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';");
     
     // Clear any cached data that has been removed
     wp_cache_flush();

templates/emails/wpinv-email-invoice-details.php

Spacing +29 added lines, -29 removed lines

@@ -1,68 +1,68 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 global $wpinv_euvat;
 
-$sent_to_admin  = !empty( $sent_to_admin ) ? true : false;
-$invoice_url = $invoice->get_view_url( true );
+$sent_to_admin = !empty($sent_to_admin) ? true : false;
+$invoice_url = $invoice->get_view_url(true);
 $use_taxes = wpinv_use_taxes();
 $vat_name = $wpinv_euvat->get_vat_name();
 
-do_action( 'wpinv_email_before_invoice_details', $invoice, $sent_to_admin ); ?>
+do_action('wpinv_email_before_invoice_details', $invoice, $sent_to_admin); ?>
 <div id="wpinv-email-details">
-    <h3 class="wpinv-details-t"><?php echo apply_filters( 'wpinv_email_details_title', __( 'Invoice Details', 'invoicing' ), $invoice ); ?></h3>
+    <h3 class="wpinv-details-t"><?php echo apply_filters('wpinv_email_details_title', __('Invoice Details', 'invoicing'), $invoice); ?></h3>
     <table class="table table-bordered table-sm">
-        <?php if ( $invoice_number = $invoice->get_number() ) { ?>
+        <?php if ($invoice_number = $invoice->get_number()) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_number_label', __( 'Invoice Number', 'invoicing' ), $invoice ); ?></td>
-                <td><a href="<?php echo esc_url( $invoice_url ) ;?>"><?php echo $invoice_number; ?></a></td>
+                <td><?php echo apply_filters('wpinv_invoice_number_label', __('Invoice Number', 'invoicing'), $invoice); ?></td>
+                <td><a href="<?php echo esc_url($invoice_url); ?>"><?php echo $invoice_number; ?></a></td>
             </tr>
         <?php } ?>
         <tr>
-            <td><?php echo apply_filters( 'wpinv_invoice_status_label', __( 'Invoice Status', 'invoicing' ), $invoice ); ?></td>
-            <td><?php echo $invoice->get_status( true ); ?></td>
+            <td><?php echo apply_filters('wpinv_invoice_status_label', __('Invoice Status', 'invoicing'), $invoice); ?></td>
+            <td><?php echo $invoice->get_status(true); ?></td>
         </tr>
-        <?php if ( $invoice->is_renewal() ) { ?>
+        <?php if ($invoice->is_renewal()) { ?>
         <tr>
-            <td><?php echo apply_filters( 'wpinv_invoice_parent_invoice_label', __( 'Parent Invoice', 'invoicing' ), $invoice ); ?></td>
-            <td><?php echo wpinv_invoice_link( $invoice->parent_invoice ); ?></td>
+            <td><?php echo apply_filters('wpinv_invoice_parent_invoice_label', __('Parent Invoice', 'invoicing'), $invoice); ?></td>
+            <td><?php echo wpinv_invoice_link($invoice->parent_invoice); ?></td>
         </tr>
         <?php } ?>
-        <?php if ( ( $gateway_title = $invoice->get_gateway_title() ) && ( $invoice->is_paid() || $invoice->is_refunded() ) ) { ?>
-            <td><?php echo apply_filters( 'wpinv_invoice_payment_method_label', __( 'Payment Method', 'invoicing' ), $invoice ); ?></td>
+        <?php if (($gateway_title = $invoice->get_gateway_title()) && ($invoice->is_paid() || $invoice->is_refunded())) { ?>
+            <td><?php echo apply_filters('wpinv_invoice_payment_method_label', __('Payment Method', 'invoicing'), $invoice); ?></td>
             <td><?php echo $gateway_title; ?></td>
         <?php } ?>
-        <?php if ( $invoice_date = $invoice->get_invoice_date( false ) ) { ?>
+        <?php if ($invoice_date = $invoice->get_invoice_date(false)) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_date_label', __( 'Invoice Date', 'invoicing' ), $invoice ); ?></td>
-                <td><?php echo wp_sprintf( '<time datetime="%s">%s</time>', date_i18n( 'c', strtotime( $invoice_date ) ), $invoice->get_invoice_date() ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_date_label', __('Invoice Date', 'invoicing'), $invoice); ?></td>
+                <td><?php echo wp_sprintf('<time datetime="%s">%s</time>', date_i18n('c', strtotime($invoice_date)), $invoice->get_invoice_date()); ?></td>
             </tr>
         <?php } ?>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && $invoice->needs_payment() && ( $due_date = $invoice->get_due_date() ) ) { ?>
+        <?php if (wpinv_get_option('overdue_active') && $invoice->needs_payment() && ($due_date = $invoice->get_due_date())) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_due_date_label', __( 'Due Date', 'invoicing' ), $invoice ); ?></td>
-                <td><?php echo wp_sprintf( '<time datetime="%s">%s</time>', date_i18n( 'c', strtotime( $due_date ) ), $invoice->get_due_date( true ) ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_due_date_label', __('Due Date', 'invoicing'), $invoice); ?></td>
+                <td><?php echo wp_sprintf('<time datetime="%s">%s</time>', date_i18n('c', strtotime($due_date)), $invoice->get_due_date(true)); ?></td>
             </tr>
         <?php } ?>
-        <?php do_action( 'wpinv_email_invoice_details_after_due_date', $invoice->ID ); ?>
-        <?php if ( empty( $sent_to_admin ) && ( $owner_vat_number = $wpinv_euvat->get_vat_number() ) ) { ?>
+        <?php do_action('wpinv_email_invoice_details_after_due_date', $invoice->ID); ?>
+        <?php if (empty($sent_to_admin) && ($owner_vat_number = $wpinv_euvat->get_vat_number())) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_owner_vat_number_label', wp_sprintf( __( 'Owner %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_owner_vat_number_label', wp_sprintf(__('Owner %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></td>
                 <td><?php echo $owner_vat_number; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $use_taxes && ( $user_vat_number = $invoice->vat_number ) ) { ?>
+        <?php if ($use_taxes && ($user_vat_number = $invoice->vat_number)) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_user_vat_number_label', wp_sprintf( __( 'Invoice %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_user_vat_number_label', wp_sprintf(__('Invoice %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></td>
                 <td><?php echo $user_vat_number; ?></td>
             </tr>
         <?php } ?>
         <tr class="table-active">
-            <td><strong><?php _e( 'Total Amount', 'invoicing' ) ?></strong></td>
-            <td><strong><?php echo $invoice->get_total( true ); ?></strong></td>
+            <td><strong><?php _e('Total Amount', 'invoicing') ?></strong></td>
+            <td><strong><?php echo $invoice->get_total(true); ?></strong></td>
         </tr>
     </table>
 </div>
-<?php do_action( 'wpinv_email_after_invoice_details', $invoice, $sent_to_admin ); ?>
\ No newline at end of file
+<?php do_action('wpinv_email_after_invoice_details', $invoice, $sent_to_admin); ?>
\ No newline at end of file