diff --git a/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php b/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php index e84dc8b..ce35286 100644 --- a/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php +++ b/resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php @@ -226,7 +226,7 @@ class="btn btn-outline-primary btn-sm "> - @if($inv->status != 'COMPLETED' && $inv->created_at->timestamp < (time() - 3600) ) + @if($inv->status != 'COMPLETED' && $inv->created_at->timestamp > (time() - 3600) ) {{__("Pay now")}} diff --git a/resources/views/segments/index/InlineMap/InlineMap.js b/resources/views/segments/index/InlineMap/InlineMap.js index 3eb185d..fd5bead 100644 --- a/resources/views/segments/index/InlineMap/InlineMap.js +++ b/resources/views/segments/index/InlineMap/InlineMap.js @@ -1,33 +1,37 @@ import L from 'leaflet'; -var map,marker ; -window.addEventListener('load',function () { +var map, marker; +window.addEventListener('load', function () { + try { - // delete L.icon.default.prototype._getIconUrl ; - if (!import.meta.env.DEV){ - L.Icon.Default.mergeOptions({ - iconRetinaUrl: "/assets/vendor/leaflet/marker-icon-2x.png", - iconUrl: "/assets/vendor/leaflet/marker-icon.png", - shadowUrl: "/assets/vendor/leaflet/marker-shadow.png" - }); - } - if (document.querySelectorAll('#mapContainer').length != 0) { - const lat = parseFloat(document.querySelector('#maplat').value); - const lng = parseFloat(document.querySelector('#maplng').value); - const zoom = parseInt(document.querySelector('#mapzoom').value); - map = L.map(document.querySelector('#mapContainer')).setView([lat, lng], zoom); + // delete L.icon.default.prototype._getIconUrl ; + if (!import.meta.env.DEV) { + L.Icon.Default.mergeOptions({ + iconRetinaUrl: "/assets/vendor/leaflet/marker-icon-2x.png", + iconUrl: "/assets/vendor/leaflet/marker-icon.png", + shadowUrl: "/assets/vendor/leaflet/marker-shadow.png" + }); + } + if (document.querySelectorAll('#mapContainer').length != 0) { + const lat = parseFloat(document.querySelector('#maplat').value); + const lng = parseFloat(document.querySelector('#maplng').value); + const zoom = parseInt(document.querySelector('#mapzoom').value); + map = L.map(document.querySelector('#mapContainer')).setView([lat, lng], zoom); - L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { - attribution: '© openstreetmap', - attributionControl: false, - }).addTo(map); + L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + attribution: '© openstreetmap', + attributionControl: false, + }).addTo(map); - map.attributionControl.setPrefix('xShop'); + map.attributionControl.setPrefix('xShop'); - if (this.marker) { - map.removeLayer(marker); - } + if (this.marker) { + map.removeLayer(marker); + } - marker = L.marker({lat: lat, lng: lng}).addTo(map); + marker = L.marker({lat: lat, lng: lng}).addTo(map); + } + } catch { } + }); diff --git a/resources/views/segments/menu/AplMenu/AplMenu.blade.php b/resources/views/segments/menu/AplMenu/AplMenu.blade.php index 4ceff90..dc31fb7 100644 --- a/resources/views/segments/menu/AplMenu/AplMenu.blade.php +++ b/resources/views/segments/menu/AplMenu/AplMenu.blade.php @@ -86,7 +86,7 @@ -