diff --git a/.gitignore b/.gitignore index 566cb01..d5a43b8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ log_22.txt marketing/ firmware/ log/ +assets/images/products/ settings/config.php settings/settings.php diff --git a/assets/images/.DS_Store b/assets/images/.DS_Store new file mode 100644 index 0000000..12648ae Binary files /dev/null and b/assets/images/.DS_Store differ diff --git a/equipments_mass_update.php b/equipments_mass_update.php index b259d33..8eb74db 100644 --- a/equipments_mass_update.php +++ b/equipments_mass_update.php @@ -41,7 +41,7 @@ if ($update_allowed === 1){ $total_not_found = 0; $output_excel_display .= ' - + @@ -101,11 +101,31 @@ if ($update_allowed === 1){ $output_excel_display .= ''; } } + $output_excel_display .= '
'.$equipment_label2.' '.$product_code.'
'.$data_to_update['serialnumber'].''.$data_to_update['productcode'].''.$data_to_update['productname'].''.$mass_update_correct.'
'; //Totals $total_input = $total_rowID + $total_not_found; $total_summary = '('.$total_rowID.$general_page_of.$total_input.')
'; - $output_excel_display .= ''; + + $order_header = ' + + + + + + + + + + + + + + + + +
Order_refOrder total'.$general_soldto.'
'.($_POST['order_ref'] ?? '').''.$total_rowID.''.($_POST['soldto'] ?? '').'
'; + } } @@ -223,6 +243,7 @@ if ($update_allowed === 1){ '.$tab3.' '.$total_summary.'
+ '.($order_header ?? '' ).' '.$output_excel_display.'
diff --git a/logfile.php b/logfile.php index d6bc844..5f72723 100644 --- a/logfile.php +++ b/logfile.php @@ -61,7 +61,7 @@ if (isset($_GET['success_msg'])) { -
+