From 137fbbc8438186aca1647272154b2c2faf6ae670 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Sat, 22 Jan 2022 22:34:33 +0800
Subject: [PATCH] update tracking

---
 app/Models/ApiModel.php                         | 16 ++++++++++++----
 .../views/designer/design_preview.blade.php     |  2 ++
 resources/views/merchbay/cart.blade.php         |  6 +++++-
 resources/views/merchbay/track_order.blade.php  |  1 +
 resources/views/merchbay_main.blade.php         | 17 +++++++++++++++++
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/Models/ApiModel.php b/app/Models/ApiModel.php
index b86f43a..ad67fb3 100755
--- a/app/Models/ApiModel.php
+++ b/app/Models/ApiModel.php
@@ -176,11 +176,19 @@ class ApiModel extends Model
 
 	function getOrderStatus($invoice)
 	{
-		$i = DB::table('tracking')
-			->where('InvoiceNumber', $invoice)
-			->groupBy('StepId')
-			->orderBy('StepId', 'ASC')
+
+		$i = DB::table('tracking')->select('tracking.*', 'carriers.Link')
+			->leftjoin('carriers', 'carriers.Carrier', '=', 'tracking.Carrier')
+			->where('tracking.InvoiceNumber', $invoice)
+			->groupBy('tracking.StepId')
+			->orderBy('tracking.StepId', 'ASC')
 			->get();
 		return $i;
+		// $i = DB::table('tracking')
+		// 	->where('InvoiceNumber', $invoice)
+		// 	->groupBy('StepId')
+		// 	->orderBy('StepId', 'ASC')
+		// 	->get();
+		return $i;
 	}
 }
diff --git a/resources/views/designer/design_preview.blade.php b/resources/views/designer/design_preview.blade.php
index f162b3d..97b2926 100755
--- a/resources/views/designer/design_preview.blade.php
+++ b/resources/views/designer/design_preview.blade.php
@@ -123,6 +123,8 @@
                             @if (!Auth::guest())
                             <div class="panel-footer">
                                 <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>
                                 </div>
                                 <div class="clearfix"></div>
diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php
index 6fa727c..3a3181c 100755
--- a/resources/views/merchbay/cart.blade.php
+++ b/resources/views/merchbay/cart.blade.php
@@ -360,10 +360,14 @@
                                     <small>{{ $store_array[0]->StoreCurrency }}</small>
                                 </h3>
 
-                                @if ($getSubtotal >= 1 && $getSubtotal <= 150)
+                                @if ($getSubtotal >= 1 && $getSubtotal <= 98)
                                     <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.
                                     </div>
+                                @else
+                                    <div class="border rounded-2 p-2 mt-2">
+                                        Congratulations! You have activated free shipping!
+                                    </div>
                                 @endif
 
                                 {{-- {{ var_dump($tax) }}
diff --git a/resources/views/merchbay/track_order.blade.php b/resources/views/merchbay/track_order.blade.php
index cc2ab09..56f022d 100644
--- a/resources/views/merchbay/track_order.blade.php
+++ b/resources/views/merchbay/track_order.blade.php
@@ -25,6 +25,7 @@
                         <strong>Note:</strong> Order tracking is only available for orders placed after December 03, 2021. 
                     </div>
                     <iframe src="https://crewsportswear.app:8092/?id={{ $userId }}" frameborder="0"></iframe>
+                    <!-- <iframe src="http://localhost:8011/?id={{ $userId }}" frameborder="0"></iframe> -->
                     @endif
 
                 </div>
diff --git a/resources/views/merchbay_main.blade.php b/resources/views/merchbay_main.blade.php
index c9be73b..22b6b5c 100755
--- a/resources/views/merchbay_main.blade.php
+++ b/resources/views/merchbay_main.blade.php
@@ -32,6 +32,23 @@
 
         gtag('config', 'G-SB3QK6BR1N');
     </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>
 
 <body>