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 @@ -
  • +
  • @@ -96,6 +96,19 @@
  • + @if(auth('customer')->check()) +
  • + + + +
  • + @else +
  • + + + +
  • + @endif
  • diff --git a/resources/views/segments/menu/AplMenu/AplMenu.scss b/resources/views/segments/menu/AplMenu/AplMenu.scss index 470452f..be1ffea 100644 --- a/resources/views/segments/menu/AplMenu/AplMenu.scss +++ b/resources/views/segments/menu/AplMenu/AplMenu.scss @@ -36,6 +36,7 @@ margin: 0 auto; > li { + flex: 1; color: white; text-align: center; height: 47px; @@ -98,6 +99,10 @@ display: block; padding: .7rem 0; } + + &.icon-menu{ + flex-grow: .4; + } } } @@ -150,4 +155,6 @@ ~header{ margin-top: 44px; } + + } diff --git a/resources/views/segments/menu/RecetMenu/RecetMenu.blade.php b/resources/views/segments/menu/RecetMenu/RecetMenu.blade.php index 2c01def..a70288f 100644 --- a/resources/views/segments/menu/RecetMenu/RecetMenu.blade.php +++ b/resources/views/segments/menu/RecetMenu/RecetMenu.blade.php @@ -21,6 +21,16 @@ @endif + + @if(auth('customer')->check()) + + + + @else + + + + @endif @if(config('app.xlang.active')) @foreach(\App\Models\XLang::all() as $lang) @if($lang->tag != app()->getLocale()) diff --git a/resources/views/segments/menu/RecetMenu/RecetMenu.scss b/resources/views/segments/menu/RecetMenu/RecetMenu.scss index 8c929c0..b8bd1c7 100644 --- a/resources/views/segments/menu/RecetMenu/RecetMenu.scss +++ b/resources/views/segments/menu/RecetMenu/RecetMenu.scss @@ -21,7 +21,7 @@ padding: 1rem; color: black; &:hover{ - color: var(--xshop-primary); + color: var(--xshop-secondary); } } &:first-child{ @@ -34,7 +34,7 @@ padding: 5px !important; margin: 0; i{ - font-size: 25px; + font-size: 22px; } } }