ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #380 from wrongecho/fixes

Browse Source 
General fixes
This commit is contained in:
Johnny
2022-02-26 11:13:34 -05:00
committed by GitHub
parent d19aac29c1 d7855c2a53
commit 77a871e6aa
4 changed files with 903 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client_contacts.php
+1 -1
View File
@@ -139,7 +139,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
if($contact_id == $primary_contact){ if($contact_id == $primary_contact){
$primary_contact_display = "<small class='text-success'>Primary Contact</small>"; $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
}else{ }else{
$primary_contact_display = "<small class='text-danger'>Needs approval</small>"; $primary_contact_display = FALSE;
} }
$contact_location_id = $row['contact_location_id']; $contact_location_id = $row['contact_location_id'];
$location_name = $row['location_name']; $location_name = $row['location_name'];
invoice.php
+1 -1
View File
@@ -299,7 +299,7 @@ if(isset($_GET['invoice_id'])){
<td><input type="text" class="form-control" id="name" name="name" placeholder="Item" required></td> <td><input type="text" class="form-control" id="name" name="name" placeholder="Item" required></td>
<td><textarea class="form-control" rows="2" id="desc" name="description" placeholder="Description"></textarea></td> <td><textarea class="form-control" rows="2" id="desc" name="description" placeholder="Description"></textarea></td>
<td><input type="number" step="0.01" min="0" class="form-control" style="text-align: center;" id="qty" name="qty" placeholder="QTY"></td> <td><input type="number" step="0.01" min="0" class="form-control" style="text-align: center;" id="qty" name="qty" placeholder="QTY"></td>
<td><input type="number" step="0.01" class="form-control" style="text-align: right;" id="price" name="price" placeholder="Price (<?php echo $client_currency_symbol; ?>)"></td> <td><input type="number" step="0.01" class="form-control" style="text-align: right;" id="price" name="price" placeholder="Price (<?php echo $invoice_currency_code; ?>)"></td>
<td> <td>
<select class="form-control select2" name="tax_id" required> <select class="form-control select2" name="tax_id" required>
<option value="0">None</option> <option value="0">None</option>
quote.php
+1 -1
View File
@@ -263,7 +263,7 @@ if(isset($_GET['quote_id'])){
<td><input type="text" class="form-control" name="name" id="name" placeholder="Item" required></td> <td><input type="text" class="form-control" name="name" id="name" placeholder="Item" required></td>
<td><textarea class="form-control" rows="2" name="description" id="desc" placeholder="Description"></textarea></td> <td><textarea class="form-control" rows="2" name="description" id="desc" placeholder="Description"></textarea></td>
<td><input type="number" step="0.01" min="0" class="form-control" id="qty" style="text-align: center;" name="qty" placeholder="QTY"></td> <td><input type="number" step="0.01" min="0" class="form-control" id="qty" style="text-align: center;" name="qty" placeholder="QTY"></td>
<td><input type="number" step="0.01" min="0" class="form-control" id="price" style="text-align: right;" name="price" placeholder="Price (<?php echo $client_currency_symbol; ?>)"></td> <td><input type="number" step="0.01" min="0" class="form-control" id="price" style="text-align: right;" name="price" placeholder="Price (<?php echo $quote_currency_code; ?>)"></td>
<td> <td>
<select class="form-control select2" id="tax" name="tax_id" required> <select class="form-control select2" id="tax" name="tax_id" required>
<option value="0">None</option> <option value="0">None</option>
setup.php
+33 -37
View File
@@ -1086,7 +1086,7 @@ if(isset($_POST['add_telemetry'])){
<body class="hold-transition sidebar-mini"> <body class="hold-transition sidebar-mini">
<div class="wrapper text-sm"> <div class="wrapper text-sm">
<!-- Navbar --> <!-- Navbar -->
<nav class="main-header navbar navbar-expand navbar-primary navbar-dark"> <nav class="main-header navbar navbar-expand navbar-primary navbar-dark">
@@ -1283,7 +1283,7 @@ if(isset($_POST['add_telemetry'])){
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
</div> </div>
<input type="password" class="form-control" data-toggle="password" name="password" placeholder="Enter a Password" autocomplete="new-password" required> <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Enter a Password" autocomplete="new-password" required minlength="8">
<div class="input-group-append"> <div class="input-group-append">
<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>
</div> </div>
@@ -1471,18 +1471,27 @@ if(isset($_POST['add_telemetry'])){
<label class="form-check-label ml-2">Share <small class="text-secondary"> (Including City, State/Province, Country, Currency and your comments)</small></label> <label class="form-check-label ml-2">Share <small class="text-secondary"> (Including City, State/Province, Country, Currency and your comments)</small></label>
</div> </div>
<hr> <br>
<div class="form-group"> <div class="form-group">
<label>Comments</label> <label>Comments</label>
<textarea class="form-control" rows="4" name="comments" placeholder="Any Comments"></textarea> <textarea class="form-control" rows="4" name="comments" placeholder="Any Comments?"></textarea>
</div> </div>
<hr> <hr>
<p>Post installation, a few additional steps are required:</p>
<ul>
<li>Backup your <a href="https://itflow.org/docs.php?doc=logins" target="_blank">master encryption key</a></li>
<li><a href="https://itflow.org/docs.php?doc=alerts" target="_blank">Configure cron</a> for alerts</li>
</ul>
<hr>
<button type="submit" name="add_telemetry" class="btn btn-primary">Finish and Sign in <i class="fa fa-fw fa-check-circle"></i></button> <button type="submit" name="add_telemetry" class="btn btn-primary">Finish and Sign in <i class="fa fa-fw fa-check-circle"></i></button>
</form> </form>
</div> </div>
</div> </div>
@@ -1493,34 +1502,21 @@ if(isset($_POST['add_telemetry'])){
<h3 class="card-title"><i class="fa fa-fw fa-cube"></i> Welcome to ITFlow Setup</h3> <h3 class="card-title"><i class="fa fa-fw fa-cube"></i> Welcome to ITFlow Setup</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<p>A database must be created before proceeding, then click on the Setup button to to get started, </p> <p><b>Thank you for choosing to try ITFlow!</b> Feel free to reach out on the <a href="https://forum.itflow.org/" target="_blank">forums</a> if you have any questions.</p>
<p>A database must be created before proceeding - click on the button below to get started! </p>
<hr> <hr>
<p>Post installation, <a href="https://itflow.org/docs.php?doc_id=3">additional steps</a> are required for tasks such as sending out recurring invoices, late payment reminders, scheduled tickets, alerts, etc.</p> <p class="text-muted">This program is <b>free software</b>: you can redistribute it and/or modify it under the terms of the <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GNU General Public License</a>. It is distributed in the hope that it will be useful, but <b>WITHOUT ANY WARRANTY</b>.</p>
<ul>
<li>Navigate to the settings/alerts page, enable cron and the alerts you want</li>
<li>Add cron.php to your crontab and set it to run once everyday at 11:00PM</li>
</ul>
<hr>
<p>An API is present to allow integration with other third pary apps. An API Key will be auto generated and can be changed in settings after setup. The API will give you the following capabilities:</p>
<ul class="mb-4">
<li>Address book XML for VOIP Phones</li>
<li>Caller ID Lookup</li>
<li>Get List of Emails in CSV to export to a mailing list</li>
<li>Acquire balance can be useful for customer's to get their balance by phone</li>
<li>Add new assets</li>
</ul>
<hr>
<p class="text-muted">This program is free software: you can redistribute it and/or modify it under the terms of the <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">GNU General Public License</a>. It is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.</p>
<?php <?php
// Check that there is access to write config.php // Check that there is access to write config.php
if(!file_put_contents("config.php", "Test")){ if(!file_put_contents("config.php", "Test")){
echo "<div class='alert alert-danger'>Warning: config.php is not writable. Ensure the webserver user has write access.</div>"; echo "<div class='alert alert-danger'>Warning: config.php is not writable. Ensure the webserver process has write access. Check the <a href='https://itflow.org/docs.php?doc=installation'>docs</a> for info.</div>";
}else{ }else{
// Else, able to write. Tidy up // Else, able to write. Tidy up
unlink("config.php"); unlink("config.php");
} }
?> ?>
<center><a href="?database" class="btn btn-primary">Setup <i class="fa fa-fw fa-arrow-alt-circle-right"></i></a></center> <hr>
<center><a href="?database" class="btn btn-primary">Begin Setup <i class="fa fa-fw fa-arrow-alt-circle-right"></i></a></center>
</div> </div>
</div> </div>
@@ -1531,23 +1527,23 @@ if(isset($_POST['add_telemetry'])){
<!-- /.content --> <!-- /.content -->
</div> </div>
<!-- /.content-wrapper --> <!-- /.content-wrapper -->
</div> </div>
<!-- ./wrapper --> <!-- ./wrapper -->
<!-- REQUIRED SCRIPTS --> <!-- REQUIRED SCRIPTS -->
<!-- jQuery --> <!-- jQuery -->
<script src="plugins/jquery/jquery.min.js"></script> <script src="plugins/jquery/jquery.min.js"></script>
<!-- Bootstrap 4 --> <!-- Bootstrap 4 -->
<script src="plugins/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Custom js--> <!-- Custom js-->
<script src='plugins/select2/js/select2.min.js'></script> <script src='plugins/select2/js/select2.min.js'></script>
<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script> <script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
<!-- AdminLTE App --> <!-- AdminLTE App -->
<script src="dist/js/adminlte.min.js"></script> <script src="dist/js/adminlte.min.js"></script>
<!-- Custom js--> <!-- Custom js-->
<script src="js/app.js"></script> <script src="js/app.js"></script>
</body> </body>