added sku and ready for tracking
This commit is contained in:
franknstayn
@@ -1,92 +1,58 @@
|
||||
<nav class="navbar navbar-expand-lg bg-black">
|
||||
<div class="container">
|
||||
<a class="navbar-brand text-white" href="/">
|
||||
<span>M</span>erchbay
|
||||
{{-- <img src="{{asset('/public/images/merchbay-white.png')}}" class="img-fluid" alt="logo"> --}}
|
||||
</a>
|
||||
<button
|
||||
class="navbar-toggler"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#navbarMainToggler"
|
||||
aria-controls="navbarMainToggler"
|
||||
aria-expanded="false"
|
||||
aria-label="Toggle navigation"
|
||||
>
|
||||
<i class="bi bi-list text-white"></i>
|
||||
</button>
|
||||
<div
|
||||
class="collapse navbar-collapse justify-content-end"
|
||||
id="navbarMainToggler"
|
||||
v-if="hasMenu"
|
||||
>
|
||||
<ul class="navbar-nav ml-auto mb-2 mb-lg-0">
|
||||
<!-- <li class="d-inline d-lg-none">
|
||||
<div class="container">
|
||||
<a class="navbar-brand text-white" href="/">
|
||||
<span>M</span>erchbay
|
||||
{{-- <img src="{{asset('/public/images/merchbay-white.png')}}" class="img-fluid" alt="logo"> --}}
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarMainToggler" aria-controls="navbarMainToggler" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<i class="bi bi-list text-white"></i>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse justify-content-end" id="navbarMainToggler" v-if="hasMenu">
|
||||
<ul class="navbar-nav ml-auto mb-2 mb-lg-0">
|
||||
<!-- <li class="d-inline d-lg-none">
|
||||
<button data-toggle="collapse" data-target="#navbarMainToggler" class="close float-end" aria-expanded="true">×</button>
|
||||
</li> -->
|
||||
<li class="nav-item text-center d-md-none d-block">
|
||||
<h5>Menu</h5>
|
||||
</li>
|
||||
<li class="nav-item text-center d-md-none d-block">
|
||||
<h5>Menu</h5>
|
||||
</li>
|
||||
{{-- <li class="nav-item">
|
||||
<a href="{{ url('./track-order') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1 sign">Track Order</a>
|
||||
</li> --}}
|
||||
@if (Auth::guest())
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('./auth/login') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1 sign">Sign in</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('./auth/register') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Register</a>
|
||||
</li>
|
||||
@else
|
||||
|
||||
@if (Auth::guest())
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href="{{ url('./auth/login') }}"
|
||||
class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1 sign"
|
||||
>Sign in</a
|
||||
>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href="{{ url('./auth/register') }}"
|
||||
class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
|
||||
>Register</a
|
||||
>
|
||||
</li>
|
||||
@else
|
||||
@if(Auth::user()->role == "admin")
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('admin') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a>
|
||||
</li>
|
||||
@elseif(Auth::user()->role == "store_owner")
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('user') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a>
|
||||
</li>
|
||||
@else
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('user') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if(Auth::user()->role == "admin")
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href="{{ url('admin') }}"
|
||||
class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
|
||||
>Dashboard</a
|
||||
>
|
||||
</li>
|
||||
@elseif(Auth::user()->role == "store_owner")
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href="{{ url('user') }}"
|
||||
class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
|
||||
>Dashboard</a
|
||||
>
|
||||
</li>
|
||||
@else
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href="{{ url('user') }}"
|
||||
class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
|
||||
>Dashboard</a
|
||||
>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
<li class="nav-item">
|
||||
<a
|
||||
href="{{ url('./auth/logout') }}"
|
||||
class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
|
||||
>Logout</a
|
||||
>
|
||||
</li>
|
||||
@endif
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('cart') }}" type="button" class="nav-link btn btn-navbar-cart btn-sm">
|
||||
<i class="fa fa-shopping-cart"></i>
|
||||
<span class="badge bg-secondary">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
|
||||
{{-- <span class="visually-hidden">unread messages</span> --}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('./auth/logout') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Logout</a>
|
||||
</li>
|
||||
@endif
|
||||
<li class="nav-item">
|
||||
<a href="{{ url('cart') }}" type="button" class="nav-link btn btn-navbar-cart btn-sm">
|
||||
<i class="fa fa-shopping-cart"></i>
|
||||
<span class="badge bg-secondary">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
|
||||
{{-- <span class="visually-hidden">unread messages</span> --}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
</nav>
|
||||
@@ -1,27 +1,26 @@
|
||||
@extends('merchbay_main')
|
||||
|
||||
@section('main-content')
|
||||
<style>
|
||||
.vh100{
|
||||
height: 100vh !important;
|
||||
}
|
||||
</style>
|
||||
<div class="wrapper pb-5">
|
||||
<div class="main__content">
|
||||
<div class="container">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col col-lg-8 pt-5 text-center text-lg-start">
|
||||
<h4>Terms of Use</h4>
|
||||
<hr class="custom-hr" />
|
||||
</div>
|
||||
<style>
|
||||
.vh100 {
|
||||
height: 100vh !important;
|
||||
}
|
||||
</style>
|
||||
<div class="wrapper pb-5">
|
||||
<div class="main__content">
|
||||
<div class="container">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col col-lg-8 pt-5 text-center text-lg-start">
|
||||
<h4>Terms of Use</h4>
|
||||
<hr class="custom-hr" />
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="col col-lg-8 vh100">
|
||||
<object data="{{ asset('public/assets/files/Terms of Use.pdf#toolbar=0&navpanes=0&scrollbar=0') }}" name="asdasdasd" type="application/pdf" width="100%"
|
||||
height="100%"></object>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="col col-lg-8 vh100">
|
||||
<object data="{{ asset('public/assets/files/Terms of Use.pdf#toolbar=0&navpanes=0&scrollbar=0') }}" name="asdasdasd" type="application/pdf" width="100%" height="100%"></object>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
</div>
|
||||
@endsection
|
||||
34
resources/views/merchbay/track_order.blade.php
Normal file
34
resources/views/merchbay/track_order.blade.php
Normal file
@@ -0,0 +1,34 @@
|
||||
@extends('merchbay_main')
|
||||
|
||||
@section('main-content')
|
||||
<style>
|
||||
iframe {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
</style>
|
||||
<div class="wrapper pb-5">
|
||||
<div class="main__content">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col col-lg-12 pt-5 text-center text-lg-start">
|
||||
<h4>Track Order</h4>
|
||||
<hr class="custom-hr" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col col-lg-12">
|
||||
@if (Auth::guest())
|
||||
Please login <a href="{{ url('auth/login?redirectUrl=') }}{{ URL::full() }}"
|
||||
class="text-decoration-underline">here</a> to track your order.
|
||||
@else
|
||||
<iframe src="http://localhost:8002/?id={{ $userId }}" frameborder="0"></iframe>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
Reference in New Issue
Block a user