Merge pull request #590 from wrongecho/deprecate-companies-notice-2

Adjust company removal notice
This commit is contained in:
Johnny
2023-01-31 11:38:42 -05:00
committed by GitHub
2 changed files with 16 additions and 12 deletions

View File

@@ -27,7 +27,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<b>The multi-company feature should be considered deprecated.</b> It may be removed in the near future - please see the <a href="https://forum.itflow.org/d/74-removing-the-multi-company-feature">forum post</a>. <b>The multi-company feature is deprecated and should not be used. </b> It will be removed in the near future - please see the <a href="https://forum.itflow.org/d/74-removing-the-multi-company-feature">forum post</a>.
</div> </div>
<hr> <hr>
<form autocomplete="off"> <form autocomplete="off">
@@ -53,7 +53,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
</thead> </thead>
<tbody> <tbody>
<?php <?php
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
$company_id = $row['company_id']; $company_id = $row['company_id'];
$company_name = htmlentities($row['company_name']); $company_name = htmlentities($row['company_name']);
@@ -68,13 +68,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
$company_logo = htmlentities($row['company_logo']); $company_logo = htmlentities($row['company_logo']);
$company_locale = htmlentities($row['company_locale']); $company_locale = htmlentities($row['company_locale']);
$company_currency = htmlentities($row['company_currency']); $company_currency = htmlentities($row['company_currency']);
$company_initials = htmlentities(initials($company_name)); $company_initials = htmlentities(initials($company_name));
?> ?>
<tr> <tr>
<td class="text-center"> <td class="text-center">
<a class="text-dark" href="#" data-toggle="modal" data-target="#editCompanyModal<?php echo $company_id; ?>"> <a class="text-dark" href="#" data-toggle="modal" data-target="#editCompanyModal<?php echo $company_id; ?>">
@@ -112,14 +112,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
</tr> </tr>
<?php <?php
include("company_edit_modal.php"); include("company_edit_modal.php");
} }
?> ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<?php include("pagination.php"); ?> <?php include("pagination.php"); ?>
</div> </div>

View File

@@ -10,6 +10,10 @@
<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off"> <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
<div class="modal-body bg-white"> <div class="modal-body bg-white">
<div class="alert alert-danger" role="alert">
<b>This feature is deprecated and should not be used</b>.
</div>
<ul class="nav nav-pills nav-justified mb-3"> <ul class="nav nav-pills nav-justified mb-3">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a> <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
@@ -26,7 +30,7 @@
</ul> </ul>
<hr> <hr>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade show active" id="pills-details"> <div class="tab-pane fade show active" id="pills-details">
@@ -115,7 +119,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
</div> </div>
<input type="text" class="form-control" name="phone" placeholder="Phone Number"> <input type="text" class="form-control" name="phone" placeholder="Phone Number">
</div> </div>
</div> </div>
@@ -125,7 +129,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
</div> </div>
<input type="email" class="form-control" name="email" placeholder="Email address"> <input type="email" class="form-control" name="email" placeholder="Email address">
</div> </div>
</div> </div>