m3 Security Fixes

Modules/M3/Resources/views/liberty-theme/layout/main.blade.php

@@ -15,8 +15,8 @@
             ->where('R428US', $loggedUser)
             ->get();
     }
-    
-    foreach ($getUsers as $key=>$user) {	
+
+    foreach ($getUsers as $key=>$user) {
         if(trim($user->R428ADMUSR)=="Y") {
             # Different logic from Qinclude version : this not an Array
             $admin_users=trim($user->R428ADMUSR);

Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php

@@ -10,17 +10,17 @@
         <div class="card mb-4">
             <div class="card-header">
                 @if($power_user->R428PWRUSR=="Y")
-                <button name="M3DeliveryAdd" type="button" class="btn btn-sm btn-info M3DeliveryAdd_click" id="M3DeliveryAdd_click" 
+                <button name="M3DeliveryAdd" type="button" class="btn btn-sm btn-info M3DeliveryAdd_click" id="M3DeliveryAdd_click"
                     data-AT9DPW="{{$power_user->R428CO.$power_user->R428PL.$power_user->R428WH}}">Add Record</button>
                 @endif
                 <!-- data-AT9DPW="$co.$plant.$whs">Add Record</button> -->
             </div>
    {{-- // AVCO	        AVCO	    CHARACTER	3	No		' '		Division
 		// AVWHS	    AVWHS	    CHARACTER	3	No		' '		Warehouse
-		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant	 
+		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant
 		// AVDELMETH	AVDELMETH	CHARACTER	4	No		' '		Delivery method
 		// AVSHPVIA	    AVSHPVIA	CHARACTER	4	No		' '		Sentinel ship via
-		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route	
+		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route
 		// AVSHORCL	    AVSHORCL	CHARACTER	3	No		' '		Sentinel intl code --}}
 
             <div class="card-body">
@@ -38,7 +38,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM664M as $key=>$val)
@@ -46,9 +46,9 @@
                                 <td></td>
                                 <td align="center">
                                     @if($power_user->R428PWRUSR=="Y")
-                                    <button name="M3DeliveryEdit{{trim($val->AVDELMETH)}}" type="submit" class="btn btn-sm btn-info M3DeliveryEdit_click" id="M3DeliveryEdit_click" 
-                                    data-AVDELMETH="{{$val->AVDELMETH}}" data-AVSHPVIA="{{trim($val->AVSHPVIA)}}" data-AVSHSRT="{{trim($val->AVSHSRT)}}" 
-                                    data-AVSHORCL="{{trim($val->AVSHORCL)}}" 
+                                    <button name="M3DeliveryEdit{{trim($val->AVDELMETH)}}" type="submit" class="btn btn-sm btn-info M3DeliveryEdit_click" id="M3DeliveryEdit_click"
+                                    data-AVDELMETH="{{$val->AVDELMETH}}" data-AVSHPVIA="{{trim($val->AVSHPVIA)}}" data-AVSHSRT="{{trim($val->AVSHSRT)}}"
+                                    data-AVSHORCL="{{trim($val->AVSHORCL)}}"
                                     >Edit</button>
                                     @endif
                                 </td>
@@ -103,11 +103,11 @@
         //
         // AVCO	        AVCO	    CHARACTER	3	No		' '		Division
 		// AVWHS	    AVWHS	    CHARACTER	3	No		' '		Warehouse
-		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant	 
+		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant
 		// AVDELMETH	AVDELMETH	CHARACTER	4	No		' '		Delivery method
 		// AVSHPVIA	    AVSHPVIA	CHARACTER	4	No		' '		Sentinel ship via
-		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route	
-		// AVSHORCL	    AVSHORCL	CHARACTER	3	No		' '		Sentinel intl code 
+		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route
+		// AVSHORCL	    AVSHORCL	CHARACTER	3	No		' '		Sentinel intl code
 
         $(document).on('click', '#M3DeliveryEdit_click', function() {
             // console.log($(this));
@@ -150,7 +150,7 @@
 
             var changes_detected = 0;
             var errors_found = 0;
-            
+
             // Retrieve the values we need to pass on
             var NEW_AVDELMETH   = $("#AVDELMETH").val();
             var NEW_AVSHPVIA    = $("#AVSHPVIA").val();
@@ -177,11 +177,11 @@
                 if(errors_found==0) {
 
                     var csrf = document.querySelector('meta[name="csrf-token"]').content;
-                    var form_post = {    
+                    var form_post = {
                         'AVDELMETH': NEW_AVDELMETH,
-                        'AVSHPVIA': NEW_AVSHPVIA, 
-                        'AVSHSRT':  NEW_AVSHSRT, 
-                        'AVSHORCL': NEW_AVSHORCL, 
+                        'AVSHPVIA': NEW_AVSHPVIA,
+                        'AVSHSRT':  NEW_AVSHSRT,
+                        'AVSHORCL': NEW_AVSHORCL,
                         'AVCO':     NEW_AVCO,
                         'AVPLANT':  NEW_AVPLANT,
                         'AVWHS':    NEW_AVWHS,
@@ -234,11 +234,11 @@
             var NEW_AVWHS       = $("#addAVWHS").val();
 
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
-            var form_post = {    
+            var form_post = {
                 'AVDELMETH':    NEW_AVDELMETH,
-                'AVSHPVIA':     NEW_AVSHPVIA, 
-                'AVSHSRT':      NEW_AVSHSRT, 
-                'AVSHORCL':     NEW_AVSHORCL, 
+                'AVSHPVIA':     NEW_AVSHPVIA,
+                'AVSHSRT':      NEW_AVSHSRT,
+                'AVSHORCL':     NEW_AVSHORCL,
                 'AVCO':         NEW_AVCO,
                 'AVPLANT':      NEW_AVPLANT,
                 'AVWHS':        NEW_AVWHS,
@@ -274,9 +274,9 @@
                 });
             }
         });
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/M3ErrorsDisplay.blade.php

@@ -370,7 +370,7 @@
                 fixedColumns: true,
                 orderCellsTop: true,
                 order: [
-                    [3, 'asc'] // Order By Date time 
+                    [3, 'asc'] // Order By Date time
                 ],
                 pageLength: 100,
                 "lengthMenu": [
@@ -472,7 +472,7 @@
             // Add event listeners to the date filter inputs
             $('#filterTop,#refresh').on('click', function() {
                 var SHMACPKR = $('#SHMACPKR').val().trim();
-                // Check SHMACPKR for invalid CHARS  
+                // Check SHMACPKR for invalid CHARS
                 var numbersOnly = /^[0-9]+$/;
                 if (!SHMACPKR.match(numbersOnly) && SHMACPKR != '') {
                     alert('Only numeric values are allowed for Delivery Note ');
@@ -818,7 +818,7 @@
             // Export To Excel  exportExcel
             $(document).on('click', '#exportExcel', function() {
                 var SHMACPKR = $('#SHMACPKR').val().trim();
-                // Check SHMACPKR for invalid CHARS  
+                // Check SHMACPKR for invalid CHARS
                 var numbersOnly = /^[0-9]+$/;
                 if (!SHMACPKR.match(numbersOnly) && SHMACPKR != '') {
                     alert('Only numeric values are allowed for Delivery Note ');

Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php

@@ -22,8 +22,8 @@ Sentinel Doc Archive
                                     <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
-                                            <option  value="{{ $currentWHDDA }}" 
-                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" 
+                                            <option  value="{{ $currentWHDDA }}"
+                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
                                                 {{ ($WHDDA!='' && $WHDDA==$currentWHDDA) ? "selected" : ""  }}>
                                                 {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                             </option>
@@ -48,7 +48,7 @@ Sentinel Doc Archive
                             </div>
                         </form>
                         @if($aggmsg!="")
-                            <center><b> {{ $aggmsg }} 
+                            <center><b> {{ $aggmsg }}
                             (
                             @foreach($ICM688M1 as $key => $ICM688M1R)
                                 <a href="M3GetPDFFromCache?MACPKR={{$ICM688M1R->A4MACPKR}}&COMPANY={{$COMPANY}}&PLANT={{$PLANT}}&WHS={{$WHS}}">{{$ICM688M1R->A4MACPKR}}</a>
@@ -57,9 +57,9 @@ Sentinel Doc Archive
                         @endif
                         @if(count($trackingno)>0)
                         @foreach($trackingno as $key => $val)
-                            @if(trim($carrier[$key])=="UPSG") 
+                            @if(trim($carrier[$key])=="UPSG")
                                 <center><b> UPSG <a href=https://www.ups.com/track?loc=en_US&tracknum={{$val}}>{{$val}}</a> </b></center>
-                            @elseif(trim($carrier[$key])=="FEDG" || trim($carrier[$key])=="FXFE") 
+                            @elseif(trim($carrier[$key])=="FEDG" || trim($carrier[$key])=="FXFE")
                                 <center><b> Fedex <a href=https://www.fedex.com/fedextrack/?trknbr={{$val}}>{{$val}}</a> </b></center>
                             @endif
                         @endforeach
@@ -78,7 +78,7 @@ Sentinel Doc Archive
                 </div>
             </div>
         </div>
- 
+
     </div>
 @endsection
 
@@ -86,7 +86,7 @@ Sentinel Doc Archive
 <script>
     $(document).ready(function() {
 
-        // Update Division/WH/Plant on Warehouse change 
+        // Update Division/WH/Plant on Warehouse change
         $(document).on('change select','#WHDDA',function(){
             $("#COMPANY").val($(this).find("option:selected").data("comp"));
             $("#PLANT").val($(this).find("option:selected").data("pl"));

Modules/M3/Resources/views/liberty-theme/pages/MFOrders.blade.php

@@ -40,8 +40,8 @@ Solon Sentinel Portal - Manifest Orders
                             @endphp
                             <tr>
                                 <td align="center">
-                                    <a class="btn btn-link" target="_blank" href="{{$sendUrl.'php/AllSentPkr.php?macpkr_input='.$val->AYMACPKR}}" > 
-                                        {{ $val->AYMACPKR }} 
+                                    <a class="btn btn-link" target="_blank" href="{{$sendUrl.'php/AllSentPkr.php?macpkr_input='.$val->AYMACPKR}}" >
+                                        {{ $val->AYMACPKR }}
                                     </a>
                                 </td>
                                 <td> {{ $val->AYONO }} </td>
@@ -87,6 +87,6 @@ Solon Sentinel Portal - Manifest Orders
             ],
         });
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php

@@ -19,7 +19,7 @@
                     <div class="card-header">
                         <form class="needs-validation"  enctype="multipart/form-data" method="GET" action="{{ route("m3.OrderLinesOfClosedOrder") }}">
                             <div class="row d-flex flex-row align-items-center">
-                                @php 
+                                @php
                                     $REPORTDATEDisp   = old('REPORTDATEDisp') ?? \DateTime::createFromFormat('Ymd',$REPORTDATEDisp)->format('Y-m-d');
                                 @endphp
                                 <div class="col">
@@ -32,8 +32,8 @@
                                     <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
-                                            <option  value="{{ $currentWHDDA }}" 
-                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" 
+                                            <option  value="{{ $currentWHDDA }}"
+                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
                                                 {{ ($WHDDA!='' && $WHDDA==$currentWHDDA) ? "selected" : ""  }}>
                                                 {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                             </option>
@@ -68,7 +68,7 @@
                                         <th>Close Date</th>
                                         <th>Delivery #</th>
                                         <th>Order #</th>
-                                        
+
                                         <th>Terms</th>
                                         <th>Weight</th>
                                         <th>Carrier</th>
@@ -255,7 +255,7 @@
             ],
             footerCallback: function (row, data, start, end, display) {
                 let api = this.api();
-        
+
                 // Remove the formatting to get integer data for summation
                 let intVal = function (i) {
                     return typeof i === 'string'
@@ -264,19 +264,19 @@
                         ? i
                         : 0;
                 };
-        
+
                 // Total over all pages
                 total = api
                     .column(13)
                     .data()
                     .reduce((a, b) => intVal(a) + intVal(b), 0);
-        
+
                 // Update footer
-                api.column(13).footer().innerHTML = total.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 });;  
+                api.column(13).footer().innerHTML = total.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 });;
             }
         });
 
-        // Update Division/WH/Plant on Warehouse change 
+        // Update Division/WH/Plant on Warehouse change
         $(document).on('change select','#WHDDA',function(){
             $("#COMPANY").val($(this).find("option:selected").data("comp"));
             $("#PLANT").val($(this).find("option:selected").data("pl"));

Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php

@@ -43,7 +43,7 @@
                                 <td> {{ $val->R658RQ }} </td>
                                 <td> {{ $val->R658TL }} </td>
                                 <td> {{ $val->R658RMQ }} </td>
-                                <td class="text-center"> 
+                                <td class="text-center">
                                     {!! ($val->R658IZLCF ?? '')=='1' ? '<i class="fas fa-lg fa-check"></i>' :'<i class="fas fa-lg fa-times"></i>'  !!}
                                 </td>
                                 <td>
@@ -52,7 +52,7 @@
                                         data-part="{{ trim($val->R658PN) }}" data-wh="{{ trim($val->R658WH) }}"
                                         data-minqty="{{ trim($val->R658MQ) }}" data-repqty="{{ trim($val->R658RQ) }}"
                                         data-repminqty="{{ trim($val->R658RMQ) }}" data-tol="{{ trim($val->R658TL) }}"
-                                        data-controlled="{{ trim($val->R658IZLCF) }}" 
+                                        data-controlled="{{ trim($val->R658IZLCF) }}"
                                         title="Edit Replenishment">
                                         Edit
                                     </button>
@@ -118,7 +118,7 @@
                                 <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="4" required>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>
@@ -202,7 +202,7 @@
                                 <select class="form-select"  id="WHDD" aria-label="WHDD" tabindex="4" disabled>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                             data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>
@@ -228,7 +228,7 @@
                             </div>
 
                         </div>
-                        
+
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
@@ -456,10 +456,10 @@ $(document).ready(function() {
             }
         ]
     });
-    
+
     var myTable = $('#datatablesSimple5').DataTable({});
 
-    // Update Division/WH/Plant on Warehouse change 
+    // Update Division/WH/Plant on Warehouse change
     $(document).on('change select','#WHDDA',function(){
         $("#R658COA").val($(this).find("option:selected").data("comp"));
         $("#R658PLA").val($(this).find("option:selected").data("pl"));
@@ -472,7 +472,7 @@ $(document).ready(function() {
         $("#editReplen").trigger('reset');
 
         // console.log($(this).data("comp").toString() + $(this).data("pl").toString() + $(this).data("wh").toString() );
-        // Set WH name 
+        // Set WH name
         WHDD = $(this).data("comp").toString() + $(this).data("pl").toString() + $(this).data("wh").toString();
         $("#WHDD").val(WHDD);
 
@@ -495,13 +495,13 @@ $(document).ready(function() {
         editModal.show();
     });
 
-    // Add Record Btn 
+    // Add Record Btn
     $(document).on('click', '#addRecordBtn', function() {
         $("#addReplen").trigger('reset');
         addModal.show();
     });
 
-    // Delete Record 
+    // Delete Record
     $(document).on('click', '.deleterefcat', function() {
         R658PN = $(this).data("part");
         R658CO = $(this).data("comp");
@@ -533,7 +533,7 @@ $(document).ready(function() {
 
     });
 
-    // Check Record Exist  
+    // Check Record Exist
     checkRecordExist = function(form_post){
         $.ajax({
             url: "{{ route('m3.replenishmentSettingsExist') }}",
@@ -550,7 +550,7 @@ $(document).ready(function() {
             error: function(error) {}
         });
     }
-            
+
 });
 
 // Validate Add Record before Submit
@@ -566,8 +566,8 @@ function validateAdd() {
     $.trim($("#R658PLA").val())  == "" ? $("#R658PLA").addClass("is-invalid")  : $("#R658PLA").removeClass("is-invalid");
     $.trim($("#R658WHA").val())  == "" ? $("#R658WHA").addClass("is-invalid")  : $("#R658WHA").removeClass("is-invalid");
 
-    if ($.trim($("#R658LCA").val()) == "" || $.trim($("#R658PNA").val()) == "" || $.trim($("#R658MQA").val()) == "" || $.trim($("#R658RQA").val()) == "" 
-    || $.trim($("#R658RMQA").val()) == "" || $.trim($("#R658TLA").val()) == "" || $.trim($("#R658COA").val()) == "" || $.trim($("#R658PLA").val()) == "" || 
+    if ($.trim($("#R658LCA").val()) == "" || $.trim($("#R658PNA").val()) == "" || $.trim($("#R658MQA").val()) == "" || $.trim($("#R658RQA").val()) == ""
+    || $.trim($("#R658RMQA").val()) == "" || $.trim($("#R658TLA").val()) == "" || $.trim($("#R658COA").val()) == "" || $.trim($("#R658PLA").val()) == "" ||
     $.trim($("#R658WHA").val()) == "" ) {
         return false;
     }

Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php

@@ -9,7 +9,7 @@ Warehouse Performance Metrics report
             <div class="card-header">
                 <form class="needs-validation"  enctype="multipart/form-data" method="GET" action="{{ route("m3.OrderLinesOfClosedOrder") }}">
                     <div class="row d-flex flex-row align-items-center">
-                        @php 
+                        @php
                             // $REPORTDATEDisp   = old('REPORTDATEDisp') ?? \DateTime::createFromFormat('Ymd',$REPORTDATEDisp)->format('Y-m-d');
                         @endphp
                         {{-- <div class="col">
@@ -22,8 +22,8 @@ Warehouse Performance Metrics report
                             <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
                                 @foreach ($IC670M as $key => $IC670MR)
                                     @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
-                                    <option  value="{{ $currentWHDDA }}" 
-                                        data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" 
+                                    <option  value="{{ $currentWHDDA }}"
+                                        data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
                                         {{ ($WHDDA!='' && $WHDDA==$currentWHDDA) ? "selected" : ""  }}>
                                         {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                     </option>
@@ -63,7 +63,7 @@ Warehouse Performance Metrics report
 @section('scripts')
 <script>
     $(document).ready(function() {
-        // Update Division/WH/Plant on Warehouse change 
+        // Update Division/WH/Plant on Warehouse change
         $(document).on('change select','#WHDDA',function(){
             $("#COMPANY").val($(this).find("option:selected").data("comp"));
             $("#PLANT").val($(this).find("option:selected").data("pl"));

Modules/M3/Resources/views/liberty-theme/pages/carrierMaint.blade.php

@@ -10,7 +10,7 @@
         <div class="card mb-4">
             <div class="card-header">
                 @if(isset($power_user[0]) && trim((string) ($power_user[0]->R428PWRUSR ?? '')) === 'Y')
-                <button name="carrierAdd" type="button" class="btn btn-sm btn-info carrierAdd_click" id="carrierAdd_click" 
+                <button name="carrierAdd" type="button" class="btn btn-sm btn-info carrierAdd_click" id="carrierAdd_click"
                     data-AT9DPW="{{ ($power_user[0]->R428CO ?? '').($power_user[0]->R428PL ?? '').($power_user[0]->R428WH ?? '') }}">Add Record</button>
                 @endif
                 <!-- data-AT9DPW="$co.$plant.$whs">Add Record</button> -->
@@ -32,7 +32,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM160M as $key=>$val)
@@ -40,9 +40,9 @@
                                 <td></td>
                                 <td align="center">
                                     @if(isset($power_user[0]) && trim((string) ($power_user[0]->R428PWRUSR ?? '')) === 'Y')
-                                    <button name="carrierEdit{{trim($val->CANUM)}}" type="submit" class="btn btn-sm btn-info carrierEdit_click" id="carrierEdit_click" 
-                                    data-CANUM="{{trim($val->CANUM)}}" data-CANAM="{{trim($val->CANAM)}}" data-TWOSHIPCARRIERCODE="{{trim($val->TWOSHIPCARRIERCODE)}}" 
-                                    data-PARCELCARRIERCODE="{{trim($val->PARCELCARRIERCODE)}}" data-CASPR10A01="{{trim($val->CASPR10A01)}}" 
+                                    <button name="carrierEdit{{trim($val->CANUM)}}" type="submit" class="btn btn-sm btn-info carrierEdit_click" id="carrierEdit_click"
+                                    data-CANUM="{{trim($val->CANUM)}}" data-CANAM="{{trim($val->CANAM)}}" data-TWOSHIPCARRIERCODE="{{trim($val->TWOSHIPCARRIERCODE)}}"
+                                    data-PARCELCARRIERCODE="{{trim($val->PARCELCARRIERCODE)}}" data-CASPR10A01="{{trim($val->CASPR10A01)}}"
                                     data-CASPR1A01="{{trim($val->CASPR1A01)}}"
                                     >Edit</button>
                                     @endif
@@ -101,7 +101,7 @@
             } else {
                 $("#PARCELCARRIERCODE").val(" ");
             }
-        }); 
+        });
 
         $("#addPARCELCARRIERCODE").change(function() {
             if($(this).is(":checked")) {
@@ -109,7 +109,7 @@
             } else {
                 $("#addPARCELCARRIERCODE").val(" ");
             }
-        }); 
+        });
 
         $("#CASPR1A01").change(function() {
             if($(this).is(":checked")) {
@@ -117,7 +117,7 @@
             } else {
                 $("#CASPR1A01").val(" ");
             }
-        }); 
+        });
 
         $("#addCASPR1A01").change(function() {
             if($(this).is(":checked")) {
@@ -125,7 +125,7 @@
             } else {
                 $("#addCASPR1A01").val(" ");
             }
-        }); 
+        });
 
         //
         // Open Modal Carrier Edit
@@ -188,7 +188,7 @@
 
             var changes_detected = 0;
             var errors_found = 0;
-            
+
             // Get the right Values
             if($("#PARCELCARRIERCODE").is(":checked")) {
                 $("#PARCELCARRIERCODE").val("X");
@@ -241,15 +241,15 @@
                 $("#PARCELCARRIERCODE").focus();
                 errors_found=1;
             }
-            
+
             if(errors_found==0) {
 
                 var csrf = document.querySelector('meta[name="csrf-token"]').content;
-                var form_post = {    
+                var form_post = {
                     'CANUM':                NEW_CANUM,
-                    'CANAM':                NEW_CANAM, 
-                    'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE, 
-                    'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE, 
+                    'CANAM':                NEW_CANAM,
+                    'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE,
+                    'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE,
                     'CASPR10A01':           NEW_CASPR10A01,
                     'CASPR1A01':            NEW_CASPR1A01,
                     '_token': csrf
@@ -329,11 +329,11 @@
             var NEW_CASPR1A01           = $("#addCASPR1A01").val();
 
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
-            var form_post = {    
+            var form_post = {
                 'CANUM':                NEW_CANUM,
-                'CANAM':                NEW_CANAM, 
-                'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE, 
-                'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE, 
+                'CANAM':                NEW_CANAM,
+                'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE,
+                'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE,
                 'CASPR10A01':           NEW_CASPR10A01,
                 'CASPR1A01':            NEW_CASPR1A01,
                 '_token': csrf
@@ -401,9 +401,9 @@
                 });
             }
         });
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/dashboard.blade.php

@@ -33,7 +33,7 @@ Sentinel API
 
     $(function() {
 
-    });    
+    });
 
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/execSummary.blade.php

@@ -214,7 +214,7 @@
 
                 if (isDisabled) {
                     $('#TOREPORTDATEDIV').hide();
-                    // toMonthPicker.input.style.backgroundColor = '#e9ecef'; 
+                    // toMonthPicker.input.style.backgroundColor = '#e9ecef';
                     // toMonthPicker.input.style.cursor = 'not-allowed';
 
                     // Set fromMonthPicker to today
@@ -374,14 +374,14 @@
                                 // Calculate hue variations based on period type
                                 let salesHue = HUE_BLUE;
                                 let weightHue = HUE_GREEN;
-                                
+
                                 // Adjust hue for quarters only
                                 if (period.startsWith("Q")) {
                                     const quarterNum = parseInt(period.substring(1));
                                     salesHue = HUE_BLUE + (quarterNum - 1) * 15;
                                     weightHue = HUE_GREEN + (quarterNum - 1) * 15;
                                 }
-                                
+
                                 // For monthly periods (odd/even), use slight variations
                                 if (period === "odd") {
                                     salesHue = HUE_BLUE + 5;
@@ -390,19 +390,19 @@
                                     salesHue = HUE_BLUE + 20;
                                     weightHue = HUE_GREEN + 20;
                                 }
-                                
+
                                 // Create color maps for each WHS within this period
                                 salesColorMap[period] = {};
                                 weightColorMap[period] = {};
                                 linesColorMap[period] = {};
-                                
+
                                 // Generate different shades for each WHS - darker to lighter
                                 whsArray.forEach((whs, whsIndex) => {
                                     // Vary lightness by WHS - start darker (25%) and get lighter
                                     // Reverse the WHS index calculation to go from dark to light
                                     const reversedIndex = whsArray.length - 1 - whsIndex;
                                     const lightness = 45 + (reversedIndex % 8) * 6;
-                                    
+
                                     // Assign colors for each metric
                                     salesColorMap[period][whs] = `hsl(${salesHue}, 85%, ${lightness}%)`;
                                     weightColorMap[period][whs] = `hsl(${weightHue}, 85%, ${lightness}%)`;
@@ -413,7 +413,7 @@
                             // Function to get the appropriate color based on time period, metric, and WHS
                             function getDatasetColor(yearLabel, metric, whs) {
                                 const period = getTimePeriod(yearLabel);
-                                
+
                                 if (metric === "Sales") {
                                     return salesColorMap[period]?.[whs] || `hsl(${HUE_BLUE}, 85%, 50%)`;
                                 } else if (metric === "Weight") {
@@ -421,7 +421,7 @@
                                 } else if (metric === "Lines") {
                                     return linesColorMap[period]?.[whs] || `hsl(${HUE_GREY}, 0%, 50%)`;
                                 }
-                                
+
                                 return "rgba(200, 200, 200, 0.6)"; // Default fallback
                             }
 
@@ -510,7 +510,7 @@
 
             });
 
-            //// Trigger Click on init 
+            //// Trigger Click on init
             $("#updateCharts").trigger("click");
 
         });

Modules/M3/Resources/views/liberty-theme/pages/execSummaryLine.blade.php

@@ -208,7 +208,7 @@
 
                 if (isDisabled) {
                     $('#TOREPORTDATEDIV').hide();
-                    // toMonthPicker.input.style.backgroundColor = '#e9ecef'; 
+                    // toMonthPicker.input.style.backgroundColor = '#e9ecef';
                     // toMonthPicker.input.style.cursor = 'not-allowed';
 
                     // Set fromMonthPicker to today
@@ -225,7 +225,7 @@
 
             //// Trigger Period change
             $('input[name="reportPeriod"]').trigger("change");
-            
+
             //// Update Charts
             $("#updateCharts").click(function() {
                 //// Validate Fields before calling Ajax
@@ -356,7 +356,7 @@
                                     const h = parseFloat(match[1]);
                                     const s = parseFloat(match[2]);
                                     const l = parseFloat(match[3]);
-                                    
+
                                     // Create lighter version by increasing lightness and reducing saturation
                                     return `hsl(${h}, ${Math.max(s - 20, 30)}%, ${Math.min(l + 15, 85)}%)`;
                                 }
@@ -367,7 +367,7 @@
                             let labels = [];
                             let datasets = [];
                             const whsSet = new Set();
-                            
+
                             // Initialize warehouse set from data
                             data.forEach(entry => whsSet.add(entry.whs));
                             if (dataLY) dataLY.forEach(entry => whsSet.add(entry.whs));
@@ -378,7 +378,7 @@
                                 // Extract unique year-month combinations
                                 const periodData = new Map();
                                 const monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-                                
+
                                 // Process current year data
                                 data.forEach(entry => {
                                     const [year, month] = entry.year.split("-");
@@ -387,21 +387,21 @@
                                     const yearSuffix = year.substring(2); // Last 2 digits
                                     const periodKey  = `${monthName}`;    // '${yearSuffix}
                                     const periodKey2 = `${monthName} '${yearSuffix}`;
-                                    
+
                                     if (!periodData.has(periodKey)) {
                                         periodData.set(periodKey, { current: {}, ly: {} ,label: periodKey2 });
                                     }
-                                    
+
                                     const whsData = periodData.get(periodKey).current;
                                     if (!whsData[entry.whs]) {
                                         whsData[entry.whs] = { dollars: 0, weight: 0, lines: 0 };
                                     }
-                                    
+
                                     whsData[entry.whs].dollars += entry.dollars;
                                     whsData[entry.whs].weight += entry.weight;
                                     whsData[entry.whs].lines += entry.lines;
                                 });
-                                
+
                                 // Process last year data if available
                                 if (dataLY && dataLY.length > 0) {
                                     dataLY.forEach(entry => {
@@ -411,22 +411,22 @@
                                         const yearSuffix = year.substring(2); // Last 2 digits
                                         const periodKey = `${monthName}`;  // '${yearSuffix}
                                         const periodKey2 = `${monthName} '${yearSuffix}`;
-                                        
+
                                         if (!periodData.has(periodKey)) {
                                             periodData.set(periodKey, { current: {}, ly: {},label: periodKey2 });
                                         }
-                                        
+
                                         const whsData = periodData.get(periodKey).ly;
                                         if (!whsData[entry.whs]) {
                                             whsData[entry.whs] = { dollars: 0, weight: 0, lines: 0 };
                                         }
-                                        
+
                                         whsData[entry.whs].dollars += entry.dollars;
                                         whsData[entry.whs].weight += entry.weight;
                                         whsData[entry.whs].lines += entry.lines;
                                     });
                                 }
-                                
+
                                 // Sort labels chronologically
                                 labels = Array.from(periodData.keys()).sort((a, b) => {
                                     // Parse month and year
@@ -434,18 +434,18 @@
                                     const [monthB, yearB] = b.split(" '");
                                     const yearDiff = parseInt(yearA) - parseInt(yearB);
                                     if (yearDiff !== 0) return yearDiff;
-                                    
+
                                     // Compare months if same year
                                     const monthOrder = { "Jan": 1, "Feb": 2, "Mar": 3, "Apr": 4, "May": 5, "Jun": 6,"Jul": 7, "Aug": 8, "Sep": 9, "Oct": 10, "Nov": 11, "Dec": 12 };
                                     return monthOrder[monthA] - monthOrder[monthB];
                                 });
-                                
+
                                 // Generate colors for each WHS
                                 const whsColors = {};
                                 whsArray.forEach((whs, index) => {
                                     whsColors[whs] = generateDistinctColors(whsArray.length)[index];
                                 });
-                                
+
                                 // Create datasets for each metric and warehouse
                                 whsArray.forEach(whs => {
                                     if (checkSales === 'on') {
@@ -464,7 +464,7 @@
                                             tension: 0.3,
                                             fill: false
                                         });
-                                        
+
                                         // Sales dataset for last year
                                         if (dataLY && dataLY.length > 0) {
                                             datasets.push({
@@ -491,7 +491,7 @@
                                         datasets.push({
                                             type: 'line',
                                             label: `Weight TY (WHS ${whs})`,
-                                            data: labels.map(period => 
+                                            data: labels.map(period =>
                                                 periodData.get(period)?.current[whs]?.weight || 0
                                             ),
                                             borderColor: whsColors[whs],
@@ -501,13 +501,13 @@
                                             tension: 0.3,
                                             fill: false
                                         });
-                                        
+
                                         // Weight dataset for last year
                                         if (dataLY && dataLY.length > 0) {
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Weight LY (WHS ${whs})`,
-                                                data: labels.map(period => 
+                                                data: labels.map(period =>
                                                     periodData.get(period)?.ly[whs]?.weight || 0
                                                 ),
                                                 borderColor: createLighterColor(whsColors[whs]),
@@ -526,7 +526,7 @@
                                         datasets.push({
                                             type: 'line',
                                             label: `Lines TY (WHS ${whs})`,
-                                            data: labels.map(period => 
+                                            data: labels.map(period =>
                                                 periodData.get(period)?.current[whs]?.lines || 0
                                             ),
                                             borderColor: whsColors[whs],
@@ -536,13 +536,13 @@
                                             tension: 0.3,
                                             fill: false
                                         });
-                                        
+
                                         // Lines dataset for last year
                                         if (dataLY && dataLY.length > 0) {
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Lines LY (WHS ${whs})`,
-                                                data: labels.map(period => 
+                                                data: labels.map(period =>
                                                     periodData.get(period)?.ly[whs]?.lines || 0
                                                 ),
                                                 borderColor: createLighterColor(whsColors[whs]),
@@ -557,28 +557,28 @@
                                     }
                                 });
                             }
-                            
+
                             // Quarterly data format handling
                             else if (dataFormat === "quarterly") {
                                 // Extract unique years and quarters
                                 const yearsSet = new Set();
                                 const periodsSet = new Set();
-                                
+
                                 data.forEach(entry => {
                                     const [quarter, year] = entry.year.split("-");
                                     yearsSet.add(year);
                                     periodsSet.add(quarter);
                                 });
-                                
+
                                 const years = Array.from(yearsSet).sort();
-                                const periods = Array.from(periodsSet).sort((a, b) => 
+                                const periods = Array.from(periodsSet).sort((a, b) =>
                                     parseInt(a.substring(1)) - parseInt(b.substring(1))
                                 );
-                                
+
                                 // Create groupedData structure for quarters
                                 const groupedData = new Map();
                                 const groupedDataLY = new Map();
-                                
+
                                 // Initialize data structures
                                 years.forEach(year => {
                                     groupedData.set(year, new Map());
@@ -586,7 +586,7 @@
                                         groupedData.get(year).set(quarter, new Map());
                                     });
                                 });
-                                
+
                                 // Process current year data
                                 data.forEach(entry => {
                                     const [quarter, year] = entry.year.split("-");
@@ -601,13 +601,13 @@
                                             dollars: 0, weight: 0, lines: 0
                                         });
                                     }
-                                    
+
                                     const whsData = groupedData.get(year).get(quarter).get(entry.whs);
                                     whsData.dollars += entry.dollars;
                                     whsData.weight += entry.weight;
                                     whsData.lines += entry.lines;
                                 });
-                                
+
                                 // Process last year data if available
                                 if (dataLY && dataLY.length > 0) {
                                     // Initialize LY structure
@@ -617,7 +617,7 @@
                                             groupedDataLY.get(year).set(quarter, new Map());
                                         });
                                     });
-                                    
+
                                     dataLY.forEach(entry => {
                                         const [quarter, year] = entry.year.split("-");
                                         if (!groupedDataLY.has(year)) {
@@ -631,24 +631,24 @@
                                                 dollars: 0, weight: 0, lines: 0
                                             });
                                         }
-                                        
+
                                         const whsData = groupedDataLY.get(year).get(quarter).get(entry.whs);
                                         whsData.dollars += entry.dollars;
                                         whsData.weight += entry.weight;
                                         whsData.lines += entry.lines;
                                     });
                                 }
-                                
+
                                 // Set labels to quarters
                                 labels = periods;
-                                
+
                                 // Create color map for years
                                 const yearColors = {};
                                 const generatedColors = generateDistinctColors(years.length);
                                 years.forEach((year, index) => {
                                     yearColors[year] = generatedColors[index];
                                 });
-                                
+
                                 // Create datasets
                                 whsArray.forEach(whs => {
                                     years.forEach(year => {
@@ -657,7 +657,7 @@
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Sales (WHS ${whs} - ${year})`,
-                                                data: periods.map(period => 
+                                                data: periods.map(period =>
                                                     groupedData.get(year)?.get(period)?.get(whs)?.dollars || 0
                                                 ),
                                                 borderColor: yearColors[year],
@@ -666,13 +666,13 @@
                                                 tension: 0.3,
                                                 fill: false
                                             });
-                                            
+
                                             // Last year sales
                                             if (dataLY && dataLY.length > 0) {
                                                 datasets.push({
                                                     type: 'line',
                                                     label: `Sales LY (WHS ${whs} - ${year})`,
-                                                    data: periods.map(period => 
+                                                    data: periods.map(period =>
                                                         groupedDataLY.get(year)?.get(period)?.get(whs)?.dollars || 0
                                                     ),
                                                     borderColor: yearColors[year],
@@ -685,13 +685,13 @@
                                                 });
                                             }
                                         }
-                                        
+
                                         if (checkWeight === 'on') {
                                             // Current year weight
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Weight (WHS ${whs} - ${year})`,
-                                                data: periods.map(period => 
+                                                data: periods.map(period =>
                                                     groupedData.get(year)?.get(period)?.get(whs)?.weight || 0
                                                 ),
                                                 borderColor: yearColors[year],
@@ -701,13 +701,13 @@
                                                 tension: 0.3,
                                                 fill: false
                                             });
-                                            
+
                                             // Last year weight
                                             if (dataLY && dataLY.length > 0) {
                                                 datasets.push({
                                                     type: 'line',
                                                     label: `Weight LY (WHS ${whs} - ${year})`,
-                                                    data: periods.map(period => 
+                                                    data: periods.map(period =>
                                                         groupedDataLY.get(year)?.get(period)?.get(whs)?.weight || 0
                                                     ),
                                                     borderColor: yearColors[year],
@@ -720,13 +720,13 @@
                                                 });
                                             }
                                         }
-                                        
+
                                         if (checkLines === 'on') {
                                             // Current year lines
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Lines (WHS ${whs} - ${year})`,
-                                                data: periods.map(period => 
+                                                data: periods.map(period =>
                                                     groupedData.get(year)?.get(period)?.get(whs)?.lines || 0
                                                 ),
                                                 borderColor: yearColors[year],
@@ -736,13 +736,13 @@
                                                 tension: 0.3,
                                                 fill: false
                                             });
-                                            
+
                                             // Last year lines
                                             if (dataLY && dataLY.length > 0) {
                                                 datasets.push({
                                                     type: 'line',
                                                     label: `Lines LY (WHS ${whs} - ${year})`,
-                                                    data: periods.map(period => 
+                                                    data: periods.map(period =>
                                                         groupedDataLY.get(year)?.get(period)?.get(whs)?.lines || 0
                                                     ),
                                                     borderColor: yearColors[year],
@@ -763,7 +763,7 @@
                                 // Group data by year/day and warehouse
                                 const groupedData = new Map();
                                 const groupedDataLY = new Map();
-                                
+
                                 // Process current year data
                                 data.forEach(entry => {
                                     if (!groupedData.has(entry.year)) {
@@ -774,13 +774,13 @@
                                             dollars: 0, weight: 0, lines: 0
                                         });
                                     }
-                                    
+
                                     const whsData = groupedData.get(entry.year).get(entry.whs);
                                     whsData.dollars += entry.dollars;
                                     whsData.weight += entry.weight;
                                     whsData.lines += entry.lines;
                                 });
-                                
+
                                 // Process last year data if available
                                 if (dataLY && dataLY.length > 0) {
                                     dataLY.forEach(entry => {
@@ -792,17 +792,17 @@
                                                 dollars: 0, weight: 0, lines: 0
                                             });
                                         }
-                                        
+
                                         const whsData = groupedDataLY.get(entry.year).get(entry.whs);
                                         whsData.dollars += entry.dollars;
                                         whsData.weight += entry.weight;
                                         whsData.lines += entry.lines;
                                     });
                                 }
-                                
+
                                 // Set labels to sorted years or days
                                 labels = Array.from(groupedData.keys()).sort();
-                                
+
                                 // Helper function to get time key
                                 function getTimeKey(yearLabel) {
                                     if (yearLabel.includes("Q")) {
@@ -814,7 +814,7 @@
                                     }
                                     return yearLabel;
                                 }
-                                
+
                                 // Create color map
                                 let uniqueKeys = new Set();
                                 data.forEach(item => {
@@ -832,22 +832,22 @@
                                     });
                                 });
                                 uniqueKeys = [...uniqueKeys];
-                                
+
                                 let colorMap = {};
                                 let generatedColors = generateDistinctColors(uniqueKeys.length);
                                 uniqueKeys.forEach((key, index) => {
                                     colorMap[key] = generatedColors[index];
                                 });
-                                
+
                                 // Function to get color
                                 function getDatasetColor(year, whs, metric, isLastYear = false) {
                                     const timeKey = getTimeKey(year);
-                                    const key = /^\d{2}$/.test(year) ? 
-                                        `${whs}_${metric}${isLastYear ? '_LY' : ''}` : 
+                                    const key = /^\d{2}$/.test(year) ?
+                                        `${whs}_${metric}${isLastYear ? '_LY' : ''}` :
                                         `${timeKey}_${whs}`;
                                     return colorMap[key] || "rgba(200, 200, 200, 0.6)";
                                 }
-                                
+
                                 // Create datasets
                                 whsArray.forEach(whs => {
                                     // Function to create dataset with unique colors
@@ -868,27 +868,27 @@
                                     if (checkSales === 'on') {
                                         // Current year data
                                         datasets.push(createDataset("Sales", "dollars", "Sales", 'yLeft', "Sales", false, groupedData));
-                                        
+
                                         // Last year data for daily format
                                         if ((dataFormat === "daily" || dataFormat === "yearly") && dataLY && dataLY.length > 0) {
                                             datasets.push(createDataset("Sales", "dollars", "Sales_LY", 'yLeft', "Sales", true, groupedDataLY));
                                         }
                                     }
-                                    
+
                                     if (checkWeight === 'on') {
                                         // Current year data
                                         datasets.push(createDataset("Weight", "weight", "Weight", 'yLeft', "Weight", false, groupedData));
-                                        
+
                                         // Last year data for daily/yearly format
                                         if ((dataFormat === "daily" || dataFormat === "yearly") && dataLY && dataLY.length > 0) {
                                             datasets.push(createDataset("Weight", "weight", "Weight_LY", 'yLeft', "Weight", true, groupedDataLY));
                                         }
                                     }
-                                    
+
                                     if (checkLines === 'on') {
                                         // Current year data
                                         datasets.push(createDataset("Lines", "lines", "Lines", 'yRight', "Lines", false, groupedData));
-                                        
+
                                         // Last year data for daily/yearly format
                                         if ((dataFormat === "daily" || dataFormat === "yearly") && dataLY && dataLY.length > 0) {
                                             datasets.push(createDataset("Lines", "lines", "Lines_LY", 'yRight', "Lines", true, groupedDataLY));
@@ -942,8 +942,8 @@
                                             x: {
                                                 title: {
                                                     display: true,
-                                                    text: dataFormat === "quarterly" ? 'Quarter' : 
-                                                        dataFormat === "monthly" ? 'Month' : 
+                                                    text: dataFormat === "quarterly" ? 'Quarter' :
+                                                        dataFormat === "monthly" ? 'Month' :
                                                         dataFormat === "daily" ? 'Day' : 'Year'
                                                 }
                                             }
@@ -984,7 +984,7 @@
                 //  End Ajax
             });
 
-            //// Trigger Click on init 
+            //// Trigger Click on init
             $("#updateCharts").trigger("click");
 
         });

Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php

@@ -13,16 +13,16 @@ Solon Sentinel Portal
         </div>
         <div class="card-body">
             <div class="card-body">
-                
+
                 <form>
-                    @csrf  
+                    @csrf
 
                     <div class="row mb-3">
                         <label for="inputEmail" class="col-sm-2 col-form-label">Date Range</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                    </div> 
+                    </div>
 
                     <div class="row mb-3">
                         <label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
@@ -30,13 +30,13 @@ Solon Sentinel Portal
                                 <select name="whs" class="form-control">
                                     <option value="*ALL">*ALL</option>
                                     @foreach($whs_array as $key)
-                                        <option value={{$key}}  
+                                        <option value={{$key}}
                                             @if($whs==$key) selected @endif
                                         >{{$key}}</option>
                                     @endforeach
                                 </select>
                             </div>
-                    </div> 
+                    </div>
 
                     <div class="form-group row">
                         <div class="col-xs-offset-2 col-xs-10">
@@ -58,7 +58,7 @@ Solon Sentinel Portal
                     {{($key=="IC")?'INTERCO':'EXTERNAL'}}
                 </div>
                 <div class="card-body">
-                
+
                 <figure class="highcharts-figure">
                 <div id="container{{($key=='IC')?'1':'2'}}"></div>
                 </figure>
@@ -112,7 +112,7 @@ if (s1 > s2){
 
 @foreach ($data as $key=>$value)
     var data{{$key}} = [
-    {id: '0.0',parent: '', name: 'Total', value: '{{ $data[$key]['total'] }}'}, 
+    {id: '0.0',parent: '', name: 'Total', value: '{{ $data[$key]['total'] }}'},
         { id: '1.1', parent: '0.0', name: 'Held', value: '{{ $data[$key]['HLD'] }}'},
             { id: '1.1.1', parent: '1.1', name: 'Financial Hold', value: '{{ $data[$key]['FinHld'] }}'},
                 { id: '1.1.1.1', parent: '1.1.1', name: 'Reserved', value: '{{ $data[$key]['FHResPick'] }}'},
@@ -142,7 +142,7 @@ title: { text: 'Interco Chart'},
 series: [{
     type: 'sunburst',
     data: dataIC,
-    
+
     allowDrillToNode: true,
     cursor: 'pointer',
     dataLabels: {
@@ -199,7 +199,7 @@ title: {  text: 'External Chart' },
 series: [{
     type: 'sunburst',
     data: dataEX,
-    
+
     allowDrillToNode: true,
     cursor: 'pointer',
     dataLabels: {
@@ -249,7 +249,7 @@ tooltip: {
 </script>
 
 <script>
-    
+
     $(document).ready(function() {
 
         // Date range init
@@ -272,6 +272,6 @@ tooltip: {
         });
 
     });
-        
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/fillBOL.blade.php

@@ -15,7 +15,7 @@
 								{{ session('success') }}
 							</div>
 						@endif
-						
+
 						@if(session('error'))
 							<div class="alert alert-danger">
 								{{ session('error') }}
@@ -51,9 +51,9 @@
     $(document).ready(function() {
 
 
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/fillBOL2.blade.php

@@ -15,7 +15,7 @@
 								{{ session('success') }}
 							</div>
 						@endif
-						
+
 						@if(session('error'))
 							<div class="alert alert-danger">
 								{{ session('error') }}
@@ -51,9 +51,9 @@
     $(document).ready(function() {
 
 
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/orderInquiry.blade.php

@@ -25,14 +25,14 @@ Solon Sentinel Portal - Order Inquiry
         <div class="card mb-4">
             <div class="card-header" style="line-height: 34px;">
                 <i class="fas fa-table me-1"></i>
-                
+
             </div>
             <div class="card-body">
                 <div class="card-body">
-                    
+
                     <form action="/gotoOrder" onSubmit="document.forms[0].order.value=document.forms[0].order.value+'-0';" method="POST">
-                        @csrf  
-                        
+                        @csrf
+
                         <div class="row mb-3">
                             <div class="col-sm-10">
                             <label for="inputOrder" class="col-sm-2 col-form-label">Please enter an order number</label>
@@ -40,7 +40,7 @@ Solon Sentinel Portal - Order Inquiry
                                 <input type="text" id="order" name="order" maxlength=6 length=4 aria-describedby="textHelpBlock">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
-                        </div> 
+                        </div>
                     </form>
 
                 </div>

Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReq.blade.php

@@ -29,21 +29,21 @@ Solon Sentinel Portal - Orders On Hold Summary
             </div>
             <div class="card-body">
                 <div class="card-body">
-                    
+
                     <form>
-                        @csrf  
-                        
+                        @csrf
+
                         <div class="row mb-3">
                             <div class="col-sm-10">
                             <label for="inputWhs" class="col-sm-2 col-form-label">Please choose Selling warehouse subset</label>
                                 @foreach($whs_list as $key => $val)
-                                    <input value="{{ $val->SLSRWH }}" id="whs" name="whs[]" type="checkbox" aria-describedby="textHelpBlock" 
+                                    <input value="{{ $val->SLSRWH }}" id="whs" name="whs[]" type="checkbox" aria-describedby="textHelpBlock"
                                     @if(array_key_exists($val->SLSRWH, $checked_whs)) checked @endif
-                                    > {{ $val->SLSRWH }} &nbsp; &nbsp; &nbsp;  
+                                    > {{ $val->SLSRWH }} &nbsp; &nbsp; &nbsp;
                                 @endforeach
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
-                        </div> 
+                        </div>
                     </form>
 
                 </div>
@@ -109,7 +109,7 @@ Solon Sentinel Portal - Orders On Hold Summary
             "columnDefs": [{ targets: [2, 3, 4, 5], className: 'dt-body-right' }, { targets: [1], className: 'dt-body-center' }],
             "footerCallback": function ( row, data, start, end, display ) {
             var api = this.api(), data;
- 
+
             // converting to interger to find total
             var intVal = function ( i ) {
                 return typeof i === 'string' ?
@@ -117,8 +117,8 @@ Solon Sentinel Portal - Orders On Hold Summary
                     typeof i === 'number' ?
                         i : 0;
             };
- 
-            // computing column Total of the complete result 
+
+            // computing column Total of the complete result
             var orderTotal = api
                 .column( 1 )
                 .data()
@@ -132,30 +132,30 @@ Solon Sentinel Portal - Orders On Hold Summary
                 .reduce( function (a, b) {
                     return intVal(a) + intVal(b);
                 }, 0 ).toFixed(2);
-				
+
 	        var whtotal = api
                 .column( 3 )
                 .data()
                 .reduce( function (a, b) {
                     return intVal(a) + intVal(b);
                 }, 0 ).toFixed(2);
-				
+
             var whtotalReserved = api
                 .column( 4 )
                 .data()
                 .reduce( function (a, b) {
                     return intVal(a) + intVal(b);
                 }, 0 ).toFixed(2);
-                    				
+
 	        var whtotalOnpick = api
             .column( 5 )
             .data()
             .reduce( function (a, b) {
                 return intVal(a) + intVal(b);
             }, 0 ).toFixed(2);
-			
-				
-            // Update footer by showing the total with the reference of the column index 
+
+
+            // Update footer by showing the total with the reference of the column index
             $( api.column( 0 ).footer() ).html('Total');
                 $( api.column( 1 ).footer() ).html(Intl.NumberFormat('en-US').format(orderTotal));
                 $( api.column( 2 ).footer() ).html('$ '+Intl.NumberFormat('en-US').format(totalTotal));

Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqOrder.blade.php

@@ -38,7 +38,7 @@
                 </ul>
             </div>
             <div class="card-body">
-                <div class="card-body">               
+                <div class="card-body">
                     <div class="tab-content" id="myTabContent">
                         <div class="tab-pane fade show active" id="order" role="tabpanel" aria-labelledby="order-tab">@include('m3::liberty-theme.partials.tabs.orders')</div>
                         <div class="tab-pane fade" id="details" role="tabpanel" aria-labelledby="details-tab">@include('m3::liberty-theme.partials.tabs.details')</div>
@@ -46,7 +46,7 @@
                     </div>
                 </div>
             </div>
-        </div>        
+        </div>
     </div>
 
     <!-- /.row -->
@@ -61,12 +61,12 @@
 
             $(document).on('click', '#DATE', function(e){
                 e.preventDefault();
-                $(this).attr("autocomplete", "off");  
+                $(this).attr("autocomplete", "off");
             });
 
             $(document).on('click', '#AMSPARE5', function(e){
                 e.preventDefault();
-                $(this).attr("autocomplete", "off");  
+                $(this).attr("autocomplete", "off");
             });
 
             $(document).on('click', '.close', function(e){
@@ -180,7 +180,7 @@
                     $('#blank-submit').html('Close');
                     $('#blank-close').addClass('close-modal3');
                     $('#blank-close').html('Back');
-                    $('#blank-modal').modal('show'); 
+                    $('#blank-modal').modal('show');
 
                 // Send ajax request
                 }else{
@@ -191,7 +191,7 @@
                         type:'POST',
                         url:'/ordersOnHoldReq/{{ $request->reason }}/{{ $request->order }}/saveShipToEdit',
                         data: {
-                            'SHSHA1': NEW_SHSHA1, 
+                            'SHSHA1': NEW_SHSHA1,
                             'SHSHA2': NEW_SHSHA2,
                             'SHSHCI': NEW_SHSHCI,
                             'SHSHST': NEW_SHSHST,
@@ -246,7 +246,7 @@
                     type:'POST',
                     url:'/ordersOnHoldReq/{{ $request->reason }}/{{ $request->order }}/saveShipToCheckBox',
                     data: {
-                        'check1': check1, 
+                        'check1': check1,
                         'check2': check2,
                         '_token': csrf
                     },
@@ -274,7 +274,7 @@
                         }
                     }
                 });
-                
+
             });
 
             // Comment editor / datatable tab

Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqReason.blade.php

@@ -49,7 +49,7 @@
                         </thead>
                         <tbody>
                         </tbody>
-                    </table>   
+                    </table>
                 </div>
             </div>
         </div>
@@ -78,7 +78,7 @@
                 { targets: [0, 1, 2, 3, 4, 5], className: 'text-center' }
             ],
         });
-        
+
     </script>
 
 

Modules/M3/Resources/views/liberty-theme/pages/palletQty.blade.php

@@ -10,7 +10,7 @@
         <div class="card mb-4">
             <div class="card-header">
                 @if($power_user->R428PWRUSR=="Y")
-                <button name="qtyAdd" type="button" class="btn btn-sm btn-info qtyAdd_click" id="qtyAdd_click" 
+                <button name="qtyAdd" type="button" class="btn btn-sm btn-info qtyAdd_click" id="qtyAdd_click"
                     data-AT9DPW="{{$power_user->R428CO.$power_user->R428PL.$power_user->R428WH}}">Add Record</button>
                 @endif
                 <!-- data-AT9DPW="$co.$plant.$whs">Add Record</button> -->
@@ -30,7 +30,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM709M as $key=>$val)
@@ -38,9 +38,9 @@
                                 <td></td>
                                 <td align="center">
                                     @if($power_user->R428PWRUSR=="Y")
-                                    <button name="qtyEdit{{trim($val->AT9PART)}}" type="submit" class="btn btn-sm btn-info qtyEdit_click" id="qtyEdit_click" 
-                                    data-AT9CO="{{$val->AT9CO}}" data-AT9PLT="{{trim($val->AT9PLT)}}" data-AT9WHS="{{trim($val->AT9WHS)}}" 
-                                    data-AT9PART="{{trim($val->AT9PART)}}" data-AT9QTY="{{$val->AT9QTY}}" data-AT9WRN="{{trim($val->AT9WRN)}}" 
+                                    <button name="qtyEdit{{trim($val->AT9PART)}}" type="submit" class="btn btn-sm btn-info qtyEdit_click" id="qtyEdit_click"
+                                    data-AT9CO="{{$val->AT9CO}}" data-AT9PLT="{{trim($val->AT9PLT)}}" data-AT9WHS="{{trim($val->AT9WHS)}}"
+                                    data-AT9PART="{{trim($val->AT9PART)}}" data-AT9QTY="{{$val->AT9QTY}}" data-AT9WRN="{{trim($val->AT9WRN)}}"
                                     data-AT9DPW="{{$val->AT9CO.$val->AT9PLT.$val->AT9WHS}}"
                                     >Edit</button>
                                     @endif
@@ -144,7 +144,7 @@
         $(document).on('click', '#submitQtyEdit', function() {
 
             var changes_detected = 0;
-            
+
             // Retrieve the values we need to pass on
             //var NEW_AT9CO      = $("#AT9CO").val();
             //var NEW_AT9PLT     = $("#AT9PLT").val();
@@ -194,9 +194,9 @@
                         url:'/palletQty/saveQtyEdit',
                         data: {
                             'AT9CO':      NEW_AT9CO,
-                            'AT9PLT':     NEW_AT9PLT, 
-                            'AT9WHS':     NEW_AT9WHS, 
-                            'AT9PART':    NEW_AT9PART, 
+                            'AT9PLT':     NEW_AT9PLT,
+                            'AT9WHS':     NEW_AT9WHS,
+                            'AT9PART':    NEW_AT9PART,
                             'AT9QTY':     NEW_AT9QTY,
                             'AT9WRN':     NEW_AT9WRN,
                             '_token': csrf
@@ -250,11 +250,11 @@
             var NEW_AT9WRN      = $("input[name=addAT9WRN]").val();
 
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
-            var form_post = {    
+            var form_post = {
                 'AT9CO':    NEW_AT9CO,
-                'AT9PLT':   NEW_AT9PLT, 
-                'AT9WHS':   NEW_AT9WHS, 
-                'AT9PART':  NEW_AT9PART, 
+                'AT9PLT':   NEW_AT9PLT,
+                'AT9WHS':   NEW_AT9WHS,
+                'AT9PART':  NEW_AT9PART,
                 'AT9QTY':   NEW_AT9QTY,
                 'AT9WRN':   NEW_AT9WRN,
                 '_token': csrf
@@ -311,9 +311,9 @@
                 });
             }
         });
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php

@@ -20,7 +20,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
                     @php $unprocessedMan = implode(', ', $unprocessedArr); @endphp
                     <b><p style="background-color:tomato;">Manifests: {!! $unprocessedMan !!} have some orders that still have a header picking status of B, and may not have closed in M3. Please investigate</b>
                 @endif
-                
+
             </div>
             <div class="card-body">
                 <table class="table table-striped table-bordered table-hover" id="datatablesSimple5" width="100%">
@@ -47,7 +47,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
                     <tbody>
                         @foreach($ICM705M1 as $key=>$val)
                             @php
-                                $closeinRed    = false; 
+                                $closeinRed    = false;
                                 $APLDCLOD      = trim($val->APLDCLOD)!="0" ? date('Y-m-d', strtotime($val->APLDCLOD)) : "";
                                 $APLDCLOT      = trim($val->APLDCLOT)!="0"?(strlen($val->APLDCLOT)==6?date('H:i:s', strtotime($val->APLDCLOT)):date('H:i:s', strtotime('0'.$val->APLDCLOT))):"";
                                 # Get current time as a timestamp
@@ -83,13 +83,13 @@ Solon Sentinel Portal - Trucks pending closure with M3
                                 <td>
                                     {{-- Link to Manifest Orders --}}
                                     @if( $val->APMANIFEST!="0" )
-                                        <a class="btn btn-link" target="_blank" href="{{ url('MFOrders', ['id' => trim($val->APMANIFEST)]) }}"> 
-                                            {{ trim($val->APMANIFEST)!="0"?$val->APMANIFEST:"" }} 
+                                        <a class="btn btn-link" target="_blank" href="{{ url('MFOrders', ['id' => trim($val->APMANIFEST)]) }}">
+                                            {{ trim($val->APMANIFEST)!="0"?$val->APMANIFEST:"" }}
                                         </a>
                                     @endif
                                     {{-- Close Button --}}
                                     @if( ($val->APMANIFEST!="0" && $val->APSPARE2!="P" && trim($val->APLDCLOD)!="") && !$closeinRed)
-                                        <button class="btn btn-sm btn-warning" id="submitManifest" data-shuser="{{trim($user)}}" data-manifest="{{trim($val->APMANIFEST)}}"  data-apco="{{trim($val->APCO)}}" data-apwhs="{{trim($val->APWHS)}}"> 
+                                        <button class="btn btn-sm btn-warning" id="submitManifest" data-shuser="{{trim($user)}}" data-manifest="{{trim($val->APMANIFEST)}}"  data-apco="{{trim($val->APCO)}}" data-apwhs="{{trim($val->APWHS)}}">
                                            Close
                                         </button>
                                     @elseif($val->APSPARE2=="P")
@@ -97,16 +97,16 @@ Solon Sentinel Portal - Trucks pending closure with M3
                                     @endif
                                 </td>
                                 {{-- MAK Show Retry Message instead of Contact MPBA --}}
-                                <td> {!! $val->APSPARE2=="P" && !$ManifestDelayed ? "In Process" : 
-                                        ( $val->APSPARE2=="P" && $ManifestDelayed ? 
+                                <td> {!! $val->APSPARE2=="P" && !$ManifestDelayed ? "In Process" :
+                                        ( $val->APSPARE2=="P" && $ManifestDelayed ?
                                             '<button class="btn btn-sm btn-danger" id="allowRetry"
                                                 data-shuser="' . trim($user) . '"
                                                 data-manifest="' . trim($val->APMANIFEST) . '"
                                                 data-apco="' . trim($val->APCO) . '"
                                                 data-apwhs="' . trim($val->APWHS) . '">
                                                 Failed – please reset
-                                            </button>' 
-                                        : '') 
+                                            </button>'
+                                        : '')
                                     !!}
                                 </td>
                                 <td> {{ $val->APDOCKDOOR }} </td>
@@ -179,9 +179,9 @@ Solon Sentinel Portal - Trucks pending closure with M3
         });
 
 
-        //  Submit Manifet 
+        //  Submit Manifet
         $(document).on('click','#submitManifest', function () {
-            if (confirm("Do you want to close this manifest in M3 immediately?")) { 
+            if (confirm("Do you want to close this manifest in M3 immediately?")) {
                 SHUSER   = $(this).data('shuser');
                 MANIFEST = $(this).data('manifest');
                 APCO     = $(this).data('apco');
@@ -225,7 +225,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
 
         // Allow Retry
         $(document).on('click','#allowRetry', function () {
-            if (confirm("Do you want to allow manifest Closing?")) { 
+            if (confirm("Do you want to allow manifest Closing?")) {
                 SHUSER   = $(this).data('shuser');
                 MANIFEST = $(this).data('manifest');
                 APCO     = $(this).data('apco');
@@ -286,6 +286,6 @@ Solon Sentinel Portal - Trucks pending closure with M3
         });
 
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userControl.blade.php

@@ -26,7 +26,7 @@
 
             <div class="card-body">
                 <div class="table-responsive">
-                
+
                 <table class="table table-striped table-bordered table-hover table-sm" id="datatablesSimple5" style="width:100%">
                     <thead>
                         <tr>
@@ -51,7 +51,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM428M as $key=>$val)
@@ -60,24 +60,24 @@
                                 <td align="center">
                                     @if($power_user[0]->R428PWRUSR=="Y" && trim($val->R428US)!="TWOSHIP" && trim($val->R428US)!="TWOSHIP303" && trim($val->R428US)!="TWOSHIP322")
                                         <!-- <a href="userControl/callCL?ACTION=P&USERID={{trim($val->R428US)}}">
-                                        <button name="userCallCLP{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click" 
+                                        <button name="userCallCLP{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click"
                                         title="Reset password for user {{trim($val->R428US)}}"
                                         ><i class="fas fa-lg fa-key"></i></button></a> -->
 
                                         @foreach($USER_INFO as $key2=>$val2)
                                             @if(trim($val2->USERPRF)==trim($val->R428US))
                                                 {{-- @if((trim($val2->STATUS)=="*DISABLED") ||
-                                                    (substr($val2->DATE_EXPIRED,0,10)!=NULL && substr($val2->DATE_EXPIRED,0,10)<=date('Y-m-d')) 
+                                                    (substr($val2->DATE_EXPIRED,0,10)!=NULL && substr($val2->DATE_EXPIRED,0,10)<=date('Y-m-d'))
                                                     || trim($val2->EXPIRED=='YES')) --}}
 
-                                                    <button name="userPassword{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userPassword_click" 
+                                                    <button name="userPassword{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userPassword_click"
                                                     id="userPassword_click"
                                                     title="Re-enable or Unexpire user {{trim($val->R428US)}}" data-R428US_PWD="{{trim($val->R428US)}}">
                                                     <i class="fas fa-lg fa-unlock-alt"></i></button>
                                                     @break
                                                 {{-- @elseif(trim($val2->STATUS)=="*DISABLED")
                                                     <a href="userControl/callCL?ACTION=R&USERID={{trim($val->R428US)}}">
-                                                    <button name="userCallCLR{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click"  
+                                                    <button name="userCallCLR{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click"
                                                     title="Re-enable user {{trim($val->R428US)}}"
                                                     ><i class="fas fa-lg fa-unlock-alt"></i></button></a>
                                                     @break  --}}
@@ -85,10 +85,10 @@
                                             @endif
                                         @endforeach
 
-                                        <button name="userEdit{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userEdit_click" id="userEdit_click" 
-                                        data-R428STS="{{$val->R428STS}}" data-R428US="{{trim($val->R428US)}}" data-R428FIRST="{{trim($val->R428FIRST)}}" 
-                                        data-R428FAMILY="{{trim($val->R428FAMILY)}}" data-R428EMAIL="{{trim(strtoLower($val->R428EMAIL))}}" 
-                                        data-R428EMPCDE="{{trim($val->R428EMPCDE)}}" data-R428ADMUSR="{{$val->R428ADMUSR}}" data-R428PWRUSR="{{$val->R428PWRUSR}}" 
+                                        <button name="userEdit{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userEdit_click" id="userEdit_click"
+                                        data-R428STS="{{$val->R428STS}}" data-R428US="{{trim($val->R428US)}}" data-R428FIRST="{{trim($val->R428FIRST)}}"
+                                        data-R428FAMILY="{{trim($val->R428FAMILY)}}" data-R428EMAIL="{{trim(strtoLower($val->R428EMAIL))}}"
+                                        data-R428EMPCDE="{{trim($val->R428EMPCDE)}}" data-R428ADMUSR="{{$val->R428ADMUSR}}" data-R428PWRUSR="{{$val->R428PWRUSR}}"
                                         data-R42811A="{{$val->R42811A}}"
                                         data-R42821A="{{$val->R42821A}}"
                                         data-R428DPW="{{$val->R428CO.$val->R428PL.$val->R428WH}}"
@@ -98,11 +98,11 @@
                                         data-MENU2OPT7="{{$val->MENU2OPT[6]}}" data-MENU2OPT8="{{$val->MENU2OPT[7]}}"
                                         data-MENU3OPT1="{{$val->MENU3OPT[0]}}" data-MENU3OPT2="{{$val->MENU3OPT[1]}}"
                                         data-MENU4OPT1="{{$val->MENU4OPT[0]}}" data-MENU4OPT2="{{$val->MENU4OPT[1]}}"
-                                        data-MENU4OPT3="{{$val->MENU4OPT[2]}}" 
+                                        data-MENU4OPT3="{{$val->MENU4OPT[2]}}"
                                         data-MENU5OPT1="{{$val->MENU5OPT[0]}}" data-MENU5OPT2="{{$val->MENU5OPT[1]}}"
                                         data-MENU5OPT3="{{$val->MENU5OPT[2]}}" data-MENU5OPT5="{{$val->MENU5OPT[4]}}"
                                         data-MENU6OPT1="{{$val->MENU6OPT[0]}}" data-MENU6OPT2="{{$val->MENU6OPT[1]}}"
-                                        data-MENU6OPT3="{{$val->MENU6OPT[2]}}" 
+                                        data-MENU6OPT3="{{$val->MENU6OPT[2]}}"
                                         title="Edit user {{trim($val->R428US)}} information">
                                         <i class="fas fa-edit " aria-hidden="true"></i></button>
                                     @endif
@@ -110,7 +110,7 @@
                                 <td> {{ $val->R428CO }} {{ $val->R428PL }} {{ $val->R428WH }} </td>
                                 <td>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        @if($IC670MR->WDCO==$val->R428CO && $IC670MR->WDPL==$val->R428PL && $IC670MR->WDWHS==$val->R428WH) 
+                                        @if($IC670MR->WDCO==$val->R428CO && $IC670MR->WDPL==$val->R428PL && $IC670MR->WDWHS==$val->R428WH)
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                             @break
                                         @endif
@@ -311,7 +311,7 @@
                 $("#R42821A").prop("checked", true);
             } else {
                 $("#R42821A").prop("checked", false);
-            } 
+            }
             // if($(this).data("menu2opt1")=='Y') {
             //     $("#MENU2OPT1").prop("checked", true);
             // } else {
@@ -442,7 +442,7 @@
             } else {
                 $("#R428STS").val("I");
             }
-        }); 
+        });
 
         // Change Admin user switch values (Edit)
         $("#R428ADMUSR").change(function() {
@@ -451,7 +451,7 @@
             } else {
                 $("#R428ADMUSR").val("N");
             }
-        }); 
+        });
 
         // Change Power user switch values (Edit)
         $("#R428PWRUSR").change(function() {
@@ -460,14 +460,14 @@
             } else {
                 $("#R428PWRUSR").val("N");
             }
-        }); 
+        });
         $("#R42811A").change(function() {
             if(this.checked) {
                 $("#R42811A").val("C");
             } else {
                 $("#R42811A").val("");
             }
-        }); 
+        });
 
         $("#R42821A").change(function() {
             if(this.checked) {
@@ -475,7 +475,7 @@
             } else {
                 $("#R42821A").val("N");
             }
-        }); 
+        });
 
         $("#MENU2OPT3").change(function() {
             if(this.checked) {
@@ -483,7 +483,7 @@
             } else {
                 $("#MENU2OPT3").val("N");
             }
-        }); 
+        });
 
         $("#MENU2OPT7").change(function() {
             if(this.checked) {
@@ -491,7 +491,7 @@
             } else {
                 $("#MENU2OPT7").val("N");
             }
-        }); 
+        });
 
         $("#MENU2OPT8").change(function() {
             if(this.checked) {
@@ -499,7 +499,7 @@
             } else {
                 $("#MENU2OPT8").val("N");
             }
-        }); 
+        });
 
         // Change Menu 3 Option switch values (Edit)
         $("#MENU3OPT1").change(function() {
@@ -508,7 +508,7 @@
             } else {
                 $("#MENU3OPT1").val("N");
             }
-        }); 
+        });
 
         $("#MENU3OPT2").change(function() {
             if(this.checked) {
@@ -516,7 +516,7 @@
             } else {
                 $("#MENU3OPT2").val("N");
             }
-        }); 
+        });
 
         // Change Menu 4 Option switch values (Edit)
         $("#MENU4OPT1").change(function() {
@@ -525,7 +525,7 @@
             } else {
                 $("#MENU4OPT1").val("N");
             }
-        }); 
+        });
 
         $("#MENU4OPT2").change(function() {
             if(this.checked) {
@@ -533,7 +533,7 @@
             } else {
                 $("#MENU4OPT2").val("N");
             }
-        }); 
+        });
 
         $("#MENU4OPT3").change(function() {
             if(this.checked) {
@@ -541,7 +541,7 @@
             } else {
                 $("#MENU4OPT3").val("N");
             }
-        }); 
+        });
 
         // Change Menu 5 Option switch values (Edit)
         $("#MENU5OPT1").change(function() {
@@ -550,7 +550,7 @@
             } else {
                 $("#MENU5OPT1").val("N");
             }
-        }); 
+        });
 
         $("#MENU5OPT2").change(function() {
             if(this.checked) {
@@ -558,7 +558,7 @@
             } else {
                 $("#MENU5OPT2").val("N");
             }
-        }); 
+        });
 
         $("#MENU5OPT3").change(function() {
             if(this.checked) {
@@ -566,7 +566,7 @@
             } else {
                 $("#MENU5OPT3").val("N");
             }
-        }); 
+        });
 
         $("#MENU5OPT5").change(function() {
             if(this.checked) {
@@ -574,7 +574,7 @@
             } else {
                 $("#MENU5OPT5").val("N");
             }
-        }); 
+        });
 
         // Change Menu 6 Option switch values (Edit)
         $("#MENU6OPT1").change(function() {
@@ -583,21 +583,21 @@
             } else {
                 $("#MENU6OPT1").val("N");
             }
-        }); 
+        });
         $("#MENU6OPT2").change(function() {
             if(this.checked) {
                 $("#MENU6OPT2").val("Y");
             } else {
                 $("#MENU6OPT2").val("N");
             }
-        }); 
+        });
         $("#MENU6OPT3").change(function() {
             if(this.checked) {
                 $("#MENU6OPT3").val("Y");
             } else {
                 $("#MENU6OPT3").val("N");
             }
-        }); 
+        });
 
         // Change Menu 2 Option switch values (Add)
         $("input[name=R428STS]").change(function() {
@@ -615,7 +615,7 @@
                 $("input[name=R428ADMUSR]").val("N");
             }
         });
-        
+
         $("input[name=R428PWRUSR]").change(function() {
             if(this.checked) {
                 $("input[name=R428PWRUSR]").val("Y");
@@ -796,7 +796,7 @@
         $(document).on('click', '#submitUserEdit', function() {
 
             var changes_detected = 0;
-            
+
             // Retrieve the values we need to pass on
             // R428DV R428PL R428WHS R428STS R428US R428FIRST R428FAMILY R428EMPCDE R428ADMUSR R428PWRUSR MENU2OPT -->
             var NEW_R428CO     = $("#R428DPW").val().substring(0,3);
@@ -817,28 +817,28 @@
 
             // var NEW_MENU2OPT1  = $("#MENU2OPT1").val();
             // var NEW_MENU2OPT2  = $("#MENU2OPT2").val();
-            var NEW_MENU2OPT3  = $("#MENU2OPT3").val(); 
+            var NEW_MENU2OPT3  = $("#MENU2OPT3").val();
             // var NEW_MENU2OPT4  = $("#MENU2OPT4").val();
             // var NEW_MENU2OPT5  = $("#MENU2OPT5").val();
             // var NEW_MENU2OPT6  = $("#MENU2OPT6").val();
             var NEW_MENU2OPT7  = $("#MENU2OPT7").val();
-            var NEW_MENU2OPT8  = $("#MENU2OPT8").val(); 
+            var NEW_MENU2OPT8  = $("#MENU2OPT8").val();
 
-            var NEW_MENU3OPT1  = $("#MENU3OPT1").val(); 
-            var NEW_MENU3OPT2  = $("#MENU3OPT2").val(); 
+            var NEW_MENU3OPT1  = $("#MENU3OPT1").val();
+            var NEW_MENU3OPT2  = $("#MENU3OPT2").val();
 
-            var NEW_MENU4OPT1  = $("#MENU4OPT1").val(); 
-            var NEW_MENU4OPT2  = $("#MENU4OPT2").val(); 
-            var NEW_MENU4OPT3  = $("#MENU4OPT3").val(); 
+            var NEW_MENU4OPT1  = $("#MENU4OPT1").val();
+            var NEW_MENU4OPT2  = $("#MENU4OPT2").val();
+            var NEW_MENU4OPT3  = $("#MENU4OPT3").val();
 
-            var NEW_MENU5OPT1  = $("#MENU5OPT1").val(); 
-            var NEW_MENU5OPT2  = $("#MENU5OPT2").val(); 
-            var NEW_MENU5OPT3  = $("#MENU5OPT3").val(); 
-            var NEW_MENU5OPT5  = $("#MENU5OPT5").val(); 
+            var NEW_MENU5OPT1  = $("#MENU5OPT1").val();
+            var NEW_MENU5OPT2  = $("#MENU5OPT2").val();
+            var NEW_MENU5OPT3  = $("#MENU5OPT3").val();
+            var NEW_MENU5OPT5  = $("#MENU5OPT5").val();
 
-            var NEW_MENU6OPT1  = $("#MENU6OPT1").val(); 
-            var NEW_MENU6OPT2  = $("#MENU6OPT2").val(); 
-            var NEW_MENU6OPT3  = $("#MENU6OPT3").val(); 
+            var NEW_MENU6OPT1  = $("#MENU6OPT1").val();
+            var NEW_MENU6OPT2  = $("#MENU6OPT2").val();
+            var NEW_MENU6OPT3  = $("#MENU6OPT3").val();
 
             // Retrieve old values
             var OLD_R428CO     = $("#OLD_R428CO").val();
@@ -858,28 +858,28 @@
 
             // var OLD_MENU2OPT1  = $("#OLD_MENU2OPT1").val();
             // var OLD_MENU2OPT2  = $("#OLD_MENU2OPT2").val();
-            var OLD_MENU2OPT3  = $("#OLD_MENU2OPT3").val(); 
+            var OLD_MENU2OPT3  = $("#OLD_MENU2OPT3").val();
             // var OLD_MENU2OPT4  = $("#OLD_MENU2OPT4").val();
             // var OLD_MENU2OPT5  = $("#OLD_MENU2OPT5").val();
             // var OLD_MENU2OPT6  = $("#OLD_MENU2OPT6").val();
             var OLD_MENU2OPT7  = $("#OLD_MENU2OPT7").val();
-            var OLD_MENU2OPT8  = $("#OLD_MENU2OPT8").val(); 
+            var OLD_MENU2OPT8  = $("#OLD_MENU2OPT8").val();
 
-            var OLD_MENU3OPT1  = $("#OLD_MENU3OPT1").val(); 
-            var OLD_MENU3OPT2  = $("#OLD_MENU3OPT2").val(); 
+            var OLD_MENU3OPT1  = $("#OLD_MENU3OPT1").val();
+            var OLD_MENU3OPT2  = $("#OLD_MENU3OPT2").val();
 
-            var OLD_MENU4OPT1  = $("#OLD_MENU4OPT1").val(); 
-            var OLD_MENU4OPT2  = $("#OLD_MENU4OPT2").val(); 
-            var OLD_MENU4OPT3  = $("#OLD_MENU4OPT3").val(); 
+            var OLD_MENU4OPT1  = $("#OLD_MENU4OPT1").val();
+            var OLD_MENU4OPT2  = $("#OLD_MENU4OPT2").val();
+            var OLD_MENU4OPT3  = $("#OLD_MENU4OPT3").val();
 
-            var OLD_MENU5OPT1  = $("#OLD_MENU5OPT1").val(); 
-            var OLD_MENU5OPT2  = $("#OLD_MENU5OPT2").val(); 
-            var OLD_MENU5OPT3  = $("#OLD_MENU5OPT3").val(); 
-            var OLD_MENU5OPT5  = $("#OLD_MENU5OPT5").val(); 
+            var OLD_MENU5OPT1  = $("#OLD_MENU5OPT1").val();
+            var OLD_MENU5OPT2  = $("#OLD_MENU5OPT2").val();
+            var OLD_MENU5OPT3  = $("#OLD_MENU5OPT3").val();
+            var OLD_MENU5OPT5  = $("#OLD_MENU5OPT5").val();
 
-            var OLD_MENU6OPT1  = $("#OLD_MENU6OPT1").val(); 
-            var OLD_MENU6OPT2  = $("#OLD_MENU6OPT2").val(); 
-            var OLD_MENU6OPT3  = $("#OLD_MENU6OPT3").val(); 
+            var OLD_MENU6OPT1  = $("#OLD_MENU6OPT1").val();
+            var OLD_MENU6OPT2  = $("#OLD_MENU6OPT2").val();
+            var OLD_MENU6OPT3  = $("#OLD_MENU6OPT3").val();
 
             // test fields that are not supposed to be blank/empty
             if (NEW_R428US=="" || NEW_R428FIRST=="" || NEW_R428FAMILY=="" || NEW_R428EMAIL=="" ) {
@@ -1021,7 +1021,7 @@
                 } else {
 
                     var csrf = document.querySelector('meta[name="csrf-token"]').content;
-                    
+
                     // console.log(NEW_R42821A); return false;
 
                     $.ajax({
@@ -1029,9 +1029,9 @@
                         url:'/userControl/saveUserEdit',
                         data: {
                             'R428CO':     NEW_R428CO,
-                            'R428PL':     NEW_R428PL, 
-                            'R428WH':     NEW_R428WH, 
-                            'R428STS':    NEW_R428STS, 
+                            'R428PL':     NEW_R428PL,
+                            'R428WH':     NEW_R428WH,
+                            'R428STS':    NEW_R428STS,
                             'R428US':     NEW_R428US,
                             'R428FIRST':  NEW_R428FIRST,
                             'R428FAMILY': NEW_R428FAMILY,
@@ -1043,24 +1043,24 @@
                             'R42821A':    NEW_R42821A,
                             // 'MENU2OPT1' : NEW_MENU2OPT1,
                             // 'MENU2OPT2' : NEW_MENU2OPT2,
-                            'MENU2OPT3' : NEW_MENU2OPT3, 
+                            'MENU2OPT3' : NEW_MENU2OPT3,
                             // 'MENU2OPT4' : NEW_MENU2OPT4,
                             // 'MENU2OPT5' : NEW_MENU2OPT5,
                             // 'MENU2OPT6' : NEW_MENU2OPT6,
                             'MENU2OPT7' : NEW_MENU2OPT7,
-                            'MENU2OPT8' : NEW_MENU2OPT8, 
-                            'MENU3OPT1' : NEW_MENU3OPT1, 
-                            'MENU3OPT2' : NEW_MENU3OPT2, 
-                            'MENU4OPT1' : NEW_MENU4OPT1, 
-                            'MENU4OPT2' : NEW_MENU4OPT2, 
-                            'MENU4OPT3' : NEW_MENU4OPT3, 
-                            'MENU5OPT1' : NEW_MENU5OPT1, 
-                            'MENU5OPT2' : NEW_MENU5OPT2, 
-                            'MENU5OPT3' : NEW_MENU5OPT3, 
-                            'MENU5OPT5' : NEW_MENU5OPT5, 
-                            'MENU6OPT1' : NEW_MENU6OPT1, 
-                            'MENU6OPT2' : NEW_MENU6OPT2, 
-                            'MENU6OPT3' : NEW_MENU6OPT3, 
+                            'MENU2OPT8' : NEW_MENU2OPT8,
+                            'MENU3OPT1' : NEW_MENU3OPT1,
+                            'MENU3OPT2' : NEW_MENU3OPT2,
+                            'MENU4OPT1' : NEW_MENU4OPT1,
+                            'MENU4OPT2' : NEW_MENU4OPT2,
+                            'MENU4OPT3' : NEW_MENU4OPT3,
+                            'MENU5OPT1' : NEW_MENU5OPT1,
+                            'MENU5OPT2' : NEW_MENU5OPT2,
+                            'MENU5OPT3' : NEW_MENU5OPT3,
+                            'MENU5OPT5' : NEW_MENU5OPT5,
+                            'MENU6OPT1' : NEW_MENU6OPT1,
+                            'MENU6OPT2' : NEW_MENU6OPT2,
+                            'MENU6OPT3' : NEW_MENU6OPT3,
                             '_token': csrf
                         },
                         success:function(data) {
@@ -1086,24 +1086,24 @@
                                 $("#R42821A").val(NEW_R42821A);
                                 // $("#MENU2OPT1").val(NEW_MENU2OPT1);
                                 // $("#MENU2OPT2").val(NEW_MENU2OPT2);
-                                $("#MENU2OPT3").val(NEW_MENU2OPT3); 
+                                $("#MENU2OPT3").val(NEW_MENU2OPT3);
                                 // $("#MENU2OPT4").val(NEW_MENU2OPT4);
                                 // $("#MENU2OPT5").val(NEW_MENU2OPT5);
                                 // $("#MENU2OPT6").val(NEW_MENU2OPT6);
                                 $("#MENU2OPT7").val(NEW_MENU2OPT7);
-                                $("#MENU2OPT8").val(NEW_MENU2OPT8); 
-                                $("#MENU3OPT1").val(NEW_MENU3OPT1); 
-                                $("#MENU3OPT2").val(NEW_MENU3OPT2); 
-                                $("#MENU4OPT1").val(NEW_MENU4OPT1); 
-                                $("#MENU4OPT2").val(NEW_MENU4OPT2); 
-                                $("#MENU4OPT3").val(NEW_MENU4OPT3); 
-                                $("#MENU5OPT1").val(NEW_MENU5OPT1); 
-                                $("#MENU5OPT2").val(NEW_MENU5OPT2); 
-                                $("#MENU5OPT3").val(NEW_MENU5OPT3); 
-                                $("#MENU5OPT5").val(NEW_MENU5OPT5); 
-                                $("#MENU6OPT1").val(NEW_MENU6OPT1); 
-                                $("#MENU6OPT2").val(NEW_MENU6OPT2); 
-                                $("#MENU6OPT3").val(NEW_MENU6OPT3); 
+                                $("#MENU2OPT8").val(NEW_MENU2OPT8);
+                                $("#MENU3OPT1").val(NEW_MENU3OPT1);
+                                $("#MENU3OPT2").val(NEW_MENU3OPT2);
+                                $("#MENU4OPT1").val(NEW_MENU4OPT1);
+                                $("#MENU4OPT2").val(NEW_MENU4OPT2);
+                                $("#MENU4OPT3").val(NEW_MENU4OPT3);
+                                $("#MENU5OPT1").val(NEW_MENU5OPT1);
+                                $("#MENU5OPT2").val(NEW_MENU5OPT2);
+                                $("#MENU5OPT3").val(NEW_MENU5OPT3);
+                                $("#MENU5OPT5").val(NEW_MENU5OPT5);
+                                $("#MENU6OPT1").val(NEW_MENU6OPT1);
+                                $("#MENU6OPT2").val(NEW_MENU6OPT2);
+                                $("#MENU6OPT3").val(NEW_MENU6OPT3);
                                 $("#OLD_R428CO").val(OLD_R428CO);
                                 $("#OLD_R428PL").val(OLD_R428PL);
                                 $("#OLD_R428WH").val(OLD_R428WH);
@@ -1120,24 +1120,24 @@
                                 $("#OLD_R42821A").val(OLD_R42821A);
                                 // $("#OLD_MENU2OPT1").val(OLD_MENU2OPT1);
                                 // $("#OLD_MENU2OPT2").val(OLD_MENU2OPT2);
-                                $("#OLD_MENU2OPT3").val(OLD_MENU2OPT3); 
+                                $("#OLD_MENU2OPT3").val(OLD_MENU2OPT3);
                                 // $("#OLD_MENU2OPT4").val(OLD_MENU2OPT4);
                                 // $("#OLD_MENU2OPT5").val(OLD_MENU2OPT5);
                                 // $("#OLD_MENU2OPT6").val(OLD_MENU2OPT6);
                                 $("#OLD_MENU2OPT7").val(OLD_MENU2OPT7);
-                                $("#OLD_MENU2OPT8").val(OLD_MENU2OPT8); 
-                                $("#OLD_MENU3OPT1").val(OLD_MENU3OPT1); 
-                                $("#OLD_MENU3OPT2").val(OLD_MENU3OPT2); 
-                                $("#OLD_MENU4OPT1").val(OLD_MENU4OPT1); 
-                                $("#OLD_MENU4OPT2").val(OLD_MENU4OPT2); 
-                                $("#OLD_MENU4OPT3").val(OLD_MENU4OPT3); 
-                                $("#OLD_MENU5OPT1").val(OLD_MENU5OPT1); 
-                                $("#OLD_MENU5OPT2").val(OLD_MENU5OPT2); 
-                                $("#OLD_MENU5OPT3").val(OLD_MENU5OPT3); 
-                                $("#OLD_MENU5OPT5").val(OLD_MENU5OPT5); 
-                                $("#OLD_MENU6OPT1").val(OLD_MENU6OPT1); 
-                                $("#OLD_MENU6OPT2").val(OLD_MENU6OPT2); 
-                                $("#OLD_MENU6OPT3").val(OLD_MENU6OPT3); 
+                                $("#OLD_MENU2OPT8").val(OLD_MENU2OPT8);
+                                $("#OLD_MENU3OPT1").val(OLD_MENU3OPT1);
+                                $("#OLD_MENU3OPT2").val(OLD_MENU3OPT2);
+                                $("#OLD_MENU4OPT1").val(OLD_MENU4OPT1);
+                                $("#OLD_MENU4OPT2").val(OLD_MENU4OPT2);
+                                $("#OLD_MENU4OPT3").val(OLD_MENU4OPT3);
+                                $("#OLD_MENU5OPT1").val(OLD_MENU5OPT1);
+                                $("#OLD_MENU5OPT2").val(OLD_MENU5OPT2);
+                                $("#OLD_MENU5OPT3").val(OLD_MENU5OPT3);
+                                $("#OLD_MENU5OPT5").val(OLD_MENU5OPT5);
+                                $("#OLD_MENU6OPT1").val(OLD_MENU6OPT1);
+                                $("#OLD_MENU6OPT2").val(OLD_MENU6OPT2);
+                                $("#OLD_MENU6OPT3").val(OLD_MENU6OPT3);
 
                                 if (data=="error profile") {
                                     //$('#blank-modal').modal('show');
@@ -1183,21 +1183,21 @@
             var NEW_R428PWRUSR  = $("input[name=R428PWRUSR]").val();
             var NEW_R42811A     = $("input[name=R42811A]").val();
             var NEW_R42821A     = $("input[name=R42821A]").val();
-            var NEW_MENU2OPT3   = $("input[name=MENU2OPT3]").val(); 
-            var NEW_MENU2OPT7   = $("input[name=MENU2OPT7]").val(); 
-            var NEW_MENU2OPT8   = $("input[name=MENU2OPT8]").val(); 
-            var NEW_MENU3OPT1   = $("input[name=MENU3OPT1]").val(); 
-            var NEW_MENU3OPT2   = $("input[name=MENU3OPT2]").val(); 
-            var NEW_MENU4OPT1   = $("input[name=MENU4OPT1]").val(); 
-            var NEW_MENU4OPT2   = $("input[name=MENU4OPT2]").val(); 
-            var NEW_MENU4OPT3   = $("input[name=MENU4OPT3]").val(); 
-            var NEW_MENU5OPT1   = $("input[name=MENU5OPT1]").val(); 
-            var NEW_MENU5OPT2   = $("input[name=MENU5OPT2]").val(); 
-            var NEW_MENU5OPT3   = $("input[name=MENU5OPT3]").val(); 
-            var NEW_MENU5OPT5   = $("input[name=MENU5OPT5]").val(); 
-            var NEW_MENU6OPT1   = $("input[name=MENU6OPT1]").val(); 
-            var NEW_MENU6OPT2   = $("input[name=MENU6OPT2]").val(); 
-            var NEW_MENU6OPT3   = $("input[name=MENU6OPT3]").val(); 
+            var NEW_MENU2OPT3   = $("input[name=MENU2OPT3]").val();
+            var NEW_MENU2OPT7   = $("input[name=MENU2OPT7]").val();
+            var NEW_MENU2OPT8   = $("input[name=MENU2OPT8]").val();
+            var NEW_MENU3OPT1   = $("input[name=MENU3OPT1]").val();
+            var NEW_MENU3OPT2   = $("input[name=MENU3OPT2]").val();
+            var NEW_MENU4OPT1   = $("input[name=MENU4OPT1]").val();
+            var NEW_MENU4OPT2   = $("input[name=MENU4OPT2]").val();
+            var NEW_MENU4OPT3   = $("input[name=MENU4OPT3]").val();
+            var NEW_MENU5OPT1   = $("input[name=MENU5OPT1]").val();
+            var NEW_MENU5OPT2   = $("input[name=MENU5OPT2]").val();
+            var NEW_MENU5OPT3   = $("input[name=MENU5OPT3]").val();
+            var NEW_MENU5OPT5   = $("input[name=MENU5OPT5]").val();
+            var NEW_MENU6OPT1   = $("input[name=MENU6OPT1]").val();
+            var NEW_MENU6OPT2   = $("input[name=MENU6OPT2]").val();
+            var NEW_MENU6OPT3   = $("input[name=MENU6OPT3]").val();
 
             // test fields that are not supposed to be blank/empty
             if (NEW_R428US=="" || NEW_R428FIRST=="" || NEW_R428FAMILY=="" || NEW_R428EMAIL=="" || NEW_R428DPW=="") {
@@ -1228,9 +1228,9 @@
                     url:'/userControl/saveUserAdd',
                     data: {
                         'R428CO':     NEW_R428CO,
-                        'R428PL':     NEW_R428PL, 
-                        'R428WH':     NEW_R428WH, 
-                        'R428STS':    NEW_R428STS, 
+                        'R428PL':     NEW_R428PL,
+                        'R428WH':     NEW_R428WH,
+                        'R428STS':    NEW_R428STS,
                         'R428US':     NEW_R428US,
                         'R428FIRST':  NEW_R428FIRST,
                         'R428FAMILY': NEW_R428FAMILY,
@@ -1240,21 +1240,21 @@
                         'R428PWRUSR': NEW_R428PWRUSR,
                         'R42811A':    NEW_R42811A,
                         'R42821A':    NEW_R42821A,
-                        'MENU2OPT3' : NEW_MENU2OPT3, 
-                        'MENU2OPT7' : NEW_MENU2OPT7, 
-                        'MENU2OPT8' : NEW_MENU2OPT8, 
-                        'MENU3OPT1' : NEW_MENU3OPT1, 
-                        'MENU3OPT2' : NEW_MENU3OPT2, 
-                        'MENU4OPT1' : NEW_MENU4OPT1, 
-                        'MENU4OPT2' : NEW_MENU4OPT2, 
-                        'MENU4OPT3' : NEW_MENU4OPT3, 
-                        'MENU5OPT1' : NEW_MENU5OPT1, 
-                        'MENU5OPT2' : NEW_MENU5OPT2, 
-                        'MENU5OPT3' : NEW_MENU5OPT3, 
-                        'MENU5OPT5' : NEW_MENU5OPT5, 
-                        'MENU6OPT1' : NEW_MENU6OPT1, 
-                        'MENU6OPT2' : NEW_MENU6OPT2, 
-                        'MENU6OPT3' : NEW_MENU6OPT3, 
+                        'MENU2OPT3' : NEW_MENU2OPT3,
+                        'MENU2OPT7' : NEW_MENU2OPT7,
+                        'MENU2OPT8' : NEW_MENU2OPT8,
+                        'MENU3OPT1' : NEW_MENU3OPT1,
+                        'MENU3OPT2' : NEW_MENU3OPT2,
+                        'MENU4OPT1' : NEW_MENU4OPT1,
+                        'MENU4OPT2' : NEW_MENU4OPT2,
+                        'MENU4OPT3' : NEW_MENU4OPT3,
+                        'MENU5OPT1' : NEW_MENU5OPT1,
+                        'MENU5OPT2' : NEW_MENU5OPT2,
+                        'MENU5OPT3' : NEW_MENU5OPT3,
+                        'MENU5OPT5' : NEW_MENU5OPT5,
+                        'MENU6OPT1' : NEW_MENU6OPT1,
+                        'MENU6OPT2' : NEW_MENU6OPT2,
+                        'MENU6OPT3' : NEW_MENU6OPT3,
                         '_token': csrf
                     },
                     success:function(data) {
@@ -1278,21 +1278,21 @@
                             $("#R428PWRUSR").val(NEW_R428PWRUSR);
                             $("#R42811A").val(NEW_R42811A);
                             $("#R42821A").val(NEW_R42821A);
-                            $("#MENU2OPT3").val(NEW_MENU2OPT3); 
-                            $("#MENU2OPT7").val(NEW_MENU2OPT7); 
-                            $("#MENU2OPT8").val(NEW_MENU2OPT8); 
-                            $("#MENU3OPT1").val(NEW_MENU3OPT1); 
-                            $("#MENU3OPT2").val(NEW_MENU3OPT2); 
-                            $("#MENU4OPT1").val(NEW_MENU4OPT1); 
-                            $("#MENU4OPT2").val(NEW_MENU4OPT2); 
-                            $("#MENU4OPT3").val(NEW_MENU4OPT3); 
-                            $("#MENU5OPT1").val(NEW_MENU5OPT1); 
-                            $("#MENU5OPT2").val(NEW_MENU5OPT2); 
-                            $("#MENU5OPT3").val(NEW_MENU5OPT3); 
-                            $("#MENU5OPT5").val(NEW_MENU5OPT5); 
-                            $("#MENU6OPT1").val(NEW_MENU6OPT1); 
-                            $("#MENU6OPT2").val(NEW_MENU6OPT2); 
-                            $("#MENU6OPT3").val(NEW_MENU6OPT3); 
+                            $("#MENU2OPT3").val(NEW_MENU2OPT3);
+                            $("#MENU2OPT7").val(NEW_MENU2OPT7);
+                            $("#MENU2OPT8").val(NEW_MENU2OPT8);
+                            $("#MENU3OPT1").val(NEW_MENU3OPT1);
+                            $("#MENU3OPT2").val(NEW_MENU3OPT2);
+                            $("#MENU4OPT1").val(NEW_MENU4OPT1);
+                            $("#MENU4OPT2").val(NEW_MENU4OPT2);
+                            $("#MENU4OPT3").val(NEW_MENU4OPT3);
+                            $("#MENU5OPT1").val(NEW_MENU5OPT1);
+                            $("#MENU5OPT2").val(NEW_MENU5OPT2);
+                            $("#MENU5OPT3").val(NEW_MENU5OPT3);
+                            $("#MENU5OPT5").val(NEW_MENU5OPT5);
+                            $("#MENU6OPT1").val(NEW_MENU6OPT1);
+                            $("#MENU6OPT2").val(NEW_MENU6OPT2);
+                            $("#MENU6OPT3").val(NEW_MENU6OPT3);
 
                             if (data=="success2") {
                                 $('#blank-modal').modal('hide');
@@ -1388,7 +1388,7 @@
                 $('#userPassword').modal('show');
                 alert("A password must be entered.");
                 $('#NEW_PASSWORD').focus();
-            } 
+            }
 //console.log('B2');
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
 //console.log('B3');
@@ -1425,6 +1425,6 @@
     });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php

@@ -15,13 +15,13 @@ Solon Sentinel Portal - Daily User Efficiency
             <div class="card-body">
                 <div class="card-body">
                     <form>
-                        @csrf  
+                        @csrf
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                        </div> 
+                        </div>
                         <div class="row mb-3">
                         <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
@@ -34,9 +34,9 @@ Solon Sentinel Portal - Daily User Efficiency
                                     @endforeach
                                 </select>
                             </div>
-                        </div> 
+                        </div>
                         <div class="form-group row">
-                            <div class="col-xs-offset-2 col-xs-10"> 
+                            <div class="col-xs-offset-2 col-xs-10">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
                         </div>
@@ -70,9 +70,9 @@ Solon Sentinel Portal - Daily User Efficiency
                         </tr>
                     </thead>
                     <tbody>
-                    @if($no_data=="Y") 
+                    @if($no_data=="Y")
                         <tr> <td colspan=12 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    @else 
+                    @else
                         @foreach($statistic4 as $key=>$val)
                             <tr>
                                 <td></td>
@@ -85,10 +85,10 @@ Solon Sentinel Portal - Daily User Efficiency
                                 {{-- <!--<td style="text-align:right"> ${{ number_format($val->A5VALUE,2) }} </td>--> --}}
                                 <td style="text-align:right"> {{ number_format($val->A5PICKED,0) }} </td>
                                 <td style="text-align:right"> {{ $val->A5PART }} </td>
-                                <td style="text-align:left"> 
+                                <td style="text-align:left">
                                     <!-- <a href="http://{{$_SERVER['SERVER_NAME']}}:{{ (stristr($_SERVER['DOCUMENT_ROOT'],'liv')?$request->ports['live']:$request->ports['test'])}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">  -->
-                                    <a href="http://{{$_SERVER['HTTP_HOST']}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}"> 
-                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }} 
+                                    <a href="http://{{$_SERVER['HTTP_HOST']}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">
+                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }}
                                     </a>
                                 </td>
                                 <td style="text-align:left"> {{ $val->A4SHSHNM }} </td>
@@ -179,7 +179,7 @@ Solon Sentinel Portal - Daily User Efficiency
                         </tr>
                 </table>
             </div>
-        </div>   
+        </div>
         <div class="card mb-4">
             <div class="card-header">
                 <i class="fas fa-table me-1"></i>
@@ -209,7 +209,7 @@ Solon Sentinel Portal - Daily User Efficiency
                     </tr>
                 </table>
             </div>
-        </div>   
+        </div>
 
     </div>
     <!-- /.row -->
@@ -241,6 +241,6 @@ Solon Sentinel Portal - Daily User Efficiency
         });
 
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php

@@ -14,16 +14,16 @@ Solon Sentinel Portal - userPickingStats v4
             </div>
             <div class="card-body">
                 <div class="card-body">
-                    
+
                     <form>
-                        @csrf  
-                        
+                        @csrf
+
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                        </div> 
+                        </div>
                         <div class="row mb-3">
                         <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
@@ -36,9 +36,9 @@ Solon Sentinel Portal - userPickingStats v4
                                     @endforeach
                                 </select>
                             </div>
-                        </div> 
+                        </div>
                         <div class="form-group row">
-                            <div class="col-xs-offset-2 col-xs-10"> 
+                            <div class="col-xs-offset-2 col-xs-10">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
                         </div>
@@ -71,9 +71,9 @@ Solon Sentinel Portal - userPickingStats v4
                         </tr>
                     </thead>
                     <tbody>
-                    @if($no_data=="Y") 
+                    @if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    @else 
+                    @else
                         @foreach($statistic4 as $key=>$val)
                             <tr>
                                 <td> {{ $val->CODE }} </td>
@@ -84,9 +84,9 @@ Solon Sentinel Portal - userPickingStats v4
                                 <!--<td style="text-align:right"> ${{ number_format($val->A5VALUE,2) }} </td>-->
                                 <td style="text-align:right"> {{ number_format($val->A5PICKED,0) }} </td>
                                 <td style="text-align:right"> {{ $val->A5PART }} </td>
-                                <td style="text-align:left"> 
-                                    <a href="http://{{$_SERVER['SERVER_ADDR']}}:{{ (stristr($_SERVER['DOCUMENT_ROOT'],'liv')?$request->ports['live']:$request->ports['test'])}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}"> 
-                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }} 
+                                <td style="text-align:left">
+                                    <a href="http://{{$_SERVER['SERVER_ADDR']}}:{{ (stristr($_SERVER['DOCUMENT_ROOT'],'liv')?$request->ports['live']:$request->ports['test'])}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">
+                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }}
                                     </a>
                                 </td>
                                 <td style="text-align:left"> {{ $val->A4SHSHNM }} </td>
@@ -179,7 +179,7 @@ Solon Sentinel Portal - userPickingStats v4
                         </tr>
                 </table>
             </div>
-        </div>   
+        </div>
         <div class="card mb-4">
             <div class="card-header">
                 <i class="fas fa-table me-1"></i>
@@ -209,7 +209,7 @@ Solon Sentinel Portal - userPickingStats v4
                     </tr>
                 </table>
             </div>
-        </div>   
+        </div>
 
     </div>
     <!-- /.row -->
@@ -241,6 +241,6 @@ Solon Sentinel Portal - userPickingStats v4
         });
 
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php

@@ -15,13 +15,13 @@ Solon Sentinel Portal - Graph User Efficiency
             <div class="card-body">
                 <div class="card-body">
                     <form>
-                        @csrf  
+                        @csrf
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date Range</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                        </div> 
+                        </div>
                         <div class="row mb-3">
                             <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
@@ -33,9 +33,9 @@ Solon Sentinel Portal - Graph User Efficiency
                                     @endforeach
                                 </select>
                             </div>
-                        </div> 
+                        </div>
                         <div class="form-group row">
-                            <div class="col-xs-offset-2 col-xs-10"> 
+                            <div class="col-xs-offset-2 col-xs-10">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
                         </div>
@@ -126,7 +126,7 @@ Solon Sentinel Portal - Graph User Efficiency
             }
         //}
     @endforeach
-    
+
     var user_name;
     @foreach($user_array as $key=>$val)
         if("{{$val['userprf']}}"=="{{$user}}") {
@@ -162,11 +162,11 @@ Solon Sentinel Portal - Graph User Efficiency
 
         series: [{
             data: performance,
-            showInLegend: false, 
+            showInLegend: false,
         }],
 
     });
-    
+
 
     $(document).ready(function() {
 
@@ -190,6 +190,6 @@ Solon Sentinel Portal - Graph User Efficiency
         });
 
     });
-        
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userProfile.blade.php

@@ -15,7 +15,7 @@ Change Warehouse
 								{{ session('success') }}
 							</div>
 						@endif
-						
+
 						@if(session('error'))
 							<div class="alert alert-danger">
 								{{ session('error') }}
@@ -46,7 +46,7 @@ Change Warehouse
 												'selected' : '';
 										@endphp
 										<option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"  {{ $selected }}>
-											{{ trim(Str::upper($IC670MR->WDWNAM)) }}  
+											{{ trim(Str::upper($IC670MR->WDWNAM)) }}
 										</option>
 									@endforeach
 								</select>

Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php

@@ -4,9 +4,9 @@
             <div class="nav">
 
                 @if($execUser!='Y' )
-                
+
                 @if($csr!="Y" )
-                               
+
                 <a class="nav-link" href="/">
                     <div class="sb-nav-link-icon"><i class="fas fa-tachometer-alt"></i></div>
                     Dashboard
@@ -44,7 +44,7 @@
                     User Control
                 </a>
 
-                @if($power_users=='Y' || $admin_users=='Y') 
+                @if($power_users=='Y' || $admin_users=='Y')
                 <a class="nav-link  {{ request()->is('carrierMaint') || request()->is('carrierMaint/*') ? 'active' : '' }}"
                     href="{{ route('m3.carrierMaint') }}">
                     <i class="fa-fw fas fa-briefcase  mr-1"></i>
@@ -62,14 +62,14 @@
                     <i class="fa-fw fas fa-briefcase  mr-1"></i>
                     M3 Delivery Methods
                 </a>
-                
+
                 <a class="nav-link  {{ request()->is('OrderLinesOfClosedOrder') || request()->is('OrderLinesOfClosedOrder/*') ? 'active' : '' }}"
                     href="{{ route('m3.OrderLinesOfClosedOrder') }}">
                     <i class="fa-fw fas fa-file-excel  mr-1"></i>
                     Daily Closed order lines report
                 </a>
 
-                @if($power_users=='Y' || $admin_users=='Y') 
+                @if($power_users=='Y' || $admin_users=='Y')
                 <a class="nav-link  {{ request()->is('userPickingStats4') || request()->is('userPickingStats4/*') ? 'active' : '' }}"
                     href="{{ route('m3.userPickingStats4') }}">
                     <i class="fa-fw fas fa-user-friends mr-1"></i>
@@ -86,7 +86,7 @@
                     <i class="fa-fw fas fa-chart-bar mr-1"></i>
                     Truck pending closure in M3
                 </a>
-                @endif 
+                @endif
 
                 {{-- Distribution whs addresses --}}
                 <a class="nav-link  {{ request()->is('ship-to') || request()->is('ship-to/*') ? 'active' : '' }}" href="{{ url('ship-to') }}">
@@ -108,21 +108,21 @@
                 <a class="nav-link  {{ request()->is('whsePerf') || request()->is('whsePerf/*') ? 'active' : '' }}"
                     href="{{ route('m3.whsePerf') }}">
                     <i class="fa-fw fas fa-chart-bar  mr-1"></i>
-                    OTTC 
+                    OTTC
                 </a>
 
                 {{-- Scan Boxes to Pallet --}}
                 {{-- <a class="nav-link  {{ request()->is('BoxPackToPallet') || request()->is('BoxPackToPallet/*') ? 'active' : '' }}"
                     href="{{ route('m3.BoxPackToPallet') }}">
                     <i class="fa-fw fas fa-chart-bar  mr-1"></i>
-                    Scan Boxes to Pallet 
+                    Scan Boxes to Pallet
                 </a> --}}
 
                 {{-- Sentinel Home --}}
                 <a class="nav-link " href="{{ env("APP_URL") }}/php/SentinelHome.php">
                     <i class="fa-fw fas fa-chart-bar mr-1"></i>Sentinel Home</a>
 
-                @endif   
+                @endif
 
                 @endif   {{-- Exec User --}}
 

Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php

@@ -28,7 +28,7 @@
 							<td><b>2ship Carrier Code</b></td> <!-- NUMERIC -->
 							<td class="text-right">
 								<input type="hidden" name="OLD_TWOSHIPCARRIERCODE" id="OLD_TWOSHIPCARRIERCODE">
-								<input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE" 
+								<input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE"
 									onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required>
 							</td>
 						</tr>
@@ -47,7 +47,7 @@
 							<td><b>ERP Carrier Code</b></td> <!-- ALPHA -->
 							<td class="text-right">
 								<input type="hidden" name="OLD_CASPR10A01" id="OLD_CASPR10A01">
-								<!--#553 <input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01" 
+								<!--#553 <input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01"
 									onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required> -->
 								<input type="text" maxlength="10" class="myinput" name="CASPR10A01" id="CASPR10A01" required>
 							</td>
@@ -58,7 +58,7 @@
 								Overnight
 								<div class="col-sm-1 form-check form-check-inline form-switch">
 									<input type="hidden" name="OLD_CASPR1A01" id="OLD_CASPR1A01">
-									<input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="">	
+									<input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="">
 								</div>
 								When closing truck
 							</td>

Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php

@@ -16,14 +16,14 @@
 							<td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
 							<td>
 							<div class="mb-3">
-                                <select class="form-select-sm" id="addAT9DPW" 
-                                @if($power_user->R428PWRUSR=="N") 
-                                    disabled 
+                                <select class="form-select-sm" id="addAT9DPW"
+                                @if($power_user->R428PWRUSR=="N")
+                                    disabled
                                 @endif
                                 >
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
-                                        data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}" 
+                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
+                                        data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}"
                                         data-AT9DPW="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}">
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>

Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php

@@ -19,7 +19,7 @@
                                 <select class="form-select-sm" name="AT9DPW" id="AT9DPW" required>
                                     <!--<option value="" selected disabled hidden>Select</option>-->
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>

Modules/M3/Resources/views/liberty-theme/partials/modals/shipToCheckBox.blade.php

@@ -11,7 +11,7 @@
 				<div class="col-xs-5">
 					<label class="checkbox-inline">
 						<input type="checkbox" name="check1" id="check1" value="1"> Ignore address checker for all future releases of this order
-					</label> 
+					</label>
 				</div>
 			</div>
 			<div class="form-group" style="clear: both; margin-top:20px;">
@@ -20,7 +20,7 @@
 						<input type="checkbox" name="check2" id="check2" value="1"> Ignore address checker if the above address is re-used on a future order
 					</label>
 				</div>
-			</div> 
+			</div>
         </div>
 		<div class="modal-footer">
 		  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>

Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php

@@ -52,7 +52,7 @@
                                 <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Div-Plt-Whs" required>
                                     <option value="" selected disabled hidden>Select a value</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-co="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
 										data-dpw="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}

Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php

@@ -22,7 +22,7 @@
 							<input type="hidden" id="R428PL" name="R428PL">
 							<input type="hidden" id="R428WH" name="R428WH">
 							<td><b>Status</b></td> <!-- Switch Active/Inactive -->
-							<td class="text-right">								
+							<td class="text-right">
 								<div class="form-check form-switch">
 									<input type="hidden" id="OLD_R428STS" name="OLD_R428STS">
 									<input type="checkbox" class="form-check-input" role="switch" id="R428STS" name="R428STS" data-on="A" data-off="I">
@@ -72,7 +72,7 @@
                                 <select class="form-select-sm" id="R428DPW" required>
                                     <option value="" selected disabled hidden>Select</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-co="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>
@@ -90,7 +90,7 @@
 				<table class="table table-condensed">
 						<tr>
 							<td><b>Admin user</b></td> <!-- SWITCH Y/N -->
-							<td class="text-right">								
+							<td class="text-right">
 								<div class="form-check form-switch">
 									<input type="hidden" id="OLD_R428ADMUSR" name="OLD_R428ADMUSR">
 									<input type="checkbox" class="form-check-input" role="switch" id="R428ADMUSR" name="R428ADMUSR" data-on="Y" data-off="N">

Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php

@@ -15,7 +15,7 @@
                         <table class="table table-condensed">
                         <tr>
                             <td><b>Enter a new password to re-enable user</b></td> <!-- Password -->
-                            <td class="text-right">								
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" name="R428US_PWD" id="R428US_PWD" value="">
                                     <input type="password" maxlength="10" length="7" class="myinput" name="NEW_PASSWORD" id="NEW_PASSWORD" required>

Modules/M3/Resources/views/liberty-theme/partials/scripts.blade.php

@@ -5,7 +5,7 @@
 <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity= "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
 
-@php 
+@php
     // ReplenishSettingsController
     $routeArray = app('request')->route()->getAction();
     $controllerAction = class_basename($routeArray['controller']);
@@ -27,7 +27,7 @@
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
 <script type="text/javascript" src="https://cdn.datatables.net/v/bs5/jszip-2.5.0/dt-1.11.3/af-2.3.7/b-2.0.1/b-colvis-2.0.1/b-html5-2.0.1/b-print-2.0.1/cr-1.5.4/date-1.1.1/fc-4.0.0/fh-3.2.0/kt-2.6.4/r-2.2.9/rg-1.1.3/rr-1.2.8/sc-2.0.5/sb-1.2.2/sp-1.4.0/sl-1.3.3/datatables.min.js"></script>
-    
+
 <script type="text/javascript" src="{{ route('m3.assets', ['path' => 'liberty-theme/js/datatables-simple-demo.js']) }}"></script>
 {{-- Data Bootstrap Responsive --}}
 <script type="text/javascript" src="https://cdn.datatables.net/responsive/2.4.1/js/dataTables.responsive.min.js"></script>
@@ -57,7 +57,7 @@
 <script src="//cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 
 <script>
-    
+
 window.addEventListener('DOMContentLoaded', event => {
 
 // Toggle the side navigation

Modules/M3/Resources/views/liberty-theme/partials/tabs/comments.blade.php

@@ -10,7 +10,7 @@
 						<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
 						<b>Order Status:</b> {{ $order->SHOST }}<br>
 						<b>Fill Code:</b> {{ $order->SHALBO }}<br>
-						@foreach ($releases as $key=>$val) 
+						@foreach ($releases as $key=>$val)
 							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white" >{{ $val->SLONO }}-{{ $val->SLRLNO }}
 								<i class="fa fa-eye pull-right"></i></a><br>
 						@endforeach

Modules/M3/Resources/views/liberty-theme/partials/tabs/details.blade.php

@@ -10,7 +10,7 @@
 						<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
 						<b>Order Status:</b> {{ $order->SHOST }}<br>
 						<b>Fill Code:</b> {{ $order->SHALBO }}<br>
-						@foreach ($releases as $key=>$val) 
+						@foreach ($releases as $key=>$val)
 							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white" >{{ $val->SLONO }}-{{ $val->SLRLNO }}
 								<i class="fa fa-eye pull-right"></i></a><br>
 						@endforeach
@@ -33,7 +33,7 @@
 					</div>
 				</div>
 			</div>
-		  
+
 			<div class="table-responsive">
 				<table class="table table-condensed">
 					<thead>

Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php

@@ -10,8 +10,8 @@
 						<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
 						<b>Order Status:</b> {{ $order->SHOST }}<br>
 						<b>Fill Code:</b> {{ $order->SHALBO }}<br>
-						@foreach ($releases as $key=>$val) 
-							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white"> {{ $val->SLONO }}-{{ $val->SLRLNO }} 
+						@foreach ($releases as $key=>$val)
+							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white"> {{ $val->SLONO }}-{{ $val->SLRLNO }}
 								<i class="fa fa-eye pull-right"></i></a><br>
 						@endforeach
 					</p>

Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php

@@ -22,7 +22,7 @@
                                         $selected = $UserCO == $IC670MR->WDCO && $UserWHS == $IC670MR->WDWHS && $UserPL == $IC670MR->WDPL ? 'selected' : '';
                                     @endphp
                                     <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"  {{ $selected }}>
-                                        {{ trim(Str::upper($IC670MR->WDWNAM)) }}  
+                                        {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                     </option>
                                 @endforeach
                             </select>