diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
index a679bd7..5f3c110 100644
--- a/app/Http/Controllers/ApiController.php
+++ b/app/Http/Controllers/ApiController.php
@@ -121,7 +121,6 @@ class ApiController extends Controller
 			return response()->json(['status' => false, 'data' => ""], 404);
 		}
 
-		
 		return response()->json([
 			'status' => true,
 			'data' => $getStatus[0]
diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php
index 1a40914..0da72bf 100644
--- a/app/Models/user/UserModel.php
+++ b/app/Models/user/UserModel.php
@@ -160,18 +160,29 @@ class UserModel extends Model {
 		return $i;
 	}
 
+	// function selectStoreOrders($store_id){
+	// 	$i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'tracking_steps.StepLabel')
+	// 					->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey')
+	// 					->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id')
+	// 					->leftjoin('tracking', 'tracking.InvoiceNumber','=','payment_details.InvoiceNumber')
+	// 					->leftjoin('tracking_steps', 'tracking_steps.Id','=','tracking.StepId')
+	// 					->where('orders.StoreId', $store_id)	
+	// 					->orderby('orders.DateCreated', 'DESC')
+	// 					->get();
+	// 	return $i;
+	// }
+
 	function selectStoreOrders($store_id){
-		$i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'tracking_steps.StepLabel')
+		$i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'tracking_steps.StepLabel', DB::raw('(SELECT tracking_steps.StepLabel FROM tracking LEFT JOIN tracking_steps ON  tracking_steps.Id = tracking.StepId WHERE tracking.InvoiceNumber = payment_details.InvoiceNumber ORDER BY  tracking.Id DESC LIMIT 1 ) AS StepLabel'))
 						->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey')
 						->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id')
-						->leftjoin('tracking', 'tracking.InvoiceNumber','=','payment_details.InvoiceNumber')
-						->leftjoin('tracking_steps', 'tracking_steps.Id','=','tracking.StepId')
 						->where('orders.StoreId', $store_id)	
 						->orderby('orders.DateCreated', 'DESC')
 						->get();
 		return $i;
 	}
 
+
 	function itemGroup($cartKey){
 		$pdo 	= 	DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT *,  COUNT(Id) AS qty, Price * SUM(Quantity) AS total_price FROM orders WHERE CartKey = :ck GROUP BY ProductId");