cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 'master'

Browse Source 
Development

See merge request CIEFWorldwideSdnBhd/shipping-portal!116
This commit is contained in:
omair saleh
2022-03-27 03:54:48 +00:00
parent 1be62a5f77 8609c926f9
commit 6d2f179025
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+2 -6
View File
@@ -158,13 +158,9 @@ class FetchLoadedContainersFromVTPortalProcessor
}
foreach($containerDetail->Rows as $packingList){
$marking = explode('/', explode('CIEF/', $packingList[13])[1]);
$marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13]));
if(!array_key_exists(1, $marking)){
continue;
}
$orderNumber = str_replace("/YW","",$marking[1]);
$orderNumber = $marking[array_key_last($marking)];
if(!$packingList[22]){
continue;
app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+2 -6
View File
@@ -134,13 +134,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
foreach ($response->Rows as $parcel){
$marking = explode('/', explode('CIEF/', $parcel[5])[1]);
$marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5]));
if(!array_key_exists(1, $marking)){
continue;
}
$orderNumber = str_replace("/YW","",$marking[1]);
$orderNumber = $marking[array_key_last($marking)];
if(!$parcel[9]){
continue;
resources/views/vendor/js.blade.php
Vendored
+13
View File
@@ -6,6 +6,19 @@
'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; })
]) !!};
</script>
@if(!App::environment('production'))
<script type="text/javascript">
var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
(function(){
var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];
s1.async=true;
s1.src='https://embed.tawk.to/623d8cdd2abe5b455fc195aa/1fv06sgtf';
s1.charset='UTF-8';
s1.setAttribute('crossorigin','*');
s0.parentNode.insertBefore(s1,s0);
})();
</script>
@endif
<script src="{{ asset('js/vendor.js') }}" type="text/javascript"></script>
<script src="{{mix('vue/app.js')}}"></script>
<script src="{{ asset('js/site.js') }}" type="text/javascript"></script>