Porting over 4f3226b

app/Controllers/Items.php

@@ -614,7 +614,7 @@ class Items extends Secure_Controller
 			$success = TRUE;
 			$new_item = FALSE;
 
-			if($item_id == NEW_ITEM)
+			if($item_id === NEW_ITEM)
 			{
 				$item_id = $item_data['item_id'];
 				$new_item = TRUE;

app/Controllers/Messages.php

@@ -51,11 +51,11 @@ class Messages extends Secure_Controller
 
 		if($response)
 		{
-			echo json_encode (['success' => TRUE, 'message' => lang('Messages.successfully_sent') . ' ' . $phone]);
+			echo json_encode (['success' => TRUE, 'message' => lang('Messages.successfully_sent') . ' ' . esc($phone)]);
 		}
 		else
 		{
-			echo json_encode (['success' => FALSE, 'message' => lang('Messages.unsuccessfully_sent') . ' ' . $phone]);
+			echo json_encode (['success' => FALSE, 'message' => lang('Messages.unsuccessfully_sent') . ' ' . esc($phone)]);
 		}
 	}
 
@@ -76,7 +76,7 @@ class Messages extends Secure_Controller
 		{
 			echo json_encode ([
 				'success' => TRUE,
-				'message' => lang('Messages.successfully_sent') . ' ' . $phone,
+				'message' => lang('Messages.successfully_sent') . ' ' . esc($phone),
 				'person_id' => $person_id	//TODO: Replace -1 with a constant
 			]);
 		}
@@ -84,9 +84,9 @@ class Messages extends Secure_Controller
 		{
 			echo json_encode ([
 				'success' => FALSE,
-				'message' => lang('Messages.unsuccessfully_sent') . ' ' . $phone,
+				'message' => lang('Messages.unsuccessfully_sent') . ' ' . esc($phone),
 				'person_id' => -1	//TODO: Replace -1 with a constant
 			]);
 		}
 	}
-}
+}

app/Helpers/tabular_helper.php

@@ -155,9 +155,9 @@ function get_sale_data_last_row(ResultInterface $sales): array
 	return [
 		'sale_id' => '-',
 		'sale_time' => lang('Sales.total'),
-		'amount_due' => '<b>'.to_currency($sum_amount_due).'</b>',
-		'amount_tendered' => '<b>'. to_currency($sum_amount_tendered).'</b>',
-		'change_due' => '<b>'.to_currency($sum_change_due).'</b>'
+		'amount_due' => to_currency($sum_amount_due),
+		'amount_tendered' => to_currency($sum_amount_tendered),
+		'change_due' => to_currency($sum_change_due)
 	];
 }
 
@@ -910,4 +910,4 @@ function get_cash_up_data_row(object $cash_up): array
 			]
 		)
 	];
-}
+}