diff --git a/Modules/M3/Helpers/Helper.php b/Modules/M3/Helpers/Helper.php index 100b4a28..51f9378a 100644 --- a/Modules/M3/Helpers/Helper.php +++ b/Modules/M3/Helpers/Helper.php @@ -295,7 +295,7 @@ class Helper $goodString = trim($StrTosanityze); $goodString = str_replace("'", '', $goodString); - $goodString = preg_replace('/\x{f0e0}/u', '', $goodString); + $goodString = str_replace("\u{f0e0}", '', $goodString); $goodString = preg_replace('/\\\\u201[0-9A-F]+/i', '', $goodString); $goodString = str_replace($badChars, '', $goodString); $goodString = iconv('UTF-8', 'ISO-8859-1//IGNORE', $goodString); diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php index 6b809b5f..263a169b 100644 --- a/Modules/M3/Http/Controllers/API/M3Controller.php +++ b/Modules/M3/Http/Controllers/API/M3Controller.php @@ -248,6 +248,9 @@ class M3Controller extends Controller $this->insertToICM666M2($Other, $commentData); } break; + + default: + break; } } } @@ -526,11 +529,23 @@ class M3Controller extends Controller } } - public function show($id) {} + public function show($id) + { + // This resource endpoint is intentionally unsupported. + } - public function edit($id) {} + public function edit($id) + { + // This resource endpoint is intentionally unsupported. + } - public function update(Request $request, $id) {} + public function update(Request $request, $id) + { + // This resource endpoint is intentionally unsupported. + } - public function destroy($id) {} + public function destroy($id) + { + // This resource endpoint is intentionally unsupported. + } } diff --git a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php index aea20f10..e5fa21d3 100644 --- a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php +++ b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php @@ -108,7 +108,7 @@ class TwoShipAPIs extends Controller curl_setopt($ch, CURLOPT_URL, $ShipOnHoldOrder_url); curl_setopt($ch, CURLOPT_VERBOSE, false); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); // When CURLOPT_SSL_VERIFYPEER is enabled (value=1), and the verification fails to prove that the certificate is authentic, the connection fails. // When the option is zero, the peer certificate verification succeeds regardless. diff --git a/Modules/M3/Http/Controllers/whsePerfDetailsController.php b/Modules/M3/Http/Controllers/whsePerfDetailsController.php index 175e9997..2b74e918 100644 --- a/Modules/M3/Http/Controllers/whsePerfDetailsController.php +++ b/Modules/M3/Http/Controllers/whsePerfDetailsController.php @@ -72,6 +72,9 @@ class whsePerfDetailsController extends Controller case 'i': $stmt2 = $io; break; + default: + $stmt2 = $all; + break; } // phpinfo(); include $_SERVER['DOCUMENT_ROOT'] . '/../../KPI2_update711M_SQL_main.inc.php'; diff --git a/Modules/M3/Resources/views/liberty-theme/pages/whsePerf.bladeOLD.php b/Modules/M3/Resources/views/liberty-theme/pages/whsePerf.bladeOLD.php deleted file mode 100644 index bae4058e..00000000 --- a/Modules/M3/Resources/views/liberty-theme/pages/whsePerf.bladeOLD.php +++ /dev/null @@ -1,255 +0,0 @@ -@extends('m3::liberty-theme.layout.main') -@section('title') - Solon Sentinel Portal - Warehouse Performance Metrics -@endsection -@section('content') - -
-

Warehouse Performance Metrics

- -
- -
- @if($power_user[0]->R428PWRUSR=="Y") - - @endif - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @foreach($ICM711M as $key=>$val) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @endforeach - -
For month{{ date('Y-m',strtotime($date_in)) }}AllNon-interco and Ground/AirParcelIntercompany & Ocean
A1+C1BA3+C2A1+C1BA3+C2A1+C1BA3+C2A1+C1A3+C2
ClosedClosed (Cherry)Still OpenOTTCClosedClosed (Cherry)Still OpenOTTCClosedClosed (Cherry)Still OpenOTTCClosedStill Open
Targets
{{$val->AVDATE}}Deliv Notes{{$val->AVANOTESCL}}{{$val->AVANOTESCH}}{{$val->AVANOTESOP}}{{ (($val->AVANOTESCL+$val->AVANOTESCH+$val->AVANOTESOP)!='0'?number_format(($val->AVANOTESCL+$val->AVANOTESCH)/($val->AVANOTESCL+$val->AVANOTESCH+$val->AVANOTESOP)*100,0):'0') }}{{$val->AVLNOTESCL}}{{$val->AVLNOTESCH}}{{$val->AVLNOTESOP}}{{ (($val->AVLNOTESCL+$val->AVLNOTESCH+$val->AVLNOTESOP)!='0'?number_format(($val->AVLNOTESCL+$val->AVLNOTESCH)/($val->AVLNOTESCL+$val->AVLNOTESCH+$val->AVLNOTESOP)*100,0):'0') }}{{$val->AVPNOTESCL}}{{$val->AVPNOTESCH}}{{$val->AVPNOTESOP}}{{ (($val->AVPNOTESCL+$val->AVPNOTESCH+$val->AVPNOTESOP)!='0'?number_format(($val->AVPNOTESCL+$val->AVPNOTESCH)/($val->AVPNOTESCL+$val->AVPNOTESCH+$val->AVPNOTESOP)*100,0):'0') }}{{$val->AVINOTESCL}}{{$val->AVINOTESOP}}
Dollars{{$val->AVADLRCL}}{{$val->AVADLRCH}}{{$val->AVADLROP}}{{ (($val->AVADLRCL+$val->AVADLRCH+$val->AVADLROP)!='0'?number_format(($val->AVADLRCL+$val->AVADLRCH)/($val->AVADLRCL+$val->AVADLRCH+$val->AVADLROP)*100,0):'0') }}{{$val->AVLDLRCL}}{{$val->AVLDLRCH}}{{$val->AVLDLROP}}{{ (($val->AVLDLRCL+$val->AVLDLRCH+$val->AVLDLROP)!='0'?number_format(($val->AVLDLRCL+$val->AVLDLRCH)/($val->AVLDLRCL+$val->AVLDLRCH+$val->AVLDLROP)*100,0):'0') }}{{$val->AVPDLRCL}}{{$val->AVPDLRCH}}{{$val->AVPDLROP}}{{ (($val->AAVPDLRCL+$val->AVPDLRCH+$val->AAVPDLROP)!='0'?number_format(($val->AVPDLRCL+$val->AVPDLRCH)/($val->AVPDLRCL+$val->AVPDLRCH+$val->AVPDLROP)*100,0):'0') }}{{$val->AVIDLRCL}}{{$val->AVIDLROP}}
Weight{{$val->AVAWGTCL}}{{$val->AVAWGTCH}}{{$val->AVAWGTOP}}{{ (($val->AVAWGTCL+$val->AVAWGTCH+$val->AVAWGTOP)!='0'?number_format(($val->AVAWGTCL+$val->AVAWGTCH)/($val->AVAWGTCL+$val->AVAWGTCH+$val->AVAWGTOP)*100,0):'0') }}{{$val->AVLWGTCL}}{{$val->AVLWGTCH}}{{$val->AVLWGTOP}}{{ (($val->AVLWGTCL+$val->AVLWGTCH+$val->AVLWGTOP)!='0'?number_format(($val->AVLWGTCL+$val->AVLWGTCH)/($val->AVLWGTCL+$val->AVLWGTCH+$val->AVLWGTOP)*100,0):'0') }}{{$val->AVPWGTCL}}{{$val->AVPWGTCH}}{{$val->AVPWGTOP}}{{ (($val->AVPWGTCL+$val->AVPWGTCH+$val->AVPWGTOP)!='0'?number_format(($val->AVPWGTCL+$val->AVPWGTCH)/($val->AVPWGTCL+$val->AVPWGTCH+$val->AVPWGTOP)*100,0):'0') }}{{$val->AVIWGTCL}}{{$val->AVIWGTOP}}
-
-
-
- -
- -@endsection - -@section('scripts') - -@endsection diff --git a/scan.sh b/scan.sh index d3a91906..464d68a2 100755 --- a/scan.sh +++ b/scan.sh @@ -3,5 +3,4 @@ PATH="/opt/homebrew/opt/openjdk/bin:$PATH" \ sonar-scanner \ -Dsonar.projectKey=Warehouse-Management-System \ -Dsonar.sources=. \ - -Dsonar.host.url=http://192.168.1.2:9001 \ - -Dsonar.token="$SONAR_TOKEN" + -Dsonar.host.url=http://192.168.1.2:9001