Passed
Pull Request — master (#107)
by Kiran
03:57
created
templates/wpinv-checkout-cart.php 2 patches
Braces   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -103,7 +103,10 @@  discard block
 block discarded – undo
103 103
         <?php } ?>
104 104
 
105 105
         <?php if ( $use_taxes && !wpinv_prices_include_tax() ) { ?>
106
-            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if ( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
106
+            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if ( !wpinv_is_cart_taxed() ) {
107
+    echo ' style="display:none;"';
108
+}
109
+?>>
107 110
                 <?php do_action( 'wpinv_checkout_table_subtotal_first', $cart_items ); ?>
108 111
                 <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
109 112
                     <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
@@ -118,7 +121,10 @@  discard block
 block discarded – undo
118 121
         <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html( $cart_items ); ?>
119 122
 
120 123
         <?php if ( $use_taxes ) { ?>
121
-            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
124
+            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if( !wpinv_is_cart_taxed() ) {
125
+    echo ' style="display:none;"';
126
+}
127
+?>>
122 128
                 <?php do_action( 'wpinv_checkout_table_tax_first' ); ?>
123 129
                 <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
124 130
                     <strong><?php echo $tax_label; ?>:</strong>
Please login to merge, or discard this patch.
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -5,138 +5,138 @@
 block discarded – undo
5 5
 
6 6
 global $wpinv_euvat, $post, $ajax_cart_details, $wpi_cart_columns, $wpi_session;
7 7
 $invoice            = wpinv_get_invoice_cart();
8
-$cart_items         = !empty( $ajax_cart_details ) ? $ajax_cart_details : wpinv_get_cart_content_details();
8
+$cart_items         = !empty($ajax_cart_details) ? $ajax_cart_details : wpinv_get_cart_content_details();
9 9
 $quantities_enabled = wpinv_item_quantities_enabled();
10 10
 $use_taxes          = wpinv_use_taxes();
11 11
 $tax_label          = $wpinv_euvat->tax_label();
12
-$tax_title          = $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
12
+$tax_title          = $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
13 13
 ?>
14 14
 <table id="wpinv_checkout_cart" class="table table-bordered table-hover">
15 15
     <thead>
16 16
         <tr class="wpinv_cart_header_row">
17
-            <?php do_action( 'wpinv_checkout_table_header_first' ); ?>
18
-            <th class="wpinv_cart_item_name text-left"><?php _e( 'Item Name', 'invoicing' ); ?></th>
19
-            <th class="wpinv_cart_item_price text-right"><?php _e( 'Item Price', 'invoicing' ); ?></th>
20
-            <?php if ( $quantities_enabled ) { ?>
21
-            <th class="wpinv_cart_item_qty text-right"><?php _e( 'Qty', 'invoicing' ); ?></th>
17
+            <?php do_action('wpinv_checkout_table_header_first'); ?>
18
+            <th class="wpinv_cart_item_name text-left"><?php _e('Item Name', 'invoicing'); ?></th>
19
+            <th class="wpinv_cart_item_price text-right"><?php _e('Item Price', 'invoicing'); ?></th>
20
+            <?php if ($quantities_enabled) { ?>
21
+            <th class="wpinv_cart_item_qty text-right"><?php _e('Qty', 'invoicing'); ?></th>
22 22
             <?php } ?>
23
-            <?php if ( $use_taxes ) { ?>
23
+            <?php if ($use_taxes) { ?>
24 24
             <th class="wpinv_cart_item_tax text-right"><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></th>
25 25
             <?php } ?>
26
-            <th class="wpinv_cart_item_subtotal text-right"><?php echo __( 'Item Total', 'invoicing' ) . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
27
-            <?php do_action( 'wpinv_checkout_table_header_last' ); ?>
26
+            <th class="wpinv_cart_item_subtotal text-right"><?php echo __('Item Total', 'invoicing') . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
27
+            <?php do_action('wpinv_checkout_table_header_last'); ?>
28 28
         </tr>
29 29
     </thead>
30 30
     <tbody>
31 31
         <?php
32
-            do_action( 'wpinv_cart_items_before' );
32
+            do_action('wpinv_cart_items_before');
33 33
             
34
-            if ( $cart_items ) {
35
-                foreach ( $cart_items as $key => $item ) {
36
-                    $wpi_item = !empty( $item['id'] ) ? new WPInv_Item( $item['id'] ) : NULL;
34
+            if ($cart_items) {
35
+                foreach ($cart_items as $key => $item) {
36
+                    $wpi_item = !empty($item['id']) ? new WPInv_Item($item['id']) : NULL;
37 37
                 ?>
38
-                <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'] ); ?>">
39
-                    <?php do_action( 'wpinv_checkout_table_body_first', $item ); ?>
38
+                <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']); ?>">
39
+                    <?php do_action('wpinv_checkout_table_body_first', $item); ?>
40 40
                     <td class="wpinv_cart_item_name text-left">
41 41
                         <?php
42
-                            if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $item['id'] ) ) {
42
+                            if (current_theme_supports('post-thumbnails') && has_post_thumbnail($item['id'])) {
43 43
                                 echo '<div class="wpinv_cart_item_image">';
44
-                                    echo get_the_post_thumbnail( $item['id'], apply_filters( 'wpinv_checkout_image_size', array( 25,25 ) ) );
44
+                                    echo get_the_post_thumbnail($item['id'], apply_filters('wpinv_checkout_image_size', array(25, 25)));
45 45
                                 echo '</div>';
46 46
                             }
47
-                            $item_title = esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $wpi_item );
47
+                            $item_title = esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($wpi_item);
48 48
                             echo '<span class="wpinv_checkout_cart_item_title">' . $item_title . '</span>';
49
-                            $summary = apply_filters( 'wpinv_checkout_cart_line_item_summary', '', $item, $wpi_item, $invoice );
50
-                            if ( !empty( $summary ) ) {
49
+                            $summary = apply_filters('wpinv_checkout_cart_line_item_summary', '', $item, $wpi_item, $invoice);
50
+                            if (!empty($summary)) {
51 51
                                 echo $summary;
52 52
                             }
53 53
                         ?>
54 54
                     </td>
55 55
                     <td class="wpinv_cart_item_price text-right">
56 56
                         <?php 
57
-                        echo wpinv_cart_item_price( $item );
58
-                        do_action( 'wpinv_checkout_cart_item_price_after', $item, $key );
57
+                        echo wpinv_cart_item_price($item);
58
+                        do_action('wpinv_checkout_cart_item_price_after', $item, $key);
59 59
                         ?>
60 60
                     </td>
61
-                    <?php if ( $quantities_enabled ) { ?>
61
+                    <?php if ($quantities_enabled) { ?>
62 62
                     <td class="wpinv_cart_item_qty text-right">
63 63
                         <?php
64
-                        echo wpinv_get_cart_item_quantity( $item );
65
-                        do_action( 'wpinv_cart_item_quantitiy', $item, $key );
64
+                        echo wpinv_get_cart_item_quantity($item);
65
+                        do_action('wpinv_cart_item_quantitiy', $item, $key);
66 66
                         ?>
67 67
                     </td>
68 68
                     <?php } ?>
69
-                    <?php if ( $use_taxes ) { ?>
69
+                    <?php if ($use_taxes) { ?>
70 70
                     <td class="wpinv_cart_item_tax text-right">
71 71
                         <?php
72
-                        echo wpinv_cart_item_tax( $item );
72
+                        echo wpinv_cart_item_tax($item);
73 73
                         //echo wpinv_get_cart_item_tax( $wpi_item->ID, $subtotal = '', $options = array() );
74
-                        do_action( 'wpinv_cart_item_tax', $item, $key );
74
+                        do_action('wpinv_cart_item_tax', $item, $key);
75 75
                         ?>
76 76
                     </td>
77 77
                     <?php } ?>
78 78
                     <td class="wpinv_cart_item_subtotal text-right">
79 79
                         <?php
80
-                        echo wpinv_cart_item_subtotal( $item );
81
-                        do_action( 'wpinv_cart_item_subtotal', $item, $key );
80
+                        echo wpinv_cart_item_subtotal($item);
81
+                        do_action('wpinv_cart_item_subtotal', $item, $key);
82 82
                         ?>
83 83
                     </td>
84
-                    <?php do_action( 'wpinv_checkout_table_body_last', $item, $key ); ?>
84
+                    <?php do_action('wpinv_checkout_table_body_last', $item, $key); ?>
85 85
                 </tr>
86 86
             <?php } ?>
87 87
         <?php } ?>
88
-        <?php do_action( 'wpinv_cart_items_middle' ); ?>
89
-        <?php do_action( 'wpinv_cart_items_after' ); ?>
88
+        <?php do_action('wpinv_cart_items_middle'); ?>
89
+        <?php do_action('wpinv_cart_items_after'); ?>
90 90
     </tbody>
91 91
     <tfoot>
92 92
         <?php $cart_columns = wpinv_checkout_cart_columns(); ?>
93
-        <?php if ( has_action( 'wpinv_cart_footer_buttons' ) ) { ?>
93
+        <?php if (has_action('wpinv_cart_footer_buttons')) { ?>
94 94
             <tr class="wpinv_cart_footer_row">
95
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
96
-                <td colspan="<?php echo ( $cart_columns ); ?>">
97
-                    <?php do_action( 'wpinv_cart_footer_buttons' ); ?>
95
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
96
+                <td colspan="<?php echo ($cart_columns); ?>">
97
+                    <?php do_action('wpinv_cart_footer_buttons'); ?>
98 98
                 </td>
99
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
99
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
100 100
             </tr>
101 101
         <?php } ?>
102 102
 
103
-        <?php if ( $use_taxes && !wpinv_prices_include_tax() ) { ?>
104
-            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if ( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
105
-                <?php do_action( 'wpinv_checkout_table_subtotal_first', $cart_items ); ?>
106
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
107
-                    <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
103
+        <?php if ($use_taxes && !wpinv_prices_include_tax()) { ?>
104
+            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
105
+                <?php do_action('wpinv_checkout_table_subtotal_first', $cart_items); ?>
106
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_subtotal_label text-right">
107
+                    <strong><?php _e('Sub-Total', 'invoicing'); ?>:</strong>
108 108
                 </td>
109 109
                 <td class="wpinv_cart_subtotal text-right">
110
-                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal( $cart_items ); ?></span>
110
+                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal($cart_items); ?></span>
111 111
                 </td>
112
-                <?php do_action( 'wpinv_checkout_table_subtotal_last', $cart_items ); ?>
112
+                <?php do_action('wpinv_checkout_table_subtotal_last', $cart_items); ?>
113 113
             </tr>
114 114
         <?php } ?>
115 115
         
116
-        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html( $cart_items ); ?>
116
+        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html($cart_items); ?>
117 117
 
118
-        <?php if ( $use_taxes ) { ?>
119
-            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
120
-                <?php do_action( 'wpinv_checkout_table_tax_first' ); ?>
121
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
118
+        <?php if ($use_taxes) { ?>
119
+            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
120
+                <?php do_action('wpinv_checkout_table_tax_first'); ?>
121
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_tax_label text-right">
122 122
                     <strong><?php echo $tax_label; ?>:</strong>
123 123
                 </td>
124 124
                 <td class="wpinv_cart_tax text-right">
125
-                    <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>
125
+                    <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>
126 126
                 </td>
127
-                <?php do_action( 'wpinv_checkout_table_tax_last' ); ?>
127
+                <?php do_action('wpinv_checkout_table_tax_last'); ?>
128 128
             </tr>
129 129
         <?php } ?>
130 130
 
131 131
         <tr class="wpinv_cart_footer_row wpinv_cart_total_row">
132
-            <?php do_action( 'wpinv_checkout_table_footer_first' ); ?>
133
-            <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_total_label text-right">
134
-                <?php echo apply_filters( 'wpinv_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?>
132
+            <?php do_action('wpinv_checkout_table_footer_first'); ?>
133
+            <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_total_label text-right">
134
+                <?php echo apply_filters('wpinv_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?>
135 135
             </td>
136 136
             <td class="wpinv_cart_total text-right">
137
-                <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>
137
+                <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>
138 138
             </td>
139
-            <?php do_action( 'wpinv_checkout_table_footer_last' ); ?>
139
+            <?php do_action('wpinv_checkout_table_footer_last'); ?>
140 140
         </tr>
141 141
     </tfoot>
142 142
 </table>
Please login to merge, or discard this patch.
templates/emails/wpinv-email-footer.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
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>
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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 ) ) ) : '';
Please login to merge, or discard this patch.
templates/emails/wpinv-email-header.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
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
 block discarded – undo
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 -->
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
templates/emails/wpinv-email-user_invoice.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
7 8
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,20 +1,20 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
6
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
7 7
 
8
-if ( $invoice->needs_payment() ) {
8
+if ($invoice->needs_payment()) {
9 9
     ?>
10
-    <p><?php printf( __( 'An invoice has been created for you on %s. To view / pay for this invoice please use the following link: %s', 'invoicing' ), wpinv_get_business_name(), '<a class="btn btn-success" href="' . esc_url( $invoice->get_view_url( true ) ) . '">' . __( 'View / Pay', 'invoicing' ) . '</a>' ); ?></p>
10
+    <p><?php printf(__('An invoice has been created for you on %s. To view / pay for this invoice please use the following link: %s', 'invoicing'), wpinv_get_business_name(), '<a class="btn btn-success" href="' . esc_url($invoice->get_view_url(true)) . '">' . __('View / Pay', 'invoicing') . '</a>'); ?></p>
11 11
     <?php 
12 12
 }
13 13
 
14
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
14
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
15 15
 
16
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
16
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
17 17
 
18
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
18
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
19 19
 
20
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
21 20
\ No newline at end of file
21
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
templates/emails/wpinv-email-processing_invoice.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
6
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
7 7
 ?>
8 8
 
9
-<p><?php _e( "Your invoice has been received and is now being processed. Your invoice details are shown below for your reference:", 'invoicing' ); ?></p>
9
+<p><?php _e("Your invoice has been received and is now being processed. Your invoice details are shown below for your reference:", 'invoicing'); ?></p>
10 10
 
11 11
 <?php
12
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
12
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
13 13
 
14
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
14
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
15 15
 
16
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
16
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
17 17
 
18
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
19 18
\ No newline at end of file
19
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
20 20
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
7 8
 ?>
Please login to merge, or discard this patch.
templates/emails/wpinv-email-overdue.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
6
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
7 7
 
8
-echo wpautop( wptexturize( $message_body ) );
8
+echo wpautop(wptexturize($message_body));
9 9
 
10
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
11 10
\ No newline at end of file
11
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
7 8
 
Please login to merge, or discard this patch.
templates/emails/wpinv-email-cancelled_invoice.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
6
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
7 7
 ?>
8 8
 
9
-<p><?php printf( __( 'The invoice #%s from %s has been cancelled. The invoice is as follows:', 'invoicing' ), $invoice->get_number(), $invoice->get_user_full_name() ); ?></p>
9
+<p><?php printf(__('The invoice #%s from %s has been cancelled. The invoice is as follows:', 'invoicing'), $invoice->get_number(), $invoice->get_user_full_name()); ?></p>
10 10
 
11 11
 <?php
12
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
12
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
13 13
 
14
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
14
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
15 15
 
16
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
16
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
17 17
 
18
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
19 18
\ No newline at end of file
19
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
20 20
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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_header', $email_heading, $invoice, $email_type, $sent_to_admin );
7 8
 ?>
Please login to merge, or discard this patch.
templates/emails/wpinv-email-styles.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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
 // Load colours
7 8
 $bg              = wpinv_get_option( 'email_background_color', '#f5f5f5' );
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -1,25 +1,25 @@  discard block
 block discarded – undo
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
 // Load colours
7
-$bg              = wpinv_get_option( 'email_background_color', '#f5f5f5' );
8
-$body            = wpinv_get_option( 'email_body_background_color', '#fdfdfd' );
9
-$base            = wpinv_get_option( 'email_base_color', '#557da2' );
10
-$base_text       = wpinv_light_or_dark( $base, '#202020', '#ffffff' );
11
-$text            = wpinv_get_option( 'email_text_color', '#505050' );
7
+$bg              = wpinv_get_option('email_background_color', '#f5f5f5');
8
+$body            = wpinv_get_option('email_body_background_color', '#fdfdfd');
9
+$base            = wpinv_get_option('email_base_color', '#557da2');
10
+$base_text       = wpinv_light_or_dark($base, '#202020', '#ffffff');
11
+$text            = wpinv_get_option('email_text_color', '#505050');
12 12
 
13
-$bg_darker_10    = wpinv_hex_darker( $bg, 10 );
14
-$body_darker_10  = wpinv_hex_darker( $body, 10 );
15
-$base_lighter_20 = wpinv_hex_lighter( $base, 20 );
16
-$base_lighter_40 = wpinv_hex_lighter( $base, 40 );
17
-$text_lighter_20 = wpinv_hex_lighter( $text, 20 );
13
+$bg_darker_10    = wpinv_hex_darker($bg, 10);
14
+$body_darker_10  = wpinv_hex_darker($body, 10);
15
+$base_lighter_20 = wpinv_hex_lighter($base, 20);
16
+$base_lighter_40 = wpinv_hex_lighter($base, 40);
17
+$text_lighter_20 = wpinv_hex_lighter($text, 20);
18 18
 
19 19
 // !important; is a gmail hack to prevent styles being stripped if it doesn't like something.
20 20
 ?>
21 21
 #wrapper {
22
-    background-color: <?php echo esc_attr( $bg ); ?>;
22
+    background-color: <?php echo esc_attr($bg); ?>;
23 23
     margin: 0;
24 24
     -webkit-text-size-adjust: none !important;
25 25
     padding: 3%;
@@ -40,15 +40,15 @@  discard block
 block discarded – undo
40 40
 
41 41
 #template_container {
42 42
     box-shadow: 0 1px 4px rgba(0,0,0,0.1) !important;
43
-    background-color: <?php echo esc_attr( $body ); ?>;
44
-    border: 1px solid <?php echo esc_attr( $bg_darker_10 ); ?>;
43
+    background-color: <?php echo esc_attr($body); ?>;
44
+    border: 1px solid <?php echo esc_attr($bg_darker_10); ?>;
45 45
     border-radius: 3px !important;
46 46
 }
47 47
 
48 48
 #template_header {
49
-    background-color: <?php echo esc_attr( $base ); ?>;
49
+    background-color: <?php echo esc_attr($base); ?>;
50 50
     border-radius: 3px 3px 0 0 !important;
51
-    color: <?php echo esc_attr( $base_text ); ?>;
51
+    color: <?php echo esc_attr($base_text); ?>;
52 52
     border-bottom: 0;
53 53
     font-weight: bold;
54 54
     line-height: 100%;
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 }
62 62
 
63 63
 #template_header h1 {
64
-    color: <?php echo esc_attr( $base_text ); ?>;
64
+    color: <?php echo esc_attr($base_text); ?>;
65 65
 }
66 66
 
67 67
 #template_footer td {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
 #template_footer #credit {
74 74
     border:0;
75
-    color: <?php echo esc_attr( $base_lighter_40 ); ?>;
75
+    color: <?php echo esc_attr($base_lighter_40); ?>;
76 76
     font-family: Arial;
77 77
     font-size:12px;
78 78
     line-height:125%;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 }
82 82
 
83 83
 #body_content {
84
-    background-color: <?php echo esc_attr( $body ); ?>;
84
+    background-color: <?php echo esc_attr($body); ?>;
85 85
 }
86 86
 
87 87
 #body_content table td {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 }
102 102
 
103 103
 #body_content_inner {
104
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
104
+    color: <?php echo esc_attr($text_lighter_20); ?>;
105 105
     font-family: Arial,Helvetica,sans-serif;
106 106
     font-size: 14px;
107 107
     line-height: 150%;
@@ -109,17 +109,17 @@  discard block
 block discarded – undo
109 109
 }
110 110
 
111 111
 .td {
112
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
113
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
112
+    color: <?php echo esc_attr($text_lighter_20); ?>;
113
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
114 114
 }
115 115
 
116 116
 .text {
117
-    color: <?php echo esc_attr( $text ); ?>;
117
+    color: <?php echo esc_attr($text); ?>;
118 118
     font-family: Arial,Helvetica,sans-serif;
119 119
 }
120 120
 
121 121
 .link {
122
-    color: <?php echo esc_attr( $base ); ?>;
122
+    color: <?php echo esc_attr($base); ?>;
123 123
 }
124 124
 
125 125
 #header_wrapper {
@@ -128,19 +128,19 @@  discard block
 block discarded – undo
128 128
 }
129 129
 
130 130
 h1 {
131
-    color: <?php echo esc_attr( $base ); ?>;
131
+    color: <?php echo esc_attr($base); ?>;
132 132
     font-family: Arial,Helvetica,sans-serif;
133 133
     font-size: 30px;
134 134
     font-weight: 300;
135 135
     line-height: 150%;
136 136
     margin: 0;
137 137
     text-align: <?php echo is_rtl() ? 'right' : 'left'; ?>;
138
-    text-shadow: 0 1px 0 <?php echo esc_attr( $base_lighter_20 ); ?>;
138
+    text-shadow: 0 1px 0 <?php echo esc_attr($base_lighter_20); ?>;
139 139
     -webkit-font-smoothing: antialiased;
140 140
 }
141 141
 
142 142
 h2 {
143
-    color: <?php echo esc_attr( $base ); ?>;
143
+    color: <?php echo esc_attr($base); ?>;
144 144
     display: block;
145 145
     font-family: Arial,Helvetica,sans-serif;
146 146
     font-size: 18px;
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 }
152 152
 
153 153
 h3 {
154
-    color: <?php echo esc_attr( $base ); ?>;
154
+    color: <?php echo esc_attr($base); ?>;
155 155
     display: block;
156 156
     font-family: Arial,Helvetica,sans-serif;
157 157
     font-size: 16px;
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 }
163 163
 
164 164
 a {
165
-    color: <?php echo esc_attr( $base ); ?>;
165
+    color: <?php echo esc_attr($base); ?>;
166 166
     font-weight: normal;
167 167
     text-decoration: underline;
168 168
 }
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
 }
181 181
 
182 182
 .table-bordered {
183
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
183
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
184 184
     border-collapse: collapse;
185 185
     border-spacing: 0;
186 186
     width: 100%;
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 
189 189
 .table-bordered th,
190 190
 .table-bordered td {
191
-    border: 1px solid <?php echo esc_attr( $body_darker_10 ); ?>;
192
-    color: <?php echo esc_attr( $text_lighter_20 ); ?>;
191
+    border: 1px solid <?php echo esc_attr($body_darker_10); ?>;
192
+    color: <?php echo esc_attr($text_lighter_20); ?>;
193 193
     font-size: 14px;
194 194
 }
195 195
 .small {
@@ -288,9 +288,9 @@  discard block
 block discarded – undo
288 288
   text-decoration: none;
289 289
 }
290 290
 .btn-default {
291
-    color: <?php echo esc_attr( $base_text ); ?>;
292
-    background-color: <?php echo esc_attr( $base ); ?>;
293
-    border-color: <?php echo esc_attr( $base ); ?>;
291
+    color: <?php echo esc_attr($base_text); ?>;
292
+    background-color: <?php echo esc_attr($base); ?>;
293
+    border-color: <?php echo esc_attr($base); ?>;
294 294
 }
295 295
 .btn-primary {
296 296
   color: #fff;
Please login to merge, or discard this patch.
templates/emails/wpinv-email-billing-details.php 2 patches
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -1,67 +1,67 @@
 block discarded – undo
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
     <?php 
10 10
     $address_row = '';
11
-    if ( $address = $invoice->get_address() ) {
12
-        $address_row .= wpautop( wp_kses_post( $address ) );
11
+    if ($address = $invoice->get_address()) {
12
+        $address_row .= wpautop(wp_kses_post($address));
13 13
     }
14 14
     
15 15
     $address_fields = array();
16
-    if ( !empty( $invoice->city ) ) {
16
+    if (!empty($invoice->city)) {
17 17
         $address_fields[] = $invoice->city;
18 18
     }
19 19
     
20
-    $country_code = !empty( $invoice->country ) ? $invoice->country : '';
21
-    if ( !empty( $invoice->state ) ) {
22
-        $address_fields[] = wpinv_state_name( $invoice->state, $country_code );
20
+    $country_code = !empty($invoice->country) ? $invoice->country : '';
21
+    if (!empty($invoice->state)) {
22
+        $address_fields[] = wpinv_state_name($invoice->state, $country_code);
23 23
     }
24 24
     
25
-    if ( !empty( $address_fields ) ) {
26
-        $address_fields = implode( ", ", $address_fields );
27
-        $address_row .= wpautop( wp_kses_post( $address_fields ) );
25
+    if (!empty($address_fields)) {
26
+        $address_fields = implode(", ", $address_fields);
27
+        $address_row .= wpautop(wp_kses_post($address_fields));
28 28
     }
29 29
     
30
-    if ( !empty( $country_code ) ) {
31
-        $country = wpinv_country_name( $country_code );
32
-        $address_row .= wpautop( wp_kses_post( trim( $country . '(' . $country_code . ')' . ' ' . $invoice->zip ) ) );
30
+    if (!empty($country_code)) {
31
+        $country = wpinv_country_name($country_code);
32
+        $address_row .= wpautop(wp_kses_post(trim($country . '(' . $country_code . ')' . ' ' . $invoice->zip)));
33 33
     }
34 34
     
35 35
     ?>
36 36
     <table class="table table-bordered table-sm wpi-billing-details">
37 37
         <tbody>
38
-            <?php do_action( 'wpinv_email_billing_fields_first', $invoice ); ?>
38
+            <?php do_action('wpinv_email_billing_fields_first', $invoice); ?>
39 39
             <tr class="wpi-receipt-name">
40
-                <th class="text-left"><?php _e( 'Name', 'invoicing' ); ?></th>
41
-                <td><?php if ( $sent_to_admin && $invoice->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>
40
+                <th class="text-left"><?php _e('Name', 'invoicing'); ?></th>
41
+                <td><?php if ($sent_to_admin && $invoice->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>
42 42
             </tr>
43 43
             <tr class="wpi-receipt-email">
44
-                <th class="text-left"><?php _e( 'Email', 'invoicing' ); ?></th>
45
-                <td><?php echo $invoice->get_email() ;?></td>
44
+                <th class="text-left"><?php _e('Email', 'invoicing'); ?></th>
45
+                <td><?php echo $invoice->get_email(); ?></td>
46 46
             </tr>
47
-            <?php if ( $invoice->company ) { ?>
47
+            <?php if ($invoice->company) { ?>
48 48
             <tr class="wpi-receipt-company">
49
-                <th class="text-left"><?php _e( 'Company', 'invoicing' ); ?></th>
50
-                <td><?php echo esc_html( $invoice->company ) ;?></td>
49
+                <th class="text-left"><?php _e('Company', 'invoicing'); ?></th>
50
+                <td><?php echo esc_html($invoice->company); ?></td>
51 51
             </tr>
52 52
             <?php } ?>
53 53
             <tr class="wpi-receipt-address">
54
-                <th class="text-left"><?php _e( 'Address', 'invoicing' ); ?></th>
55
-                <td><?php echo $address_row ;?></td>
54
+                <th class="text-left"><?php _e('Address', 'invoicing'); ?></th>
55
+                <td><?php echo $address_row; ?></td>
56 56
             </tr>
57
-            <?php if ( $invoice->phone ) { ?>
57
+            <?php if ($invoice->phone) { ?>
58 58
             <tr class="wpi-receipt-phone">
59
-                <th class="text-left"><?php _e( 'Phone', 'invoicing' ); ?></th>
60
-                <td><?php echo esc_html( $invoice->phone ) ;?></td>
59
+                <th class="text-left"><?php _e('Phone', 'invoicing'); ?></th>
60
+                <td><?php echo esc_html($invoice->phone); ?></td>
61 61
             </tr>
62 62
             <?php } ?>
63
-            <?php do_action( 'wpinv_email_billing_fields_last', $invoice ); ?>
63
+            <?php do_action('wpinv_email_billing_fields_last', $invoice); ?>
64 64
         </tbody>
65 65
     </table>
66 66
 </div>
67
-<?php do_action( 'wpinv_email_after_billing_details', $invoice ); ?>
68 67
\ No newline at end of file
68
+<?php do_action('wpinv_email_after_billing_details', $invoice); ?>
69 69
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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">
Please login to merge, or discard this patch.