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
 {
@@ -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.
@@ -108,7 +112,8 @@ class MainController extends Controller {
 	}
 
 	//call this from blade view
-	public static function getCountCart(){
+	public static function getCountCart()
+	{
 		$m 	= 	new MainModel;
 
 		if (Session::get('cartkey')) {
@@ -116,13 +121,13 @@ class MainController extends Controller {
 			$cartKey = Session::get('cartkey');
 
 			echo $i 	= 	$m->cartCount($cartKey);
-			 
 		} else {
 			echo 0;
 		}
 	}
 
-	public function countCart(Request $request){
+	public function countCart(Request $request)
+	{
 
 		$m 	= 	new MainModel;
 
@@ -131,29 +136,37 @@ class MainController extends Controller {
 			$cartKey = $request->session()->get('cartkey');
 
 			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)
+		if ($row > 0) {
-        {
 			// \Session::flash('message', 'Record successfully deleted.');
 			echo '<script>
         			alert("Item removed");
         		</script>';
 			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'],

app/Http/routes.php

@@ -201,6 +201,8 @@ Route::group(array('middleware' => ['isAuthorized', 'cors'], 'prefix' => 'api'),
 	Route::get('tracking', 'ApiController@getTrackingStatus');
 	Route::get('order-status', 'ApiController@getOrderStatus');
 	Route::get('steps', 'ApiController@getSteps');
+	Route::get('invoices', 'ApiController@getInvoices');
+	Route::get('tracking-status', 'ApiController@trackingStatus');
 });
 
 Route::get('vue/designer', function() {
@@ -214,3 +216,5 @@ Route:get('/privacy-policy', function() {
 Route::get('/terms-of-use', function () {
 	return view('merchbay.terms_of_use');	
 });
+
+Route::get('/track-order', 'MainController@trackingPage');

app/Models/ApiModel.php

@@ -69,8 +69,17 @@ class ApiModel extends Model
 		// 	->get();
 		// return $i;
 
-		$i = DB::table('orders')->select('orders.Id', 'orders.Name', 'orders.Name2', 'orders.Number', 'orders.Size', 'orders.JerseySize', 
+		$i = DB::table('orders')->select(
-		'orders.ShortsSize', 'orders.Quantity', DB::raw('(SELECT COUNT(*) FROM tracking WHERE StepId = '.$stepid.' AND  OrdersId = orders.Id) AS Status'))
+			'orders.Id',
+			'orders.Name',
+			'orders.Name2',
+			'orders.Number',
+			'orders.Size',
+			'orders.JerseySize',
+			'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)
@@ -106,7 +115,8 @@ class ApiModel extends Model
 		return $i;
 	}
 
-	function getCurrentTrackingSteps($invoice){
+	function getCurrentTrackingSteps($invoice)
+	{
 		$i = DB::table('tracking')->select('StepId')
 			->where('InvoiceNumber', $invoice)
 			->groupBy('StepId')
@@ -115,7 +125,8 @@ class ApiModel extends Model
 		return $i;
 	}
 
-	function getStatus($invoice, $productid, $orderid, $qcounter){
+	function getStatus($invoice, $productid, $orderid, $qcounter)
+	{
 		$i = DB::table('tracking')->select('production_user.Name', DB::raw('DATE_FORMAT(tracking.created_at, "%b %d, %Y - %H:%i") AS datetime'))
 			->leftjoin('production_user', 'production_user.Id', '=', 'tracking.ScannedBy')
 			->where('tracking.InvoiceNumber', $invoice)
@@ -126,14 +137,16 @@ class ApiModel extends Model
 		return $i;
 	}
 
-	function selectSteps(){
+	function selectSteps()
+	{
 		$i = DB::table('tracking_steps')
 			->orderBy('Order', 'ASC')
 			->get();
 		return $i;
 	}
 
-	function selectCurrentStep($invoice){
+	function selectCurrentStep($invoice)
+	{
 		$i = DB::table('tracking')->select('tracking_steps.*')
 			->leftjoin('tracking_steps', 'tracking_steps.Id', '=', 'tracking.StepId')
 			->where('tracking.InvoiceNumber', $invoice)
@@ -143,10 +156,31 @@ class ApiModel extends Model
 	}
 
 
-	function selectCurrentStepOrder($stepOrder){
+	function selectCurrentStepOrder($stepOrder)
+	{
 		$i = DB::table('tracking_steps')
 			->where('Order', $stepOrder)
 			->get();
 		return $i;
 	}
+
+	function selectInvoices($id)
+	{
+		$i = DB::table('payment_details')->select('payment_details.*', 'shipping_addresses.*')
+			->leftjoin('shipping_addresses', 'payment_details.Id', '=', 'shipping_addresses.PaymentDetail_Id')
+			->where('payment_details.UserId', $id)
+			->orderBy('payment_details.Id', 'DESC')
+			->get();
+		return $i;
+	}
+
+	function getOrderStatus($invoice)
+	{
+		$i = DB::table('tracking')
+			->where('InvoiceNumber', $invoice)
+			->groupBy('StepId')
+			->orderBy('StepId', 'ASC')
+			->get();
+		return $i;
+	}
 }

app/Models/user/UserModel.php

@@ -1,33 +1,39 @@
-<?php namespace App\Models\user;
+<?php
+
+namespace App\Models\user;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class UserModel extends Model {
+class UserModel extends Model
+{
 
-	function insertAddressBook($data){
+	function insertAddressBook($data)
+	{
 
 		$i = DB::table('user_address_book')->insert($data);
 		return $i;
 	}
 
-	function selectAddresBook($field, $userId){
+	function selectAddresBook($field, $userId)
+	{
 
 		$i = DB::table('user_address_book')
 			->where($field, '=', $userId)
 			->get();
 		return $i;
-		
 	}
 
-	function saveUpdateAddressBook($data, $id){
+	function saveUpdateAddressBook($data, $id)
+	{
 		$i = DB::table('user_address_book')->where('Id', $id)
 			->update($data);
 
 		return $i;
 	}
 
-	function selectProfileInfo($id){
+	function selectProfileInfo($id)
+	{
 
 		$i = DB::table('user_logins')->select('user_logins.name', 'user_logins.username', 'user_logins.email', 'user_logins.email_is_verified', 'user_logins.other_email', 'user_logins.role', 'user_logins.store_id', 'user_info.ContactNumber', 'user_info.Gender', 'user_info.Birthday')
 			->leftjoin('user_info', 'user_info.UserId', '=', 'user_logins.id')
@@ -36,14 +42,16 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function saveUpdateUserLogins($data, $id){
+	function saveUpdateUserLogins($data, $id)
+	{
 		$i = DB::table('user_logins')->where('id', $id)
 			->update($data);
 
 		return $i;
 	}
 
-	function saveUpdateUserInfo($data, $id){
+	function saveUpdateUserInfo($data, $id)
+	{
 		$exists = DB::table('user_info')->where('UserId', $id)->first();
 
 		if (!$exists) {
@@ -54,10 +62,10 @@ class UserModel extends Model {
 				->update($data);
 		}
 		return $i;
-	
 	}
 
-	function saveUpdatePassword($password, $id){
+	function saveUpdatePassword($password, $id)
+	{
 
 		$i = DB::table('user_logins')->where('id', $id)
 			->update(['password' => $password]);
@@ -65,7 +73,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectPaymentDetails($field, $val){
+	function selectPaymentDetails($field, $val)
+	{
 
 		$i = DB::table('payment_details')
 			->where($field, $val)
@@ -74,7 +83,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectClientDesigns($userid){
+	function selectClientDesigns($userid)
+	{
 
 		$i = DB::table('client_designs')->where('ClientId', $userid)
 			->orderBy('Id', 'DESC')
@@ -83,7 +93,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectClientDesignsbyCode($code){
+	function selectClientDesignsbyCode($code)
+	{
 
 		$i = DB::table('client_designs')->where('DesignCode', $code)
 			->get();
@@ -91,7 +102,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectTemplatePaths($field, $templateid){
+	function selectTemplatePaths($field, $templateid)
+	{
 		$i = DB::table('template_paths')
 			->where($field, $templateid)
 			->where('IsActive', 'TRUE')
@@ -99,21 +111,24 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function updateClientDesign($data, $id){
+	function updateClientDesign($data, $id)
+	{
 		$i = DB::table('client_designs')->where('DesignCode', $id)
 			->update($data);
 
 		return $i;
 	}
 
-	function selectStoreInfo($storeId){
+	function selectStoreInfo($storeId)
+	{
 		$i = DB::table('teamstores')->where('Id', $storeId)
 			->get();
 
 		return $i;
 	}
 
-	function saveResendCode($data){
+	function saveResendCode($data)
+	{
 
 		$res = DB::table('email_verification_codes')->where("EmailAddress", $data['EmailAddress'])
 			->get();
@@ -126,10 +141,10 @@ class UserModel extends Model {
 			$i = DB::table('email_verification_codes')->insert($data);
 			return $i;
 		}
-
 	}
 
-	function validateCode($data){
+	function validateCode($data)
+	{
 
 		$i = DB::table('email_verification_codes')->where('EmailAddress', $data['EmailAddress'])
 			->where('VerCode', $data['Code'])
@@ -138,14 +153,16 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectOrderItem($ck){
+	function selectOrderItem($ck)
+	{
 		$i = DB::table('orders')
 			->where('CartKey', $ck)
 			->get();
 		return $i;
 	}
 
-	function selectOrderItemWithStoreId($store_id, $ck){
+	function selectOrderItemWithStoreId($store_id, $ck)
+	{
 		$i = DB::table('orders')
 			->where('StoreId', $store_id)
 			->where('CartKey', $ck)
@@ -153,7 +170,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectOrder($field, $value){
+	function selectOrder($field, $value)
+	{
 		$i = DB::table('orders')
 			->where($field, $value)
 			->get();
@@ -172,10 +190,12 @@ class UserModel extends Model {
 	// 	return $i;
 	// }
 
-	function selectStoreOrders($store_id){
+	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.*', 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'))
+	{
+		$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.*', 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'), 'teamstore_products.ProductCode')
 			->leftjoin('payment_details', 'payment_details.CartKey', '=', 'orders.CartKey')
 			->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id', '=', 'payment_details.Id')
+			->leftjoin('teamstore_products', 'teamstore_products.Id', '=', 'orders.ProductId')
 			->where('orders.StoreId', $store_id)
 			->orderby('orders.DateCreated', 'DESC')
 			->get();
@@ -183,26 +203,27 @@ class UserModel extends Model {
 	}
 
 
-	function itemGroup($cartKey){
+	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");
 		$query->execute([':ck' => $cartKey]);
 		$row = $query->fetchAll(\PDO::FETCH_OBJ);
 		return $row;
-		
 	}
 
 
-	function itemGroupWithStoreId($store_id, $cartKey){
+	function itemGroupWithStoreId($store_id, $cartKey)
+	{
 		$pdo 	= 	DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT *,  COUNT(Id) AS qty, Price * SUM(Quantity) AS total_price FROM orders WHERE StoreId= :si AND CartKey = :ck GROUP BY ProductId");
 		$query->execute(array(':si' => $store_id, ':ck' => $cartKey));
 		$row = $query->fetchAll(\PDO::FETCH_OBJ);
 		return $row;
-		
 	}
 
-	function selectDisplayItemThumb(){
+	function selectDisplayItemThumb()
+	{
 
 		$i = DB::table('teamstore_product_thumbnails')
 			->where('ImageClass', 'active')
@@ -211,7 +232,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectDisplayItemThumbById($id){
+	function selectDisplayItemThumbById($id)
+	{
 
 		$i = DB::table('teamstore_product_thumbnails')
 			->where('ProductId', $id)
@@ -220,14 +242,16 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function deleteImageThumb($field, $id){
+	function deleteImageThumb($field, $id)
+	{
 		$i = DB::table('teamstore_product_thumbnails')
 			->where($field, $id)
 			->delete();
 		return $i;
 	}
 
-	function deleteStoreItem($id){
+	function deleteStoreItem($id)
+	{
 		$i = DB::table('teamstore_products')
 			->where('Id', $id)
 			->delete();
@@ -235,7 +259,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectItemsStoreId($ck){
+	function selectItemsStoreId($ck)
+	{
 
 		$i = DB::table('cart_tmp')
 			->select(DB::raw('StoreId'))
@@ -246,7 +271,8 @@ class UserModel extends Model {
 	}
 
 
-	function selectUserLogins($field, $value){
+	function selectUserLogins($field, $value)
+	{
 
 		$i = DB::table('user_logins')
 			->where($field, $value)
@@ -254,26 +280,30 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function insertNewProduct($data){
+	function insertNewProduct($data)
+	{
 		$pdo 	= 	DB::connection()->getPdo();
 		$i = DB::table('teamstore_products')->insert($data);
 		$id = DB::getPdo()->lastInsertId();
 		return $id;
 	}
 
-	function insertNewProductThumbnails($data){
+	function insertNewProductThumbnails($data)
+	{
 		$i = DB::table('teamstore_product_thumbnails')->insert($data);
 		return $i;
 	}
 
-	function updateProductCode($data, $id){
+	function updateProductCode($data, $id)
+	{
 		$i = DB::table('teamstore_products')->where('Id', $id)
 			->update($data);
 
 		return $i;
 	}
 
-	function selectTeamStoreName($ck){
+	function selectTeamStoreName($ck)
+	{
 		$pdo 	= 	DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT t.Id, t.StoreName FROM orders AS o INNER JOIN teamstores AS t ON t.Id = o.StoreId WHERE o.CartKey = :ck GROUP BY o.StoreId ORDER BY t.StoreName ASC");
 		$query->execute(array(':ck' => $ck));
@@ -283,24 +313,28 @@ class UserModel extends Model {
 
 
 
-	function updateActiveThumb($id, $product_id){
+	function updateActiveThumb($id, $product_id)
+	{
 		DB::table('teamstore_product_thumbnails')->where('ProductId', $product_id)
 			->update(['ImageClass' => null]);
 		$i = DB::table('teamstore_product_thumbnails')->where('Id', $id)
 			->update(['ImageClass' => 'active']);
 	}
 
-	function updateThumbnailOrdering($order, $id){
+	function updateThumbnailOrdering($order, $id)
+	{
 		$i = DB::table('teamstore_product_thumbnails')->where('Id', $id)
 			->update(['Ordering' => $order]);
 	}
 
-	function updateItemOrdering($order, $id){
+	function updateItemOrdering($order, $id)
+	{
 		$i = DB::table('teamstore_products')->where('Id', $id)
 			->update(['Ordering' => $order]);
 	}
 
-	function updateTeamstore($id, $data){
+	function updateTeamstore($id, $data)
+	{
 
 		$i = DB::table('teamstores')
 			->where("Id", $id)
@@ -308,7 +342,8 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectShippingAddress($field, $value){
+	function selectShippingAddress($field, $value)
+	{
 
 		$i = DB::table('shipping_addresses')
 			->where($field, $value)
@@ -316,21 +351,24 @@ class UserModel extends Model {
 		return $i;
 	}
 
-	function selectUserLoginsWhereIn($ids){
+	function selectUserLoginsWhereIn($ids)
+	{
 		$i = DB::table('user_logins')
 			->whereIn('store_id', $ids)
 			->get();
 		return $i;
 	}
 
-	function selectShippingCost(){
+	function selectShippingCost()
+	{
 		$i = DB::table('shipping_cost')
 			->get();
 		return $i;
 	}
 
 
-	function countStoreOrder($storeId){
+	function countStoreOrder($storeId)
+	{
 		$pdo 	= 	DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT SUM(o.Quantity) AS count_order FROM orders AS o WHERE o.StoreId = :storeId");
 		$query->execute([':storeId' => $storeId]);
@@ -338,7 +376,8 @@ class UserModel extends Model {
 		return $row;
 	}
 
-	function storeIncome($storeId){
+	function storeIncome($storeId)
+	{
 		$pdo 	= 	DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT SUM(o.Price) AS store_income  FROM orders AS o WHERE o.StoreId = :storeId");
 		$query->execute([':storeId' => $storeId]);
@@ -346,7 +385,8 @@ class UserModel extends Model {
 		return $row;
 	}
 
-	function countStoreProduct($storeId){
+	function countStoreProduct($storeId)
+	{
 		$pdo 	= 	DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT COUNT(Id) AS store_product_count FROM teamstore_products AS tp WHERE tp.TeamStoreId = :storeId");
 		$query->execute([':storeId' => $storeId]);
@@ -354,7 +394,8 @@ class UserModel extends Model {
 		return $row;
 	}
 
-	function countStorePublishedProduct($storeId){
+	function countStorePublishedProduct($storeId)
+	{
 		$pdo 	= 	DB::connection()->getPdo();
 		$query	=	$pdo->prepare("SELECT COUNT(Id) AS store_published_product FROM teamstore_products AS tp WHERE tp.TeamStoreId = :storeId AND PrivacyStatus = 'public'");
 		$query->execute([':storeId' => $storeId]);
@@ -362,20 +403,23 @@ class UserModel extends Model {
 		return $row;
 	}
 
-	function getAnnouncement($storeId){
+	function getAnnouncement($storeId)
+	{
 		$i = DB::table('store_announcement')
 			->where('StoreId', $storeId)
 			->get();
 		return $i;
 	}
 
-	function saveNewAnnouncement($data){
+	function saveNewAnnouncement($data)
+	{
 		$i = DB::table('store_announcement')
 			->insert($data);
 		return $i;
 	}
 
-	function updateAnnouncement($id, $data){
+	function updateAnnouncement($id, $data)
+	{
 		$i = DB::table('store_announcement')
 			->where('Id', $id)
 			->update($data);

resources/views/auth/login.blade.php

@@ -5,6 +5,7 @@
 	.error {
 		color: red;
 	}
+
 	.form-wrapper {
 		margin-top: 20%;
 	}
@@ -22,18 +23,15 @@
 				<div class="col col-lg-5">
 					<div id="login-response-msg"></div>
 					<form role="form" id="frm-login">
+						<input type="hidden" name="redirect" value="{{ Request::get('redirectUrl')  }}">
 						<input type="hidden" name="_token" value="{{ csrf_token() }}">
 						<div class="mb-3">
-							<label for="exampleInputEmail1" class="form-label"
+							<label for="exampleInputEmail1" class="form-label">Email address</label>
-								>Email address</label
-							>
 							<input type="email" class="form-control" name="email" value="{{ old('email') }}" title="Please enter your email address" placeholder="example@gmail.com">
 							<!-- <div id="emailHelp" class="form-text">We'll never share your email with anyone else.</div> -->
 						</div>
 						<div class="mb-3">
-							<label for="exampleInputPassword1" class="form-label"
+							<label for="exampleInputPassword1" class="form-label">Password</label>
-								>Password</label
-							>
 							<input type="password" class="form-control" name="password" placeholder="Password" title="Please enter your password">
 						</div>
 						<button type="submit" class="btn btn-green btn-sm w-100">
@@ -42,18 +40,12 @@
 					</form>
 
 					<div class="text-center py-3">
-						<nuxt-link to="/auth/reset-password"
+						<nuxt-link to="/auth/reset-password">Forgot your password?</nuxt-link>
-							>Forgot your password?</nuxt-link
-						>
 					</div>
 					<hr class="custom-hr" />
 					<div class="text-center py-3">
 						Don't have an account?
-						<a 
+						<a href="{{ url('./auth/register')}}" class="btn btn-black btn-sm w-100">Register</a>
-							href="{{ url('./auth/register')}}"
-							class="btn btn-black btn-sm w-100"
-							>Register</a
-						>
 					</div>
 				</div>
 			</div>

resources/views/merchbay/navbar.blade.php

@@ -4,22 +4,10 @@
       <span>M</span>erchbay
       {{-- <img src="{{asset('/public/images/merchbay-white.png')}}" class="img-fluid" alt="logo"> --}}
     </a>
-      <button
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarMainToggler" aria-controls="navbarMainToggler" aria-expanded="false" aria-label="Toggle navigation">
-        class="navbar-toggler"
-        type="button"
-        data-bs-toggle="collapse"
-        data-bs-target="#navbarMainToggler"
-        aria-controls="navbarMainToggler"
-        aria-expanded="false"
-        aria-label="Toggle navigation"
-      >
       <i class="bi bi-list text-white"></i>
     </button>
-      <div
+    <div class="collapse navbar-collapse justify-content-end" id="navbarMainToggler" v-if="hasMenu">
-        class="collapse navbar-collapse justify-content-end"
-        id="navbarMainToggler"
-        v-if="hasMenu"
-      >
       <ul class="navbar-nav ml-auto mb-2 mb-lg-0">
         <!-- <li class="d-inline d-lg-none">
               <button data-toggle="collapse" data-target="#navbarMainToggler" class="close float-end" aria-expanded="true">×</button>
@@ -27,56 +15,34 @@
         <li class="nav-item text-center d-md-none d-block">
           <h5>Menu</h5>
         </li>
-
+        {{-- <li class="nav-item">
+          <a href="{{ url('./track-order') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1 sign">Track Order</a>
+        </li> --}}
         @if (Auth::guest())
         <li class="nav-item">
-                <a
+          <a href="{{ url('./auth/login') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1 sign">Sign in</a>
-                href="{{ url('./auth/login') }}"
-                class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1 sign"
-                >Sign in</a
-                >
         </li>
         <li class="nav-item">
-                <a
+          <a href="{{ url('./auth/register') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Register</a>
-                href="{{ url('./auth/register') }}"
-                class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
-                >Register</a
-                >
         </li>
         @else
 
         @if(Auth::user()->role == "admin")
         <li class="nav-item">
-                    <a
+          <a href="{{ url('admin') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a>
-                    href="{{ url('admin') }}"
-                    class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
-                    >Dashboard</a
-                    >
         </li>
         @elseif(Auth::user()->role == "store_owner")
         <li class="nav-item">
-                    <a
+          <a href="{{ url('user') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a>
-                    href="{{ url('user') }}"
-                    class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
-                    >Dashboard</a
-                    >
         </li>
         @else
         <li class="nav-item">
-                    <a
+          <a href="{{ url('user') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a>
-                    href="{{ url('user') }}"
-                    class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
-                    >Dashboard</a
-                    >
         </li>
         @endif
 
         <li class="nav-item">
-                <a
+          <a href="{{ url('./auth/logout') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Logout</a>
-                href="{{ url('./auth/logout') }}"
-                class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1"
-                >Logout</a
-                >
         </li>
         @endif
         <li class="nav-item">

resources/views/merchbay/terms_of_use.blade.php

@@ -17,8 +17,7 @@
             </div>
             <div class="row justify-content-center">
                 <div class="col col-lg-8 vh100">
-											<object  data="{{ asset('public/assets/files/Terms of Use.pdf#toolbar=0&navpanes=0&scrollbar=0') }}" name="asdasdasd" type="application/pdf" width="100%"
+                    <object data="{{ asset('public/assets/files/Terms of Use.pdf#toolbar=0&navpanes=0&scrollbar=0') }}" name="asdasdasd" type="application/pdf" width="100%" height="100%"></object>
-											height="100%"></object>
                 </div>
             </div>
         </div>

resources/views/merchbay/track_order.blade.php

@@ -0,0 +1,34 @@
+@extends('merchbay_main')
+
+@section('main-content')
+    <style>
+        iframe {
+            width: 100%;
+            height: 100vh;
+        }
+
+    </style>
+    <div class="wrapper pb-5">
+        <div class="main__content">
+            <div class="container">
+                <div class="row">
+                    <div class="col col-lg-12 pt-5 text-center text-lg-start">
+                        <h4>Track Order</h4>
+                        <hr class="custom-hr" />
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col col-lg-12">
+                        @if (Auth::guest())
+                            Please login <a href="{{ url('auth/login?redirectUrl=') }}{{ URL::full() }}"
+                                class="text-decoration-underline">here</a> to track your order.
+                        @else
+                            <iframe src="http://localhost:8002/?id={{ $userId }}" frameborder="0"></iframe>
+                        @endif
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/merchbay_main.blade.php

@@ -364,8 +364,13 @@
 
                         if (response.success) {
                             // $("#login-response-msg").html(response);
-                            // console.log();
+                            // console.log(response);
+                            // location.reload();
+                            if (response.redirect != "") {
+                                window.location = response.redirect;
+                            } else {
                                 location.reload();
+                            }
                         } else {
                             $("#login-response-msg").html(response.message);
                         }

resources/views/user-layouts/store-orders.blade.php

@@ -53,6 +53,7 @@
                                             <tr>
                                                 <th>Status</th>
                                                 <th>Invoice No.</th>
+                                                <th>SKU</th>
                                                 <th>Product Name</th>
                                                 <th>Name</th>
                                                 <th>Number</th>
@@ -83,6 +84,7 @@
                                                 <tr>
                                                     <td>{{ $item_order->StepLabel }}</td>
                                                     <td>{{ $item_order->InvoiceNumber }}</td>
+                                                    <td>{{ $item_order->ProductCode }}</td>
                                                     <td>{{ $item_order->ProductName }}</td>
                                                     <td>{{ $item_order->Name }}</td>
                                                     <td>{{ $item_order->Number }}</td>

resources/views/user-layouts/view-store-item.blade.php

@@ -45,7 +45,7 @@
                                     <div class="col-md-12">
                                         <ul class="hide-bullets">
                                             <li class="col-sm-3 col-xs-4">
-                                                    <a class="thumbnail btn-add-thumbnail" style="border-bottom-left-radius: 0px; border-botomt-right-radius: 0px; margin-bottom: -28px; cursor: pointer;">
+                                                <a class="thumbnail btn-add-thumbnail" style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; margin-bottom: -28px; cursor: pointer;">
                                                     <!-- <span class="close">&times;</span> -->
                                                     <img class="img img-responsive product-center " style="height: 65.45px;" src="{{ asset('/public/images/add-new-img.svg') }}" />
                                                     <!-- <p class="center">Add Image</p> -->
@@ -92,6 +92,10 @@
                             <div class="row">
                                 <div class="col-md-12">
                                     <input type="hidden" class="form-control" name="item_url" value="{{ $product_array[0]->ProductURL }}" placeholder="Item Name">
+                                    <div class="form-group">
+                                        <label>SKU</label>
+                                        <input type="text" class="form-control" name="sku" value="{{ $product_array[0]->ProductCode }}" placeholder="SKU">
+                                    </div>
                                     <div class="form-group">
                                         <label>Item Name</label>
                                         <input type="text" class="form-control" name="itemName" value="{{ $product_array[0]->ProductName }}" placeholder="Item Name">