From 712fdfca2638ad3ea356fe89bd0dc5b9d343a888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Thu, 28 Mar 2024 20:12:19 +0100
Subject: [PATCH] Mass_update & logfile bug

---
 .gitignore                 |   1 +
 assets/images/.DS_Store    | Bin 0 -> 6148 bytes
 equipments_mass_update.php |  25 +++++++++++++++++++++++--
 logfile.php                |   2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 assets/images/.DS_Store

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 0000000000000000000000000000000000000000..12648aee244ff9e88c6e0a810e6dfa961ee7437f
GIT binary patch
literal 6148
zcmeHKO^*^W7=Fv5I|v&w(PS?slX!&{Vf~61#NC652jh_SpavOcmYp~|CCsoK2nlEX
z5B>$O{u2L-Cw<;d*9;8kO^NAC+NWPnJAL}Lr9>n;6Ym~Tm53|^#^N<ZYmDnT<gB1e
zDnOz7IHL)T$)^Jv<yxBpqkvIh+Z5ovTOk*_R?>j7`!}ND^H2`lP`YTt2gFl^gCEL}
z;xZ4cDMb_l`^eR??>#zI`#;bBvckVk$MlkV>ckjQKrtmaJH}vh?sR!{aeIYb#yAoq
zdy3OqKc@J!!m{v%JXa4V)d1tgE2Dh>Q+szBkF+LV-BB3CNu%*i6n2VNuI^g9R@r*z
zoXM$^^pi>4>5t!Vt}A8eUZ(r*N#IX=)tk>`l=OqhA1gxO`DpU?br5-S+L4pUixt;N
zE3A@L>Q(n=v*yG5HM{kwF|XOP$IV8~K5RXh&r8;=J9nSF>U{{$Bl!_?fC-$*%Jwu~
z0&9}f;lde5p^S#8W8OYigV*8$D=|<hAIeFTBv@ruUjACG5j<eUR|?!u)>m%)ra!(d
zay=+-`<(H%J?fH!UtM|I5aVxHb7DWsGAo+t(>c5}0DtX>%EPj}DxF~FFTm&`)RB_#
zOi9fReAYF~M|P`C`-fHD>aR2(XB03B{0jy6e6SH1+Zq=ss-pvudIA88C{~6v|5ad)
zt+B0fks@kfBBcUTs?bjik<w9a>vnC8ixg8j3H|sGdSszrC_;^n{%zHqL_0+j8wHF4
z%L?qI*(%@v$D7~(%OsOC3K#|cD+NUH$T{j@O8RciO^)wc8{s_y8@F4es3?f^b*vJ6
e74IV`L!HeDU|ZuNMU=qI9|0wUiHrh&Re_%+6zFXL

literal 0
HcmV?d00001

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 .= '<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>
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'])) {
                 <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>