Mass_update & logfile bug
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,5 +5,6 @@ log_22.txt
|
||||
marketing/
|
||||
firmware/
|
||||
log/
|
||||
assets/images/products/
|
||||
settings/config.php
|
||||
settings/settings.php
|
||||
|
||||
BIN
assets/images/.DS_Store
vendored
Normal file
BIN
assets/images/.DS_Store
vendored
Normal file
Binary file not shown.
@@ -41,7 +41,7 @@ if ($update_allowed === 1){
|
||||
$total_not_found = 0;
|
||||
|
||||
$output_excel_display .= '<table class="sortable">
|
||||
<thead>
|
||||
<thead style="text-align: left;">
|
||||
<tr>
|
||||
<th>'.$equipment_label2.'</th>
|
||||
<th>'.$product_code.'</th>
|
||||
@@ -101,11 +101,31 @@ if ($update_allowed === 1){
|
||||
$output_excel_display .= '<tr><td>'.$data_to_update['serialnumber'].'</td><td>'.$data_to_update['productcode'].'</td><td>'.$data_to_update['productname'].'</td><td>'.$mass_update_correct.'</td></tr>';
|
||||
}
|
||||
}
|
||||
$output_excel_display .= '</tbody></table>';
|
||||
|
||||
//Totals
|
||||
$total_input = $total_rowID + $total_not_found;
|
||||
$total_summary = '('.$total_rowID.$general_page_of.$total_input.')<br>';
|
||||
$output_excel_display .= '</tbody></table>';
|
||||
|
||||
$order_header = '<table style="margin-bottom: 15px;">
|
||||
<thead style="text-align: left;">
|
||||
<tr>
|
||||
<th>Order_ref</th>
|
||||
<th>Order total</th>
|
||||
<th>'.$general_soldto.'</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>'.($_POST['order_ref'] ?? '').'</td>
|
||||
<td>'.$total_rowID.'</td>
|
||||
<td>'.($_POST['soldto'] ?? '').'</td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>';
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -223,6 +243,7 @@ if ($update_allowed === 1){
|
||||
<i class="fa-solid fa-bars fa-sm"></i>'.$tab3.' '.$total_summary.'
|
||||
</div>
|
||||
<div class="table order-table" id="excel_table">
|
||||
'.($order_header ?? '' ).'
|
||||
'.$output_excel_display.'
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -61,7 +61,7 @@ if (isset($_GET['success_msg'])) {
|
||||
<label for="Logfile"></label>
|
||||
<textarea name="logfile" id="logfile" style="min-height: 100vh;"><?=$contents?></textarea>
|
||||
</div>
|
||||
<div class="tab-content active">
|
||||
<div class="tab-content">
|
||||
<label for="Logfile"></label>
|
||||
<textarea name="" id="" style="min-height: 100vh;"><?=$contents_webserver?></textarea>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user