added sku and ready for tracking

app/Http/Controllers/ApiController.php

@@ -10,6 +10,7 @@ use App\Models\ApiModel;
 use ArrayObject;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Auth;
 
 class ApiController extends Controller
 {
@@ -19,8 +20,8 @@ class ApiController extends Controller
 		$ApiModel 		= new ApiModel;
 		$post 			=	$request->all();
 		$response 	 = $ApiModel->loginProductionUser($post['username'], $post['password']);
-		
-		
+
+
 		if (!$response) {
 			return response()->json(['status' => false, 'message' => "Invalid user"], 401);
 		}
@@ -48,14 +49,14 @@ class ApiController extends Controller
 			"created_at" => date('Y-m-d H:i:s', strtotime($post['datetime']))
 		);
 
-	
+
 		$checkIfTrackExist = $ApiModel->checkIfTrackExist($post['StepId'], $post['productId'], $post['ordersId'], $post['invoice'], $post['quantityCounter']);
 		if ($checkIfTrackExist) {
 			return response()->json(['status' => false, 'message' => "Already scanned."], 500);
 		}
 
 		// $selectNextStep = $ApiModel->selectNextStep($post['invoice']);
-	
+
 		// if(($selectNextStep->StepId + 1) != $post['StepId']){
 		// 	return response()->json(['status' => false, 'message' => "Your account is not allowed to update this item."], 401);
 		// }
@@ -82,7 +83,7 @@ class ApiController extends Controller
 		$ApiModel 		= new ApiModel;
 		$invoice = Input::get('invoice');
 		$getStep = Input::get('step');
-		
+
 
 		// $response 	 = $ApiModel->getTrackingStatus($invoice);
 		$selectPaymentDetails 	 = $ApiModel->selectPaymentDetails($invoice);
@@ -104,7 +105,7 @@ class ApiController extends Controller
 			$selectOrderList[$k]->table_fields = $table_fields[$k];
 			$selectOrderList[$k]->product_images = $product_images[$k];
 		}
-		
+
 		return response()->json([
 			'status' => true,
 			'payment_details' => $selectPaymentDetails[0],
@@ -119,9 +120,9 @@ class ApiController extends Controller
 		$productid = Input::get('productid');
 		$orderid = Input::get('orderid');
 		$qcounter = Input::get('qcounter');
-		
+
 		$getStatus 	 = $ApiModel->getStatus($invoice, $productid, $orderid, $qcounter);
-		
+
 		if (!$getStatus) {
 			return response()->json(['status' => false, 'data' => ""], 404);
 		}
@@ -132,7 +133,8 @@ class ApiController extends Controller
 		], 200);
 	}
 
-	public function getSteps(){
+	public function getSteps()
+	{
 		$ApiModel 		= new ApiModel;
 		$selectSteps 	 = $ApiModel->selectSteps();
 
@@ -144,6 +146,39 @@ class ApiController extends Controller
 			'status' => true,
 			'data' => $selectSteps
 		], 200);
-		
+	}
+
+	public function getInvoices()
+	{
+		$ApiModel 		= new ApiModel;
+		$userId = Input::get('id');
+
+		$selectInvoices 	 = $ApiModel->selectInvoices($userId);
+
+		if (!$selectInvoices) {
+			return response()->json(['status' => false, 'data' => ""], 404);
+		}
+
+		return response()->json([
+			'status' => true,
+			'data' => $selectInvoices
+		], 200);
+	}
+
+	public function trackingStatus()
+	{
+		$ApiModel 		= new ApiModel;
+		$invoice = Input::get('invoice');
+
+		$getOrderStatus 	 = $ApiModel->getOrderStatus($invoice);
+
+		if (!$getOrderStatus) {
+			return response()->json(['status' => false, 'data' => ""], 404);
+		}
+
+		return response()->json([
+			'status' => true,
+			'data' => $getOrderStatus
+		], 200);
 	}
 }

app/Http/Controllers/CustomAuthController.php

