From 7ad1bfa0fbfb35f9f285a262d275f3c6e47d208b Mon Sep 17 00:00:00 2001
From: El_Coloso <diegoramosp@gmail.com>
Date: Sun, 26 Jan 2025 21:21:40 -0500
Subject: [PATCH] Fix requisitions (#4147)

* Fix data types on null values
* Fix receiving receipt image tag
* Fix error on Receiving Model
---
 app/Libraries/Receiving_lib.php    | 2 +-
 app/Models/Receiving.php           | 3 +--
 app/Views/receivings/receipt.php   | 4 +++-
 app/Views/receivings/receiving.php | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Libraries/Receiving_lib.php b/app/Libraries/Receiving_lib.php
index 5f3e97165..5a9b4b903 100644
--- a/app/Libraries/Receiving_lib.php
+++ b/app/Libraries/Receiving_lib.php
@@ -246,7 +246,7 @@ class Receiving_lib
 	 * @param string $stock_destination
 	 * @return void
 	 */
-	public function set_stock_destination(string $stock_destination): void
+	public function set_stock_destination(?string $stock_destination): void
 	{
 		$this->session->set('recv_stock_destination', $stock_destination);
 	}
diff --git a/app/Models/Receiving.php b/app/Models/Receiving.php
index 169bf3523..1e3a97a26 100644
--- a/app/Models/Receiving.php
+++ b/app/Models/Receiving.php
@@ -104,7 +104,7 @@ class Receiving extends Model
 	/**
 	 * @throws ReflectionException
 	 */
-	public function save_value(array $items, int $supplier_id, int $employee_id, string $comment, string $reference, string $payment_type, int $receiving_id = NEW_ENTRY): int	//TODO: $receiving_id gets overwritten before it's evaluated. It doesn't make sense to pass this here.
+	public function save_value(array $items, int $supplier_id, int $employee_id, string $comment, string $reference, ?string $payment_type, int $receiving_id = NEW_ENTRY): int	//TODO: $receiving_id gets overwritten before it's evaluated. It doesn't make sense to pass this here.
 	{
 		$attribute = model(Attribute::class);
 		$inventory = model('Inventory');
@@ -187,7 +187,6 @@ class Receiving extends Model
 
 			$inventory->insert($inv_data, false);
 			$attribute->copy_attribute_links($item_data['item_id'], 'receiving_id', $receiving_id);
-			$supplier = $supplier->get_info($supplier_id);	//TODO: supplier is never used after this.
 		}
 
 		$this->db->transComplete();
diff --git a/app/Views/receivings/receipt.php b/app/Views/receivings/receipt.php
index a3801353c..f631a5ed5 100644
--- a/app/Views/receivings/receipt.php
+++ b/app/Views/receivings/receipt.php
@@ -37,7 +37,9 @@
 		if ($config['company_logo'] != '')
 		{
 		?>
-			<div id="company_name"><img id="image" src="<?= esc(base_url('uploads/' . $config['company_logo']), 'url') ?>" alt="company_logo" /></div>
+			<div id="company_name">
+				<img id="image" src="<?= base_url('uploads/' . esc($config['company_logo'], 'url')) ?>" alt="company_logo" />
+			</div>
 		<?php
 		}
 		?>
diff --git a/app/Views/receivings/receiving.php b/app/Views/receivings/receiving.php
index 1a0d1b031..1c1d82dad 100644
--- a/app/Views/receivings/receiving.php
+++ b/app/Views/receivings/receiving.php
@@ -219,7 +219,7 @@ if (isset($success))
 							{
 							?>
 								<td><?= $item['discount'] ?></td>
-								<?= form_hidden('discount', $item['discount']) ?>
+								<?= form_hidden('discount', (string)$item['discount']) ?>
 							<?php
 							}
 							?>