update tracking

2022-01-22 22:34:33 +08:00
parent d104563ce6
commit 137fbbc843
5 changed files with 37 additions and 5 deletions
--- 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;
 	}
 }