From 8ea5fc50783739224f62c144679edd64a4024aa4 Mon Sep 17 00:00:00 2001
From: Doug Hutcheson <owlbrudder@gmail.com>
Date: Thu, 19 Oct 2023 10:20:36 +0800
Subject: [PATCH] CI4: Bugfix to correct two config issues

Adds 'payment_message' to the app_config table and corrects a typo in Views/login.php where 'Login.form' should have been 'login_form'.
---
 app/Database/Migrations/20230412000000_add_missing_config.php | 3 ++-
 app/Views/login.php                                           | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Database/Migrations/20230412000000_add_missing_config.php b/app/Database/Migrations/20230412000000_add_missing_config.php
index c4f019e6d..9fd4d0236 100644
--- a/app/Database/Migrations/20230412000000_add_missing_config.php
+++ b/app/Database/Migrations/20230412000000_add_missing_config.php
@@ -15,7 +15,8 @@ class Migration_add_missing_config extends Migration
 			['key' => 'smtp_user', 'value' => ''],
 			['key' => 'smtp_pass', 'value' => ''],
 			['key' => 'login_form', 'value' => ''],
-			['key' => 'receiving_calculate_average_price', 'value' => '']
+			['key' => 'receiving_calculate_average_price', 'value' => ''],
+			['key' => 'payment_message', 'value' => '']
 		];
 
 		$this->db->table('app_config')->ignore(true)->insertBatch($image_values);
diff --git a/app/Views/login.php b/app/Views/login.php
index 7da20d8ec..ec9ddfab8 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -56,7 +56,7 @@
 							<?= lang('Login.migration_needed', [$latest_version]) ?>
 						</div>
 					<?php endif; ?>
-					<?php if (empty($config['Login.form']) || 'floating_labels'==($config['Login.form'])): ?>
+					<?php if (empty($config['login_form']) || 'floating_labels'==($config['login_form'])): ?>
 						<div class="form-floating mt-3">
 							<input class="form-control" id="input-username" name="username" type="text" placeholder="<?= lang('Login.username') ?>">
 							<label for="input-username"><?= lang('Login.username') ?></label>
@@ -65,7 +65,7 @@
 							<input class="form-control" id="input-password" name="password" type="password" placeholder="<?= lang('Login.password') ?>">
 							<label for="input-password"><?= lang('Login.password') ?></label>
 						</div>
-					<?php elseif ('input_groups'==($config['Login.form'])): ?>
+					<?php elseif ('input_groups'==($config['login_form'])): ?>
 						<div class="input-group mt-3">
 				  <span class="input-group-text" id="input-username">
 					<svg class="bi" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">