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

M3 Integration fixes

Browse Source
This commit is contained in:
Mark Gregory
2026-09-21 10:14:57 +01:00
parent 4af997c465
commit 6d60cbff84
5853 changed files with 79032 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Resources/views/liberty-theme/pages/carrierMaint.blade.php
Executable
+406
View File
@@ -0,0 +1,406 @@
@extends('m3::liberty-theme.layout.main')
@section('title')
Solon Sentinel Portal - Carrier Master Maintenance
@endsection
@section('content')
<!-- /.row -->
<div class="container-fluid px-4">
<h1 class="mt-4">Carrier Master Maintenance</h1>
<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"
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> -->
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover" id="datatablesSimple5" style="width:80%">
<thead>
<tr>
<th></th>
<th></th>
<th>SCAC Code</th>
<th>Carrier name</th>
<th>2ship Carrier Code</th>
<th>Parcel Carrier Code</th>
<th>ERP Carrier Code</th>
<th>Timing of M3 closing</th>
</tr>
</thead>
<tbody>
@foreach($ICM160M as $key=>$val)
<tr>
<td></td>
<td>
@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)}}"
data-CASPR1A01="{{trim($val->CASPR1A01)}}"
>Edit</button>
@endif
</td>
<td> {{ $val->CANUM }} </td>
<td> {{ $val->CANAM }} </td>
<td> {{ $val->TWOSHIPCARRIERCODE }} </td>
<td> {{ $val->PARCELCARRIERCODE=="X"?"Parcel":"" }} </td>
<td> {{ $val->CASPR10A01 }} </td>
<td> {{ $val->CASPR1A01=="Y"?"When closing truck":"" }} </td>
</tr>
@endforeach
<!-- endif-->
</tbody>
</table>
</div>
</div>
</div>
</div>
<!-- /.row -->
<!-- @include('m3::liberty-theme.partials.modals.blank') -->
@include('m3::liberty-theme.partials.modals.carrierAdd')
@include('m3::liberty-theme.partials.modals.carrierEdit')
@endsection
@section('scripts')
<script>
$(document).ready(function() {
// DataTable init
var myTable = $('#datatablesSimple5').DataTable({
"aaSorting": [],
"lengthMenu": [ [12,35,50,-1], [12,35,50,"All"] ],
"sPaginationType": "full_numbers",
"dom": 'Bfrtip', // Needs button container
"responsive": true,
"orderCellsTop": true,
"order": [ [2, 'asc'] ],
"pageLength": 12,
"columnDefs": [
{
orderable: true,
searchable: true,
targets: -2
}
]
});
// Update Checkbox values on Change
$("#PARCELCARRIERCODE").change(function() {
if($(this).is(":checked")) {
$("#PARCELCARRIERCODE").val("X");
} else {
$("#PARCELCARRIERCODE").val(" ");
}
});
$("#addPARCELCARRIERCODE").change(function() {
if($(this).is(":checked")) {
$("#addPARCELCARRIERCODE").val("X");
} else {
$("#addPARCELCARRIERCODE").val(" ");
}
});
$("#CASPR1A01").change(function() {
if($(this).is(":checked")) {
$("#CASPR1A01").val("Y");
} else {
$("#CASPR1A01").val(" ");
}
});
$("#addCASPR1A01").change(function() {
if($(this).is(":checked")) {
$("#addCASPR1A01").val("Y");
} else {
$("#addCASPR1A01").val(" ");
}
});
//
// Open Modal Carrier Edit
//
$(document).on('click', '#carrierEdit_click', function() {
// console.log($(this));
$("#CANUM").val($(this).data("canum"));
$("#CANAM").val($(this).data("canam"));
$("#TWOSHIPCARRIERCODE").val($(this).data("twoshipcarriercode"));
$("#PARCELCARRIERCODE").val($(this).data("parcelcarriercode"));
$("#CASPR10A01").val($(this).data("caspr10a01"));
$("#CASPR1A01").val($(this).data("caspr1a01"));
$("#OLD_CANUM").val($(this).data("canum"));
$("#OLD_CANAM").val($(this).data("canam"));
$("#OLD_TWOSHIPCARRIERCODE").val($(this).data("twoshipcarriercode"));
$("#OLD_PARCELCARRIERCODE").val($(this).data("parcelcarriercode"));
$("#OLD_CASPR10A01").val($(this).data("caspr10a01"));
$("#OLD_CASPR1A01").val($(this).data("caspr1a01"));
if($(this).data("parcelcarriercode")=='X') {
$("#PARCELCARRIERCODE").prop("checked", true);
} else {
$("#PARCELCARRIERCODE").prop("checked", false);
}
if($(this).data("caspr1a01")=='Y') {
$("#CASPR1A01").prop("checked", true);
} else {
$("#CASPR1A01").prop("checked", false);
}
$('#carrierEdit').modal('show');
});
//
// Open Modal Carrier Add
//
$(document).on('click', '#carrierAdd_click', function() {
// console.log($(this));
// $("#AT9DPW").val($(this).data("at9dpw"));
$('#carrierAdd').modal('show');
});
// Clear values on Edit form when Close is clicked
$(document).on('click', '#closeEdit', function() {
document.getElementById("frmEdit").reset();
});
// Clear values on Add form when Close is clicked
$(document).on('click', '#closeAdd', function() {
document.getElementById("frmAdd").reset();
});
//
// Save Carrier Edit
//
$(document).on('click', '#submitCarrierEdit', function() {
var changes_detected = 0;
var errors_found = 0;
// Get the right Values
if($("#PARCELCARRIERCODE").is(":checked")) {
$("#PARCELCARRIERCODE").val("X");
} else {
$("#PARCELCARRIERCODE").val(" ");
}
if($("#addPARCELCARRIERCODE").is(":checked")) {
$("#addPARCELCARRIERCODE").val("X");
} else {
$("#addPARCELCARRIERCODE").val(" ");
}
if($("#CASPR1A01").is(":checked")) {
$("#CASPR1A01").val("Y");
} else {
$("#CASPR1A01").val(" ");
}
if($("#addCASPR1A01").is(":checked")) {
$("#addCASPR1A01").val("Y");
} else {
$("#addCASPR1A01").val(" ");
}
// Retrieve the values we need to pass on
var NEW_CANUM = $("#CANUM").val();
var NEW_CANAM = $("#CANAM").val();
var NEW_TWOSHIPCARRIERCODE = $("#TWOSHIPCARRIERCODE").val();
var NEW_PARCELCARRIERCODE = $("#PARCELCARRIERCODE").val();
var NEW_CASPR10A01 = $("#CASPR10A01").val();
var NEW_CASPR1A01 = $("#CASPR1A01").val();
// Retrieve old values
var OLD_CANUM = $("#OLD_CANUM").val();
var OLD_CANAM = $("#OLD_CANAM").val();
var OLD_TWOSHIPCARRIERCODE = $("#OLD_TWOSHIPCARRIERCODE").val();
var OLD_PARCELCARRIERCODE = $("#OLD_PARCELCARRIERCODE").val();
var OLD_CASPR10A01 = $("#OLD_CASPR10A01").val();
var OLD_CASPR1A01 = $("#OLD_CASPR1A01").val();
if(NEW_TWOSHIPCARRIERCODE.length>3) {
$('#carrierEdit').modal('show');
alert("Value entered greater than 999");
$("#TWOSHIPCARRIERCODE").val("");
$("#TWOSHIPCARRIERCODE").focus();
errors_found=1;
}
if(NEW_CASPR10A01.length>6) {
$('#carrierEdit').modal('show');
alert("Value entered greater than 999999");
$("#PARCELCARRIERCODE").val("");
$("#PARCELCARRIERCODE").focus();
errors_found=1;
}
if(errors_found==0) {
var csrf = document.querySelector('meta[name="csrf-token"]').content;
var form_post = {
'CANUM': NEW_CANUM,
'CANAM': NEW_CANAM,
'TWOSHIPCARRIERCODE': NEW_TWOSHIPCARRIERCODE,
'PARCELCARRIERCODE': NEW_PARCELCARRIERCODE,
'CASPR10A01': NEW_CASPR10A01,
'CASPR1A01': NEW_CASPR1A01,
'_token': csrf
};
// console.log(form_post); return false;
$.ajax({
type:'POST',
url:'/carrierMaint/saveCarrierEdit',
data: form_post,
success:function(data) {
if (data=="success") {
//$('#blank-modal').modal('hide');
$('#carrierEdit').modal('hide');
// alert("should reload here");
location.reload();
} else {
$("#CANUM").val(NEW_CANUM);
$("#CANAM").val(NEW_CANAM);
$("#TWOSHIPCARRIERCODE").val(NEW_TWOSHIPCARRIERCODE);
$("#AT9DPW").val(NEW_AT9DPWH);
$("#PARCELCARRIERCODE").val(NEW_PARCELCARRIERCODE);
$("#CASPR10A01").val(NEW_CASPR10A01);
$("#CASPR1A01").val(NEW_CASPR1A01);
$("#OLD_CANUM").val(OLD_CANUM);
$("#OLD_CANAM").val(OLD_CANAM);
$("#OLD_TWOSHIPCARRIERCODE").val(OLD_TWOSHIPCARRIERCODE);
$("#OLD_PARCELCARRIERCODE").val(OLD_PARCELCARRIERCODE);
$("#OLD_CASPR10A01").val(OLD_CASPR10A01);
$("#OLD_CASPR1A01").val(OLD_CASPR1A01);
// if (data=="null") {
// alert("SCAC Code entered cannot be blank. Please try again.");
// $("#addCANUM").val('');
// $('#carrierAdd').modal('show');
// $("#addCANUM").focus();
// }
}
}
});
}
});
//
// Save Carrier Add
//
$(document).on('click', '#submitCarrierAdd', function() {
var errors_found = 0;
// Get the right Values
if($("#PARCELCARRIERCODE").is(":checked")) {
$("#PARCELCARRIERCODE").val("X");
} else {
$("#PARCELCARRIERCODE").val(" ");
}
if($("#addPARCELCARRIERCODE").is(":checked")) {
$("#addPARCELCARRIERCODE").val("X");
} else {
$("#addPARCELCARRIERCODE").val(" ");
}
if($("#CASPR1A01").is(":checked")) {
$("#CASPR1A01").val("Y");
} else {
$("#CASPR1A01").val(" ");
}
if($("#addCASPR1A01").is(":checked")) {
$("#addCASPR1A01").val("Y");
} else {
$("#addCASPR1A01").val(" ");
}
// Retrieve the values we need to pass on
var NEW_CANUM = $("#addCANUM").val();
var NEW_CANAM = $("#addCANAM").val();
var NEW_TWOSHIPCARRIERCODE = $("#addTWOSHIPCARRIERCODE").val();
var NEW_PARCELCARRIERCODE = $("#addPARCELCARRIERCODE").val();
var NEW_CASPR10A01 = $("#addCASPR10A01").val();
var NEW_CASPR1A01 = $("#addCASPR1A01").val();
var csrf = document.querySelector('meta[name="csrf-token"]').content;
var form_post = {
'CANUM': NEW_CANUM,
'CANAM': NEW_CANAM,
'TWOSHIPCARRIERCODE': NEW_TWOSHIPCARRIERCODE,
'PARCELCARRIERCODE': NEW_PARCELCARRIERCODE,
'CASPR10A01': NEW_CASPR10A01,
'CASPR1A01': NEW_CASPR1A01,
'_token': csrf
};
// console.log(form_post); return false;
// if (NEW_PARCELCARRIERCODE.trim()=="" || NEW_CASPR10A01.trim()=="") {
// $('#carrierAdd').modal('show');
// if (NEW_CASPR10A01=="") {
// $('#CASPR10A01').focus();
// }
// alert("There are fields that are blank that must be populated.");
// } else {
if(NEW_TWOSHIPCARRIERCODE.length>3) {
$('#carrierAdd').modal('show');
alert("Value entered greater than 999");
$("#addTWOSHIPCARRIERCODE").val("");
$("#addTWOSHIPCARRIERCODE").focus();
errors_found=1;
}
if(NEW_CASPR10A01.length>6) {
$('#carrierAdd').modal('show');
alert("Value entered greater than 999999");
$("#addPARCELCARRIERCODE").val("");
$("#addPARCELCARRIERCODE").focus();
errors_found=1;
}
if(errors_found==0) {
$.ajax({
type:'POST',
url:'/carrierMaint/saveCarrierAdd',
data: form_post,
success:function(data) {
if (data=="success") {
$('#carrierAdd').modal('hide');
location.reload();
} else {
$("#addCANUM").val(NEW_CANUM);
$("#addCANAM").val(NEW_CANAM);
$("#addTWOSHIPCARRIERCODE").val(NEW_TWOSHIPCARRIERCODE);
$("#addPARCELCARRIERCODE").val(NEW_PARCELCARRIERCODE);
$("#addCASPR10A01").val(NEW_CASPR10A01);
$("#addCASPR1A01").val(NEW_CASPR1A01);
if (data=="exists") {
alert("SCAC Code entered already exists. Please try again.");
$("#addCANUM").val('');
$("#addCANAM").val('');
$("#addTWOSHIPCARRIERCODE").val('');
$("#addPARCELCARRIERCODE").val('');
$("#addCASPR10A01").val('');
$("#addCASPR1A01").val('');
$('#carrierAdd').modal('show');
}
if (data=="null") {
alert("SCAC Code entered cannot be blank. Please try again.");
$("#addCANUM").val('');
$('#carrierAdd').modal('show');
$("#addCANUM").focus();
}
}
}
});
}
});
});
//});
</script>
@endsection