diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php index e6606ec5..0116279d 100644 --- a/Modules/M3/Http/Controllers/API/CloseShipment.php +++ b/Modules/M3/Http/Controllers/API/CloseShipment.php @@ -11,7 +11,7 @@ use Str; use Log; use Http; use File; -use Helper; +use Modules\M3\Helpers\Helper; use Modules\M3\Http\Controllers\GetContentsController; //use Request; diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php index 4511902b..f96590f8 100644 --- a/Modules/M3/Http/Controllers/API/M3Controller.php +++ b/Modules/M3/Http/Controllers/API/M3Controller.php @@ -9,7 +9,7 @@ use DB; use Config; use Str; use Log; -use Helper; +use Modules\M3\Helpers\Helper; class M3Controller extends Controller { diff --git a/Modules/M3/Http/Controllers/API/M3InventoryReport.php b/Modules/M3/Http/Controllers/API/M3InventoryReport.php index 6b74ba0c..8d4a106a 100644 --- a/Modules/M3/Http/Controllers/API/M3InventoryReport.php +++ b/Modules/M3/Http/Controllers/API/M3InventoryReport.php @@ -14,7 +14,7 @@ use Cache; use DateTime; use Smalot\PdfParser\Parser; use File; -use Helper; +use Modules\M3\Helpers\Helper; use Json; class M3InventoryReport extends Controller diff --git a/Modules/M3/Http/Controllers/API/PdfStorage.php b/Modules/M3/Http/Controllers/API/PdfStorage.php index c2167ced..98a83773 100644 --- a/Modules/M3/Http/Controllers/API/PdfStorage.php +++ b/Modules/M3/Http/Controllers/API/PdfStorage.php @@ -14,7 +14,7 @@ use Cache; use DateTime; use Smalot\PdfParser\Parser; use File; -use Helper; +use Modules\M3\Helpers\Helper; class PdfStorage extends Controller { diff --git a/Modules/M3/Http/Controllers/API/ReplenAPI.php b/Modules/M3/Http/Controllers/API/ReplenAPI.php index c2bc2eb5..a21aa2aa 100644 --- a/Modules/M3/Http/Controllers/API/ReplenAPI.php +++ b/Modules/M3/Http/Controllers/API/ReplenAPI.php @@ -14,7 +14,7 @@ use Cache; use DateTime; use Smalot\PdfParser\Parser; use File; -use Helper; +use Modules\M3\Helpers\Helper; class ReplenAPI extends Controller { diff --git a/Modules/M3/Http/Controllers/API/TransferAPI.php b/Modules/M3/Http/Controllers/API/TransferAPI.php index 939ad616..194570f5 100644 --- a/Modules/M3/Http/Controllers/API/TransferAPI.php +++ b/Modules/M3/Http/Controllers/API/TransferAPI.php @@ -14,7 +14,7 @@ use Cache; use DateTime; use Smalot\PdfParser\Parser; use File; -use Helper; +use Modules\M3\Helpers\Helper; class TransferAPI extends Controller { diff --git a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php index e9fbec77..268e7b7b 100644 --- a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php +++ b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php @@ -14,7 +14,7 @@ use Cache; use DateTime; use Smalot\PdfParser\Parser; use File; -use Helper; +use Modules\M3\Helpers\Helper; class TwoShipAPIs extends Controller { diff --git a/Modules/M3/Http/Controllers/M3DeliveryController.php b/Modules/M3/Http/Controllers/M3DeliveryController.php index 782cd44c..98c2b17a 100644 --- a/Modules/M3/Http/Controllers/M3DeliveryController.php +++ b/Modules/M3/Http/Controllers/M3DeliveryController.php @@ -14,33 +14,20 @@ class M3DeliveryController extends Controller { public static function index(Request $request) { - - $power_user = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m') - ->select('R428PWRUSR','R428US','R428CO','R428PL','R428WH') - ->where('R428US','=',strtoUpper(m3_user())) - ->first(); - $co = $power_user->R428CO; - $plant = $power_user->R428PL; - $whs = $power_user->R428WH; - $ICM664M = DB::connection(config('m3.connection', 'pgsql'))->select("select * from ICM664M - where AVCO='$co' and AVPLANT='$plant' and AVWHS='$whs'"); - $IC670M = DB::connection(config('m3.connection', 'pgsql'))->select("select * from IC670M where WDCO='$co' and WDPL='$plant' and WDWHS='$whs'"); - $shipvia = DB::connection(config('m3.connection', 'pgsql'))->select("select AXCODE, AXDESC from ICM319M order by 1"); -#646 where AXCO='$co' and AXWHS='$whs' and AXPLANT='$plant' + $connection = config('m3.connection', 'pgsql'); + $power_user = (object) ['R428PWRUSR'=>'N','R428US'=>strtoUpper(m3_user()),'R428CO'=>'','R428PL'=>'','R428WH'=>'']; + if (\Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m')) { + $power_user = DB::connection($connection)->table('icm428m')->select('R428PWRUSR','R428US','R428CO','R428PL','R428WH') + ->where('R428US',strtoUpper(m3_user()))->first() ?? $power_user; + } + $co=$power_user->R428CO; $plant=$power_user->R428PL; $whs=$power_user->R428WH; + $ICM664M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm664m') + ? DB::connection($connection)->table('icm664m')->where('AVCO',$co)->where('AVPLANT',$plant)->where('AVWHS',$whs)->get() : collect(); + $IC670M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('ic670m') + ? DB::connection($connection)->table('ic670m')->where('WDCO',$co)->where('WDPL',$plant)->where('WDWHS',$whs)->get() : collect(); + $shipvia = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm319m') + ? DB::connection($connection)->table('icm319m')->select('AXCODE','AXDESC')->orderBy('AXCODE')->get() : collect(); return view('m3::liberty-theme.pages.M3Delivery', compact('ICM664M','IC670M','power_user','shipvia')); - - // AVCO AVCO CHARACTER 3 No ' ' Division - // AVWHS AVWHS CHARACTER 3 No ' ' Warehouse - // AVPLANT AVPLANT CHARACTER 3 No ' ' Plant - // AVDELMETH AVDELMETH CHARACTER 4 No ' ' Delivery method - // AVSHPVIA AVSHPVIA CHARACTER 4 No ' ' Sentinel ship via - // AVSHSRT AVSHSRT CHARACTER 6 No ' ' Sentinel route - // AVSHORCL AVSHORCL CHARACTER 3 No ' ' Sentinel intl code - // AVSPR1A01 AVSPR1A01 CHARACTER 1 No ' ' Spare field 1A 01 - // AVSPR1A02 AVSPR1A02 CHARACTER 1 No ' ' Spare field 1A 02 - // AVSPR10A01 AVSPR10A01 CHARACTER 10 No ' ' Spare field 10A 1 - // AVSPR15A01 AVSPR15A01 CHARACTER 15 No ' ' Spare field 15A 1 - // AVSPR30A01 AVSPR30A01 CHARACTER 30 No ' ' Spare field 30A 1 } // diff --git a/Modules/M3/Http/Controllers/M3ErrorsDispController.php b/Modules/M3/Http/Controllers/M3ErrorsDispController.php index 6f2d49bb..002d5f18 100644 --- a/Modules/M3/Http/Controllers/M3ErrorsDispController.php +++ b/Modules/M3/Http/Controllers/M3ErrorsDispController.php @@ -23,9 +23,10 @@ class M3ErrorsDispController extends Controller $skipdates = isset($request->skipdates) ? trim($request->skipdates) : "N"; # Get users from ICM428M - $ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m') - ->select('R428US', 'R428FIRST', 'R428FAMILY') - ->get(); + $connection = config('m3.connection', 'pgsql'); + $ICM428M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m') + ? DB::connection($connection)->table('icm428m')->select('R428US', 'R428FIRST', 'R428FAMILY')->get() + : collect(); $ICM428MCOL = collect($ICM428M); $ICM428MCOL->filter(function ($value) { return $value->R428US = trim($value->R428US); diff --git a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php index bcbba5e0..4635fa44 100644 --- a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php +++ b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php @@ -19,7 +19,10 @@ class M3GetPDFFromCacheController extends Controller // Parse PDF file and build necessary objects. $parser = new \Smalot\PdfParser\Parser(); - $aggno = $aggmsg = ""; #$carrier = $trackingno = ""; + $aggno = $aggmsg = ""; + $IC670M = $PDFArray = $carrier = $trackingno = $ICM688M1 = []; + $AYMACPKR = $WHDDA = $COMPANY = $PLANT = $WHS = ''; + #$carrier = $trackingno = ""; # PDF File PATH $pdfFilePath = Config::get('arrays.PdfPath'); diff --git a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php index 3577cb41..2ab13dac 100644 --- a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php +++ b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php @@ -15,6 +15,10 @@ use Storage; class OrderLinesOfClosedOrder extends Controller { public static function index(Request $request){ + $IC670M = $ICM688M2 = []; + $WHDDA = $COMPANY = $PLANT = $WHS = ''; + $REPORTDATEDisp = today()->format('Ymd'); + $allReportsUrls = []; try { $SHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : ''; // dd($SHUSER); diff --git a/Modules/M3/Http/Controllers/ReplenishSettingsController.php b/Modules/M3/Http/Controllers/ReplenishSettingsController.php index e195df96..33c92351 100644 --- a/Modules/M3/Http/Controllers/ReplenishSettingsController.php +++ b/Modules/M3/Http/Controllers/ReplenishSettingsController.php @@ -23,10 +23,10 @@ class ReplenishSettingsController extends Controller # Get Logged user Id $userId = m3_user() !== '' ? strtoupper(m3_user()) : '' ; // $userId = 'E1135818'; // Brad : E1135818 Malak : E2011812 ACOM_PDF - $ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m') - ->where('R428US',$userId) - ->where('R428STS','A') - ->first(); + $connection = config('m3.connection', 'pgsql'); + $ICM428M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m') + ? DB::connection($connection)->table('icm428m')->where('R428US',$userId)->where('R428STS','A')->first() + : null; $userCO = isset($ICM428M->R428CO) ? $ICM428M->R428CO : ''; $userPL = isset($ICM428M->R428PL) ? $ICM428M->R428PL : ''; @@ -34,11 +34,13 @@ class ReplenishSettingsController extends Controller if ($userCO!='') { # Warehouse Table - $IC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m') + $IC670M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('ic670m') + ? DB::connection($connection)->table('ic670m') ->where('WDCO',$userCO) ->where('WDPL',$userPL) ->where('WDWHS',$userWH) - ->get(); + ->get() + : []; } else{ // $REFCAT658 =[]; @@ -151,10 +153,10 @@ class ReplenishSettingsController extends Controller # Get Logged user Id $userId = m3_user() !== '' ? strtoupper(m3_user()) : '' ; // $userId = 'E1135818'; // Brad : E1135818 Malak : E2011812 ACOM_PDF - $ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m') - ->where('R428US',$userId) - ->where('R428STS','A') - ->first(); + $connection = config('m3.connection', 'pgsql'); + $ICM428M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m') + ? DB::connection($connection)->table('icm428m')->where('R428US',$userId)->where('R428STS','A')->first() + : null; $userCO = isset($ICM428M->R428CO) ? $ICM428M->R428CO : ''; $userPL = isset($ICM428M->R428PL) ? $ICM428M->R428PL : ''; diff --git a/Modules/M3/Http/Controllers/carrierMaintController.php b/Modules/M3/Http/Controllers/carrierMaintController.php index fedab827..10eb432f 100644 --- a/Modules/M3/Http/Controllers/carrierMaintController.php +++ b/Modules/M3/Http/Controllers/carrierMaintController.php @@ -8,7 +8,7 @@ use Config; use Illuminate\Http\Request; use Symfony\Component\HttpFoundation\Response; use Modules\M3\Models\ICM160M; -use Helper; +use Modules\M3\Helpers\Helper; class carrierMaintController extends Controller diff --git a/Modules/M3/Http/Controllers/palletQtyController.php b/Modules/M3/Http/Controllers/palletQtyController.php index abeed02d..8af16ecb 100644 --- a/Modules/M3/Http/Controllers/palletQtyController.php +++ b/Modules/M3/Http/Controllers/palletQtyController.php @@ -14,24 +14,19 @@ class palletQtyController extends Controller { public static function index(Request $request) { - - #$IC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get(); - #$power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='".strtoUpper(m3_user())."'"); - $power_user = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m') - ->select('R428PWRUSR','R428US','R428CO','R428PL','R428WH') - ->where('R428US','=',strtoUpper(m3_user())) - ->first(); - $co = $power_user->R428CO; - $plant = $power_user->R428PL; - $whs = $power_user->R428WH; - $ICM709M = DB::connection(config('m3.connection', 'pgsql'))->table('icm709m') - ->where('AT9CO','=',$co) - ->where('AT9PLT','=',$plant) - ->where('AT9WHS','=',$whs) - ->get(); - $IC670M = DB::connection(config('m3.connection', 'pgsql'))->select("select * from IC670M where WDCO='$co' and WDPL='$plant' and WDWHS='$whs'"); + $connection = config('m3.connection', 'pgsql'); + $power_user = (object) ['R428PWRUSR'=>'N','R428US'=>strtoUpper(m3_user()),'R428CO'=>'','R428PL'=>'','R428WH'=>'']; + if (\Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m')) { + $power_user = DB::connection($connection)->table('icm428m') + ->select('R428PWRUSR','R428US','R428CO','R428PL','R428WH') + ->where('R428US','=',strtoUpper(m3_user()))->first() ?? $power_user; + } + $co=$power_user->R428CO; $plant=$power_user->R428PL; $whs=$power_user->R428WH; + $ICM709M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm709m') + ? DB::connection($connection)->table('icm709m')->where('AT9CO',$co)->where('AT9PLT',$plant)->where('AT9WHS',$whs)->get() : collect(); + $IC670M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('ic670m') + ? DB::connection($connection)->table('ic670m')->where('WDCO',$co)->where('WDPL',$plant)->where('WDWHS',$whs)->get() : collect(); return view('m3::liberty-theme.pages.palletQty', compact('ICM709M','IC670M','power_user')); - } // diff --git a/Modules/M3/Http/Controllers/userControlController.php b/Modules/M3/Http/Controllers/userControlController.php index 2fb7a672..476e888e 100644 --- a/Modules/M3/Http/Controllers/userControlController.php +++ b/Modules/M3/Http/Controllers/userControlController.php @@ -14,28 +14,20 @@ class userControlController extends Controller { public static function index(Request $request) { - - #$sqlstmt="select * from ICM428M"; - #$ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')->get(); - $ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m') - ->select('R428US','R428CO', 'R428WH') - ->where('R428US','=',strtoUpper(m3_user())) - ->first(); - $co = $ICM428M->R428CO; - $whs = $ICM428M->R428WH; - - $ICM428M = DB::connection(config('m3.connection', 'pgsql'))->select("SELECT * FROM ICM428M where R428CO='$co' and R428WH='$whs'"); - #765 add DATE_PASSWORD_EXPIRES as DATE_EXPIRED, SET_PASSWORD_TO_EXPIRE as EXPIRED - $USER_INFO = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')->selectRaw('R428US as USERPRF, R428STS as STATUS, NULL as DATE_EXPIRED, NULL as EXPIRED')->get()->all(); - #echo "
"; var_dump($USER_INFO); echo "
"; - $power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='".strtoUpper(m3_user())."'"); - #765 -# $expired_users = DB::connection(config('m3.connection', 'pgsql'))->select("SELECT USER_PROFILE FROM TABLE (SYSTOOLS.AUDIT_JOURNAL_CP () ) WHERE PASSWORD_EXPIRED = '*YES'"); -# echo "
"; print_r($expired_users); echo "
"; - - $IC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get(); + $connection = config('m3.connection', 'pgsql'); + $profile = null; + if (\Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m')) { + $profile = DB::connection($connection)->table('icm428m')->where('R428US',strtoUpper(m3_user()))->first(); + } + $co=$profile->R428CO ?? ''; $whs=$profile->R428WH ?? ''; + $ICM428M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m') + ? DB::connection($connection)->table('icm428m')->where('R428CO',$co)->where('R428WH',$whs)->get() : collect(); + $USER_INFO = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m') + ? DB::connection($connection)->table('icm428m')->selectRaw('R428US as USERPRF, R428STS as STATUS, NULL as DATE_EXPIRED, NULL as EXPIRED')->get()->all() : []; + $power_user = [(object)['R428PWRUSR'=>$profile->R428PWRUSR ?? 'N','R428CO'=>$co,'R428PL'=>$profile->R428PL ?? '','R428WH'=>$whs]]; + $IC670M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('ic670m') + ? DB::connection($connection)->table('ic670m')->get() : collect(); return view('m3::liberty-theme.pages.userControl', compact('ICM428M','IC670M','power_user','USER_INFO')); - } // diff --git a/Modules/M3/Resources/assets/liberty-theme/css/m3-core-shell.css b/Modules/M3/Resources/assets/liberty-theme/css/m3-core-shell.css new file mode 100644 index 00000000..ba2a3c7b --- /dev/null +++ b/Modules/M3/Resources/assets/liberty-theme/css/m3-core-shell.css @@ -0,0 +1,26 @@ +/* M3 integration inside the Core WMS shell. Core owns the global sidebar, topbar, typography and appearance. */ +.m3-core-page{font-family:inherit;color:inherit;width:100%;max-width:1600px;margin:0 auto;padding:1.5rem} +.m3-core-header{display:flex;align-items:flex-start;justify-content:space-between;gap:1rem;margin-bottom:1.5rem;padding:1.5rem;border:1px solid rgb(228 228 231);border-radius:1.5rem;background:linear-gradient(135deg,#020617,#0f172a 55%,#172554);color:#fff} +.m3-core-eyebrow{margin:0 0 .5rem;font-size:.75rem;font-weight:700;letter-spacing:.28em;color:#bfdbfe} +.m3-core-title{margin:0;font:inherit;font-size:2rem;font-weight:650;line-height:1.15;letter-spacing:-.025em;color:#fff} +.m3-core-context{margin:.5rem 0 0;color:#dbeafe} +.m3-core-actions{display:flex;gap:.5rem;flex-wrap:wrap} +.m3-core-breadcrumb{margin-bottom:1rem;color:rgb(82 82 91);font-size:.875rem} +.m3-core-content{color:rgb(24 24 27)} +.m3-core-content .container-fluid{padding:0} +.m3-core-content .panel,.m3-core-content .card,.m3-core-content .well{border:1px solid rgb(228 228 231);border-radius:1rem;background:#fff;box-shadow:0 1px 2px rgb(0 0 0/.04);overflow:hidden} +.m3-core-content .panel-heading,.m3-core-content .card-header{background:rgb(250 250 250);border-bottom:1px solid rgb(228 228 231);padding:.9rem 1rem;font-weight:600} +.m3-core-content table{color:inherit;background:transparent} +.m3-core-content .table>tbody>tr>td,.m3-core-content .table>tbody>tr>th,.m3-core-content .table>tfoot>tr>td,.m3-core-content .table>tfoot>tr>th,.m3-core-content .table>thead>tr>td,.m3-core-content .table>thead>tr>th{border-color:rgb(228 228 231)} +.m3-core-content input,.m3-core-content select,.m3-core-content textarea,.m3-core-content button{font-family:inherit} +.m3-core-alert{padding:1rem;border:1px solid rgb(254 202 202);border-radius:1rem;background:rgb(254 242 242);color:rgb(153 27 27);font-weight:600} +html.dark .m3-core-header{border-color:rgb(63 63 70);background:linear-gradient(135deg,#020617,#0f172a 55%,#172554)} +html.dark .m3-core-breadcrumb{color:rgb(161 161 170)} +html.dark .m3-core-content{color:rgb(244 244 245)} +html.dark .m3-core-content .panel,html.dark .m3-core-content .card,html.dark .m3-core-content .well{border-color:rgb(63 63 70);background:rgb(24 24 27)} +html.dark .m3-core-content .panel-heading,html.dark .m3-core-content .card-header{background:rgb(39 39 42);border-color:rgb(63 63 70);color:rgb(244 244 245)} +html.dark .m3-core-content .table{color:rgb(244 244 245)} +html.dark .m3-core-content .table>tbody>tr>td,html.dark .m3-core-content .table>tbody>tr>th,html.dark .m3-core-content .table>tfoot>tr>td,html.dark .m3-core-content .table>tfoot>tr>th,html.dark .m3-core-content .table>thead>tr>td,html.dark .m3-core-content .table>thead>tr>th{border-color:rgb(63 63 70)} +html.dark .m3-core-content input,html.dark .m3-core-content select,html.dark .m3-core-content textarea{background:rgb(39 39 42);border-color:rgb(82 82 91);color:rgb(244 244 245)} +html.dark .m3-core-alert{border-color:rgb(127 29 29);background:rgb(69 10 10);color:rgb(254 202 202)} +@media(max-width:768px){.m3-core-page{padding:1rem}.m3-core-header{padding:1.25rem}.m3-core-title{font-size:1.6rem}} diff --git a/Modules/M3/Resources/public/liberty-theme/css/m3-core-shell.css b/Modules/M3/Resources/public/liberty-theme/css/m3-core-shell.css new file mode 100644 index 00000000..ba2a3c7b --- /dev/null +++ b/Modules/M3/Resources/public/liberty-theme/css/m3-core-shell.css @@ -0,0 +1,26 @@ +/* M3 integration inside the Core WMS shell. Core owns the global sidebar, topbar, typography and appearance. */ +.m3-core-page{font-family:inherit;color:inherit;width:100%;max-width:1600px;margin:0 auto;padding:1.5rem} +.m3-core-header{display:flex;align-items:flex-start;justify-content:space-between;gap:1rem;margin-bottom:1.5rem;padding:1.5rem;border:1px solid rgb(228 228 231);border-radius:1.5rem;background:linear-gradient(135deg,#020617,#0f172a 55%,#172554);color:#fff} +.m3-core-eyebrow{margin:0 0 .5rem;font-size:.75rem;font-weight:700;letter-spacing:.28em;color:#bfdbfe} +.m3-core-title{margin:0;font:inherit;font-size:2rem;font-weight:650;line-height:1.15;letter-spacing:-.025em;color:#fff} +.m3-core-context{margin:.5rem 0 0;color:#dbeafe} +.m3-core-actions{display:flex;gap:.5rem;flex-wrap:wrap} +.m3-core-breadcrumb{margin-bottom:1rem;color:rgb(82 82 91);font-size:.875rem} +.m3-core-content{color:rgb(24 24 27)} +.m3-core-content .container-fluid{padding:0} +.m3-core-content .panel,.m3-core-content .card,.m3-core-content .well{border:1px solid rgb(228 228 231);border-radius:1rem;background:#fff;box-shadow:0 1px 2px rgb(0 0 0/.04);overflow:hidden} +.m3-core-content .panel-heading,.m3-core-content .card-header{background:rgb(250 250 250);border-bottom:1px solid rgb(228 228 231);padding:.9rem 1rem;font-weight:600} +.m3-core-content table{color:inherit;background:transparent} +.m3-core-content .table>tbody>tr>td,.m3-core-content .table>tbody>tr>th,.m3-core-content .table>tfoot>tr>td,.m3-core-content .table>tfoot>tr>th,.m3-core-content .table>thead>tr>td,.m3-core-content .table>thead>tr>th{border-color:rgb(228 228 231)} +.m3-core-content input,.m3-core-content select,.m3-core-content textarea,.m3-core-content button{font-family:inherit} +.m3-core-alert{padding:1rem;border:1px solid rgb(254 202 202);border-radius:1rem;background:rgb(254 242 242);color:rgb(153 27 27);font-weight:600} +html.dark .m3-core-header{border-color:rgb(63 63 70);background:linear-gradient(135deg,#020617,#0f172a 55%,#172554)} +html.dark .m3-core-breadcrumb{color:rgb(161 161 170)} +html.dark .m3-core-content{color:rgb(244 244 245)} +html.dark .m3-core-content .panel,html.dark .m3-core-content .card,html.dark .m3-core-content .well{border-color:rgb(63 63 70);background:rgb(24 24 27)} +html.dark .m3-core-content .panel-heading,html.dark .m3-core-content .card-header{background:rgb(39 39 42);border-color:rgb(63 63 70);color:rgb(244 244 245)} +html.dark .m3-core-content .table{color:rgb(244 244 245)} +html.dark .m3-core-content .table>tbody>tr>td,html.dark .m3-core-content .table>tbody>tr>th,html.dark .m3-core-content .table>tfoot>tr>td,html.dark .m3-core-content .table>tfoot>tr>th,html.dark .m3-core-content .table>thead>tr>td,html.dark .m3-core-content .table>thead>tr>th{border-color:rgb(63 63 70)} +html.dark .m3-core-content input,html.dark .m3-core-content select,html.dark .m3-core-content textarea{background:rgb(39 39 42);border-color:rgb(82 82 91);color:rgb(244 244 245)} +html.dark .m3-core-alert{border-color:rgb(127 29 29);background:rgb(69 10 10);color:rgb(254 202 202)} +@media(max-width:768px){.m3-core-page{padding:1rem}.m3-core-header{padding:1.25rem}.m3-core-title{font-size:1.6rem}} diff --git a/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php b/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php index 7d92798c..b5b09cbc 100644 --- a/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php +++ b/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php @@ -58,125 +58,35 @@ // dump($callingProgramPacking); @endphp - - - - - - - - - - @yield('title') - {{ config('app.name', 'WMS') }} - - {{-- Use Core's favicon set so M3 keeps the same browser identity as WMS. --}} - - - - - - - - - - - {{-- Load the same locally managed font family used by Core. --}} - @fonts + +
@include('m3::liberty-theme.partials.styles') - - - - @include('m3::liberty-theme.partials.top-navigation') -
- @if ( !($pdfURL && $callingProgramPacking)) - @include('m3::liberty-theme.partials.left-navigation') - @endif + -
-
-
-
-
-
- @yield('breadcrumb') -
-
- @yield('btn') -
- -
- - @if( $csr=='') - @yield('content') - @elseif( $csr=='Y' && $pdfURL) - @yield('content') - @else - {!! '

403 - Unauthorized

' !!} - @endif - -
-
- -
-
- @include('m3::liberty-theme.partials.footer') -
+
+
+

M3 INTEGRATION

+

@yield('title', 'M3')

+ @if($WDWNAM !== '') +

{{ $WDWNAM }}

+ @endif
+
@yield('btn')
+ + @hasSection('breadcrumb') +
@yield('breadcrumb')
+ @endif + +
+ @if($csr === '' || ($csr === 'Y' && $pdfURL)) + @yield('content') + @else +
403 - Unauthorized
+ @endif +
+ @include('m3::liberty-theme.partials.scripts') @yield('scripts') - - - - - - \ No newline at end of file +
+ diff --git a/Modules/M3/Resources/views/liberty-theme/partials/module-navigation.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/module-navigation.blade.php new file mode 100644 index 00000000..a7cb8243 --- /dev/null +++ b/Modules/M3/Resources/views/liberty-theme/partials/module-navigation.blade.php @@ -0,0 +1,24 @@ + diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php index 77724be2..0712453c 100644 --- a/resources/views/layouts/app/sidebar.blade.php +++ b/resources/views/layouts/app/sidebar.blade.php @@ -231,7 +231,7 @@
@endif -
+
routeIs('m3.*')) data-wms-selected="true" data-wms-has-active="true" data-wms-menu-open="true" @endif>