Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ All notable changes to ITFlow will be documented in this file.
- Moved cron/cli scripts to scripts subfolder - Old scripts remain in the root for now, but please update your cron configurations!
- Bugfix: Ticket edit modal not showing multi-client/no-client projects
- Bugfix: Asset interface losing DHCP setting
- Bugfix: Editing / creating recurring expensives results in error 500 due to incorrect var name
- Bugfix: Editing / creating recurring expenses results in error 500 due to incorrect var name
- Stripe online payment setup now prompts you to set the income/expense account

## 24.12

Expand Down
6 changes: 3 additions & 3 deletions admin_settings_online_payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="<?php if ($config_stripe_enable == 0) { echo "d-none"; } ?>">

<div class="form-group">
<label>Publishable key</label>
<label>Publishable key <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
Expand All @@ -35,7 +35,7 @@
</div>

<div class="form-group">
<label>Secret key</label>
<label>Secret key <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
Expand All @@ -45,7 +45,7 @@
</div>

<div class="form-group">
<label>Expense / Income Account</label>
<label>Account <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-piggy-bank"></i></span>
Expand Down
8 changes: 7 additions & 1 deletion post/admin/admin_settings_online_payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
// Logging
logAction("Settings", "Edit", "$session_name edited online payment settings");

$_SESSION['alert_message'] = "Online Payment Settings updated";

if ($config_stripe_account == 0) {
$_SESSION['alert_type'] = "error";
$_SESSION['alert_message'] = "Stripe payment account must be specified!";
} else {
$_SESSION['alert_message'] = "Online Payment Settings updated";
}

header("Location: " . $_SERVER["HTTP_REFERER"]);
}
Loading