m3 Security Fixes

Modules/M3/Resources/lang/en/validation.php

@@ -1,5 +1,7 @@
 <?php
 
+$selectedInvalidMessage = $selectedInvalidMessage;
+
 return [
 
     /*
@@ -42,7 +44,7 @@ return [
     'distinct' => 'The :attribute field has a duplicate value.',
     'email' => 'The :attribute must be a valid email address.',
     'ends_with' => 'The :attribute must end with one of the following: :values.',
-    'exists' => 'The selected :attribute is invalid.',
+    'exists' => $selectedInvalidMessage,
     'file' => 'The :attribute must be a file.',
     'filled' => 'The :attribute field must have a value.',
     'gt' => [
@@ -58,7 +60,7 @@ return [
         'array' => 'The :attribute must have :value items or more.',
     ],
     'image' => 'The :attribute must be an image.',
-    'in' => 'The selected :attribute is invalid.',
+    'in' => $selectedInvalidMessage,
     'in_array' => 'The :attribute field does not exist in :other.',
     'integer' => 'The :attribute must be an integer.',
     'ip' => 'The :attribute must be a valid IP address.',
@@ -92,7 +94,7 @@ return [
         'array' => 'The :attribute must have at least :min items.',
     ],
     'multiple_of' => 'The :attribute must be a multiple of :value.',
-    'not_in' => 'The selected :attribute is invalid.',
+    'not_in' => $selectedInvalidMessage,
     'not_regex' => 'The :attribute format is invalid.',
     'numeric' => 'The :attribute must be a number.',
     'password' => 'The password is incorrect.',

Modules/M3/Resources/public/liberty-theme/assets/demo/chart-area-demo.js

@@ -3,9 +3,9 @@ Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSyste
 Chart.defaults.global.defaultFontColor = '#292b2c';
 
 // Area Chart Example
-var ctx = document.getElementById("myAreaChart");
+let ctx = document.getElementById("myAreaChart");
 if (ctx) {
-var myLineChart = new Chart(ctx, {
+let myLineChart = new Chart(ctx, {
   type: 'line',
   data: {
     labels: ["Mar 1", "Mar 2", "Mar 3", "Mar 4", "Mar 5", "Mar 6", "Mar 7", "Mar 8", "Mar 9", "Mar 10", "Mar 11", "Mar 12", "Mar 13"],

Modules/M3/Resources/public/liberty-theme/assets/demo/chart-bar-demo.js

@@ -3,9 +3,9 @@ Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSyste
 Chart.defaults.global.defaultFontColor = '#292b2c';
 
 // Bar Chart Example
-var ctx = document.getElementById("myBarChart");
+let ctx = document.getElementById("myBarChart");
 if (ctx) {
-var myLineChart = new Chart(ctx, {
+let myLineChart = new Chart(ctx, {
   type: 'bar',
   data: {
     labels: ["January", "February", "March", "April", "May", "June"],

Modules/M3/Resources/public/liberty-theme/assets/demo/chart-pie-demo.js

@@ -3,9 +3,9 @@ Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSyste
 Chart.defaults.global.defaultFontColor = '#292b2c';
 
 // Pie Chart Example
-var ctx = document.getElementById("myPieChart");
+let ctx = document.getElementById("myPieChart");
 if (ctx){
-var myPieChart = new Chart(ctx, {
+let myPieChart = new Chart(ctx, {
   type: 'pie',
   data: {
     labels: ["Blue", "Red", "Yellow", "Green"],

Modules/M3/Resources/public/liberty-theme/js/scripts.js

@@ -100,14 +100,14 @@ $(function() {
                     stripHtml: true
                 },
                 customize: function(xlsx,btnObj, tableInst) {
-                    var sheet = xlsx.xl.worksheets['sheet1.xml'];
-                    var cellIndexes = tableInst.cells(".bg-danger").indexes();
-                    for (var i = 0; i < cellIndexes.length; i++) {
-                        var cellIndex = cellIndexes[i];
-                        var tblRow = cellIndex['row']+3; // adjusted from 0 indexed
-                        var tblCol = cellIndex['column']; // adjusted from 0 indexed
-                        var xlCol = numberToLetters(tblCol);
-                        var excelCell = xlCol+tblRow;
+                    let sheet = xlsx.xl.worksheets['sheet1.xml'];
+                    let cellIndexes = tableInst.cells(".bg-danger").indexes();
+                    for (let i = 0; i < cellIndexes.length; i++) {
+                        let cellIndex = cellIndexes[i];
+                        let tblRow = cellIndex['row']+3; // adjusted from 0 indexed
+                        let tblCol = cellIndex['column']; // adjusted from 0 indexed
+                        let xlCol = numberToLetters(tblCol);
+                        let excelCell = xlCol+tblRow;
                         $('row c[r='+excelCell+']', sheet).attr( 's', '11' );
                     }
                 }

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

@@ -49,7 +49,7 @@
                 <div class="card mb-4 border-secondary h-100">
                     <div class="card-header fw-semibold d-flex justify-content-between align-items-center">
                         <span>Scan Box Barcode</span>
-                        {{-- <span id="scan-alert" class="badge bg-danger d-none">Danger</span> --}}
+                        {{-- <span id="scan-alert-badge" class="badge bg-danger d-none">Danger</span> --}}
                     </div>
                     <div class="card-body py-2">
                         <div class="d-flex align-items-center gap-2 flex-wrap">
@@ -67,7 +67,7 @@
 
                             </div>
 
-                            {{-- <div id="scan-alert" class="d-none align-self-center"></div> --}}
+                            {{-- <div id="scan-alert-1" class="d-none align-self-center"></div> --}}
                         </div>
                     </div>
                 </div>

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

@@ -73,12 +73,12 @@
     </div>
 
     <!-- Add Modal -->
-    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true"
+    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="addModalLabel" aria-hidden="true"
         data-bs-backdrop="static">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title" id="exampleModalLabel">Add Record</h5>
+                    <h5 class="modal-title" id="addModalLabel">Add Record</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <form class="needs-validation" id="addReplen" method="POST" action="{{ route("m3.replenishmentSettings.store") }}" enctype="multipart/form-data">
@@ -156,12 +156,12 @@
     </div>
 
     <!-- Edit Modal -->
-    <div class="modal fade" id="editModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true"
+    <div class="modal fade" id="editModal" tabindex="-1" aria-labelledby="editModalLabel" aria-hidden="true"
         data-bs-backdrop="static">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title" id="exampleModalLabel">Edit Record</h5>
+                    <h5 class="modal-title" id="editModalLabel">Edit Record</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <form class="needs-validation" id="editReplen" method="POST" action="replenishmentSettingsUpdate"