Passed
Push — master ( 59160c...9fabf9 )
by Kiran
10:03 queued 05:25
created
vendor/ayecode/wp-super-duper/map.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@
 block discarded – undo
227 227
 
228 228
 		if($args['type']=='image'){
229 229
 			$output .= "<img src='https://maps.googleapis.com/maps/api/staticmap?center=".esc_attr($args['location'])."&maptype=".esc_attr($args['maptype'])."&zoom=".esc_attr($args['zoom'])."&size=".esc_attr($args['static_width'])."x".esc_attr($args['static_height'])."&key=".esc_attr($args['api_key'])."' />";
230
-		}else{
230
+		} else{
231 231
 			$output .= "<iframe width='".esc_attr($args['width'])."' height='".esc_attr($args['height'])."' frameborder='0' allowfullscreen style='border:0;' src='https://www.google.com/maps/embed/v1/".esc_attr($args['type'])."?q=".esc_attr($args['location'])."&maptype=".esc_attr($args['maptype'])."&zoom=".esc_attr($args['zoom'])."&key=".esc_attr($args['api_key'])."' ></iframe> ";
232 232
 		}
233 233
 
Please login to merge, or discard this patch.
includes/libraries/class-ayecode-addons.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // Exit if accessed directly
3
-if ( ! defined( 'ABSPATH' ) ) exit;
3
+if ( ! defined( 'ABSPATH' ) ) {
4
+    exit;
5
+}
4 6
 if(!class_exists('Ayecode_Addons')) {
5 7
 
6 8
     abstract class Ayecode_Addons
Please login to merge, or discard this patch.
ayecode/wp-ayecode-ui/includes/components/class-aui-component-button.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
 			if($type=='a'){
50 50
 				$new_window = !empty($args['new_window']) ? ' target="_blank" ' : '';
51 51
 				$output .= '<a href="' . $args['href'] . '"'.$new_window;
52
-			}elseif($type=='badge'){
52
+			} elseif($type=='badge'){
53 53
 				$output .= '<span ';
54
-			}else{
54
+			} else{
55 55
 				$output .= '<button type="' . $type . '" ';
56 56
 			}
57 57
 
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 			// close
119 119
 			if($type=='a'){
120 120
 				$output .= '</a>';
121
-			}elseif($type=='badge'){
121
+			} elseif($type=='badge'){
122 122
 				$output .= '</span>';
123
-			}else{
123
+			} else{
124 124
 				$output .= '</button>';
125 125
 			}
126 126
 
Please login to merge, or discard this patch.
ayecode/wp-ayecode-ui/includes/components/class-aui-component-dropdown.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 			// dropdown-menu
56 56
 			if(!empty($args['dropdown_menu'])){
57 57
 				$output .= $args['dropdown_menu'];
58
-			}elseif(!empty($args['dropdown_items'])){
58
+			} elseif(!empty($args['dropdown_items'])){
59 59
 				$output .= '<div class="dropdown-menu '.AUI_Component_Helper::esc_classes($args['dropdown_menu_class']).'" aria-labelledby="'.sanitize_html_class($args['id']).'">';
60 60
 				$output .= aui()->render($args['dropdown_items']);
61 61
 				$output .= '</div>';
Please login to merge, or discard this patch.
includes/libraries/wp-all-import/rapid-addon.php 1 patch
Braces   +80 added lines, -33 removed lines patch added patch discarded remove patch
@@ -156,7 +156,9 @@  discard block
 block discarded – undo
156 156
 
157 157
 		function parse($data) {
158 158
 			
159
-			if ( ! $this->is_active_addon($data['import']->options['custom_type'])) return false;
159
+			if ( ! $this->is_active_addon($data['import']->options['custom_type'])) {
160
+			    return false;
161
+			}
160 162
 
161 163
 			$parsedData = $this->helper_parse($data, $this->options_array());
162 164
 			return $parsedData;
@@ -177,8 +179,7 @@  discard block
 block discarded – undo
177 179
 						if ($field['type'] == 'accordion')
178 180
 						{
179 181
 							$this->fields[$value['slug']]['is_sub_field'] = true;
180
-						}
181
-						else
182
+						} else
182 183
 						{
183 184
 							foreach ($value as $n => $param) {							
184 185
 								if (is_array($param) and ! empty($this->fields[$param['slug']])){
@@ -242,7 +243,9 @@  discard block
 block discarded – undo
242 243
             if ( ! empty( $this->fields ) ) {
243 244
 
244 245
                 foreach ($this->fields as $field_slug => $field_params) {
245
-                    if (in_array($field_params['type'], array('title', 'plain_text', 'acf'))) continue;
246
+                    if (in_array($field_params['type'], array('title', 'plain_text', 'acf'))) {
247
+                        continue;
248
+                    }
246 249
                     $default_value = '';
247 250
                     if (!empty($field_params['enum_values'])){
248 251
                         foreach ($field_params['enum_values'] as $key => $value) {						
@@ -310,8 +313,9 @@  discard block
 block discarded – undo
310 313
 
311 314
 		function post_saved( $importData ){
312 315
 
313
-			if (is_callable($this->post_saved_function))
314
-				call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
316
+			if (is_callable($this->post_saved_function)) {
317
+							call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
318
+			}
315 319
 			
316 320
 		}
317 321
 
@@ -336,7 +340,9 @@  discard block
 block discarded – undo
336 340
 				$data = array();
337 341
 				if (!empty($this->fields)){
338 342
 					foreach ($this->fields as $field_slug => $field_params) {
339
-						if (in_array($field_params['type'], array('title', 'plain_text'))) continue;
343
+						if (in_array($field_params['type'], array('title', 'plain_text'))) {
344
+						    continue;
345
+						}
340 346
 						switch ($field_params['type']) {
341 347
 
342 348
 							case 'image':
@@ -421,7 +427,9 @@  discard block
 block discarded – undo
421 427
 			$visible_fields = 0;
422 428
 
423 429
 			foreach ($this->fields as $field_slug => $field_params) {
424
-				if ($field_params['is_sub_field']) continue;
430
+				if ($field_params['is_sub_field']) {
431
+				    continue;
432
+				}
425 433
 				$visible_fields++;
426 434
 			}
427 435
 
@@ -430,7 +438,9 @@  discard block
 block discarded – undo
430 438
 			foreach ($this->fields as $field_slug => $field_params) {				
431 439
 
432 440
 				// do not render sub fields
433
-				if ($field_params['is_sub_field']) continue;		
441
+				if ($field_params['is_sub_field']) {
442
+				    continue;
443
+				}
434 444
 
435 445
 				$counter++;		
436 446
 
@@ -561,7 +571,9 @@  discard block
 block discarded – undo
561 571
 				$fieldData['id']    = $field_params['field_obj']->ID;
562 572
 				$fieldData['label'] = $field_params['field_obj']->post_title;
563 573
 				$fieldData['key']   = $field_params['field_obj']->post_name;
564
-				if (empty($fieldData['name'])) $fieldData['name'] = $field_params['field_obj']->post_excerpt;
574
+				if (empty($fieldData['name'])) {
575
+				    $fieldData['name'] = $field_params['field_obj']->post_excerpt;
576
+				}
565 577
 				if (function_exists('pmai_render_field')) {
566 578
 					echo pmai_render_field($fieldData, ( ! empty($current_values) ) ? $current_values : array() );
567 579
 				}
@@ -573,9 +585,12 @@  discard block
 block discarded – undo
573 585
 			} else if($field_params['type'] == 'plain_text'){
574 586
 				if ($field_params['is_html']):					
575 587
 					echo $field_params['name'];				
576
-				else:
588
+				else {
589
+				    :
577 590
 					?>
578
-					<p style="margin: 0 0 12px 0;"><?php echo $field_params['name'];?></p>
591
+					<p style="margin: 0 0 12px 0;"><?php echo $field_params['name'];
592
+				}
593
+				?></p>
579 594
 					<?php
580 595
 				endif;
581 596
 			}
@@ -595,8 +610,7 @@  discard block
 block discarded – undo
595 610
 					if (is_array($value)){
596 611
 						if ($field_params['type'] == 'accordion'){								
597 612
 							$sub_fields[$key][] = $this->convert_field($value, $current_values);
598
-						}
599
-						else
613
+						} else
600 614
 						{
601 615
 							foreach ($value as $k => $sub_field) {								
602 616
 								if (is_array($sub_field) and ! empty($this->fields[$sub_field['slug']]))
@@ -758,7 +772,9 @@  discard block
 block discarded – undo
758 772
 
759 773
 		function add_title($title = '', $tooltip = ''){
760 774
 
761
-			if (empty($title)) return;
775
+			if (empty($title)) {
776
+			    return;
777
+			}
762 778
 
763 779
 			return $this->add_field(sanitize_key($title) . time(), $title, 'title', null, $tooltip);			
764 780
 
@@ -766,7 +782,9 @@  discard block
 block discarded – undo
766 782
 
767 783
 		function add_text($text = '', $is_html = false){
768 784
 
769
-			if (empty($text)) return;
785
+			if (empty($text)) {
786
+			    return;
787
+			}
770 788
 
771 789
 			$count = is_array($this->fields) ? count($this->fields) : 0;
772 790
 
@@ -902,7 +920,9 @@  discard block
 block discarded – undo
902 920
 		*/
903 921
 		function import_images( $slug, $title, $type = 'images', $callback = NULL ){
904 922
 			
905
-			if ( empty($title) or empty($slug) ) return;
923
+			if ( empty($title) or empty($slug) ) {
924
+			    return;
925
+			}
906 926
 
907 927
 			if (is_array($slug)) {
908 928
                 $section_slug = 'pmxi_' . md5(serialize($slug));
@@ -1005,8 +1025,7 @@  discard block
 block discarded – undo
1005 1025
 								$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug]['xpaths'][$option_name], $file)->parse();
1006 1026
 								$tmp_files[] = $file;						
1007 1027
 							}
1008
-						} 
1009
-						else {							
1028
+						} else {							
1010 1029
 							$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug][$option_name], $file)->parse();
1011 1030
 							$tmp_files[] = $file;
1012 1031
 						}
@@ -1036,13 +1055,23 @@  discard block
 block discarded – undo
1036 1055
 			
1037 1056
 			$import_options = $import_options['options'];
1038 1057
 
1039
-			if ($import_options['update_all_data'] == 'yes') return true;
1058
+			if ($import_options['update_all_data'] == 'yes') {
1059
+			    return true;
1060
+			}
1040 1061
 
1041
-			if ( ! $import_options['is_update_custom_fields'] ) return false;			
1062
+			if ( ! $import_options['is_update_custom_fields'] ) {
1063
+			    return false;
1064
+			}
1042 1065
 
1043
-			if ($import_options['update_custom_fields_logic'] == "full_update") return true;
1044
-			if ($import_options['update_custom_fields_logic'] == "only" and ! empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list']) ) return true;
1045
-			if ($import_options['update_custom_fields_logic'] == "all_except" and ( empty($import_options['custom_fields_list']) or ! in_array($meta_key, $import_options['custom_fields_list']) )) return true;
1066
+			if ($import_options['update_custom_fields_logic'] == "full_update") {
1067
+			    return true;
1068
+			}
1069
+			if ($import_options['update_custom_fields_logic'] == "only" and ! empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list']) ) {
1070
+			    return true;
1071
+			}
1072
+			if ($import_options['update_custom_fields_logic'] == "all_except" and ( empty($import_options['custom_fields_list']) or ! in_array($meta_key, $import_options['custom_fields_list']) )) {
1073
+			    return true;
1074
+			}
1046 1075
 
1047 1076
 			return false;
1048 1077
 
@@ -1056,13 +1085,23 @@  discard block
 block discarded – undo
1056 1085
 			
1057 1086
 			$import_options = $import_options['options'];
1058 1087
 
1059
-			if ($import_options['update_all_data'] == 'yes') return true;
1088
+			if ($import_options['update_all_data'] == 'yes') {
1089
+			    return true;
1090
+			}
1060 1091
 
1061
-			if ( ! $import_options['is_update_categories'] ) return false;			
1092
+			if ( ! $import_options['is_update_categories'] ) {
1093
+			    return false;
1094
+			}
1062 1095
 
1063
-			if ($import_options['update_categories_logic'] == "full_update") return true;
1064
-			if ($import_options['update_categories_logic'] == "only" and ! empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list']) ) return true;
1065
-			if ($import_options['update_categories_logic'] == "all_except" and ( empty($import_options['taxonomies_list']) or ! in_array($tax_name, $import_options['taxonomies_list']) )) return true;
1096
+			if ($import_options['update_categories_logic'] == "full_update") {
1097
+			    return true;
1098
+			}
1099
+			if ($import_options['update_categories_logic'] == "only" and ! empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list']) ) {
1100
+			    return true;
1101
+			}
1102
+			if ($import_options['update_categories_logic'] == "all_except" and ( empty($import_options['taxonomies_list']) or ! in_array($tax_name, $import_options['taxonomies_list']) )) {
1103
+			    return true;
1104
+			}
1066 1105
 
1067 1106
 			return false;
1068 1107
 
@@ -1072,11 +1111,17 @@  discard block
 block discarded – undo
1072 1111
 
1073 1112
 			$import_options = $import_options['options'];
1074 1113
 
1075
-			if ($import_options['update_all_data'] == 'yes') return true;
1114
+			if ($import_options['update_all_data'] == 'yes') {
1115
+			    return true;
1116
+			}
1076 1117
 
1077
-			if (!$import_options['is_update_images']) return false;			
1118
+			if (!$import_options['is_update_images']) {
1119
+			    return false;
1120
+			}
1078 1121
 
1079
-			if ($import_options['is_update_images']) return true;			
1122
+			if ($import_options['is_update_images']) {
1123
+			    return true;
1124
+			}
1080 1125
 
1081 1126
 			return false;
1082 1127
 		}
@@ -1153,7 +1198,9 @@  discard block
 block discarded – undo
1153 1198
 
1154 1199
 				$requires_counter = 0;
1155 1200
 				foreach ($conditions['plugins'] as $plugin) {
1156
-					if ( is_plugin_active($plugin) ) $requires_counter++;
1201
+					if ( is_plugin_active($plugin) ) {
1202
+					    $requires_counter++;
1203
+					}
1157 1204
 				}
1158 1205
 
1159 1206
 				if ($requires_counter != count($conditions['plugins'])){ 					
Please login to merge, or discard this patch.
templates/invoice/invoice-logo.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,12 +19,18 @@
 block discarded – undo
19 19
 
20 20
         <?php if ( ! empty( $logo_width ) && ! empty( $logo_height ) ) : ?>
21 21
             <img class="logo" style="max-width:100%; width:<?php echo absint( $logo_width ); ?>px; height:<?php echo absint( $logo_height ); ?>px;" src="<?php echo esc_url( $logo ); ?>">
22
-        <?php else : ?>
23
-            <img class="logo" style="max-width:100%;" src="<?php echo esc_url( $logo ); ?>">
22
+        <?php else {
23
+    : ?>
24
+            <img class="logo" style="max-width:100%;" src="<?php echo esc_url( $logo );
25
+}
26
+?>">
24 27
         <?php endif; ?>
25 28
 
26
-    <?php else : ?>
27
-        <h1 class="h3"><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
29
+    <?php else {
30
+    : ?>
31
+        <h1 class="h3"><?php echo esc_html( wpinv_get_business_name() );
32
+}
33
+?></h1>
28 34
     <?php endif; ?>
29 35
 
30 36
 </a>
Please login to merge, or discard this patch.
includes/admin/views/wizard-header.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,9 +57,12 @@
 block discarded – undo
57 57
                         </li>
58 58
                     <?php endforeach; ?>
59 59
                 </ol>
60
-            <?php else : ?>
60
+            <?php else {
61
+    : ?>
61 62
                 <div class='mb-3'>&nbsp;</div>
62
-            <?php endif; ?>
63
+            <?php endif;
64
+}
65
+?>
63 66
 
64 67
             <div class="text-center pb-3 mt-5">
65 68
                 <a class=" text-decoration-none" href="https://wpgetpaid.com/">
Please login to merge, or discard this patch.
templates/subscriptions/subscriptions-table-row.php 1 patch
Switch Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -20,35 +20,35 @@
 block discarded – undo
20 20
 
21 21
 		switch ( $column ) :
22 22
 
23
-		case 'subscription':
24
-			$subscription_id = (int) $subscription->get_id();
25
-			$url             = esc_url( $subscription->get_view_url() );
26
-			$id_label        = sprintf(
27
-				esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
28
-				(int) $subscription->get_id()
29
-			);
30
-			echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
31
-			break;
32
-
33
-		case 'status':
34
-			echo esc_html( $subscription->get_status_label() );
35
-			break;
36
-
37
-		case 'renewal-date':
38
-			$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
39
-			echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
40
-			break;
41
-
42
-		case 'amount':
43
-			$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
44
-			$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
45
-			echo wp_kses_post( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
46
-			break;
47
-
48
-		endswitch;
49
-
50
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
51
-
52
-	echo '</td>';
53
-
54
-endforeach;
23
+		    case 'subscription':
24
+			    $subscription_id = (int) $subscription->get_id();
25
+			    $url             = esc_url( $subscription->get_view_url() );
26
+			    $id_label        = sprintf(
27
+				    esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
28
+				    (int) $subscription->get_id()
29
+			    );
30
+			    echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
31
+			    break;
32
+
33
+		    case 'status':
34
+			    echo esc_html( $subscription->get_status_label() );
35
+			    break;
36
+
37
+		    case 'renewal-date':
38
+			    $renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
39
+			    echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
40
+			    break;
41
+
42
+		    case 'amount':
43
+			    $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
44
+			    $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
45
+			    echo wp_kses_post( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
46
+			    break;
47
+
48
+		    endswitch;
49
+
50
+		    do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
51
+
52
+	    echo '</td>';
53
+
54
+    endforeach;
Please login to merge, or discard this patch.
includes/admin/subscriptions.php 1 patch
Switch Indentation   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -508,39 +508,39 @@  discard block
 block discarded – undo
508 508
 
509 509
 								switch ( $key ) {
510 510
 
511
-								case 'total':
512
-										echo '<strong>';
513
-										wpinv_the_price( $payment->get_total(), $payment->get_currency() );
514
-										echo '</strong>';
515
-									break;
516
-
517
-								case 'relationship':
518
-										echo $payment->is_renewal() ? esc_html__( 'Renewal Invoice', 'invoicing' ) : esc_html__( 'Initial Invoice', 'invoicing' );
519
-									break;
520
-
521
-								case 'date':
522
-									echo esc_html( getpaid_format_date_value( $payment->get_date_created() ) );
523
-									break;
524
-
525
-								case 'status':
526
-										$status = $payment->get_status_nicename();
527
-										if ( is_admin() ) {
528
-										$status = $payment->get_status_label_html();
529
-										}
530
-
531
-										echo wp_kses_post( $status );
532
-									break;
533
-
534
-								case 'invoice':
535
-										$link    = esc_url( get_edit_post_link( $payment->get_id() ) );
536
-
537
-										if ( ! is_admin() ) {
538
-										$link = esc_url( $payment->get_view_url() );
539
-										}
540
-
541
-										$invoice = esc_html( $payment->get_number() );
542
-										echo wp_kses_post( "<a href='$link'>$invoice</a>" );
543
-									break;
511
+								    case 'total':
512
+										    echo '<strong>';
513
+										    wpinv_the_price( $payment->get_total(), $payment->get_currency() );
514
+										    echo '</strong>';
515
+									    break;
516
+
517
+								    case 'relationship':
518
+										    echo $payment->is_renewal() ? esc_html__( 'Renewal Invoice', 'invoicing' ) : esc_html__( 'Initial Invoice', 'invoicing' );
519
+									    break;
520
+
521
+								    case 'date':
522
+									    echo esc_html( getpaid_format_date_value( $payment->get_date_created() ) );
523
+									    break;
524
+
525
+								    case 'status':
526
+										    $status = $payment->get_status_nicename();
527
+										    if ( is_admin() ) {
528
+										    $status = $payment->get_status_label_html();
529
+										    }
530
+
531
+										    echo wp_kses_post( $status );
532
+									    break;
533
+
534
+								    case 'invoice':
535
+										    $link    = esc_url( get_edit_post_link( $payment->get_id() ) );
536
+
537
+										    if ( ! is_admin() ) {
538
+										    $link = esc_url( $payment->get_view_url() );
539
+										    }
540
+
541
+										    $invoice = esc_html( $payment->get_number() );
542
+										    echo wp_kses_post( "<a href='$link'>$invoice</a>" );
543
+									    break;
544 544
 										}
545 545
 
546 546
 								echo '</td>';
@@ -635,37 +635,37 @@  discard block
 block discarded – undo
635 635
 
636 636
 								switch ( $key ) {
637 637
 
638
-								case 'item_name':
639
-										$item_name = get_the_title( $subscription_group_item['item_id'] );
640
-										$item_name = empty( $item_name ) ? $subscription_group_item['item_name'] : $item_name;
638
+								    case 'item_name':
639
+										    $item_name = get_the_title( $subscription_group_item['item_id'] );
640
+										    $item_name = empty( $item_name ) ? $subscription_group_item['item_name'] : $item_name;
641 641
 
642
-										if ( $invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity'] ) {
643
-										echo esc_html( $item_name );
644
-										} else {
645
-										printf( '%1$s x %2$d', esc_html( $item_name ), (float) $subscription_group_item['quantity'] );
646
-											}
642
+										    if ( $invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity'] ) {
643
+										    echo esc_html( $item_name );
644
+										    } else {
645
+										    printf( '%1$s x %2$d', esc_html( $item_name ), (float) $subscription_group_item['quantity'] );
646
+											    }
647 647
 
648
-									break;
648
+									    break;
649 649
 
650
-								case 'price':
651
-									wpinv_the_price( $subscription_group_item['item_price'], $invoice->get_currency() );
652
-									break;
650
+								    case 'price':
651
+									    wpinv_the_price( $subscription_group_item['item_price'], $invoice->get_currency() );
652
+									    break;
653 653
 
654
-								case 'tax':
655
-									wpinv_the_price( $subscription_group_item['tax'], $invoice->get_currency() );
656
-									break;
654
+								    case 'tax':
655
+									    wpinv_the_price( $subscription_group_item['tax'], $invoice->get_currency() );
656
+									    break;
657 657
 
658
-								case 'discount':
659
-									wpinv_the_price( $subscription_group_item['discount'], $invoice->get_currency() );
660
-									break;
658
+								    case 'discount':
659
+									    wpinv_the_price( $subscription_group_item['discount'], $invoice->get_currency() );
660
+									    break;
661 661
 
662
-								case 'initial':
663
-									wpinv_the_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() );
664
-									break;
662
+								    case 'initial':
663
+									    wpinv_the_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() );
664
+									    break;
665 665
 
666
-								case 'recurring':
667
-										echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() ) . '</strong>' );
668
-									break;
666
+								    case 'recurring':
667
+										    echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() ) . '</strong>' );
668
+									    break;
669 669
 
670 670
 										}
671 671
 
@@ -689,29 +689,29 @@  discard block
 block discarded – undo
689 689
 
690 690
 								switch ( $key ) {
691 691
 
692
-								case 'item_name':
693
-										echo esc_html( $subscription_group_fee['name'] );
694
-									break;
692
+								    case 'item_name':
693
+										    echo esc_html( $subscription_group_fee['name'] );
694
+									    break;
695 695
 
696
-								case 'price':
697
-									wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
698
-									break;
696
+								    case 'price':
697
+									    wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
698
+									    break;
699 699
 
700
-								case 'tax':
701
-									echo '&mdash;';
702
-									break;
700
+								    case 'tax':
701
+									    echo '&mdash;';
702
+									    break;
703 703
 
704
-								case 'discount':
705
-										echo '&mdash;';
706
-									break;
704
+								    case 'discount':
705
+										    echo '&mdash;';
706
+									    break;
707 707
 
708
-								case 'initial':
709
-									wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
710
-									break;
708
+								    case 'initial':
709
+									    wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
710
+									    break;
711 711
 
712
-								case 'recurring':
713
-										echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_fee['recurring_fee'], $invoice->get_currency() ) . '</strong>' );
714
-									break;
712
+								    case 'recurring':
713
+										    echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_fee['recurring_fee'], $invoice->get_currency() ) . '</strong>' );
714
+									    break;
715 715
 
716 716
 										}
717 717
 
@@ -816,39 +816,39 @@  discard block
 block discarded – undo
816 816
 
817 817
 								switch ( $key ) {
818 818
 
819
-								case 'status':
820
-										echo wp_kses_post( $_suscription->get_status_label_html() );
821
-									break;
822
-
823
-								case 'item':
824
-											$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
825
-											echo wp_kses_post( implode( ' | ', $markup ) );
826
-									break;
827
-
828
-								case 'renewals':
829
-									$max_bills = $_suscription->get_bill_times();
830
-									echo ( (int) $_suscription->get_times_billed() ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
831
-									break;
832
-
833
-								case 'renewal_date':
834
-										echo $_suscription->is_active() ? esc_html( getpaid_format_date_value( $_suscription->get_expiration() ) ) : '&mdash;';
835
-									break;
836
-
837
-								case 'start_date':
838
-										echo 'pending' == $_suscription->get_status() ? '&mdash;' : esc_html( getpaid_format_date_value( $_suscription->get_date_created() ) );
839
-									break;
840
-
841
-								case 'subscription':
842
-										$url = is_admin() ? admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $_suscription->get_id() ) ) : $_suscription->get_view_url();
843
-										printf(
844
-                                            '%1$s#%2$s%3$s',
845
-                                            '<a href="' . esc_url( $url ) . '">',
846
-                                            '<strong>' . intval( $_suscription->get_id() ) . '</strong>',
847
-											'</a>'
848
-                                        );
849
-
850
-											echo wp_kses_post( WPInv_Subscriptions_List_Table::column_amount( $_suscription ) );
851
-									break;
819
+								    case 'status':
820
+										    echo wp_kses_post( $_suscription->get_status_label_html() );
821
+									    break;
822
+
823
+								    case 'item':
824
+											    $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
825
+											    echo wp_kses_post( implode( ' | ', $markup ) );
826
+									    break;
827
+
828
+								    case 'renewals':
829
+									    $max_bills = $_suscription->get_bill_times();
830
+									    echo ( (int) $_suscription->get_times_billed() ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
831
+									    break;
832
+
833
+								    case 'renewal_date':
834
+										    echo $_suscription->is_active() ? esc_html( getpaid_format_date_value( $_suscription->get_expiration() ) ) : '&mdash;';
835
+									    break;
836
+
837
+								    case 'start_date':
838
+										    echo 'pending' == $_suscription->get_status() ? '&mdash;' : esc_html( getpaid_format_date_value( $_suscription->get_date_created() ) );
839
+									    break;
840
+
841
+								    case 'subscription':
842
+										    $url = is_admin() ? admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $_suscription->get_id() ) ) : $_suscription->get_view_url();
843
+										    printf(
844
+                                                '%1$s#%2$s%3$s',
845
+                                                '<a href="' . esc_url( $url ) . '">',
846
+                                                '<strong>' . intval( $_suscription->get_id() ) . '</strong>',
847
+											    '</a>'
848
+                                            );
849
+
850
+											    echo wp_kses_post( WPInv_Subscriptions_List_Table::column_amount( $_suscription ) );
851
+									    break;
852 852
 
853 853
 										}
854 854
 
Please login to merge, or discard this patch.