AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1145 from itflow-org/stripe-account-ui 

Stripe payments - Account selection
This commit is contained in:
wrongecho 2025-01-09 14:58:42 +00:00 committed by GitHub
parent 3c697617f9 d32e3a698f
commit 2f57bdb677
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -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! - 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: Ticket edit modal not showing multi-client/no-client projects
- Bugfix: Asset interface losing DHCP setting - 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 ## 24.12

6
admin_settings_online_payment.php
View File

@ -25,7 +25,7 @@ require_once "inc_all_admin.php";
<div class="<?php if ($config_stripe_enable == 0) { echo "d-none"; } ?>"> <div class="<?php if ($config_stripe_enable == 0) { echo "d-none"; } ?>">
<div class="form-group"> <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">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
@ -35,7 +35,7 @@ require_once "inc_all_admin.php";
</div> </div>
<div class="form-group"> <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">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-key"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
@ -45,7 +45,7 @@ require_once "inc_all_admin.php";
</div> </div>
<div class="form-group"> <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">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-piggy-bank"></i></span> <span class="input-group-text"><i class="fas fa-fw fa-piggy-bank"></i></span>

8
post/admin/admin_settings_online_payment.php
View File

@ -18,7 +18,13 @@ if (isset($_POST['edit_online_payment_settings'])) {
// Logging // Logging
logAction("Settings", "Edit", "$session_name edited online payment settings"); 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"]); header("Location: " . $_SERVER["HTTP_REFERER"]);
} }