mirror of https://github.com/itflow-org/itflow
updated initial sorting order for some lists
This commit is contained in:
parent
cac8083279
commit
341f1c37a2
|
|
@ -70,7 +70,7 @@
|
|||
|
||||
### Technologies Used
|
||||
* PHP/MySQL
|
||||
* SB Admin Bootstrap CSS Framework
|
||||
* AdminLTE3
|
||||
* fontawesome
|
||||
* chart.js
|
||||
* moments.js
|
||||
|
|
@ -78,11 +78,10 @@
|
|||
* PHPmailer
|
||||
* mPDF
|
||||
* FullCalendar.io
|
||||
* bootstrap-select
|
||||
* Select2
|
||||
* Date Range Picker
|
||||
* Bootstrap Typeahead
|
||||
* EasyMDE forked from SimpleMDE
|
||||
* parsedown
|
||||
* SummerNote
|
||||
|
||||
### API Calls
|
||||
* Caller ID lookup (Returns a Name) - /api.php?api_key=[API_KEY]&cid=[PHONE_NUMBER]
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "account_id";
|
||||
$sb = "account_name";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
@ -35,8 +35,8 @@
|
|||
$disp = "ASC";
|
||||
}
|
||||
}else{
|
||||
$o = "DESC";
|
||||
$disp = "ASC";
|
||||
$o = "ASC";
|
||||
$disp = "DESC";
|
||||
}
|
||||
|
||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM accounts
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "category_type";
|
||||
$sb = "category_name";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
@ -35,8 +35,8 @@
|
|||
$disp = "ASC";
|
||||
}
|
||||
}else{
|
||||
$o = "DESC";
|
||||
$disp = "ASC";
|
||||
$o = "ASC";
|
||||
$disp = "DESC";
|
||||
}
|
||||
|
||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM categories WHERE (category_name LIKE '%$q%' OR category_type LIKE '%$q%') AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ if(isset($_GET['q'])){
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "client_id";
|
||||
$sb = "client_name";
|
||||
}
|
||||
|
||||
//Column Order Filter
|
||||
|
|
@ -39,8 +39,8 @@ if(isset($_GET['o'])){
|
|||
$disp = "ASC";
|
||||
}
|
||||
}else{
|
||||
$o = "DESC";
|
||||
$disp = "ASC";
|
||||
$o = "ASC";
|
||||
$disp = "DESC";
|
||||
}
|
||||
|
||||
//Date From and Date To Filter
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "companies.company_id";
|
||||
$sb = "company_name";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
@ -35,8 +35,8 @@
|
|||
$disp = "ASC";
|
||||
}
|
||||
}else{
|
||||
$o = "DESC";
|
||||
$disp = "ASC";
|
||||
$o = "ASC";
|
||||
$disp = "DESC";
|
||||
}
|
||||
|
||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM companies, settings
|
||||
|
|
|
|||
2
cron.php
2
cron.php
|
|
@ -66,7 +66,7 @@ while($row = mysqli_fetch_array($sql_companies)){
|
|||
|
||||
//PAST DUE INVOICE ALERTS
|
||||
//$invoiceAlertArray = [$config_invoice_overdue_reminders];
|
||||
$invoiceAlertArray = [3,8,14,30,45,60,90,120];
|
||||
$invoiceAlertArray = [30,60,90,120,150];
|
||||
|
||||
foreach($invoiceAlertArray as $day){
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "invoice_id";
|
||||
$sb = "invoice_number";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "payment_id";
|
||||
$sb = "payment_date";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
|
|||
3
post.php
3
post.php
|
|
@ -177,6 +177,7 @@ if(isset($_POST['verify'])){
|
|||
if(isset($_POST['edit_general_settings'])){
|
||||
|
||||
$config_api_key = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_api_key']));
|
||||
$config_base_url = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_base_url']));
|
||||
|
||||
$path = "$config_invoice_logo";
|
||||
|
||||
|
|
@ -190,7 +191,7 @@ if(isset($_POST['edit_general_settings'])){
|
|||
move_uploaded_file($_FILES['file']['tmp_name'], $path);
|
||||
}
|
||||
|
||||
mysqli_query($mysqli,"UPDATE settings SET config_invoice_logo = '$path', config_api_key = '$config_api_key' WHERE company_id = $session_company_id");
|
||||
mysqli_query($mysqli,"UPDATE settings SET config_invoice_logo = '$path', config_api_key = '$config_api_key', config_base_url = '$config_base_url' WHERE company_id = $session_company_id");
|
||||
|
||||
//logging
|
||||
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'General', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
$disp = "ASC";
|
||||
}
|
||||
}else{
|
||||
$o = "DESC";
|
||||
$disp = "ASC";
|
||||
$o = "ASC";
|
||||
$disp = "DESC";
|
||||
}
|
||||
|
||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM products, categories WHERE products.category_id = categories.category_id AND products.company_id = $session_company_id AND (product_name LIKE '%$q%' OR category_name LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "revenue_id";
|
||||
$sb = "revenue_date";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
|
|||
|
|
@ -19,6 +19,17 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Base URL</label>
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
|
||||
</div>
|
||||
<input type="text" class="form-control" name="config_base_url" placeholder="ex host.domain.ext" value="<?php echo $config_base_url; ?>">
|
||||
</div>
|
||||
<small class="form-text text-muted">This is used by cron to send the correct url for invoice guest views</small>
|
||||
</div>
|
||||
|
||||
<div class="form-group mb-4">
|
||||
<label>Logo</label>
|
||||
<input type="file" class="form-control-file" name="file">
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "ticket_id";
|
||||
$sb = "ticket_number";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "trip_id";
|
||||
$sb = "trip_date";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
if(!empty($_GET['sb'])){
|
||||
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
|
||||
}else{
|
||||
$sb = "user_id";
|
||||
$sb = "name";
|
||||
}
|
||||
|
||||
if(isset($_GET['o'])){
|
||||
|
|
@ -35,8 +35,8 @@
|
|||
$disp = "ASC";
|
||||
}
|
||||
}else{
|
||||
$o = "DESC";
|
||||
$disp = "ASC";
|
||||
$o = "ASC";
|
||||
$disp = "DESC";
|
||||
}
|
||||
|
||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM users
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@
|
|||
$disp = "ASC";
|
||||
}
|
||||
}else{
|
||||
$o = "DESC";
|
||||
$disp = "ASC";
|
||||
$o = "ASC";
|
||||
$disp = "DESC";
|
||||
}
|
||||
|
||||
//Date From and Date To Filter
|
||||
|
|
|
|||
Loading…
Reference in New Issue