webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update tracking

Browse Source
This commit is contained in:
franknstayn
2022-01-22 22:34:33 +08:00
parent d104563ce6
commit 137fbbc843
5 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/ApiModel.php
View File

@@ -176,11 +176,19 @@ class ApiModel extends Model
function getOrderStatus($invoice) function getOrderStatus($invoice)
{ {
$i = DB::table('tracking')
->where('InvoiceNumber', $invoice) $i = DB::table('tracking')->select('tracking.*', 'carriers.Link')
->groupBy('StepId') ->leftjoin('carriers', 'carriers.Carrier', '=', 'tracking.Carrier')
->orderBy('StepId', 'ASC') ->where('tracking.InvoiceNumber', $invoice)
->groupBy('tracking.StepId')
->orderBy('tracking.StepId', 'ASC')
->get(); ->get();
return $i; return $i;
// $i = DB::table('tracking')
// ->where('InvoiceNumber', $invoice)
// ->groupBy('StepId')
// ->orderBy('StepId', 'ASC')
// ->get();
return $i;
} }
} }

2
resources/views/designer/design_preview.blade.php
View File

@@ -123,6 +123,8 @@
@if (!Auth::guest()) @if (!Auth::guest())
<div class="panel-footer"> <div class="panel-footer">
<div id="dd_footer_button"> <div id="dd_footer_button">
<!-- <a href="{{ url('user/my-designs') }}" type="button" class="btn btn-primary pull-right" style="margin-left: 10px;"><i class="fa fa-plus-square"></i> Purchase this Item</a> -->
<a href="{{ url('user/my-designs') }}" type="button" class="btn btn-default pull-right"><i class="fa fa-arrow-left"></i> Go to My Designs</a> <a href="{{ url('user/my-designs') }}" type="button" class="btn btn-default pull-right"><i class="fa fa-arrow-left"></i> Go to My Designs</a>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

6
resources/views/merchbay/cart.blade.php
View File

@@ -360,10 +360,14 @@
<small>{{ $store_array[0]->StoreCurrency }}</small> <small>{{ $store_array[0]->StoreCurrency }}</small>
</h3> </h3>
@if ($getSubtotal >= 1 && $getSubtotal <= 150) @if ($getSubtotal >= 1 && $getSubtotal <= 98)
<div class="border rounded-2 p-2 mt-2"> <div class="border rounded-2 p-2 mt-2">
If you order $99 worth of product you get free shipping (pre tax). You are <strong>{{ number_format(99 - $getSubtotal, 2) }} {{ $store_array[0]->StoreCurrency }}</strong> away. If you order $99 worth of product you get free shipping (pre tax). You are <strong>{{ number_format(99 - $getSubtotal, 2) }} {{ $store_array[0]->StoreCurrency }}</strong> away.
</div> </div>
@else
<div class="border rounded-2 p-2 mt-2">
Congratulations! You have activated free shipping!
</div>
@endif @endif
{{-- {{ var_dump($tax) }} {{-- {{ var_dump($tax) }}

1
resources/views/merchbay/track_order.blade.php
View File

@@ -25,6 +25,7 @@
<strong>Note:</strong> Order tracking is only available for orders placed after December 03, 2021. <strong>Note:</strong> Order tracking is only available for orders placed after December 03, 2021.
</div> </div>
<iframe src="https://crewsportswear.app:8092/?id={{ $userId }}" frameborder="0"></iframe> <iframe src="https://crewsportswear.app:8092/?id={{ $userId }}" frameborder="0"></iframe>
<!-- <iframe src="http://localhost:8011/?id={{ $userId }}" frameborder="0"></iframe> -->
@endif @endif
</div> </div>

17
resources/views/merchbay_main.blade.php
View File

@@ -32,6 +32,23 @@
gtag('config', 'G-SB3QK6BR1N'); gtag('config', 'G-SB3QK6BR1N');
</script> </script>
<!-- Meta Pixel Code -->
<script>
!function(f,b,e,v,n,t,s)
{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
n.callMethod.apply(n,arguments):n.queue.push(arguments)};
if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
n.queue=[];t=b.createElement(e);t.async=!0;
t.src=v;s=b.getElementsByTagName(e)[0];
s.parentNode.insertBefore(t,s)}(window, document,'script',
'https://connect.facebook.net/en_US/fbevents.js');
fbq('init', '466782825021431');
fbq('track', 'PageView');
</script>
<noscript><img height="1" width="1" style="display:none"
src="https://www.facebook.com/tr?id=466782825021431&ev=PageView&noscript=1"
/></noscript>
<!-- End Meta Pixel Code -->
</head> </head>
<body> <body>