updated apis

app/Models/ApiModel.php

@@ -61,7 +61,7 @@ class ApiModel extends Model
 		return $i;
 	}
 
-	function selectOrderListTableFields($cartKey, $productId)
+	function selectOrderListTableFields($cartKey, $productId, $stepid)
 	{
 		// $i = DB::table('orders')->select('Id', 'Name', 'Name2', 'Number', 'Size', 'JerseySize', 'ShortsSize', 'Quantity')
 		// 	->where('CartKey', $cartKey)
@@ -70,8 +70,9 @@ class ApiModel extends Model
 		// return $i;
 
 		$i = DB::table('orders')->select('orders.Id', 'orders.Name', 'orders.Name2', 'orders.Number', 'orders.Size', 'orders.JerseySize', 
-		'orders.ShortsSize', 'orders.Quantity', DB::raw('COUNT(tracking.Id) AS Status'))
-			->leftjoin('tracking', 'orders.Id', '=', 'tracking.OrdersId')
+		'orders.ShortsSize', 'orders.Quantity', DB::raw('(SELECT COUNT(*) FROM tracking WHERE StepId = '.$stepid.' AND  OrdersId = orders.Id) AS Status'))
+			// ->leftjoin('tracking', 'orders.Id', '=', 'tracking.OrdersId')
+			// ->where('tracking.StepId', $stepid)
 			->where('orders.CartKey', $cartKey)
 			->where('orders.ProductId', $productId)
 			->groupBy('orders.Id')
@@ -124,4 +125,28 @@ class ApiModel extends Model
 				->get();
 		return $i;
 	}
+
+	function selectSteps(){
+		$i = DB::table('tracking_steps')
+				->orderBy('Order', 'ASC')
+				->get();
+		return $i;
+	}
+
+	function selectCurrentStep($invoice){
+		$i = DB::table('tracking')->select('tracking_steps.*')
+				->leftjoin('tracking_steps', 'tracking_steps.Id', '=', 'tracking.StepId')
+				->where('tracking.InvoiceNumber', $invoice)
+				->orderBy('tracking.StepId', 'DESC')
+				->first();
+		return $i;
+	}
+
+
+	function selectCurrentStepOrder($stepOrder){
+		$i = DB::table('tracking_steps')
+				->where('Order', $stepOrder)
+				->get();
+		return $i;
+	}
 }