mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Security Fixes for Pass 41

Browse Source
This commit is contained in:
Mark Gregory
2026-09-17 13:37:19 +01:00
parent a9b63e43b3
commit 15773b0bce
56 changed files with 169 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Company/Resources/views/show.blade.php
+2 -2
View File
@@ -215,7 +215,7 @@
</div>
<form method="POST" action="{{ route('platform.companies.warehouses.division.update', [$company, $warehouse]) }}" class="contents">
@csrf @method('PUT')
<select name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select aria-label="Division Id" name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<option value="">Company-level warehouse</option>
@foreach($company->divisions as $divisionOption)
<option value="{{ $divisionOption->id }}" @selected($warehouse->division_id === $divisionOption->id)>{{ $divisionOption->name }}</option>
@@ -276,7 +276,7 @@
<div>
<label class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Description</label>
<textarea name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea>
<textarea aria-label="Description" name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea>
</div>
</form>
<div class="mt-6"><h4 class="font-semibold">Division address</h4><form method="POST" action="{{ route('platform.companies.divisions.address.update', [$company, $division]) }}" class="mt-4">@csrf @method('PUT')@include('company::partials.address-form', ['address' => $division->address, 'defaultLabel' => 'Operating address'])</form></div>
Modules/Countries/Resources/views/index.blade.php
+1 -1
View File
@@ -57,7 +57,7 @@
<input name="search" value="{{ $search }}"
placeholder="Search by country, ISO code, currency or calling code"
class="min-h-11 rounded-xl border-zinc-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100" id="sonar-input-517d4d4cc5">
<select name="status"
<select aria-label="Status" name="status"
class="min-h-11 rounded-xl border-zinc-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100">
<option value="all" @selected($status === 'all')>All statuses</option>
<option value="active" @selected($status === 'active')>Active</option>
Modules/Documentation/Resources/views/documents/index.blade.php
+2 -2
View File
@@ -47,13 +47,13 @@
<label for="sonar-input-9f8539cc9d" class="visually-hidden">Search title, reference, summary or body</label>
<input class="doc-input" name="search" value="{{ request('search') }}"
placeholder="Search title, reference, summary or body" id="sonar-input-9f8539cc9d">
<select class="doc-select" name="status">
<select aria-label="Status" class="doc-select" name="status">
<option value="">All statuses</option>
@foreach ($statuses as $value => $label)
<option value="{{ $value }}" @selected(request('status') === $value)>{{ $label }}</option>
@endforeach
</select>
<select class="doc-select" name="category">
<select aria-label="Category" class="doc-select" name="category">
<option value="">All categories</option>
@foreach ($categories as $category)
<option value="{{ $category->id }}" @selected((string) request('category') === (string) $category->id)>{{ $category->name }}
Modules/Helpdesk/Resources/views/components/colour-select.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
</label>
<div class="grid gap-2 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center">
<select
<select aria-label="Form Field"
wire:model.live="{{ $model }}"
class="h-9 w-full rounded-lg border border-zinc-300 bg-white px-3 text-sm font-semibold text-zinc-900 shadow-sm outline-none transition-colors duration-150 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-100"
>
Modules/Helpdesk/Resources/views/components/html-editor.blade.php
+1 -1
View File
@@ -121,7 +121,7 @@
class="helpdesk-rich-editor block min-h-[14rem] w-full overflow-y-auto whitespace-pre-wrap break-words border-0 bg-zinc-950 px-5 py-4 text-base leading-7 text-zinc-100 outline-none transition placeholder:text-zinc-500 empty:before:pointer-events-none empty:before:text-zinc-500 empty:before:content-[attr(data-placeholder)] focus:ring-2 focus:ring-blue-500"
></div>
<textarea
<textarea aria-label="Form Field"
x-ref="input"
wire:model.defer="{{ $model }}"
spellcheck="true"
Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+1 -1
View File
@@ -486,7 +486,7 @@
class="prose prose-sm min-h-[12rem] max-w-none bg-white p-4 text-sm leading-6 text-zinc-900 outline-none dark:prose-invert dark:bg-zinc-950 dark:text-zinc-100"
data-placeholder="Write a public reply or internal note. Right-click or Ctrl-click underlined words for spelling suggestions.">{!! $oldCommentBody !!}</div>
<textarea id="ticket-comment-body" name="commentBody" required spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text" class="sr-only" tabindex="-1" aria-hidden="true">{{ $oldCommentBody }}</textarea>
<textarea aria-label="Ticket Comment Body" id="ticket-comment-body" name="commentBody" required spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text" class="sr-only" tabindex="-1" aria-hidden="true">{{ $oldCommentBody }}</textarea>
</div>
<p class="mt-2 flex items-center gap-2 text-xs font-medium text-zinc-500 dark:text-zinc-400">
Modules/Helpdesk/Resources/views/partials/ticket-controls.blade.php
+1 -1
View File
@@ -56,7 +56,7 @@
</button>
</div>
<textarea spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
<textarea aria-label="Description" spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
class="block w-full rounded-lg border border-zinc-300 bg-white p-2 text-xs font-semibold text-zinc-900 shadow-sm focus:border-emerald-500 focus:ring-emerald-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100"
data-dusk="ticket-time-description"></textarea>
Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
</button>
</div>
<textarea spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
<textarea aria-label="Description" spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
class="block w-full rounded-lg border border-zinc-300 bg-white p-2 text-xs font-semibold text-zinc-900 shadow-sm focus:border-emerald-500 focus:ring-emerald-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100"
data-dusk="ticket-time-description">{{ old('description') }}</textarea>
Modules/M3/Console/GenerateGS1Cmd.php
+1 -1
View File
@@ -115,7 +115,7 @@ class GenerateGS1Cmd extends Command
// Get number of Pallets
$packageCount = count($gSArray['PackagesArray']);
$packageNum = 1;
foreach ($gSArray['PackagesArray'] as $value) {
while ($packageNum <= $packageCount) {
$table_style = $packageNum < $packageCount ? ' style="page-break-after: always;" ' : '';
if (Cache::has('GS1SEQUENCE')) {
Modules/M3/Console/UtilitiesCmd.php
+2 -2
View File
@@ -6,7 +6,7 @@ use Config;
use Illuminate\Console\Command;
use Illuminate\Http\Request;
use Log;
use Modules\M3\Http\Controllers\utilitiesContoller;
use Modules\M3\Http\Controllers\UtilitiesController;
class UtilitiesCmd extends Command
{
@@ -45,7 +45,7 @@ class UtilitiesCmd extends Command
$this->info('Start Utilities Command...');
$myRequest = new Request;
utilitiesContoller::fixICM799MSentPKR($myRequest);
UtilitiesController::fixICM799MSentPKR($myRequest);
$this->info('End Utilities Command...');
Modules/M3/Http/Controllers/API/CloseShipment.php
+6 -12
View File
@@ -134,7 +134,7 @@ class CloseShipment extends Controller
// Check Date & Time Before Updating ICM699M
if ($sHDT != '' && $sHTIME != '' && $sHTYPE != '' && $nODEBUG) {
$iCM699MU = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->where('SHMACPKR', $mANIFEST)
->where('SHDT', $sHDT)
->where('SHTIME', $sHTIME)
@@ -156,7 +156,7 @@ class CloseShipment extends Controller
->where('SHERROR', 'Z')
->where('SHTYPE', 'M3-QtyChg')
->get();
foreach ($iCM699MQtyChg as $key => $ICM699MQtyChgR) {
foreach ($iCM699MQtyChg as $ICM699MQtyChgR) {
$string = $ICM699MQtyChgR->SHDATA;
$start = 'PickerLine:';
$end = ' -';
@@ -308,7 +308,6 @@ class CloseShipment extends Controller
$a4ONO = trim($ICM695M1JOINR->A4ONO);
$aYMACPKR = trim($ICM695M1JOINR->AYMACPKR);
$aYINTBOX = trim($ICM695M1JOINR->AYINTBOX);
$a4CLOSEM3 = trim($ICM695M1JOINR->A4CLOSEM3);
$tRACKING = trim($ICM695M1JOINR->TRACKING);
$sCAC = trim($ICM695M1JOINR->SCAC);
$cARRIER = '';
@@ -379,7 +378,7 @@ class CloseShipment extends Controller
// Get Commodities
$commoditiesTmp = isset($responseData->commodities) ? $responseData->commodities : '';
if ($commoditiesTmp != '') {
$commodities = $commoditiesTmp; // json_encode($commoditiesTmp);
$commodities = $commoditiesTmp;
} else {
$commodities = '';
$errorMsgs = $errorMsgs . ' Could not find Commodities; ';
@@ -639,7 +638,6 @@ class CloseShipment extends Controller
if ($responseContents != null && $responseStatusCode == '200') {
$responseMsg = $responseContents->result->CloseShipment;
$m3APIRESULT = $responseMsg->PickingListClose->Result;
$m3APIRESULTMsg = isset($responseMsg->PickingListClose->ErrorMessage) ? $responseMsg->PickingListClose->ErrorMessage : '';
// Check M3 Response for Errors
$responseResult = $responseContents->result;
@@ -664,7 +662,6 @@ class CloseShipment extends Controller
} else {
$m3APIRESULT = 'Error';
$responseMsg = self::NULL_M3_RESPONSE;
$m3APIRESULTMsg = self::NULL_M3_RESPONSE;
$responseResult = '';
$m3Errors = $responseStatusCode;
}
@@ -745,7 +742,7 @@ class CloseShipment extends Controller
// Update ICM699M : Look for CommTCP_read and set SHERROR to Z Case # 580
$sHACKNOTE = 'Sentinel automatically closed the error (false positive CommTCP_read)';
$iCM699MUZ = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->where('SHMACPKR', $aYMACPKR)
->where('SHCO', $cOMPANY)
->where('SHWHS', $wHS)
@@ -757,7 +754,7 @@ class CloseShipment extends Controller
// Update ICM705M1 to say that we have processed this manifest (set APSPARE2='X' )
if ($tRANSTYPE == 'M') {
$iCM705M1U = DB::connection(config('m3.connection', 'pgsql'))->table('icm705m1')
DB::connection(config('m3.connection', 'pgsql'))->table('icm705m1')
->where('APMANIFEST', $mANIFEST)
->where('APCO', $cOMPANY)
->where('APWHS', $wHS)
@@ -794,7 +791,6 @@ class CloseShipment extends Controller
$a4REFORD = trim($ICM695M1JOINR->A4REFORD);
$a4ONO = trim($ICM695M1JOINR->A4ONO);
$aYMACPKR = trim($ICM695M1JOINR->A4MACPKR);
$a4CLOSEM3 = trim($ICM695M1JOINR->A4CLOSEM3);
$aYWHS = trim($ICM695M1JOINR->A4WHS);
$aYCO = trim($ICM695M1JOINR->A4CO);
@@ -843,7 +839,6 @@ class CloseShipment extends Controller
if ($responseContents != null) {
$responseMsg = $responseContents->result->CloseShipment;
$m3APIRESULT = $responseMsg->PickingListClose->Result;
$m3APIRESULTMsg = isset($responseMsg->PickingListClose->ErrorMessage) ? $responseMsg->PickingListClose->ErrorMessage : '';
// Check M3 Response for Errors
$responseResult = $responseContents->result;
@@ -863,7 +858,6 @@ class CloseShipment extends Controller
} else {
$m3APIRESULT = 'Error';
$responseMsg = self::NULL_M3_RESPONSE;
$m3APIRESULTMsg = self::NULL_M3_RESPONSE;
}
// If you get a successful response
@@ -917,7 +911,7 @@ class CloseShipment extends Controller
// Update ICM699M : Look for CommTCP_read and set SHERROR to Z Case # 580
$sHACKNOTE = 'Sentinel automatically closed the error (false positive CommTCP_read)';
$iCM699MUZ = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->where('SHMACPKR', $aYMACPKR)
->where('SHCO', $cOMPANY)
->where('SHWHS', $wHS)
Modules/M3/Http/Controllers/API/TransferAPI.php
+4 -4
View File
@@ -141,7 +141,7 @@ class TransferAPI extends Controller
}
// Set SHERROR to Z in ICM699M
$iCM699MU = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->where('SHMACPKR', $dELIVERYNO)
->where('SHDT', $sHDT)
->where('SHTIME', $sHTIME)
@@ -266,7 +266,7 @@ class TransferAPI extends Controller
$responseStatusCode = $response->getStatusCode();
$m3SessionId = $response->hasHeader('x-transaction-id') ? '-sessionID:' . $response->header('x-transaction-id') : '-sessionID';
$m3ResponseTimeTmp = $response->hasHeader('x-response-time') ? ltrim($response->header('x-response-time'), '-') : '0';
$m3ResponseTimeTmp2 = floatval($m3ResponseTimeTmp) / 1000; // $m3ResponseTimeTmp / 1000;
$m3ResponseTimeTmp2 = floatval($m3ResponseTimeTmp) / 1000;
$dateTime = new DateTime;
$dateTime->setTimestamp($m3ResponseTimeTmp2);
$m3ResponseTime = $m3ResponseTimeTmp != '' ? '-M3ResponseTime:' . $dateTime->format('d/m/Y H:i:s.v') : '-M3ResponseTime';
@@ -301,7 +301,7 @@ class TransferAPI extends Controller
Helper::logToICM699M($data);
// Log to ICM799M
$iCM799MINS = DB::connection(config('m3.connection', 'pgsql'))->table('icm799m')
DB::connection(config('m3.connection', 'pgsql'))->table('icm799m')
->insert(['IMDIV' => $dIVI,
'IMPLANT' => $a5PLANT,
'IMWHS' => $wHS,
@@ -548,7 +548,7 @@ class TransferAPI extends Controller
$responseStatusCode = $response->getStatusCode();
$m3SessionId = $response->hasHeader('x-transaction-id') ? '-sessionID:' . $response->header('x-transaction-id') : '-sessionID';
$m3ResponseTimeTmp = $response->hasHeader('x-response-time') ? ltrim($response->header('x-response-time'), '-') : '0';
$m3ResponseTimeTmp2 = floatval($m3ResponseTimeTmp) / 1000; // $m3ResponseTimeTmp / 1000;
$m3ResponseTimeTmp2 = floatval($m3ResponseTimeTmp) / 1000;
$dateTime = new DateTime;
$dateTime->setTimestamp($m3ResponseTimeTmp2);
$m3ResponseTime = $m3ResponseTimeTmp != '' ? '-M3ResponseTime:' . $dateTime->format('d/m/Y H:i:s.v') : '-M3ResponseTime';
Modules/M3/Http/Controllers/authController.php → Modules/M3/Http/Controllers/AuthController.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Modules\M3\Http\Controllers;
class authController extends Controller
class AuthController extends Controller
{
public static function logout()
{
Modules/M3/Http/Controllers/carrierMaintController.php → Modules/M3/Http/Controllers/CarrierMaintController.php
+1 -1
View File
@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Schema;
use Modules\M3\Helpers\Helper;
use Modules\M3\Models\ICM160M;
class carrierMaintController extends Controller
class CarrierMaintController extends Controller
{
public static function index(Request $request)
{
Modules/M3/Http/Controllers/dashboardController.php → Modules/M3/Http/Controllers/DashboardController.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Modules\M3\Http\Controllers;
class dashboardController extends Controller
class DashboardController extends Controller
{
public static function index()
{
Modules/M3/Http/Controllers/execSummaryController.php → Modules/M3/Http/Controllers/ExecSummaryController.php
+1 -1
View File
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
use Log;
use Str;
class execSummaryController extends Controller
class ExecSummaryController extends Controller
{
private const WAREHOUSE_IN_CLAUSE = "' and a5whs in (";
Modules/M3/Http/Controllers/execSummaryLineController.php → Modules/M3/Http/Controllers/ExecSummaryLineController.php
+1 -1
View File
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
use Log;
use Str;
class execSummaryLineController extends Controller
class ExecSummaryLineController extends Controller
{
private const WAREHOUSE_IN_CLAUSE = "' and a5whs in (";
Modules/M3/Http/Controllers/fillBOL2Controller.php → Modules/M3/Http/Controllers/FillBOL2Controller.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Modules\M3\Http\Controllers;
use Illuminate\Http\Request;
use Modules\M3\Services\BillOfLadingService;
class fillBOL2Controller extends Controller
class FillBOL2Controller extends Controller
{
protected $bolService;
Modules/M3/Http/Controllers/fillBOLController.php → Modules/M3/Http/Controllers/FillBOLController.php
+1 -1
View File
@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
use mikehaertl\pdftk\Pdf;
use Storage;
class fillBOLController extends Controller
class FillBOLController extends Controller
{
public static function index(Request $request)
{
Modules/M3/Http/Controllers/M3ErrorsDispController.php
+2 -2
View File
@@ -151,7 +151,7 @@ class M3ErrorsDispController extends Controller
$cLOSESIM = $request->CLOSESIM != null ? trim($request->CLOSESIM) : 'N';
if ($cLOSESIM == 'N') {
$iCM699MU = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->where('SHMACPKR', $sHMACPKR)
->where('SHDT', $sHDT)
->where('SHTIME', $sHTIME)
@@ -163,7 +163,7 @@ class M3ErrorsDispController extends Controller
->update(['SHERROR' => 'Z', 'SHACKUSER' => $sHUSER, 'SHACKDATE' => date('Y-m-d'), 'SHACKTIME' => date('H:i:s'), 'SHACKNOTE' => $sHACKNOTE]);
} else {
$iCM699MU = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->where('SHCO', $sHCO)
->where('SHWHS', $sHWHS)
->where('SHSOURCE', $sHSOURCE)
Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
-13
View File
@@ -18,20 +18,15 @@ class OrderLinesOfClosedOrder extends Controller
public static function index(Request $request)
{
$iC670M = $iCM688M2 = [];
$wHDDA = $cOMPANY = $pLANT = $wHS = '';
$rEPORTDATEDisp = today()->format('Ymd');
$allReportsUrls = [];
try {
[$cOMPANY, $pLANT, $wHS] = self::userWarehouseContext('110', '144', '322');
// Warehouse Table
$iC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
// Get URL PARAMS
$urlParams = count($request->all()) > 0 ? $request->all() : '';
$rEPORTDATEDisp = isset($urlParams['REPORTDATEDisp']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['REPORTDATEDisp']))->format('Ymd') : today()->format('Ymd');
$wHDDA = $cOMPANY . $pLANT . $wHS;
if ($rEPORTDATEDisp != '' && $cOMPANY != '' && $wHS != '' && $pLANT != '') {
// Case 729: Add Currency code A1SHCURR FROM ICM666M
$selectContent = "
@@ -91,8 +86,6 @@ class OrderLinesOfClosedOrder extends Controller
[$cOMPANY, $pLANT, $wHS] = self::userWarehouseContext();
// Warehouse Table
$iC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
// Get URL PARAMS
$urlParams = count($request->all()) > 0 ? $request->all() : '';
$reportDate = isset($urlParams['REPORTDATE']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['REPORTDATE']))->format('Ymd') : today()->format('Ymd');
@@ -100,8 +93,6 @@ class OrderLinesOfClosedOrder extends Controller
$reportDateWD = isset($urlParams['REPORTDATE']) ? trim($urlParams['REPORTDATE']) : today()->format('Y-m-d');
$toreportDateWD = isset($urlParams['TOREPORTDATE']) ? trim($urlParams['TOREPORTDATE']) : today()->format('Y-m-d');
$wHDDA = $cOMPANY . $pLANT . $wHS;
if ($reportDate != '' && $cOMPANY != '' && $wHS != '' && $pLANT != '') {
// Case 729: Add Currency code A1SHCURR FROM ICM666M
$selectContent = "
@@ -175,16 +166,12 @@ class OrderLinesOfClosedOrder extends Controller
[$cOMPANY, $pLANT, $wHS] = self::userWarehouseContext();
// Warehouse Table
$iC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
// Get URL PARAMS
$urlParams = count($request->all()) > 0 ? $request->all() : '';
$reportDate = isset($urlParams['REPORTDATE']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['REPORTDATE']))->format('Ymd') : today()->format('Ymd');
$toreportDate = isset($urlParams['TOREPORTDATE']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['TOREPORTDATE']))->format('Ymd') : today()->format('Ymd');
$reportDateWD = isset($urlParams['REPORTDATE']) ? trim($urlParams['REPORTDATE']) : today()->format('Y-m-d');
$toreportDateWD = isset($urlParams['TOREPORTDATE']) ? trim($urlParams['TOREPORTDATE']) : today()->format('Y-m-d');
$wHDDA = $cOMPANY . $pLANT . $wHS;
if ($reportDate != '' && $cOMPANY != '' && $wHS != '' && $pLANT != '') {
// Case 729: Add Currency code A1SHCURR FROM ICM666M
$iCM688M2 = DB::connection(config('m3.connection', 'pgsql'))
Modules/M3/Http/Controllers/palletQtyController.php → Modules/M3/Http/Controllers/PalletQtyController.php
+1 -1
View File
@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Schema;
use Modules\M3\Models\ICM709M;
class palletQtyController extends Controller
class PalletQtyController extends Controller
{
public static function index(Request $request)
{
Modules/M3/Http/Controllers/pendingClosureController.php → Modules/M3/Http/Controllers/PendingClosureController.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Modules\M3\Http\Controllers;
use DB;
use Symfony\Component\HttpFoundation\Request;
class pendingClosureController extends Controller
class PendingClosureController extends Controller
{
public static function index(Request $request)
{
Modules/M3/Http/Controllers/sentinelController.php → Modules/M3/Http/Controllers/SentinelController.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Modules\M3\Http\Controllers;
use DB;
use Illuminate\Http\Request;
class sentinelController extends Controller
class SentinelController extends Controller
{
public static function packSyst5Func(Request $request)
{
Modules/M3/Http/Controllers/userControlController.php → Modules/M3/Http/Controllers/UserControlController.php
+1 -18
View File
@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Schema;
use Modules\M3\Models\ICM428M;
use Modules\M3\Services\PostgresProgramBridge;
class userControlController extends Controller
class UserControlController extends Controller
{
private const AUTH_FAILURE_MESSAGE = 'Could not connect due to wrong user or password.';
@@ -101,7 +101,6 @@ class userControlController extends Controller
// # $result = $conn->PgmCall(Config::get('eproconf.misc.PGM1'), Config::get('eproconf.misc.libname4'), $params, array(), array());
$result = $conn->PgmCall('ICMUSRPRF', 'EWOBJ', $params, [], []);
if (! $result) {
$pGMERRORS = self::PROGRAM_ERROR_PREFIX . $conn->getErrorCode() . self::MESSAGE_SEPARATOR . $conn->getErrorMsg();
return 'error profile2';
} else {
@@ -171,8 +170,6 @@ class userControlController extends Controller
public static function callCL(Request $request)
{
$pGMERRORS = '';
// connect to toolkit using DB2 credentials (can also leave blank for default authority)
try {
$conn = app(PostgresProgramBridge::class);
@@ -186,13 +183,10 @@ class userControlController extends Controller
case 8001:
// "Authorization failure on distributed database connection attempt"
// Usually means a wrong DB2 user or password
$pGMERRORS = self::AUTH_FAILURE_MESSAGE;
break;
case 42705:
$pGMERRORS = self::DATABASE_NOT_FOUND_MESSAGE;
break;
default:
$pGMERRORS = self::CONNECTION_ERROR_PREFIX . $code . ' ' . $msg;
break;
}
}
@@ -210,7 +204,6 @@ class userControlController extends Controller
// AddParameterPackDec($io, $length, $scale, $comment, $varName, $value,$dimension)
// Add Delivery Note Param
// $params[] = $conn->AddParameterPackDec('in', 11, 0, 'ParamIn','','00000087125');
// Start Time Tracking
// $start = microtime(true);
@@ -220,7 +213,6 @@ class userControlController extends Controller
$result = $conn->PgmCall('ICMCHGPRF', 'EWOBJ', $params, [], []);
if (! $result) {
$pGMERRORS = self::PROGRAM_ERROR_PREFIX . $conn->getErrorCode() . self::MESSAGE_SEPARATOR . $conn->getErrorMsg();
echo "<script>alert($pGMERRORS);</script>";
return 'error';
@@ -253,8 +245,6 @@ class userControlController extends Controller
ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
$pGMERRORS = '';
// echo "B3<br>";
// connect to toolkit using DB2 credentials (can also leave blank for default authority)
try {
@@ -267,24 +257,17 @@ class userControlController extends Controller
case 8001:
// "Authorization failure on distributed database connection attempt"
// Usually means a wrong DB2 user or password
$pGMERRORS = self::AUTH_FAILURE_MESSAGE;
break;
case 42705:
$pGMERRORS = self::DATABASE_NOT_FOUND_MESSAGE;
break;
default:
$pGMERRORS = self::CONNECTION_ERROR_PREFIX . $code . ' ' . $msg;
break;
}
}
// $params[] = $conn->AddParameterChar('in', 9, 'sts','STATUS','*ENABLED');
// $params[] = $conn->AddParameterChar('in', 4, 'pwdexp','PWDEXP','*NO');
$result = $conn->CLCommand('QSYS/CHGUSRPRF USRPRF(' . $request->R428US_PWD . ') PASSWORD(' . $request->NEW_PASSWORD . ') STATUS(*ENABLED) PWDEXP(*NO)');
if (! $result) {
$pGMERRORS = self::PROGRAM_ERROR_PREFIX . $conn->getErrorCode() . self::MESSAGE_SEPARATOR . $conn->getErrorMsg();
dump($pGMERRORS);
echo "<script>alert($pGMERRORS);</script>";
Modules/M3/Http/Controllers/userPickingStats4.php → Modules/M3/Http/Controllers/UserPickingStats4.php
+3 -6
View File
@@ -7,7 +7,7 @@ use DB;
use Illuminate\Support\Facades\Schema;
use Symfony\Component\HttpFoundation\Request;
class userPickingStats4 extends Controller
class UserPickingStats4 extends Controller
{
public static function index(Request $request)
{
@@ -244,9 +244,6 @@ class userPickingStats4 extends Controller
}
// print_r($request);
// print_r($perf_array); print_r($monitor_array);
// return encoded json if input field named format is json
if ($request->format == 'json') {
@@ -285,12 +282,12 @@ class userPickingStats4 extends Controller
// display webpage of statistic version 4
$request->ports = Config::get('arrays.env_ports');
$no_data = 'N';
if (empty($statistic4) && $_SERVER['REQUEST_URI'] != '/userPickingStats4') {
if (empty($statistic4) && $_SERVER['REQUEST_URI'] != '/UserPickingStats4') {
$no_data = 'Y';
}
return view(
'm3::liberty-theme.pages.userPickingStats4',
'm3::liberty-theme.pages.UserPickingStats4',
compact('statistic4', 'starting', 'user', 'user_array', 'monitor_array', 'totals_array', 'perf_array', 'request', 'no_data'),
);
Modules/M3/Http/Controllers/userPickingStats5.php → Modules/M3/Http/Controllers/UserPickingStats5.php
+3 -3
View File
@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Schema;
use Symfony\Component\HttpFoundation\Request;
class userPickingStats5 extends Controller
class UserPickingStats5 extends Controller
{
public static function index(Request $request)
{
@@ -31,7 +31,7 @@ class userPickingStats5 extends Controller
$totals_array = $totals;
$user_array = $userArray;
return view('m3::liberty-theme.pages.userPickingStats5', compact(
return view('m3::liberty-theme.pages.UserPickingStats5', compact(
'statistic5',
'totals_array',
'user_array',
@@ -103,7 +103,7 @@ class userPickingStats5 extends Controller
{
$statistics = [];
$count = 0;
$url = $request->getSchemeAndHttpHost() . '/userPickingStats4';
$url = $request->getSchemeAndHttpHost() . '/UserPickingStats4';
for ($day = 0; $day <= $days; $day++) {
$date = date('Y-m-d', strtotime($starting . "+$day days"));
Modules/M3/Http/Controllers/userProfileController.php → Modules/M3/Http/Controllers/UserProfileController.php
+1 -1
View File
@@ -6,7 +6,7 @@ use DB;
use Illuminate\Http\Request;
use Modules\M3\Models\ICM428M;
class userProfileController extends Controller
class UserProfileController extends Controller
{
public static function index(Request $request)
{
Modules/M3/Http/Controllers/utilitiesContoller.php → Modules/M3/Http/Controllers/UtilitiesController.php
+2 -10
View File
@@ -13,17 +13,15 @@ use Log;
use Modules\M3\Services\PostgresProgramBridge;
use PDF;
use Picqer\Barcode\BarcodeGeneratorPNG;
use Smalot\PdfParser\Parser;
use Zebra\Zpl\Image;
class utilitiesContoller extends Controller
class UtilitiesController extends Controller
{
public static function index(Request $request)
{
dd('SentM3Test');
// Get The Next ID by Calling POM002C
$pGMERRORS = '';
// connect to toolkit using DB2 credentials (can also leave blank for default authority)
try {
@@ -38,13 +36,10 @@ class utilitiesContoller extends Controller
case 8001:
// "Authorization failure on distributed database connection attempt"
// Usually means a wrong DB2 user or password
$pGMERRORS = 'Could not connect due to wrong user or password.';
break;
case 42705:
$pGMERRORS = 'Database not found. Try WRKRDBDIRE to check.';
break;
default:
$pGMERRORS = 'Could not connect. Error: ' . $code . ' ' . $msg;
break;
}
}
@@ -74,7 +69,6 @@ class utilitiesContoller extends Controller
$result = $conn->PgmCall('ICM700CSBM', 'EWOBJTST', $params, [], []);
if (! $result) {
$pGMERRORS = 'Error calling program. Code: ' . $conn->getErrorCode() . ' Msg: ' . $conn->getErrorMsg();
}
// Successful Call
else {
@@ -96,8 +90,6 @@ class utilitiesContoller extends Controller
$pdfFileName = 'E1232824-10826596';
// Parse PDF file and build necessary objects.
$parser = new Parser;
$pdfFile = File::get('/www/sentm3test/htdocs/labels/' . $pdfFileName . '.pdf');
// Transform content to base64
@@ -155,7 +147,7 @@ class utilitiesContoller extends Controller
->orderBy('A5PICKSTRD', 'ASC')
->get();
foreach ($iCM688M2SLTMP as $key => $ICM688M2SL) {
foreach ($iCM688M2SLTMP as $ICM688M2SL) {
$a5MACPKR = isset($ICM688M2SL->A5MACPKR) ? $ICM688M2SL->A5MACPKR : '';
$a5SENTPKR = isset($ICM688M2SL->A5SENTPKR) ? $ICM688M2SL->A5SENTPKR : '';
Modules/M3/Http/Controllers/whsePerfController.php → Modules/M3/Http/Controllers/WhsePerfController.php
+1 -1
View File
@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
use PhpOffice\PhpSpreadsheet\IOFactory;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
class whsePerfController extends Controller
class WhsePerfController extends Controller
{
public static function index(Request $request)
{
Modules/M3/Http/Controllers/whsePerfDetailsController.php → Modules/M3/Http/Controllers/WhsePerfDetailsController.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Modules\M3\Http\Controllers;
use DB;
use Illuminate\Http\Request;
class whsePerfDetailsController extends Controller
class WhsePerfDetailsController extends Controller
{
public static function index(Request $request)
{
Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@ Solon Sentinel Portal
<div class="row mb-3">
<label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
<div class="col-sm-10">
<select name="whs" class="form-control">
<select aria-label="Whs" name="whs" class="form-control">
<option value="*ALL">*ALL</option>
@foreach($whs_array as $key)
<option value={{$key}}
Modules/M3/Resources/views/liberty-theme/pages/userControl.blade.php
+5 -5
View File
@@ -118,11 +118,11 @@
<td> {{ $val->R428PWRUSR }} </td>
<td> {{ $val->R42811A }} </td>
<td> {{ $val->R42821A }} </td>
<td><pre><font size=+1> {{ str_replace("N"," ",$val->MENU2OPT) }} </span></pre></td>
<td><pre><font size=+1> {{ str_replace("N"," ",$val->MENU3OPT) }} </span></pre></td>
<td><pre><font size=+1> {{ str_replace("N"," ",$val->MENU4OPT) }} </span></pre></td>
<td><pre><font size=+1> {{ str_replace("N"," ",$val->MENU5OPT) }} </span></pre></td>
<td><pre><font size=+1> {{ str_replace("N"," ",$val->MENU6OPT) }} </span></pre></td>
<td><pre><span style="font-size: 1.25rem"> {{ str_replace("N"," ",$val->MENU2OPT) }} </span></pre></td>
<td><pre><span style="font-size: 1.25rem"> {{ str_replace("N"," ",$val->MENU3OPT) }} </span></pre></td>
<td><pre><span style="font-size: 1.25rem"> {{ str_replace("N"," ",$val->MENU4OPT) }} </span></pre></td>
<td><pre><span style="font-size: 1.25rem"> {{ str_replace("N"," ",$val->MENU5OPT) }} </span></pre></td>
<td><pre><span style="font-size: 1.25rem"> {{ str_replace("N"," ",$val->MENU6OPT) }} </span></pre></td>
</tr>
@endforeach
<!-- endif-->
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@ Solon Sentinel Portal - Daily User Efficiency
<div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<select name="user" class="form-select">
<select aria-label="User" name="user" class="form-select">
<option value="" selected> </option>
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@ Solon Sentinel Portal - userPickingStats v4
<div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<select name="user" class="form-control">
<select aria-label="User" name="user" class="form-control">
<option value="" selected> </option>
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@ Solon Sentinel Portal - Graph User Efficiency
<div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<select name="user" class="form-select">
<select aria-label="User" name="user" class="form-select">
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
@if($val['userprf']==$user) selected @endif
Modules/M3/Resources/views/liberty-theme/pages/whsePerf.blade.php
+18 -18
View File
@@ -156,10 +156,10 @@
<td class="text-right">{{$val->AVANOTESOP}}</td>
<td class="text-right" style="width:50px">
@if (number_format(($val->AVANOTESCL+$val->AVANOTESCH)/($val->AVANOTESCL+$val->AVANOTESCH+$val->AVANOTESOP)*100,0)<$pct_array['all_notes'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVANOTESCL+$val->AVANOTESCH)/($val->AVANOTESCL+$val->AVANOTESCH+$val->AVANOTESOP)*100,0)>=$pct_array['all_notes'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVANOTESCL+$val->AVANOTESCH+$val->AVANOTESOP)!='0'?number_format(($val->AVANOTESCL+$val->AVANOTESCH)/($val->AVANOTESCL+$val->AVANOTESCH+$val->AVANOTESOP)*100,0):'0') }}%
</span>
@@ -170,10 +170,10 @@
<td class="text-right">{{$val->AVLNOTESOP}}</td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVLNOTESCL+$val->AVLNOTESCH)/($val->AVLNOTESCL+$val->AVLNOTESCH+$val->AVLNOTESOP)*100,0)<$pct_array['ltl_notes'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVLNOTESCL+$val->AVLNOTESCH)/($val->AVLNOTESCL+$val->AVLNOTESCH+$val->AVLNOTESOP)*100,0)>=$pct_array['ltl_notes'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVLNOTESCL+$val->AVLNOTESCH+$val->AVLNOTESOP)!='0'?number_format(($val->AVLNOTESCL+$val->AVLNOTESCH)/($val->AVLNOTESCL+$val->AVLNOTESCH+$val->AVLNOTESOP)*100,0):'0') }}%
</span>
@@ -184,10 +184,10 @@
<td class="text-right">{{$val->AVPNOTESOP}}</td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVPNOTESCL+$val->AVPNOTESCH)/($val->AVPNOTESCL+$val->AVPNOTESCH+$val->AVPNOTESOP)*100,0)<$pct_array['parcel_notes'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVPNOTESCL+$val->AVPNOTESCH)/($val->AVPNOTESCL+$val->AVPNOTESCH+$val->AVPNOTESOP)*100,0)>=$pct_array['parcel_notes'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVPNOTESCL+$val->AVPNOTESCH+$val->AVPNOTESOP)!='0'?number_format(($val->AVPNOTESCL+$val->AVPNOTESCH)/($val->AVPNOTESCL+$val->AVPNOTESCH+$val->AVPNOTESOP)*100,0):'0') }}%
</span>
@@ -204,10 +204,10 @@
<td class="text-right">${{number_format($val->AVADLROP,0)}}</td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVADLRCL+$val->AVADLRCH)/($val->AVADLRCL+$val->AVADLRCH+$val->AVADLROP)*100,0)<$pct_array['all_dollars'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVADLRCL+$val->AVADLRCH)/($val->AVADLRCL+$val->AVADLRCH+$val->AVADLROP)*100,0)>=$pct_array['all_dollars'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVADLRCL+$val->AVADLRCH+$val->AVADLROP)!='0'?number_format(($val->AVADLRCL+$val->AVADLRCH)/($val->AVADLRCL+$val->AVADLRCH+$val->AVADLROP)*100,0):'0') }}%
</span>
@@ -218,10 +218,10 @@
<td class="text-right">${{number_format($val->AVLDLROP,0)}}</td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVLDLRCL+$val->AVLDLRCH)/($val->AVLDLRCL+$val->AVLDLRCH+$val->AVLDLROP)*100,0)<$pct_array['ltl_dollars'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVLDLRCL+$val->AVLDLRCH)/($val->AVLDLRCL+$val->AVLDLRCH+$val->AVLDLROP)*100,0)>=$pct_array['ltl_dollars'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVLDLRCL+$val->AVLDLRCH+$val->AVLDLROP)!='0'?number_format(($val->AVLDLRCL+$val->AVLDLRCH)/($val->AVLDLRCL+$val->AVLDLRCH+$val->AVLDLROP)*100,0):'0') }}%
</span>
@@ -232,10 +232,10 @@
<td class="text-right">${{number_format($val->AVPDLROP,0)}}</td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVPDLRCL+$val->AVPDLRCH)/($val->AVPDLRCL+$val->AVPDLRCH+$val->AVPDLROP)*100,0)<$pct_array['parcel_dollars'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVPDLRCL+$val->AVPDLRCH)/($val->AVPDLRCL+$val->AVPDLRCH+$val->AVPDLROP)*100,0)>=$pct_array['parcel_dollars'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVPDLRCL+$val->AVPDLRCH+$val->AVPDLROP)!='0'?number_format(($val->AVPDLRCL+$val->AVPDLRCH)/($val->AVPDLRCL+$val->AVPDLRCH+$val->AVPDLROP)*100,0):'0') }}%
</span>
@@ -252,10 +252,10 @@
<td class="text-right"><a href="./whsePerfDetails?for=a&date={{ date('Y-m-d',strtotime($val->AVDATE)) }}">{{number_format($val->AVAWGTOP,0)}}</a></td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVAWGTCL+$val->AVAWGTCH)/($val->AVAWGTCL+$val->AVAWGTCH+$val->AVAWGTOP)*100,0)<$pct_array['all_weight'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVAWGTCL+$val->AVAWGTCH)/($val->AVAWGTCL+$val->AVAWGTCH+$val->AVAWGTOP)*100,0)>=$pct_array['all_weight'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVAWGTCL+$val->AVAWGTCH+$val->AVAWGTOP)!='0'?number_format(($val->AVAWGTCL+$val->AVAWGTCH)/($val->AVAWGTCL+$val->AVAWGTCH+$val->AVAWGTOP)*100,0):'0') }}%
</span>
@@ -266,10 +266,10 @@
<td class="text-right"><a href="./whsePerfDetails?for=l&date={{ date('Y-m-d',strtotime($val->AVDATE)) }}">{{number_format($val->AVLWGTOP,0)}}</a></td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVLWGTCL+$val->AVLWGTCH)/($val->AVLWGTCL+$val->AVLWGTCH+$val->AVLWGTOP)*100,0)<$pct_array['ltl_weight'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVLWGTCL+$val->AVLWGTCH)/($val->AVLWGTCL+$val->AVLWGTCH+$val->AVLWGTOP)*100,0)>=$pct_array['ltl_weight'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVLWGTCL+$val->AVLWGTCH+$val->AVLWGTOP)!='0'?number_format(($val->AVLWGTCL+$val->AVLWGTCH)/($val->AVLWGTCL+$val->AVLWGTCH+$val->AVLWGTOP)*100,0):'0') }}%
</span>
@@ -280,10 +280,10 @@
<td class="text-right"><a href="./whsePerfDetails?for=p&date={{ date('Y-m-d',strtotime($val->AVDATE)) }}">{{number_format($val->AVPWGTOP,0)}}</a></td>
<td class="text-right" style="width:20px">
@if (number_format(($val->AVPWGTCL+$val->AVPWGTCH)/($val->AVPWGTCL+$val->AVPWGTCH+$val->AVPWGTOP)*100,0)<$pct_array['parcel_weight'])
<font style="color:red">
<span style="color:red">
@endif
@if (number_format(($val->AVPWGTCL+$val->AVPWGTCH)/($val->AVPWGTCL+$val->AVPWGTCH+$val->AVPWGTOP)*100,0)>=$pct_array['parcel_weight'])
<font style="color:green">
<span style="color:green">
@endif
{{ (($val->AVPWGTCL+$val->AVPWGTCH+$val->AVPWGTOP)!='0'?number_format(($val->AVPWGTCL+$val->AVPWGTCH)/($val->AVPWGTCL+$val->AVPWGTCH+$val->AVPWGTOP)*100,0):'0') }}%
</span>
Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@ Sentinel Doc Archive
<div class="mb-2 row">
<label for="date" class="col-sm-1 col-form-label">Select Year and Month</label>
<div class="col-sm-1">
<select name="date_in_yr" id="date_in_yr">
<select aria-label="Date In Yr" name="date_in_yr" id="date_in_yr">
@for($x=date('Y',strtotime(date('Y').'- 5 years'));$x<date('Y');$x++)
<option value={{$x}}>{{$x}}</option>
@endfor
Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php
+4 -4
View File
@@ -70,13 +70,13 @@
</a>
@if($power_users=='Y' || $admin_users=='Y')
<a class="nav-link {{ request()->is('userPickingStats4') || request()->is('userPickingStats4/*') ? 'active' : '' }}"
href="{{ route('m3.userPickingStats4') }}">
<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>
Daily User Efficiency
</a>
<a class="nav-link {{ request()->is('userPickingStats5') || request()->is('userPickingStats5/*') ? 'active' : '' }}"
href="{{ route('m3.userPickingStats5') }}">
<a class="nav-link {{ request()->is('UserPickingStats5') || request()->is('UserPickingStats5/*') ? 'active' : '' }}"
href="{{ route('m3.UserPickingStats5') }}">
<i class="fa-fw fas fa-chart-bar mr-1"></i>
Graph User Efficiency
</a>
Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
+4 -4
View File
@@ -11,7 +11,7 @@
<input type="hidden" id="addAVCO" name="addAVCO" value="{{$power_user->R428CO}}">
<input type="hidden" id="addAVPLANT" name="addAVPLANT" value="{{$power_user->R428PL}}">
<input type="hidden" id="addAVWHS" name="addAVWHS" value="{{$power_user->R428WH}}">
<table class="table table-condensed" >
<table role="presentation" class="table table-condensed" >
<thead>
</thead>
<tbody>
@@ -25,7 +25,7 @@
<tr>
<td><b>Ship Via</b></td> <!-- ALPHA -->
<td class="text-right">
<select id="addAVSHPVIA" name="addAVSHPVIA">
<select aria-label="Addavshpvia" id="addAVSHPVIA" name="addAVSHPVIA">
<option value="">Select Ship Via</option>
@foreach($shipvia as $key=>$val)
<option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
@@ -36,7 +36,7 @@
<tr>
<td><b>Sentinel Route</b></td> <!-- ALPHA -->
<td class="text-right">
<select id="addAVSHSRT" name="addAVSHSRT">
<select aria-label="Addavshsrt" id="addAVSHSRT" name="addAVSHSRT">
<option value=" "></option>
<option value="GR">GR</option>
<option value="PU">PU</option>
@@ -46,7 +46,7 @@
<tr>
<td><b>International Code</b></td> <!-- ALPHA -->
<td class="text-right">
<select id="addAVSHORCL" name="addAVSHORCL">
<select aria-label="Addavshorcl" id="addAVSHORCL" name="addAVSHORCL">
<option value=" " selected></option>
<option value="Y">002 - International</option>
</select>
Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+4 -4
View File
@@ -11,7 +11,7 @@
<input type="hidden" id="AVCO" name="AVCO" value="{{$power_user->R428CO}}">
<input type="hidden" id="AVPLANT" name="AVPLANT" value="{{$power_user->R428PL}}">
<input type="hidden" id="AVWHS" name="AVWHS" value="{{$power_user->R428WH}}">
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tbody>
<tr>
<td><b>Delivery Method</b></td> <!-- ALPHA -->
@@ -26,7 +26,7 @@
<td class="text-right">
<label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
<input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
<select id="AVSHPVIA" name="AVSHPVIA">
<select aria-label="Avshpvia" id="AVSHPVIA" name="AVSHPVIA">
<option value="">Select Ship Via</option>
@foreach($shipvia as $key=>$val)
<option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
@@ -39,7 +39,7 @@
<td class="text-right">
<label for="OLD_AVSHSRT" class="visually-hidden">OLD AVSHSRT</label>
<input type="hidden" name="OLD_AVSHSRT" id="OLD_AVSHSRT">
<select id="AVSHSRT" name="AVSHSRT">
<select aria-label="Avshsrt" id="AVSHSRT" name="AVSHSRT">
<option value=" "></option>
<option value="GR">GR</option>
<option value="PU">PU</option>
@@ -51,7 +51,7 @@
<td class="text-right">
<label for="OLD_AVSHORCL" class="visually-hidden">OLD AVSHORCL</label>
<input type="hidden" name="OLD_AVSHORCL" id="OLD_AVSHORCL">
<select id="AVSHORCL" name="AVSHORCL">
<select aria-label="Avshorcl" id="AVSHORCL" name="AVSHORCL">
<option value=" " selected></option>
<option value="Y">002 - International</option>
</select>
Modules/M3/Resources/views/liberty-theme/partials/modals/carrierAdd.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="carrierAddData">
<table class="table table-condensed" >
<table role="presentation" class="table table-condensed" >
<thead>
</thead>
<tbody>
Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="carrierEditData">
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tbody>
<tr>
<td><b>Carrier Number</b></td> <!-- ALPHA -->
Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+2 -2
View File
@@ -8,7 +8,7 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="qtyAddData">
<table class="table table-condensed" >
<table role="presentation" class="table table-condensed" >
<thead>
</thead>
<tbody>
@@ -16,7 +16,7 @@
<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"
<select aria-label="Addat9dpw" class="form-select-sm" id="addAT9DPW"
@if($power_user->R428PWRUSR=="N")
disabled
@endif
Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="qtyEditData">
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tbody>
<tr>
<td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
Modules/M3/Resources/views/liberty-theme/partials/modals/shipToEdit.blade.php
+4 -4
View File
@@ -7,7 +7,7 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="shipToEditData">
<table class="table table-condensed" >
<table role="presentation" class="table table-condensed" >
<thead>
<tr>
<td></td>
@@ -42,20 +42,20 @@
<td class="text-left smalltxt" id="ORIG_PSHCI">{!! (isset($original->PSHCI)&&trim($original->PSHCI)!=''?trim($original->PSHCI):'') !!}</td>
<td class="text-left smalltxt" id="OLD_SHSHCI">{!! (isset($order->SHSHCI)&&trim($order->SHSHCI)!=''?trim($order->SHSHCI):'') !!}</td>
<td class="text-right"><label for="sonar-input-e043dfd88b" class="visually-hidden">sonar input e043dfd88b</label>
<input maxlength="17" onkeypress='return ((event.charCode id="sonar-input-e043dfd88b">= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHCI" value="{!! (isset($order->SHSHCI)&&trim($order->SHSHCI)!=''?trim($order->SHSHCI):' ') !!}"></td>
<input id="sonar-input-e043dfd88b" aria-label="Shshci" maxlength="17" onkeypress='return ((event.charCode >= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHCI" value="{!! (isset($order->SHSHCI)&&trim($order->SHSHCI)!=''?trim($order->SHSHCI):' ') !!}"></td>
</tr>
<tr>
<td><b>State</b></td> <!-- ALPHA MAX -->
<td class="text-left smalltxt" id="ORIG_PSHST">{!! (isset($original->PSHST)&&trim($original->PSHST)!=''?trim($original->PSHST):'') !!}</td>
<td class="text-left smalltxt" id="OLD_SHSHST">{!! (isset($order->SHSHST)&&trim($order->SHSHST)!=''?trim($order->SHSHST):'') !!}</td>
<td class="text-right"><label for="sonar-input-967e1c005d" class="visually-hidden">sonar input 967e1c005d</label>
<input maxlength="2" onkeypress='return ((event.charCode id="sonar-input-967e1c005d">= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHST" value="{!! (isset($order->SHSHST)&&trim($order->SHSHST)!=''?trim($order->SHSHST):' ') !!}"></td>
<input id="sonar-input-967e1c005d" aria-label="Shshst" maxlength="2" onkeypress='return ((event.charCode >= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHST" value="{!! (isset($order->SHSHST)&&trim($order->SHSHST)!=''?trim($order->SHSHST):' ') !!}"></td>
<tr>
<td><b>Zip</b></td> <!-- MAX -->
<td class="text-left smalltxt" id="ORIG_PSHZP">{!! (isset($original->PSHZP)&&trim($original->PSHZP)!=''?trim($original->PSHZP):'') !!}</td>
<td class="text-left smalltxt" id="OLD_SHSHZP">{!! (isset($order->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):'') !!}</td>
<td class="text-right"><label for="sonar-input-d755055c65" class="visually-hidden">SHSHZP</label>
<input maxlength="9" class="myinput toUpper" type="text" name="SHSHZP" value="{!! (isset($order->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):' ') !!}" id="sonar-input-e043dfd88b"></td>
<input maxlength="9" class="myinput toUpper" type="text" name="SHSHZP" value="{!! (isset($order->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):' ') !!}" id="sonar-input-d755055c65"></td>
</tr>
<tr>
<td><b>Country</b></td> <!-- ALPHA MAX -->
Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+2 -2
View File
@@ -8,12 +8,12 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="userAddData">
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tbody>
<!-- R428DV R428PL R428WHS R428STS R428US R428FIRST R428FAMILY R428EMAIL R428EMPCDE R428ADMUSR R428PWRUSR -->
<tr>
<td>
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tr>
<input type="hidden" id="R428CO" name="R428CO">
<input type="hidden" id="R428PL" name="R428PL">
Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php
+2 -2
View File
@@ -8,12 +8,12 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="userEditData">
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tbody>
<!-- R428DV R428PL R428WHS R428STS R428US R428FIRST R428FAMILY R428EMAIL R428EMPCDE R428ADMUSR R428PWRUSR -->
<tr>
<td>
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tr>
<input type="hidden" id="OLD_R428CO" name="OLD_R428CO">
<input type="hidden" id="OLD_R428PL" name="OLD_R428PL">
Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php
+2 -2
View File
@@ -8,11 +8,11 @@
</div>
<div class="modal-body">
<div class="table-responsive" id="userPasswordData">
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tbody>
<tr>
<td>
<table class="table table-condensed">
<table role="presentation" class="table table-condensed">
<tr>
<td><b>Enter a new password to re-enable user</b></td> <!-- Password -->
<td class="text-right">
Modules/M3/Resources/views/liberty-theme/partials/module-navigation.blade.php
+1 -1
View File
@@ -13,7 +13,7 @@
<a class="m3-module-nav-link {{ request()->routeIs('m3.OrderLinesOfClosedOrder') ? 'is-active' : '' }}" href="{{ route('m3.OrderLinesOfClosedOrder') }}"><i class="fas fa-file-excel"></i><span>Closed Orders</span></a>
@if($power_users === 'Y' || $admin_users === 'Y')
<a class="m3-module-nav-link {{ request()->routeIs('m3.carrierMaint') ? 'is-active' : '' }}" href="{{ route('m3.carrierMaint') }}"><i class="fas fa-route"></i><span>Carriers</span></a>
<a class="m3-module-nav-link {{ request()->routeIs('m3.userPickingStats4') || request()->routeIs('m3.userPickingStats5') ? 'is-active' : '' }}" href="{{ route('m3.userPickingStats4') }}"><i class="fas fa-chart-line"></i><span>Efficiency</span></a>
<a class="m3-module-nav-link {{ request()->routeIs('m3.UserPickingStats4') || request()->routeIs('m3.UserPickingStats5') ? 'is-active' : '' }}" href="{{ route('m3.UserPickingStats4') }}"><i class="fas fa-chart-line"></i><span>Efficiency</span></a>
<a class="m3-module-nav-link {{ request()->routeIs('m3.pendingClosure') ? 'is-active' : '' }}" href="{{ route('m3.pendingClosure') }}"><i class="fas fa-clock"></i><span>Pending Closure</span></a>
@endif
<a class="m3-module-nav-link {{ request()->routeIs('m3.ship-to.*') ? 'is-active' : '' }}" href="{{ route('m3.ship-to.index') }}"><i class="fas fa-warehouse"></i><span>Ship-to</span></a>
Modules/M3/Routes/web.php
+57 -57
View File
@@ -1,29 +1,29 @@
<?php
use Illuminate\Support\Facades\Route;
use Modules\M3\Http\Controllers\authController;
use Modules\M3\Http\Controllers\AuthController;
use Modules\M3\Http\Controllers\BoxPackToPalletController;
use Modules\M3\Http\Controllers\carrierMaintController;
use Modules\M3\Http\Controllers\dashboardController;
use Modules\M3\Http\Controllers\execSummaryController;
use Modules\M3\Http\Controllers\execSummaryLineController;
use Modules\M3\Http\Controllers\fillBOL2Controller;
use Modules\M3\Http\Controllers\fillBOLController;
use Modules\M3\Http\Controllers\CarrierMaintController;
use Modules\M3\Http\Controllers\DashboardController;
use Modules\M3\Http\Controllers\ExecSummaryController;
use Modules\M3\Http\Controllers\ExecSummaryLineController;
use Modules\M3\Http\Controllers\FillBOL2Controller;
use Modules\M3\Http\Controllers\FillBOLController;
use Modules\M3\Http\Controllers\GetContentsController;
use Modules\M3\Http\Controllers\M3CallCloseAPIController;
use Modules\M3\Http\Controllers\M3DeliveryController;
use Modules\M3\Http\Controllers\MFOrdersController;
use Modules\M3\Http\Controllers\palletQtyController;
use Modules\M3\Http\Controllers\pendingClosureController;
use Modules\M3\Http\Controllers\sentinelController;
use Modules\M3\Http\Controllers\PalletQtyController;
use Modules\M3\Http\Controllers\PendingClosureController;
use Modules\M3\Http\Controllers\SentinelController;
use Modules\M3\Http\Controllers\ShipToController;
use Modules\M3\Http\Controllers\userControlController;
use Modules\M3\Http\Controllers\userPickingStats4;
use Modules\M3\Http\Controllers\userPickingStats5;
use Modules\M3\Http\Controllers\UserControlController;
use Modules\M3\Http\Controllers\UserPickingStats4;
use Modules\M3\Http\Controllers\UserPickingStats5;
// Sentinel
use Modules\M3\Http\Controllers\userProfileController;
use Modules\M3\Http\Controllers\UserProfileController;
// Warehouse Performance
use Modules\M3\Http\Controllers\utilitiesContoller;
use Modules\M3\Http\Controllers\UtilitiesController;
use Modules\M3\Http\Controllers\WhsePerfController;
// Pack Box To Pallet
use Modules\M3\Http\Controllers\WhsePerfDetailsController;
@@ -32,7 +32,7 @@ use Modules\M3\Http\Controllers\WhsPerfMetrics;
// Not Used
// use Modules\M3\Http\Controllers\orderInquiryController;
// use Modules\M3\Http\Controllers\ordersOnHoldReqController;
// use Modules\M3\Http\Controllers\userPickingStats4;
// use Modules\M3\Http\Controllers\UserPickingStats4;
// use Modules\M3\Http\Controllers\ReplenishSettingsController;
Route::get('/assets/{path}', function (string $path) {
@@ -68,47 +68,47 @@ Route::get('/assets/{path}', function (string $path) {
Route::get('/health', fn () => response()->json(['module' => 'M3', 'status' => 'ok', 'database' => config('m3.connection', 'pgsql')]))->name('health');
// Admin Panel
Route::get('/', [dashboardController::class, 'index'])->name('index');
Route::get('/', [DashboardController::class, 'index'])->name('index');
// Utilities utilitiesContoller
Route::get('/utilities', [utilitiesContoller::class, 'index'])->name('utilities');
Route::get('/pdfReadWrite', [utilitiesContoller::class, 'pdfReadWrite'])->name('pdfReadWrite');
Route::get('/fixICM799MSentPKR', [utilitiesContoller::class, 'fixICM799MSentPKR'])->name('fixICM799MSentPKR');
Route::get('/generateGS128', [utilitiesContoller::class, 'generateGS128'])->name('generateGS128');
Route::get('/miscTests', [utilitiesContoller::class, 'miscTests'])->name('miscTests');
// Utilities UtilitiesController
Route::get('/utilities', [UtilitiesController::class, 'index'])->name('utilities');
Route::get('/pdfReadWrite', [UtilitiesController::class, 'pdfReadWrite'])->name('pdfReadWrite');
Route::get('/fixICM799MSentPKR', [UtilitiesController::class, 'fixICM799MSentPKR'])->name('fixICM799MSentPKR');
Route::get('/generateGS128', [UtilitiesController::class, 'generateGS128'])->name('generateGS128');
Route::get('/miscTests', [UtilitiesController::class, 'miscTests'])->name('miscTests');
// logout
Route::get('/logout', [authController::class, 'logout'])->name('logout');
Route::get('/logout', [AuthController::class, 'logout'])->name('logout');
// orderInquiry
// Route::get('/orderInquiry', [orderInquiryController::class, 'index'])->name('orderInquiry');
// Route::post('/gotoOrder',[ordersOnHoldReqController::class, 'order'])->name('ordersOnHoldReqOrder');
// v4
Route::get('/userPickingStats4', [userPickingStats4::class, 'index'])->name('userPickingStats4');
Route::post('/userPickingStats4', [userPickingStats4::class, 'index'])->name('userPickingStats4');
Route::get('/UserPickingStats4', [UserPickingStats4::class, 'index'])->name('UserPickingStats4');
Route::post('/UserPickingStats4', [UserPickingStats4::class, 'index'])->name('UserPickingStats4');
// userControl
Route::get('/userControl', [userControlController::class, 'index'])->name('userControl');
Route::post('/userControl', [userControlController::class, 'index'])->name('userControl');
Route::post('/userControl/saveUserAdd', [userControlController::class, 'saveUserAdd'])->name('saveUserAdd');
Route::post('/userControl/saveUserEdit', [userControlController::class, 'saveUserEdit'])->name('saveUserEdit');
Route::get('/userControl/callCL', [userControlController::class, 'callCL'])->name('callCL');
Route::post('/userControl/savePassword', [userControlController::class, 'savePassword'])->name('savePassword');
Route::get('/userControl', [UserControlController::class, 'index'])->name('userControl');
Route::post('/userControl', [UserControlController::class, 'index'])->name('userControl');
Route::post('/userControl/saveUserAdd', [UserControlController::class, 'saveUserAdd'])->name('saveUserAdd');
Route::post('/userControl/saveUserEdit', [UserControlController::class, 'saveUserEdit'])->name('saveUserEdit');
Route::get('/userControl/callCL', [UserControlController::class, 'callCL'])->name('callCL');
Route::post('/userControl/savePassword', [UserControlController::class, 'savePassword'])->name('savePassword');
// palletQty
Route::get('/palletQty', [palletQtyController::class, 'index'])->name('palletQty');
Route::post('/palletQty', [palletQtyController::class, 'index'])->name('palletQty');
Route::post('/palletQty/saveQtyAdd', [palletQtyController::class, 'saveQtyAdd'])->name('saveQtyAdd');
Route::post('/palletQty/saveQtyAdd2', [palletQtyController::class, 'saveQtyAdd2'])->name('saveQtyAdd2');
Route::post('/palletQty/saveQtyEdit', [palletQtyController::class, 'saveQtyEdit'])->name('saveQtyEdit');
Route::get('/palletQty', [PalletQtyController::class, 'index'])->name('palletQty');
Route::post('/palletQty', [PalletQtyController::class, 'index'])->name('palletQty');
Route::post('/palletQty/saveQtyAdd', [PalletQtyController::class, 'saveQtyAdd'])->name('saveQtyAdd');
Route::post('/palletQty/saveQtyAdd2', [PalletQtyController::class, 'saveQtyAdd2'])->name('saveQtyAdd2');
Route::post('/palletQty/saveQtyEdit', [PalletQtyController::class, 'saveQtyEdit'])->name('saveQtyEdit');
// carrierMaint
Route::get('/carrierMaint', [carrierMaintController::class, 'index'])->name('carrierMaint');
Route::post('/carrierMaint', [carrierMaintController::class, 'index'])->name('carrierMaint');
Route::post('/carrierMaint/saveCarrierAdd', [carrierMaintController::class, 'saveCarrierAdd'])->name('saveCarrierAdd');
Route::post('/carrierMaint/saveCarrierAdd2', [carrierMaintController::class, 'saveCarrierAdd2'])->name('saveCarrierAdd2');
Route::post('/carrierMaint/saveCarrierEdit', [carrierMaintController::class, 'saveCarrierEdit'])->name('saveCarrierEdit');
Route::get('/carrierMaint', [CarrierMaintController::class, 'index'])->name('carrierMaint');
Route::post('/carrierMaint', [CarrierMaintController::class, 'index'])->name('carrierMaint');
Route::post('/carrierMaint/saveCarrierAdd', [CarrierMaintController::class, 'saveCarrierAdd'])->name('saveCarrierAdd');
Route::post('/carrierMaint/saveCarrierAdd2', [CarrierMaintController::class, 'saveCarrierAdd2'])->name('saveCarrierAdd2');
Route::post('/carrierMaint/saveCarrierEdit', [CarrierMaintController::class, 'saveCarrierEdit'])->name('saveCarrierEdit');
// M3Delivery Maint
Route::get('/M3Delivery', [M3DeliveryController::class, 'index'])->name('M3Delivery');
@@ -143,14 +143,14 @@ Route::any('/StoreExcelToDisk', 'Modules\M3\Http\Controllers\OrderLinesOfClosedO
Route::any('/downloadFiles', 'Modules\M3\Http\Controllers\OrderLinesOfClosedOrder@downloadFiles')->name('downloadFiles');
// v5
Route::get('/userPickingStats5', [userPickingStats5::class, 'index'])->name('userPickingStats5');
Route::post('/userPickingStats5', [userPickingStats5::class, 'index'])->name('userPickingStats5');
Route::get('/UserPickingStats5', [UserPickingStats5::class, 'index'])->name('UserPickingStats5');
Route::post('/UserPickingStats5', [UserPickingStats5::class, 'index'])->name('UserPickingStats5');
// 732
// pendingClosure
Route::get('/pendingClosure', [pendingClosureController::class, 'index'])->name('pendingClosure');
Route::post('/pendingClosure', [pendingClosureController::class, 'index'])->name('pendingClosure');
Route::post('/allowRetry', [pendingClosureController::class, 'allowRetry'])->name('allowRetry');
Route::get('/pendingClosure', [PendingClosureController::class, 'index'])->name('pendingClosure');
Route::post('/pendingClosure', [PendingClosureController::class, 'index'])->name('pendingClosure');
Route::post('/allowRetry', [PendingClosureController::class, 'allowRetry'])->name('allowRetry');
// Ship To
Route::resource('ship-to', ShipToController::class)->parameters(['ship-to' => 'austcn'])->except(['show']);
@@ -166,16 +166,16 @@ Route::get('/MFOrders/{id}', [MFOrdersController::class, 'index'])->name('MFOrde
Route::any('/GetContentsForClose', [GetContentsController::class, 'processShipment'])->name('GetContentsForClose');
// Update Profile
Route::any('/userprofile', [userProfileController::class, 'index'])->name('userprofile');
Route::post('/userprofileupdate', [userProfileController::class, 'updateUserProfile'])->name('userprofileupdate');
Route::any('/userprofileupdateajax', [userProfileController::class, 'updateUserProfileAjax'])->name('userprofileupdateajax');
Route::any('/userprofile', [UserProfileController::class, 'index'])->name('userprofile');
Route::post('/userprofileupdate', [UserProfileController::class, 'updateUserProfile'])->name('userprofileupdate');
Route::any('/userprofileupdateajax', [UserProfileController::class, 'updateUserProfileAjax'])->name('userprofileupdateajax');
// Sentinel Functions
Route::any('/packSyst5Func', [sentinelController::class, 'packSyst5Func'])->name('packSyst5Func');
Route::any('/packSyst5Func', [SentinelController::class, 'packSyst5Func'])->name('packSyst5Func');
// Executives summary
Route::any('/execsummary', [execSummaryController::class, 'index'])->name('execsummary');
Route::any('/execsummaryline', [execSummaryLineController::class, 'index'])->name('execsummaryline');
Route::any('/execsummary', [ExecSummaryController::class, 'index'])->name('execsummary');
Route::any('/execsummaryline', [ExecSummaryLineController::class, 'index'])->name('execsummaryline');
// Warehouse Perf Metrics
Route::any('/whsePerf', [WhsePerfController::class, 'index'])->name('whsePerf');
@@ -185,11 +185,11 @@ Route::any('/whsePerfDetails', [WhsePerfDetailsController::class, 'index'])->nam
Route::any('/downloadFilesWhs', [WhsPerfMetrics::class, 'downloadFiles'])->name('downloadFilesWhs');
// BOL PDFs
Route::any('/fillBOL', [fillBOLController::class, 'index'])->name('fillBOL');
Route::any('/fillBOLPDF', [fillBOLController::class, 'fillBOL'])->name('fillBOLPDF');
Route::any('/fillBOL', [FillBOLController::class, 'index'])->name('fillBOL');
Route::any('/fillBOLPDF', [FillBOLController::class, 'fillBOL'])->name('fillBOLPDF');
Route::any('/fillBOL2', [fillBOL2Controller::class, 'index'])->name('fillBOL2');
Route::any('/fillBOL2PDF', [fillBOL2Controller::class, 'fillBOL'])->name('fillBOL2PDF');
Route::any('/fillBOL2', [FillBOL2Controller::class, 'index'])->name('fillBOL2');
Route::any('/fillBOL2PDF', [FillBOL2Controller::class, 'fillBOL'])->name('fillBOL2PDF');
// Pack Box to Pallet BoxPackToPalletController
Route::any('/BoxPackToPallet', [BoxPackToPalletController::class, 'index'])->name('BoxPackToPallet');
Modules/Platform/resources/views/licenses/index.blade.php
+2 -2
View File
@@ -11,7 +11,7 @@
<h2 class="text-lg font-bold text-zinc-900 dark:text-white">Issue licence key</h2>
<form method="POST" action="{{ route('platform.licenses.store') }}" class="mt-5 grid gap-4 md:grid-cols-5">
@csrf
<select name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select aria-label="Company Id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
@foreach ($companies as $company)
<option value="{{ $company->id }}">{{ $company->name }}</option>
@endforeach
@@ -19,7 +19,7 @@
<label for="sonar-input-959b26bb51" class="visually-hidden">Licence label</label>
<input name="label" placeholder="Licence label"
class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-959b26bb51">
<select name="plan" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select aria-label="Plan" name="plan" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<option>standard</option>
<option>professional</option>
<option>enterprise</option>
Modules/Platform/resources/views/payments/index.blade.php
+2 -2
View File
@@ -7,7 +7,7 @@
<h2 class="text-lg font-bold text-zinc-900 dark:text-white">Add payment or override</h2>
<form method="POST" action="{{ route('platform.payments.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
@csrf
<select name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select aria-label="Company Id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
@foreach ($companies as $company)
<option value="{{ $company->id }}">{{ $company->name }}</option>
@endforeach
@@ -18,7 +18,7 @@
<label for="sonar-input-e17e77c7c9" class="visually-hidden">currency</label>
<input name="currency" value="gbp"
class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-e17e77c7c9">
<select name="status" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select aria-label="Status" name="status" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<option>paid</option>
<option>pending</option>
<option>failed</option>
Modules/Warehouse/resources/views/rules/index.blade.php
+2 -2
View File
@@ -7,7 +7,7 @@
<h2 class="text-lg font-bold text-zinc-900 dark:text-white">Add validation rule</h2>
<form method="POST" action="{{ route('warehouse-rules.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
@csrf
<select name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select aria-label="Warehouse Id" name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
@foreach ($warehouses as $warehouse)
<option value="{{ $warehouse->id }}">{{ $warehouse->name }}</option>
@endforeach
@@ -18,7 +18,7 @@
<label for="sonar-input-e1cd9e371a" class="visually-hidden">stock.location.required</label>
<input name="rule_key" placeholder="stock.location.required"
class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-e1cd9e371a">
<select name="severity" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select aria-label="Severity" name="severity" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<option>error</option>
<option>warning</option>
<option>blocker</option>