diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index fb18d67f..0c8a2512 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -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;
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 13b53faa..fc15e580 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -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;
diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php
index 9adee26b..2e3eb60c 100644
--- a/resources/views/vendor/js.blade.php
+++ b/resources/views/vendor/js.blade.php
@@ -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>