@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Validator;
 use App\Models\user\UserModel;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Input;
 
 class CustomAuthController extends Controller
 {
@@ -23,6 +24,8 @@ class CustomAuthController extends Controller
 		$email = $post['email'];
 		$password = $post['password'];
 
+		// $redirectUrl = Input::get('redirectUrl');
+
 		if (Auth::attempt(['email' => $email, 'password' => $password])) {
 
 			if (Auth::user()->role == 'admin') {
@@ -49,7 +52,8 @@ class CustomAuthController extends Controller
 				'success' => true,
 				'message' => $message,
 				'navbar' => $navbar,
-				'save_design_button' => $save_design_button
+				'save_design_button' => $save_design_button,
+				'redirect' =>  $post['redirect']
 			));
 		} else {
 

app/Http/Controllers/MainController.php

@@ -1,4 +1,6 @@
-<?php namespace App\Http\Controllers;
+<?php
+
+namespace App\Http\Controllers;
 
 use App\Http\Requests;
 use App\Http\Controllers\Controller;
@@ -8,8 +10,10 @@ use App\Models\MainModel;
 // use Illuminate\Support\Facades\Request;
 use Analytics;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Auth;
 
-class MainController extends Controller {
+class MainController extends Controller
+{
 
 	/**
 	 * Display a listing of the resource.
@@ -17,25 +21,25 @@ class MainController extends Controller {
 	 * @return Response
 	 */
 	public function index()
-	{	
+	{
 		return view('sublayouts.index');
 	}
 
 	public function sports()
 	{
 		// if(Request::ajax()){
-			$m 		= new MainModel;
-			$fetchData 	 = $m->selectAllSports();
-			//var_dump($fetchData);
+		$m 		= new MainModel;
+		$fetchData 	 = $m->selectAllSports();
+		//var_dump($fetchData);
 
-			foreach ($fetchData as $row) {
-				?>
-				<div class="col-md-3 col-sm-6 col-xs-12 list-sport">
-					<a href="<?php echo url('sports') . "/" . $row->URL; ?>"><img src="<?php echo config('site_config.uploads')  . 'sports-thumbnails/' . $row->Thumbnail; ?>" alt="" class="img img-responsive product-center"  /></a>
-					<h3 class="text-center sports-title"><?php echo $row->SportsName ?></h3>
-				</div>
-				<?php
-			}
+		foreach ($fetchData as $row) {
+?>
+			<div class="col-md-3 col-sm-6 col-xs-12 list-sport">
+				<a href="<?php echo url('sports') . "/" . $row->URL; ?>"><img src="<?php echo config('site_config.uploads')  . 'sports-thumbnails/' . $row->Thumbnail; ?>" alt="" class="img img-responsive product-center" /></a>
+				<h3 class="text-center sports-title"><?php echo $row->SportsName ?></h3>
+			</div>
+<?php
+		}
 
 		// }else{
 		// 	  return response()->view('errors/403');
@@ -48,8 +52,8 @@ class MainController extends Controller {
 
 		$data 	 = $m->selectSportsId($url);
 		$categoryids = array();
-		
-		foreach($data as $row){
+
+		foreach ($data as $row) {
 			$categoryids[] =  $row->Category;
 		}
 
@@ -58,13 +62,13 @@ class MainController extends Controller {
 		// $array_templateby_category = $m->selectTemplatesByCategory($url, $id);
 
 		// var_dump($array_category);
-		
+
 		return view('sublayouts.sports-category')
-												->with('array_sports', $array_sports)
-												->with('row', $array_category);
+			->with('array_sports', $array_sports)
+			->with('row', $array_category);
 	}
 
-	
+
 	public function templatesByCategory($url, $id)
 	{
 		$m 		= new MainModel;
@@ -75,9 +79,9 @@ class MainController extends Controller {
 		$array_category 	 = $m->selectCategory($categoryids);
 		// var_dump($array_category);
 		return view('sublayouts.sports-styles')
-											->with('cat', $url)
-											->with('row', $data)
-											->with('array_category', $array_category);
+			->with('cat', $url)
+			->with('row', $data)
+			->with('array_category', $array_category);
 		// if(count($data) > 1){
 		// 	return view('sublayouts.sports-styles')
 		// 									->with('cat', $url)
@@ -88,72 +92,81 @@ class MainController extends Controller {
 		// }
 	}
 
-	
+
 	public function fetchTemplates()
 	{
 		// if(Request::ajax()){
-			// $m 		= new MainModel;
-			//
-			// $data 	 = $m->selectSportsId($url);
-			// echo $data[0]->id;
-			//$fetchData 	 = $m->selectSportsTemplates();
+		// $m 		= new MainModel;
+		//
+		// $data 	 = $m->selectSportsId($url);
+		// echo $data[0]->id;
+		//$fetchData 	 = $m->selectSportsTemplates();
 
 
-			//var_dump($fetchData);
+		//var_dump($fetchData);
 
 		// }else{
 		// 	  return response()->view('errors/403');
 		// }
 
 	}
-	
-	//call this from blade view
-	public static function getCountCart(){
-		$m 	= 	new MainModel;
-		
-		if(Session::get('cartkey')){
 
-         	$cartKey = Session::get('cartkey');
+	//call this from blade view
+	public static function getCountCart()
+	{
+		$m 	= 	new MainModel;
+
+		if (Session::get('cartkey')) {
+
+			$cartKey = Session::get('cartkey');
 
 			echo $i 	= 	$m->cartCount($cartKey);
-			 
-      	}else{
+		} else {
 			echo 0;
-       	}
-    }
+		}
+	}
 
-	public function countCart(Request $request){
+	public function countCart(Request $request)
+	{
 
 		$m 	= 	new MainModel;
 
-		if($request->session()->has('cartkey')){
+		if ($request->session()->has('cartkey')) {
 
-         	$cartKey = $request->session()->get('cartkey');
+			$cartKey = $request->session()->get('cartkey');
 
-			 echo $i 	= 	$m->cartCount($cartKey);
-			 
-      	}else{
+			echo $i 	= 	$m->cartCount($cartKey);
+		} else {
 			echo 0;
-       	}
-
+		}
 	}
 
 
-	public function removeCartItem($id){
+	public function removeCartItem($id)
+	{
 
 		$m              =   new MainModel;
-		
-        $row            =   $m->removeItem($id);
-        if($row > 0)
-        {
-           // \Session::flash('message', 'Record successfully deleted.');
-        	echo '<script>
+
+		$row            =   $m->removeItem($id);
+		if ($row > 0) {
+			// \Session::flash('message', 'Record successfully deleted.');
+			echo '<script>
         			alert("Item removed");
         		</script>';
-            return redirect('cart');
-        }
-
-    }
+			return redirect('cart');
+		}
+	}
 
 
+	public function trackingPage()
+	{
+
+		if (Auth::check()) {
+			$userId = Auth::user()->id;
+		} else {
+			$userId = "";
+		}
+		return view('merchbay.track_order')
+			->with('userId', $userId);
+	}
 }

app/Http/Controllers/user/UserController.php

@@ -366,6 +366,7 @@ class UserController extends Controller {
 		$item_url = $post['item_url'];
 		$data = array(
 			'ProductName'			=> $post['itemName'],
+			'ProductCode'			=> $post['sku'],
 			'ProductPrice'			=> str_replace('$ ', '', $post['item_price']),
 			'ProductDescription'	=> $post['itemDescription'],
 			'PrivacyStatus' 	 	=> $post['item_privacy'],