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

Stripe payments - Account selection

Author: wrongecho

CHANGELOG.md

@@ -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
 

admin_settings_online_payment.php

@@ -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>
@@ -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>
@@ -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>

post/admin/admin_settings_online_payment.php

@@ -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"]);
 }