diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index 49ec306..b322702 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -611,6 +611,7 @@ class PaypalController extends Controller
 			//throw $th;
 			// echo $e->getCode();
 			echo $e->getData();
+			// var_dump($e->getData());
 			Session::put('cartkeyError', 'Invalid payment.');
 			return Redirect::route('cart');
 		}
diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php
index f84f252..1e2713e 100755
--- a/app/Http/Controllers/user/UserController.php
+++ b/app/Http/Controllers/user/UserController.php
@@ -1,4 +1,6 @@
-<?php namespace App\Http\Controllers\user;
+<?php
+
+namespace App\Http\Controllers\user;
 
 use App\Http\Requests;
 use App\Http\Controllers\Controller;
@@ -14,13 +16,15 @@ use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Storage;
 
 
-class UserController extends Controller {
-	
-	public function index(){
+class UserController extends Controller
+{
+
+	public function index()
+	{
 		$m 		= new UserModel;
 		$userRole = Auth::user()->role;
 
-		if($userRole == "store_owner"){
+		if ($userRole == "store_owner") {
 			$storeId = Auth::user()->store_id;
 
 			$countStoreOrder = $m->countStoreOrder($storeId);
@@ -34,8 +38,8 @@ class UserController extends Controller {
 				'store_income' => $storeIncome[0]->store_income,
 				'store_product_count' => $countStoreProduct[0]->store_product_count,
 				'store_published_product' =>  $countStorePublishedProduct[0]->store_published_product
-			);				
-		}else{
+			);
+		} else {
 			$post_data = array(
 				'isStoreOwner' => false,
 				'store_order' => "",
@@ -47,32 +51,32 @@ class UserController extends Controller {
 
 		// $post_data = json_encode($post_data, JSON_FORCE_OBJECT);
 		return view('user-layouts.index')->with('data', $post_data);
-
 	}
 
-	public function addressBook(){
+	public function addressBook()
+	{
 		$m 		= new UserModel;
 		$userId = Auth::user()->id;
-		
+
 		$array_address_book 	= 	$m->selectAddresBook('UserId', $userId);
 
 		return view('user-layouts.address_book')
-									->with('array_address_book', $array_address_book);
-		
+			->with('array_address_book', $array_address_book);
 	}
 
-	public function createAddressBook(){
+	public function createAddressBook()
+	{
 
 		return view('user-layouts.create_address_book');
-		
 	}
 
-	public function saveAddressBook(Request $request){
+	public function saveAddressBook(Request $request)
+	{
 		$post 	=	$request->all();
 		$m 		= new UserModel;
 
 		$userId = Auth::user()->id;
-		
+
 		$data = array(
 			'UserId'			=> $userId,
 			'Fullname'			=> $post['fullname'],
@@ -86,27 +90,27 @@ class UserController extends Controller {
 			'CountryCode'     		=> $post['countryCode'],
 			'Country'     		=> $post['country']
 		);
-		
-		echo $i 	= 	$m->insertAddressBook($data);
 
+		echo $i 	= 	$m->insertAddressBook($data);
 	}
 
-	public function editAddressBook($id){
+	public function editAddressBook($id)
+	{
 		$m 		= new UserModel;
 		$userId = Auth::user()->id;
-		
+
 		$array_address_book 	= 	$m->selectAddresBook('Id', $id);
-		
-		if($array_address_book[0]->UserId != $userId){
+
+		if ($array_address_book[0]->UserId != $userId) {
 			return redirect('user/address-book');
 		}
-		
+
 		return view('user-layouts.edit_address_book')
-									->with('array_address_book', $array_address_book);
-		
+			->with('array_address_book', $array_address_book);
 	}
 
-	public function updateAddressBook(Request $request){
+	public function updateAddressBook(Request $request)
+	{
 		$post 	=	$request->all();
 		$m 		= new UserModel;
 
@@ -126,90 +130,94 @@ class UserController extends Controller {
 			'CountryCode'     		=> $post['countryCode'],
 			'Country'     		=> $post['country']
 		);
-		
-		echo $i 	= 	$m->saveUpdateAddressBook($data, $id);
 
+		echo $i 	= 	$m->saveUpdateAddressBook($data, $id);
 	}
 
-	public function profile(){
+	public function profile()
+	{
 		$m 		= new UserModel;
 		$userId = Auth::user()->id;
 
 		$array_profile_info 	= 	$m->selectProfileInfo($userId);
 		return view('user-layouts.profile')
-										->with('array_profile_info', $array_profile_info);
+			->with('array_profile_info', $array_profile_info);
 	}
 
-	public function editProfile(){
+	public function editProfile()
+	{
 		$m 		= new UserModel;
 		$userId = Auth::user()->id;
 
 		$array_profile_info 	= 	$m->selectProfileInfo($userId);
 		return view('user-layouts.edit_profile')
-										->with('array_profile_info', $array_profile_info);
-	
+			->with('array_profile_info', $array_profile_info);
 	}
-	
-	public function updateProfile(Request $request){
+
+	public function updateProfile(Request $request)
+	{
 		$post 	=	$request->all();
 		$m 		= new UserModel;
 
 		$userId = Auth::user()->id;
 
 		$user_logins_data = array(
-								'name'			=> $post['fullname'],
-								'email'			=> $post['email'],
-								'other_email'			=> $post['other_email'],
-							);
+			'name'			=> $post['fullname'],
+			'email'			=> $post['email'],
+			'other_email'			=> $post['other_email'],
+		);
 
 		$user_info_data = array(
-								'UserId'			=> $userId,
-								'ContactNumber'		=> $post['contactnumber'],
-								'Gender'			=> $post['gender'],
-								'Birthday'			=> date('Y-m-d', strtotime($post['birthday']))
-							);
-	
+			'UserId'			=> $userId,
+			'ContactNumber'		=> $post['contactnumber'],
+			'Gender'			=> $post['gender'],
+			'Birthday'			=> date('Y-m-d', strtotime($post['birthday']))
+		);
+
 		$i = $m->saveUpdateUserLogins($user_logins_data, $userId);
 		$i1 = $m->saveUpdateUserInfo($user_info_data, $userId);
-		
+
 
 		return $i;
 	}
 
-	public function changePassword(){
+	public function changePassword()
+	{
 		return view('user-layouts.change_password');
 	}
 
-	public function updatePassword(Request $request){
+	public function updatePassword(Request $request)
+	{
 		$post 	=	$request->all();
 		$m 		= new UserModel;
 		$c_password = Auth::user()->password;
 		$userId = Auth::user()->id;
 
-		if(!(Hash::check($post['current_password'], $c_password))){
+		if (!(Hash::check($post['current_password'], $c_password))) {
 			$message = "Your current password does not matches with the password you provided. Please try again.";
-            return $message;
+			return $message;
 		}
 
-		if(strcmp($post['current_password'], $post['new_password']) == 0){
-            //Current password and new password are same
+		if (strcmp($post['current_password'], $post['new_password']) == 0) {
+			//Current password and new password are same
 			$message = "New Password cannot be same as your current password. Please choose a different password.";
-            return $message;
-        }
+			return $message;
+		}
 
 		if ($post['new_password'] != $post['con_new_password']) {
 			// The passwords matches
 			$message = "Password confirmation and New Password must match. Please try again.";
-            return $message;
+			return $message;
 		}
 
 
-		$i = $m->saveUpdatePassword(bcrypt($post['new_password']) , $userId);
-		
+		$i = $m->saveUpdatePassword(bcrypt($post['new_password']), $userId);
+
 		return $i;
 	}
-	
-	public function orders(){
+
+	public function orders()
+	{
 		$m 		= new UserModel;
 		$userId = Auth::user()->id;
 		$array_payment_details 	= 	$m->selectPaymentDetails('UserId', $userId);
@@ -221,23 +229,25 @@ class UserController extends Controller {
 	}
 
 
-	public function myDesigns(){
+	public function myDesigns()
+	{
 		$m 		= new UserModel;
 		$userId = Auth::user()->id;
-		
+
 		$array_client_designs 	= 	$m->selectClientDesigns($userId);
 		// var_dump($array_client_designs);
 		return view('user-layouts.my-design')->with('array_client_designs', $array_client_designs);
 	}
-	
-	public function viewDesign($designCode){
+
+	public function viewDesign($designCode)
+	{
 		$m 		= new UserModel;
 		$newMainModel 		= new MainModel;
 		$userId = Auth::user()->id;
 		$array_client_designs 	= 	$m->selectClientDesignsbyCode($designCode);
-		
+
 		// check if its your design	
-		if($userId != $array_client_designs[0]->ClientId){
+		if ($userId != $array_client_designs[0]->ClientId) {
 			return redirect()->back();
 		}
 
@@ -245,12 +255,13 @@ class UserController extends Controller {
 		$array_cat_name = $newMainModel->selectCategoryName($array_client_designs[0]->TemplateCode);
 
 		return view('user-layouts.view-design')
-											->with('array_client_designs', $array_client_designs)
-											->with('array_template_paths', $array_template_paths)
-											->with('array_cat_name', $array_cat_name);
+			->with('array_client_designs', $array_client_designs)
+			->with('array_template_paths', $array_template_paths)
+			->with('array_cat_name', $array_cat_name);
 	}
 
-	public function updateDesignDetails(Request $request){
+	public function updateDesignDetails(Request $request)
+	{
 		$post 	=	$request->all();
 		$m 		= new UserModel;
 
@@ -264,27 +275,25 @@ class UserController extends Controller {
 		$i = $m->updateClientDesign($client_design_data, $design_code);
 
 		return $i;
-		
 	}
 
-	public function store(){
+	public function store()
+	{
 		$m 		= new UserModel;
 		$userRole = Auth::user()->role;
 		$array_store_info = array();
 
-		if($userRole == "store_owner"){
+		if ($userRole == "store_owner") {
 			$storeId = Auth::user()->store_id;
-			
+
 			$array_store_info 	= 	$m->selectStoreInfo($storeId);
 
-			return redirect('store/'. $array_store_info[0]->StoreUrl);
-
-
+			return redirect('store/' . $array_store_info[0]->StoreUrl);
 		}
-
 	}
 
-	public function storeItems(){
+	public function storeItems()
+	{
 		$thumbnails = array();
 		$newUserModel 		= new UserModel;
 		$newTeamStoreModel 	= new TeamStoreModel;
@@ -299,42 +308,41 @@ class UserController extends Controller {
 
 			$thumbnails_array 			= 	$newTeamStoreModel->getProductThumbnails($pr_arr->Id);
 
-			if(!empty($thumbnails_array)){
+			if (!empty($thumbnails_array)) {
 				foreach ($thumbnails_array as $t => $thumb) {
-				
-					if($thumb->ImageClass == 'custom'){
+
+					if ($thumb->ImageClass == 'custom') {
 						$displayThumbnails = $thumb->Image;
 						break;
 					}
-	
-					if($thumb->ImageClass == 'active'){
+
+					if ($thumb->ImageClass == 'active') {
 						$displayThumbnails = $thumb->Image;
 						break;
-					}	
+					}
 				}
-	
-				$thumbnails[] = array(
-									'folder' 	=>	$store_array[0]->ImageFolder,
-									'product_id' =>  $pr_arr->Id,
-									'thumb'	     =>  $displayThumbnails
-				);
 
-			}else{
 				$thumbnails[] = array(
-									'folder' 	=>	$store_array[0]->ImageFolder,
-									'product_id' =>  $pr_arr->Id,
-									'thumb'	     =>  "product-image-placeholder.png"
+					'folder' 	=>	$store_array[0]->ImageFolder,
+					'product_id' =>  $pr_arr->Id,
+					'thumb'	     =>  $displayThumbnails
+				);
+			} else {
+				$thumbnails[] = array(
+					'folder' 	=>	$store_array[0]->ImageFolder,
+					'product_id' =>  $pr_arr->Id,
+					'thumb'	     =>  "product-image-placeholder.png"
 				);
 			}
-			
 		}
-		
+
 		return view('user-layouts.store_items')->with('store_array', $store_array)
-											->with('product_array', $product_array)
-											->with('thumbnails', $thumbnails);
+			->with('product_array', $product_array)
+			->with('thumbnails', $thumbnails);
 	}
 
-	public function viewStoreItem($url){
+	public function viewStoreItem($url)
+	{
 		$product_array = array();
 		$newUserModel 		= new UserModel;
 		$newTeamStoreModel 	= new TeamStoreModel;
@@ -345,21 +353,20 @@ class UserController extends Controller {
 		$shipping_cost = $newUserModel->selectShippingCost();
 
 		return view('user-layouts.view-store-item')->with('product_array', $product_array)
-													->with('available_size', $available_size)
-													->with('thumbnails_array', $thumbnails_array)
-													->with('shipping_cost', $shipping_cost);
-
-		
+			->with('available_size', $available_size)
+			->with('thumbnails_array', $thumbnails_array)
+			->with('shipping_cost', $shipping_cost);
 	}
 
 
-	public function storeItemUpdate(Request $request){
+	public function storeItemUpdate(Request $request)
+	{
 		$post 	=	$request->all();
 		$newTeamStoreModel 	= new TeamStoreModel;
 
-		if($post['shipping_cost'] == 0){
+		if ($post['shipping_cost'] == 0) {
 			$shipping_cost_id = null;
-		}else{
+		} else {
 			$shipping_cost_id = $post['shipping_cost'];
 		}
 
@@ -378,7 +385,7 @@ class UserController extends Controller {
 		);
 
 		$i 	= $newTeamStoreModel->updateStoreItem($data, $item_url);
-		
+
 		return $i;
 	}
 
@@ -389,7 +396,7 @@ class UserController extends Controller {
 
 		$store_array 	= $TeamStoreModel->selectTeamStore('Id', $store_id);
 		return view('user-layouts.store_setting')
-										->with('store_array', $store_array);
+			->with('store_array', $store_array);
 	}
 
 	public function emailVerify()
@@ -398,53 +405,52 @@ class UserController extends Controller {
 		$userId = Auth::user()->id;
 		$email_is_verified = Auth::user()->email_is_verified;
 
-		if($email_is_verified == 0){
+		if ($email_is_verified == 0) {
 			$array_profile_info 	= 	$m->selectProfileInfo($userId);
 			return view('user-layouts.email_verify')
-											->with('array_profile_info', $array_profile_info);
+				->with('array_profile_info', $array_profile_info);
 		}
 
 		return redirect('user/profile');
-		
 	}
 
 
-	public function resendVericationCode(Request $request){
+	public function resendVericationCode(Request $request)
+	{
 		$post 	=	$request->all();
 		$random_hash =  rand(1000, 9999);
 
 		$newUserModel 		= new UserModel;
-	
+
 		$emailDetails = [
-            'receiver'   => $post['email'],  
+			'receiver'   => $post['email'],
 			'subject' => 'CREW Sportswear Email Verification Code',
 			'verification_code' 		=> $random_hash
 		];
-		
-		Mail::send('emails.resend_code', $emailDetails, function($message) use ($emailDetails) {
-			
+
+		Mail::send('emails.resend_code', $emailDetails, function ($message) use ($emailDetails) {
+
 			$message->from('no-reply@crewsportswear.com', 'CREW Sportswear');
 			$message->to($emailDetails['receiver'])->subject('CREW Sportswear Email Verification Code');
-
 		});
 
-		if( count(Mail::failures()) > 0 ) {
-			
+		if (count(Mail::failures()) > 0) {
+
 			echo '0';
-	 
-		}else{
+		} else {
 			$data = array(
 				'EmailAddress'		=> $post['email'],
 				'VerCode'		=> $random_hash
 			);
-	
+
 			$i 	= $newUserModel->saveResendCode($data);
 			echo $i;
 		}
 	}
-	
 
-	public function verifyCode(Request $request){
+
+	public function verifyCode(Request $request)
+	{
 		$post 	=	$request->all();
 
 		$verification_code = $post['verification_code'];
@@ -452,7 +458,7 @@ class UserController extends Controller {
 
 		$newUserModel 		= new UserModel;
 		$userId = Auth::user()->id;
-		
+
 		$data = array(
 			'EmailAddress'		=> $userEmail,
 			'Code'				=> $verification_code
@@ -461,41 +467,42 @@ class UserController extends Controller {
 		$i 	= $newUserModel->validateCode($data);
 		// var_dump($i);
 
-		if($i){
+		if ($i) {
 
 			$user_logins_data = array(
 				'email_is_verified'		=> 1
 			);
-			
+
 			$newUserModel->saveUpdateUserLogins($user_logins_data, $userId);
-		
+
 			return response()->json(array(
-				'success' => true, 
-				'message'=>'Your email is successfully verified.'
+				'success' => true,
+				'message' => 'Your email is successfully verified.'
 			));
-			
-		}else{
+		} else {
 			return response()->json(array(
-				'success' => false, 
-				'message'=>'Invalid verification code.'
+				'success' => false,
+				'message' => 'Invalid verification code.'
 			));
 		}
 	}
 
-	public function orderDetails($ck){
+	public function orderDetails($ck)
+	{
 		$newUserModel 		= new UserModel;
 		$order_item_array 	= $newUserModel->selectOrderItem($ck);
 		$item_goup_array 	= $newUserModel->itemGroup($ck);
 		$item_thumbs 		= $newUserModel->selectDisplayItemThumb();
 		$array_payment_details 	= 	$newUserModel->selectPaymentDetails('CartKey', $ck);
 		return view('user-layouts.order_details')
-									->with('array_payment_details', $array_payment_details)
-									->with('img_thumb', $item_thumbs)
-									->with('item_goup_array', $item_goup_array)
-									->with('order_item_array', $order_item_array);
+			->with('array_payment_details', $array_payment_details)
+			->with('img_thumb', $item_thumbs)
+			->with('item_goup_array', $item_goup_array)
+			->with('order_item_array', $order_item_array);
 	}
-	
-	public function sellDesign($designCode){
+
+	public function sellDesign($designCode)
+	{
 		$m 		= new UserModel;
 		$newMainModel 		= new MainModel;
 		$newTeamStoreModel 	= new TeamStoreModel;
@@ -504,7 +511,7 @@ class UserController extends Controller {
 		$array_client_designs 	=	$m->selectClientDesignsbyCode($designCode);
 		$store_array 	= $newTeamStoreModel->selectTeamStore('Id', $store_id);
 		// check if its your design	
-		if($userId != $array_client_designs[0]->ClientId){
+		if ($userId != $array_client_designs[0]->ClientId) {
 			return redirect()->back();
 		}
 
@@ -514,13 +521,14 @@ class UserController extends Controller {
 		$array_cat_name = $newMainModel->selectCategoryName($array_client_designs[0]->TemplateCode);
 
 		return view('user-layouts.sell_design')
-											->with('array_client_designs', $array_client_designs)
-											->with('array_template_paths', $array_template_paths)
-											->with('store_array', $store_array)
-											->with('array_cat_name', $array_cat_name);
+			->with('array_client_designs', $array_client_designs)
+			->with('array_template_paths', $array_template_paths)
+			->with('store_array', $store_array)
+			->with('array_cat_name', $array_cat_name);
 	}
 
-	public function buyDesign($designCode){
+	public function buyDesign($designCode)
+	{
 		$m 		= new UserModel;
 		$newMainModel 		= new MainModel;
 		$newTeamStoreModel 	= new TeamStoreModel;
@@ -529,7 +537,7 @@ class UserController extends Controller {
 		$array_client_designs 	=	$m->selectClientDesignsbyCode($designCode);
 		// $store_array 	= $newTeamStoreModel->selectTeamStore('Id', $store_id);
 		// check if its your design	
-		if($userId != $array_client_designs[0]->ClientId){
+		if ($userId != $array_client_designs[0]->ClientId) {
 			return redirect()->back();
 		}
 
@@ -539,15 +547,15 @@ class UserController extends Controller {
 		$array_cat_name = $newMainModel->selectCategoryName($array_client_designs[0]->TemplateCode);
 
 		return view('user-layouts.buy_design')
-											->with('array_client_designs', $array_client_designs)
-											->with('array_template_paths', $array_template_paths)
-											// ->with('store_array', $store_array)
-											->with('array_cat_name', $array_cat_name);
-
+			->with('array_client_designs', $array_client_designs)
+			->with('array_template_paths', $array_template_paths)
+			// ->with('store_array', $store_array)
+			->with('array_cat_name', $array_cat_name);
 	}
 
 	//save item from my design //
-	public function saveNewStoreItem(Request $request){
+	public function saveNewStoreItem(Request $request)
+	{
 		$post 	=	$request->all();
 		$UserModel		= new UserModel;
 		$newTeamStoreModel 	= new TeamStoreModel;
@@ -564,34 +572,36 @@ class UserController extends Controller {
 		$itemForm = $post['itemForm'];
 		$itemUrl = $store_array[0]->StoreUrl . '-' . $post['itemUrl'];
 		$itemPrivacy = $post['itemPrivacy'];
-		$available_size = implode(",", $_POST['available_size']); 
+		$available_size = implode(",", $_POST['available_size']);
 
 		$check_product_url = array(
 			'ProductURL' => $itemUrl
 		);
 
-		$validator = Validator::make($check_product_url, [
-			'ProductURL' 			=> 'unique:teamstore_products'
-		],
-		[
-			'ProductURL.unique' => 'The Item URL has already been taken.',
-		]);
-		
-		
-		if ($validator->fails())
-        {
+		$validator = Validator::make(
+			$check_product_url,
+			[
+				'ProductURL' 			=> 'unique:teamstore_products'
+			],
+			[
+				'ProductURL.unique' => 'The Item URL has already been taken.',
+			]
+		);
+
+
+		if ($validator->fails()) {
 			$errors = "";
 			// var_dump(($validator->errors()->all()));
-			foreach($validator->errors()->all() as $error){
-				$errors .= "<li>".$error."</li>";
+			foreach ($validator->errors()->all() as $error) {
+				$errors .= "<li>" . $error . "</li>";
 			}
 
 			$message = '
 			<div class="alert alert-danger alert-dismissible">
 				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
 					<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
-					'.$errors. 
-			'</div>';
+					' . $errors .
+				'</div>';
 
 			return response()->json(array(
 				'success' => false,
@@ -603,7 +613,7 @@ class UserController extends Controller {
 			'TeamStoreId'		=> $store_id,
 			'ProductName'		=> $itemName,
 			'ProductPrice'		=> str_replace('$ ', '', $itemPrice),
-			'ProductDescription'=> $itemDescription,
+			'ProductDescription' => $itemDescription,
 			'ProductURL'		=> $itemUrl,
 			'ProductForm'		=> $itemForm,
 			'AvailableSizes'	=> $available_size,
@@ -617,11 +627,11 @@ class UserController extends Controller {
 
 		$array_template_paths 	= 	$UserModel->selectTemplatePaths('TemplateCode', $templateCode);
 
-		foreach($array_template_paths as $key => $row1){
-			if($key  == 0){
+		foreach ($array_template_paths as $key => $row1) {
+			if ($key  == 0) {
 				$thumb =  $designCode . '-front-thumbnail.png';
 				$class = "active";
-			}else{
+			} else {
 				$thumb =  $designCode . '-' . strtolower($row1->Side) . '-thumbnail.png';
 				$class = null;
 			}
@@ -629,24 +639,22 @@ class UserController extends Controller {
 			$thumbs = 	$data = array(
 				'ProductId' => $id,
 				'Image' => $thumb,
-				'ImageClass' =>$class
+				'ImageClass' => $class
 			);
-			
-			$UserModel->insertNewProductThumbnails($thumbs);
 
-		
+			$UserModel->insertNewProductThumbnails($thumbs);
 		}
 
-		$prod_code = array('ProductCode' => $getYear . '-' .str_pad($id, 10,'0', STR_PAD_LEFT));
-	 	$i = $UserModel->updateProductCode($prod_code, $id);
-		
+		$prod_code = array('ProductCode' => $getYear . '-' . str_pad($id, 10, '0', STR_PAD_LEFT));
+		$i = $UserModel->updateProductCode($prod_code, $id);
+
 		return response()->json(array(
 			'success' => true
 		));
-	
 	}
 
-	function addStoreItem(){
+	function addStoreItem()
+	{
 		$newTeamStoreModel 	= new TeamStoreModel;
 
 		$user_role = Auth::user()->role;
@@ -655,9 +663,10 @@ class UserController extends Controller {
 		$store_array 	= $newTeamStoreModel->selectTeamStore('Id', $store_id);
 		return view('user-layouts.add_item')->with('store_array', $store_array);
 	}
-	
+
 	//manually uploading item
-	function saveNewItem(Request $request){
+	function saveNewItem(Request $request)
+	{
 
 		$post 	=	$request->all();
 		// var_dump($post['imgupload']);
@@ -676,36 +685,38 @@ class UserController extends Controller {
 		$itemForm = $post['itemForm'];
 		$itemUrl = $store_array[0]->StoreUrl . '-' . $post['itemUrl'];
 		$itemPrivacy = $post['itemPrivacy'];
-		$available_size = implode(",", $_POST['available_size']); 
+		$available_size = implode(",", $_POST['available_size']);
+
+
 
-		
-		
 		$check_product_url = array(
 			'ProductURL' => $itemUrl
 		);
 
-		$validator = Validator::make($check_product_url, [
-			'ProductURL' 			=> 'unique:teamstore_products'
-		],
-		[
-			'ProductURL.unique' => 'The Item URL has already been taken.',
-		]);
-		
-		
-		if ($validator->fails())
-        {
+		$validator = Validator::make(
+			$check_product_url,
+			[
+				'ProductURL' 			=> 'unique:teamstore_products'
+			],
+			[
+				'ProductURL.unique' => 'The Item URL has already been taken.',
+			]
+		);
+
+
+		if ($validator->fails()) {
 			$errors = "";
 			// var_dump(($validator->errors()->all()));
-			foreach($validator->errors()->all() as $error){
-				$errors .= "<li>".$error."</li>";
+			foreach ($validator->errors()->all() as $error) {
+				$errors .= "<li>" . $error . "</li>";
 			}
 
 			$message = '
 			<div class="alert alert-danger alert-dismissible">
 				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
 					<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
-					'.$errors. 
-			'</div>';
+					' . $errors .
+				'</div>';
 
 			return response()->json(array(
 				'success' => false,
@@ -717,7 +728,7 @@ class UserController extends Controller {
 			'TeamStoreId'		=> $store_id,
 			'ProductName'		=> $itemName,
 			'ProductPrice'		=> str_replace('$ ', '', $itemPrice),
-			'ProductDescription'=> $itemDescription,
+			'ProductDescription' => $itemDescription,
 			'ProductURL'		=> $itemUrl,
 			'ProductForm'		=> $itemForm,
 			'AvailableSizes'	=> $available_size,
@@ -729,27 +740,27 @@ class UserController extends Controller {
 		$id 	= $UserModel->insertNewProduct($data); // product item id
 		// echo $id;
 
-		for($i = 0; $i < count($post['imgupload']); $i++){
-			$rawName = date('Ymd') . "-" . time().'-'.$request->file('imgupload')[$i]->getClientOriginalName();
+		for ($i = 0; $i < count($post['imgupload']); $i++) {
+			$rawName = date('Ymd') . "-" . time() . '-' . $request->file('imgupload')[$i]->getClientOriginalName();
 			$imageExt = $request->file('imgupload')[$i]->getClientOriginalExtension();
 
-			$custom_file_name	=	str_replace(' ','-',strtolower($rawName));
+			$custom_file_name	=	str_replace(' ', '-', strtolower($rawName));
 			$custom_file_name	= preg_replace("/\.[^.\s]{3,4}$/", "", $custom_file_name);
-			$NewImageName = $custom_file_name.'.'.$imageExt;
+			$NewImageName = $custom_file_name . '.' . $imageExt;
 			$thumbnail =  $NewImageName;
 
-			if($i == 0){
+			if ($i == 0) {
 				$imageClass = "active";
-			}else{
+			} else {
 				$imageClass = null;
 			}
-			
+
 			$thumbs = 	$data = array(
 				'ProductId' => $id,
 				'Image' => $thumbnail,
-				'ImageClass' =>$imageClass
+				'ImageClass' => $imageClass
 			);
-			
+
 			$u = $UserModel->insertNewProductThumbnails($thumbs);
 			// var_dump($thumbs);
 			Storage::disk('sftp')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+')); //live
@@ -757,68 +768,195 @@ class UserController extends Controller {
 			// var_dump($s);
 		}
 
-		$prod_code = array('ProductCode' => $getYear . '-' .str_pad($id, 10,'0', STR_PAD_LEFT));
-	 	$i = $UserModel->updateProductCode($prod_code, $id);
-		
+		$prod_code = array('ProductCode' => $getYear . '-' . str_pad($id, 10, '0', STR_PAD_LEFT));
+		$i = $UserModel->updateProductCode($prod_code, $id);
 
-		 return response()->json(array(
-			'success' => true,
-			'message' => 'success'
-		));
 
-	}
-	
-	function saveNewItemImage(Request $request){
-		$post 	=	$request->all();
-		$UserModel		= new UserModel;
-		$getYear = date('y');
-		$id = $post['_id'];
-		
-		$getActiveDisplay = $UserModel->selectDisplayItemThumbById($id);
-
-		for($i = 0; $i < count($post['upload_images']); $i++){
-			$rawName = date('Ymd') . "-" . time().'-'.$request->file('upload_images')[$i]->getClientOriginalName();
-			$imageExt = $request->file('upload_images')[$i]->getClientOriginalExtension();
-
-			$custom_file_name	=	str_replace(' ','-',strtolower($rawName));
-			$custom_file_name	= preg_replace("/\.[^.\s]{3,4}$/", "", $custom_file_name);
-			$NewImageName = $custom_file_name.'.'.$imageExt;
-			$thumbnail =  $NewImageName;
-
-			if($i == 0 && empty($getActiveDisplay)){
-				$imageClass = "active";
-			}else{
-				$imageClass = null;
-			}
-			
-			$thumbs = 	$data = array(
-				'ProductId' => $id,
-				'Image' => $thumbnail,
-				'ImageClass' =>$imageClass
-			);
-			
-			$u = $UserModel->insertNewProductThumbnails($thumbs);
-			Storage::disk('sftp')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+')); //live
-			//Storage::disk('localdir')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+'));
-	
-		}
-
-		
 		return response()->json(array(
 			'success' => true,
 			'message' => 'success'
 		));
-
 	}
 
-	function deleteImageThumb(Request $request){
+	function saveNewItemFromDesigner(Request $request)
+	{
+
+		$post 	=	$request->all();
+		// var_dump($post['imgupload']);
+		$UserModel		= new UserModel;
+		$newTeamStoreModel = new TeamStoreModel;
+		$getYear = date('y');
+
+		$store_id 	= 1; // default merchbay store
+		$store_array 	= $newTeamStoreModel->selectTeamStore('Id', $store_id);
+		$client_design 	= $UserModel->selectClientDesignsbyCode($post['designCode']);
+		$userId = Auth::user()->id;
+
+		$templateCode =  $client_design[0]->TemplateCode;
+		$designCode =  $client_design[0]->DesignCode;
+		$itemName = $client_design[0]->DesignName;
+		$itemDescription = "Sublimated T-Shirt 100% moisture wicking polyester. Imported. Lightweight fabric helps wick away sweat to keep you dry and comfortable.";
+		$itemPrice = "1.00";
+		$itemForm = "tshirt-form";
+		$itemUrl = $store_array[0]->StoreUrl . '-' . $userId . '-' . $client_design[0]->DesignCode;
+		$itemPrivacy = "public";
+		$available_size = "youth,adult";
+
+
+		$product 	= $newTeamStoreModel->selectTeamStoreProducts('ProductURL', $itemUrl);
+		// var_dump(count($product));
+		if (count($product)) {
+			return response()->json(array(
+				'success' => true,
+				'message' => 'success',
+				"link" => '/store/merchbay-store/product/' . $itemUrl
+			));
+		}
+
+
+		$check_product_url = array(
+			'ProductURL' => $itemUrl
+		);
+
+		$validator = Validator::make(
+			$check_product_url,
+			[
+				'ProductURL' 			=> 'unique:teamstore_products'
+			],
+			[
+				'ProductURL.unique' => 'The Item URL has already been taken.',
+			]
+		);
+
+
+		if ($validator->fails()) {
+			$errors = "";
+			// var_dump(($validator->errors()->all()));
+			foreach ($validator->errors()->all() as $error) {
+				$errors .= "<li>" . $error . "</li>";
+			}
+
+			$message = '
+			<div class="alert alert-danger alert-dismissible">
+				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+					<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
+					' . $errors .
+				'</div>';
+
+			return response()->json(array(
+				'success' => false,
+				'message' => $message
+			));
+		}
+
+		$data = array(
+			'TeamStoreId'		=> $store_id,
+			'ProductName'		=> $itemName,
+			'ProductPrice'		=> str_replace('$ ', '', $itemPrice),
+			'ProductDescription' => $itemDescription,
+			'ProductURL'		=> $itemUrl,
+			'ProductForm'		=> $itemForm,
+			'AvailableSizes'	=> $available_size,
+			'PrivacyStatus'		=> $itemPrivacy,
+			'TemplateCode'		=> $templateCode,
+			'DesignCode'		=> $designCode,
+			// 'ShippingCostId' => 1
+		);
+
+
+		$id 	= $UserModel->insertNewProduct($data); // product item id
+		// echo $id;
+
+		$array_template_paths 	= 	$UserModel->selectTemplatePaths('TemplateCode', $templateCode);
+
+		$imageThumbs = array();
+		foreach ($array_template_paths as $key => $path) {
+			$imageThumbs[] = $designCode . "-" . strtolower($path->Side) . "-thumbnail.png";
+		}
+		// var_dump($imageThumbs);
+		// $images = explode(",", $post["imagesThumb"]);
+
+		for ($i = 0; $i < count($imageThumbs); $i++) {
+			$thumbnail =  $imageThumbs[$i];
+
+			if ($i == 0) {
+				$imageClass = "active";
+			} else {
+				$imageClass = null;
+			}
+
+			$thumbs = 	$data = array(
+				'ProductId' => $id,
+				'Image' => $thumbnail,
+				'ImageClass' => $imageClass
+			);
+
+			$UserModel->insertNewProductThumbnails($thumbs);
+		}
+
+		$prod_code = array('ProductCode' => $getYear . '-' . str_pad($id, 10, '0', STR_PAD_LEFT));
+		$i = $UserModel->updateProductCode($prod_code, $id);
+
+
+		return response()->json(array(
+			'success' => true,
+			'message' => 'success',
+			"link" => '/store/merchbay-store/product/' . $itemUrl
+		));
+	}
+
+	function saveNewItemImage(Request $request)
+	{
+		$post 	=	$request->all();
+		$UserModel		= new UserModel;
+		$getYear = date('y');
+		$id = $post['_id'];
+
+		$getActiveDisplay = $UserModel->selectDisplayItemThumbById($id);
+
+		for ($i = 0; $i < count($post['upload_images']); $i++) {
+			$rawName = date('Ymd') . "-" . time() . '-' . $request->file('upload_images')[$i]->getClientOriginalName();
+			$imageExt = $request->file('upload_images')[$i]->getClientOriginalExtension();
+
+			$custom_file_name	=	str_replace(' ', '-', strtolower($rawName));
+			$custom_file_name	= preg_replace("/\.[^.\s]{3,4}$/", "", $custom_file_name);
+			$NewImageName = $custom_file_name . '.' . $imageExt;
+			$thumbnail =  $NewImageName;
+
+			if ($i == 0 && empty($getActiveDisplay)) {
+				$imageClass = "active";
+			} else {
+				$imageClass = null;
+			}
+
+			$thumbs = 	$data = array(
+				'ProductId' => $id,
+				'Image' => $thumbnail,
+				'ImageClass' => $imageClass
+			);
+
+			$u = $UserModel->insertNewProductThumbnails($thumbs);
+			Storage::disk('sftp')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+')); //live
+			//Storage::disk('localdir')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+'));
+
+		}
+
+
+		return response()->json(array(
+			'success' => true,
+			'message' => 'success'
+		));
+	}
+
+	function deleteImageThumb(Request $request)
+	{
 		$file =  $request->thumb_filename;
 		$id	  =  $request->thumb_id;
 		$UserModel		= new UserModel;
 
 		$storagePath  = Storage::disk('sftp')->getDriver()->getAdapter()->getPathPrefix();
-		if(file_exists($storagePath.$file)) {
-			unlink($storagePath.$file);
+		if (file_exists($storagePath . $file)) {
+			unlink($storagePath . $file);
 		}
 
 		$i = $UserModel->deleteImageThumb('Id', $id);
@@ -828,10 +966,10 @@ class UserController extends Controller {
 			'message' 		=> 'success',
 			'delete_row' 	=> 'item-' . $id
 		));
-		
 	}
-	
-	function updateActiveThumbnail(Request $request){
+
+	function updateActiveThumbnail(Request $request)
+	{
 		$post 	=	$request->all();
 		$UserModel		= new UserModel;
 		$i = $UserModel->updateActiveThumb($post['id'], $post['product_id']);
@@ -839,7 +977,8 @@ class UserController extends Controller {
 
 	}
 
-	function saveThumbnailOrdering(Request $request){
+	function saveThumbnailOrdering(Request $request)
+	{
 		$post 	=	$request->all();
 		$arrayItems = $post['item'];
 		$order = 1;
@@ -856,7 +995,8 @@ class UserController extends Controller {
 		));
 	}
 
-	function saveItemOrdering(Request $request){
+	function saveItemOrdering(Request $request)
+	{
 		$post 	=	$request->all();
 		$arrayItems = $post['order_number'];
 		$order = 1;
@@ -873,161 +1013,164 @@ class UserController extends Controller {
 		));
 	}
 
-	
 
-	function storeSettingUpdate(Request $request){
+
+	function storeSettingUpdate(Request $request)
+	{
 		$post 	=	$request->all();
-        $UserModel 	    = new UserModel;
+		$UserModel 	    = new UserModel;
 
-        $store_id   	= Auth::user()->store_id;
-        $store_name     = $post['store_name'];
-        $store_url      = $post['store_url'];
-        $orig_store_url = $post['orig_store_url'];
-        
-       
-        if($post['store_status'] == "Public"){
-            $store_status = "true";
-        }else{
-            $store_status = "false";
-        }
-
-        if(isset($post['set_store_password'])){
-            $store_password = $post['store_password'];
-        }else{
-            $store_password = null;
-        }
-
-        if($request->file('store_logo') != null){
-            $store_logo_name    = 'logo.'. $request->file('store_logo')->getClientOriginalExtension();
-        }else{
-            $store_logo_name = $post['orig_store_logo'];
-        }
-
-        if($request->file('store_banner') != null){
-            $store_banner_name = 'banner.'. $request->file('store_banner')->getClientOriginalExtension();
-        }else{
-            $store_banner_name = $post['orig_store_banner'];
-        }
+		$store_id   	= Auth::user()->store_id;
+		$store_name     = $post['store_name'];
+		$store_url      = $post['store_url'];
+		$orig_store_url = $post['orig_store_url'];
 
 
-        if($orig_store_url != $store_url){
+		if ($post['store_status'] == "Public") {
+			$store_status = "true";
+		} else {
+			$store_status = "false";
+		}
 
-            $check_store_url = array(
-                'StoreUrl' => $store_url
-            );
-            
-            $validator = Validator::make($check_store_url, [
-                'StoreUrl' 			=> 'unique:teamstores'
-            ],
-            [
-                'StoreUrl.unique' => 'The Store URL has already been taken.',
-            ]);
-            
-            
-            if ($validator->fails())
-            {
-                $errors = "";
-                
-                foreach($validator->errors()->all() as $error){
-                    $errors .= "<li>".$error."</li>";
-                }
-    
-                return response()->json(array(
-                    'success' => false,
-                    'clearform'  => false,
-                    'message' => $errors
-                ));
-            }
+		if (isset($post['set_store_password'])) {
+			$store_password = $post['store_password'];
+		} else {
+			$store_password = null;
+		}
 
-           
-            
-        }
+		if ($request->file('store_logo') != null) {
+			$store_logo_name    = 'logo.' . $request->file('store_logo')->getClientOriginalExtension();
+		} else {
+			$store_logo_name = $post['orig_store_logo'];
+		}
 
-        $data = array(
-            // 'StoreUrl'		=> $store_url,
-            // 'ImageFolder'	=> $store_url,
-            'Password'		=> $store_password,
-            'HashId' 	 	=> md5($store_url),
-            'StoreName' 	=> $store_name,
-            'StoreLogo'	    => $store_logo_name,
-            'StoreBanner' 	=> $store_banner_name,
-            'IsActive'      => $store_status
-        );
+		if ($request->file('store_banner') != null) {
+			$store_banner_name = 'banner.' . $request->file('store_banner')->getClientOriginalExtension();
+		} else {
+			$store_banner_name = $post['orig_store_banner'];
+		}
 
-        // var_dump($data);
-       
 
-        $UserModel->updateTeamstore($store_id, $data);
-        // var_dump($res);
-        // if($res){
-					$filesystem = Storage::disk('sftp');
-					$filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755);
+		if ($orig_store_url != $store_url) {
 
-            if($request->file('store_logo') != null){
-                $filesystem->put('/merchbay/teamstore/'.   $orig_store_url . '/'  . $store_logo_name, fopen($request->file('store_logo'), 'r+'));
-            }
+			$check_store_url = array(
+				'StoreUrl' => $store_url
+			);
 
-            if($request->file('store_banner') != null){
-							$filesystem->put('/merchbay/teamstore/'.   $orig_store_url . '/'  . $store_banner_name, fopen($request->file('store_banner'), 'r+'));
-            }
-            
-            return response()->json(array(
-              'success' => true, 
-              'clearform'  => false,
-							'message'=>'Store is successfully updated.'
-			));
-			
-        // }else{
-        //     return response()->json(array(
-        //         'success' => false, 
-        //         'clearform'  => true,
+			$validator = Validator::make(
+				$check_store_url,
+				[
+					'StoreUrl' 			=> 'unique:teamstores'
+				],
+				[
+					'StoreUrl.unique' => 'The Store URL has already been taken.',
+				]
+			);
+
+
+			if ($validator->fails()) {
+				$errors = "";
+
+				foreach ($validator->errors()->all() as $error) {
+					$errors .= "<li>" . $error . "</li>";
+				}
+
+				return response()->json(array(
+					'success' => false,
+					'clearform'  => false,
+					'message' => $errors
+				));
+			}
+		}
+
+		$data = array(
+			// 'StoreUrl'		=> $store_url,
+			// 'ImageFolder'	=> $store_url,
+			'Password'		=> $store_password,
+			'HashId' 	 	=> md5($store_url),
+			'StoreName' 	=> $store_name,
+			'StoreLogo'	    => $store_logo_name,
+			'StoreBanner' 	=> $store_banner_name,
+			'IsActive'      => $store_status
+		);
+
+		// var_dump($data);
+
+
+		$UserModel->updateTeamstore($store_id, $data);
+		// var_dump($res);
+		// if($res){
+		$filesystem = Storage::disk('sftp');
+		$filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755);
+
+		if ($request->file('store_logo') != null) {
+			$filesystem->put('/merchbay/teamstore/' .   $orig_store_url . '/'  . $store_logo_name, fopen($request->file('store_logo'), 'r+'));
+		}
+
+		if ($request->file('store_banner') != null) {
+			$filesystem->put('/merchbay/teamstore/' .   $orig_store_url . '/'  . $store_banner_name, fopen($request->file('store_banner'), 'r+'));
+		}
+
+		return response()->json(array(
+			'success' => true,
+			'clearform'  => false,
+			'message' => 'Store is successfully updated.'
+		));
+
+		// }else{
+		//     return response()->json(array(
+		//         'success' => false, 
+		//         'clearform'  => true,
 		// 		'message' => 'Something went wrong. Please refresh the page and try again.'
 		// 	));
-        // }
+		// }
 
 	}
 
-	function storeOrders(){
+	function storeOrders()
+	{
 		$UserModel				= new UserModel;
 		$newTeamStoreModel		= new TeamStoreModel;
 		$store_id 			= Auth::user()->store_id;
-		
+
 		$array_store_orders = $UserModel->selectStoreOrders($store_id);
 		$store_array 	= 	$newTeamStoreModel->selectTeamStore('Id', $store_id);
-		
+
 		return view('user-layouts.store-orders')
-									->with('store_array', $store_array)
-									->with('array_store_orders', $array_store_orders);
+			->with('store_array', $store_array)
+			->with('array_store_orders', $array_store_orders);
 	}
 
-	function showStoreOrderDetails(Request $request){
+	function showStoreOrderDetails(Request $request)
+	{
 
 		$post 					=	$request->all();
 		// var_dump($post['pid']);
 		$UserModel				= new UserModel;
 		$array_payment_details 	= $UserModel->selectPaymentDetails('CartKey', $post['ck']);
 		$array_shipping_add 	= $UserModel->selectShippingAddress('PaymentDetail_Id', $array_payment_details[0]->Id);
-		
+
 		$array_thumbnail_display = $UserModel->selectDisplayItemThumbById($post['pid']);
 		$array_item = $UserModel->selectOrder('Id', $post['id']);
 		$handle_order_detail_body = view('user-layouts.order-details-body')
-												->with('array_payment_details', $array_payment_details)
-												->with('array_shipping_add', $array_shipping_add)
-												->with('array_thumbnail_display', $array_thumbnail_display)
-												->with('array_item', $array_item)
-												->render();
+			->with('array_payment_details', $array_payment_details)
+			->with('array_shipping_add', $array_shipping_add)
+			->with('array_thumbnail_display', $array_thumbnail_display)
+			->with('array_item', $array_item)
+			->render();
+
 
-	
 		return response()->json(array(
 			'success' => true,
 			'payment_details_response' => $handle_order_detail_body,
 			'thumb' => $array_thumbnail_display,
-			'item' => $array_item 
+			'item' => $array_item
 		));
 	}
-	
 
-	function itemStoreReArrange(){
+
+	function itemStoreReArrange()
+	{
 		$thumbnails = array();
 		$newUserModel 		= new UserModel;
 		$newTeamStoreModel 	= new TeamStoreModel;
@@ -1042,72 +1185,71 @@ class UserController extends Controller {
 
 			$thumbnails_array 			= 	$newTeamStoreModel->getProductThumbnails($pr_arr->Id);
 
-			if(!empty($thumbnails_array)){
+			if (!empty($thumbnails_array)) {
 				foreach ($thumbnails_array as $t => $thumb) {
-				
-					if($thumb->ImageClass == 'custom'){
+
+					if ($thumb->ImageClass == 'custom') {
 						$displayThumbnails = $thumb->Image;
 						break;
 					}
-	
-					if($thumb->ImageClass == 'active'){
+
+					if ($thumb->ImageClass == 'active') {
 						$displayThumbnails = $thumb->Image;
 						break;
-					}	
+					}
 				}
-	
-				$thumbnails[] = array(
-									'folder' 	=>	$store_array[0]->ImageFolder,
-									'product_id' =>  $pr_arr->Id,
-									'thumb'	     =>  $displayThumbnails
-				);
 
-			}else{
 				$thumbnails[] = array(
-									'folder' 	=>	$store_array[0]->ImageFolder,
-									'product_id' =>  $pr_arr->Id,
-									'thumb'	     =>  "product-image-placeholder.png"
+					'folder' 	=>	$store_array[0]->ImageFolder,
+					'product_id' =>  $pr_arr->Id,
+					'thumb'	     =>  $displayThumbnails
+				);
+			} else {
+				$thumbnails[] = array(
+					'folder' 	=>	$store_array[0]->ImageFolder,
+					'product_id' =>  $pr_arr->Id,
+					'thumb'	     =>  "product-image-placeholder.png"
 				);
 			}
-			
 		}
-		
+
 		return view('user-layouts.store_items_arrange')->with('store_array', $store_array)
-											->with('product_array', $product_array)
-											->with('thumbnails', $thumbnails);
+			->with('product_array', $product_array)
+			->with('thumbnails', $thumbnails);
 	}
 
-	function deleteStoreItem(Request $request){
+	function deleteStoreItem(Request $request)
+	{
 		// 
 		$post 					=	$request->all();
 
 		$UserModel				= new UserModel;
 		$res 	= $UserModel->deleteStoreItem($post['id']);
-		
-		if($res){
+
+		if ($res) {
 			return response()->json(array(
 				'success' => true,
 				'message' => "Store item is successfully delete."
 			));
-		}else{
+		} else {
 			return response()->json(array(
 				'success' => false,
 				'message' => "Something went wrong. Please try again!"
 			));
 		}
-		
 	}
 
 
-	function announcementIndex(){
+	function announcementIndex()
+	{
 		$UserModel				= new UserModel;
 		$storeId = Auth::user()->store_id;
 
 		$getAnnouncement 	= $UserModel->getAnnouncement($storeId);
 
-		if(count($getAnnouncement) > 0){
+		if (count($getAnnouncement) > 0) {
 			$data = $getAnnouncement[0];
-		}else{
+		} else {
 			$data =  (object) array(
 				'Id' => 0,
 				'StoreId' => "",
@@ -1117,13 +1259,13 @@ class UserController extends Controller {
 			);
 		}
 		return view('user-layouts.announcement')
-					->with("data", $data)		
-					->render();
-
+			->with("data", $data)
+			->render();
 	}
 
 
-	function announcementUpdateSave(Request $request){
+	function announcementUpdateSave(Request $request)
+	{
 		$post 					=	$request->all();
 		$UserModel				= new UserModel;
 
@@ -1136,11 +1278,11 @@ class UserController extends Controller {
 		);
 
 		// var_dump($getAnnouncement[0]->Id);
-	
-		if(count($getAnnouncement) > 0){
+
+		if (count($getAnnouncement) > 0) {
 			$response = $UserModel->updateAnnouncement($getAnnouncement[0]->Id, $data);
-		}else{
-			$data['IsActive'] = 0; 
+		} else {
+			$data['IsActive'] = 0;
 			$response = $UserModel->saveNewAnnouncement($data);
 		}
 
@@ -1158,22 +1300,23 @@ class UserController extends Controller {
 		}
 	}
 
-	function announcementUpdateStatus(Request $request){
+	function announcementUpdateStatus(Request $request)
+	{
 		$post 					=	$request->all();
 		$UserModel				= new UserModel;
 
 		$storeId = Auth::user()->store_id;
 
 		$getAnnouncement 	= $UserModel->getAnnouncement($storeId);
-	
-		if(!count($getAnnouncement)){
+
+		if (!count($getAnnouncement)) {
 			return response()->json(array(
 				'success' => false,
 				'message' => 'Please update your announcement first.'
 			));
 		}
 
-		
+
 		$data = array(
 			'IsActive' => ($post['IsActive'] == 'true') ? 1 : 0
 		);
@@ -1191,12 +1334,12 @@ class UserController extends Controller {
 
 	}
 
-	function getAddressBook() {
+	function getAddressBook()
+	{
 		$UserModel				= new UserModel;
 		$userId = Auth::user()->id;
 		$array_address_book 	= 	$UserModel->selectAddresBook('UserId', $userId);
 
 		return $array_address_book;
 	}
-	
 }
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 240ac33..79c3683 100755
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -23,7 +23,6 @@ Route::controllers([
 	'password' => 'Auth\PasswordController',
 ]);
 
-
 // Route::get('/', 'MainController@index');
 Route::get('/sportslist', 'MainController@sports');
 Route::get('/sports/{url}', 'MainController@templatesCat');
@@ -147,6 +146,9 @@ Route::group(['middleware' => 'normaluser'], function () {
 	Route::get('user/announcement', 'user\UserController@announcementIndex');
 	Route::post('user/announcement/updateSave', 'user\UserController@announcementUpdateSave');
 	Route::post('user/announcement/status/update', 'user\UserController@announcementUpdateStatus');
+
+
+	Route::post('user/store-items/personal-design', 'user\UserController@saveNewItemFromDesigner');
 });
 
 Route::group(['middleware' => 'auth'], function () {
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index ca3ea07..1aa01f0 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -40,7 +40,7 @@
 					</form>
 
 					<div class="text-center py-3">
-						<nuxt-link to="/auth/reset-password">Forgot your password?</nuxt-link>
+						<a href="{{ url('/password/email') }}">Forgot your password?</a>
 					</div>
 					<hr class="custom-hr" />
 					<div class="text-center py-3">
diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php
index 539d4d2..bacaee8 100755
--- a/resources/views/auth/password.blade.php
+++ b/resources/views/auth/password.blade.php
@@ -1,55 +1,64 @@
-@extends('app')
+@extends('merchbay_main')
 
-@section('content')
+@section('main-content')
 <style>
-	.error{
+	.error {
 		color: red;
 	}
-	.form-wrapper{
+
+	.form-wrapper {
 		margin-top: 20%;
 	}
 </style>
-<div class="container">
-	<div class="col-md-4 col-md-offset-4">
-		<div class="form-wrapper">
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<h3 class="text-center">R E S E T  &nbsp; P A S S W O R D</h3>
+<div class="wrapper pb-5">
+	<div class="main__content">
+		<div class="container">
+			<div class="row justify-content-center">
+				<div class="col col-lg-5 pt-5 text-center text-lg-start">
+					<h4>Forgot Password</h4>
+					<hr class="custom-hr" />
 				</div>
-				<div class="panel-body">
-					<div class="row">
-						<div class="col-xs-12">
-							@if (session('status'))
-								<div class="alert alert-success">
-									{{ session('status') }}
-								</div>
-							@endif
-
-							@if (count($errors) > 0)
-								<div class="alert alert-danger">
-									<strong>Whoops!</strong> There were some problems with your input.<br><br>
-									<ul>
-										@foreach ($errors->all() as $error)
-											<li>{{ $error }}</li>
-										@endforeach
-									</ul>
-								</div>
-							@endif
-							<form role="form" method="POST" action="{{ url('/password/email') }}">
-								<input type="hidden" name="_token" value="{{ csrf_token() }}">
-								<div class="form-group">
-									<label for="username" class="control-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">
-									<span class="help-block"></span>
-								</div>
-								<button type="submit" class="btn btn-default btn-block">Send Password Reset Link</button>
-							</form>
-							<br><br>
-						</div>
+			</div>
+			<div class="row justify-content-center">
+				<div class="col col-lg-5">
+					@if (session('status'))
+					<div class="alert alert-success">
+						{{ session('status') }}
 					</div>
+					@endif
+
+					@if (count($errors) > 0)
+					<div class="alert alert-danger">
+						<strong>Whoops!</strong> There were some problems with your input.<br><br>
+						<ul>
+							@foreach ($errors->all() as $error)
+							<li>{{ $error }}</li>
+							@endforeach
+						</ul>
+					</div>
+					@endif
+					<form role="form" method="POST" action="{{ url('/password/email') }}">
+						<input type="hidden" name="_token" value="{{ csrf_token() }}">
+						<div class="mb-3">
+							<label for="exampleInputEmail1" class="form-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>
+						<button type="submit" class="btn btn-green btn-sm w-100">
+							Submit
+						</button>
+						<a href="{{ url('./auth/login')}}" class="btn btn-black btn-sm w-100 mt-2">
+							Cancel
+						</a>
+					</form>
+
+					<!-- <hr class="custom-hr" />
+					<div class="text-center py-3">
+						Don't have an account?
+						<a href="{{ url('./auth/register')}}" class="btn btn-black btn-sm w-100">Register</a>
+					</div> -->
 				</div>
 			</div>
 		</div>
 	</div>
 </div>
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php
index 66e14db..5cd65df 100755
--- a/resources/views/auth/reset.blade.php
+++ b/resources/views/auth/reset.blade.php
@@ -1,62 +1,59 @@
-@extends('app')
-
-@section('content')
+@extends('merchbay_main')
 
+@section('main-content')
 <style>
-	.error{
+	.error {
 		color: red;
 	}
-	.form-wrapper{
+
+	.form-wrapper {
 		margin-top: 20%;
 	}
 </style>
-<div class="container">
-	<div class="col-md-4 col-md-offset-4">
-		<div class="form-wrapper">
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<h3 class="text-center">R E S E T  &nbsp; P A S S W O R D</h3>
+<div class="wrapper pb-5">
+	<div class="main__content">
+		<div class="container">
+			<div class="row justify-content-center">
+				<div class="col col-lg-5 pt-5 text-center text-lg-start">
+					<h4>Reset Password</h4>
+					<hr class="custom-hr" />
 				</div>
-				<div class="panel-body">
-					<div class="row">
-						<div class="col-xs-12">
-							@if (count($errors) > 0)
-								<div class="alert alert-danger">
-									<strong>Whoops!</strong> There were some problems with your input.<br><br>
-									<ul>
-										@foreach ($errors->all() as $error)
-											<li>{{ $error }}</li>
-										@endforeach
-									</ul>
-								</div>
-							@endif
-							<form role="form" method="POST" action="{{ url('/password/reset') }}">
-								<input type="hidden" name="_token" value="{{ csrf_token() }}">
-								<input type="hidden" name="token" value="{{ $token }}">
-
-								<div class="form-group">
-									<label  class="control-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">
-									<span class="help-block"></span>
-								</div>
-								<div class="form-group">
-									<label class="control-label">Password</label>
-									<input type="password" class="form-control" name="password" placeholder="Password">
-									<span class="help-block"></span>
-								</div>
-								<div class="form-group">
-									<label  class="control-label">Confirm Password</label>
-									<input type="password" class="form-control" name="password_confirmation" placeholder="Confirm Password">
-									<span class="help-block"></span>
-								</div>
-								<button type="submit" class="btn btn-default btn-block">Reset Password</button>
-							</form>
-							<br><br>
-						</div>
+			</div>
+			<div class="row justify-content-center">
+				<div class="col col-lg-5">
+					@if (count($errors) > 0)
+					<div class="alert alert-danger">
+						<strong>Whoops!</strong> There were some problems with your input.<br><br>
+						<ul>
+							@foreach ($errors->all() as $error)
+							<li>{{ $error }}</li>
+							@endforeach
+						</ul>
 					</div>
+					@endif
+					<form role="form" method="POST" action="{{ url('/password/reset') }}">
+						<input type="hidden" name="_token" value="{{ csrf_token() }}">
+						<input type="hidden" name="token" value="{{ $token }}">
+						<div class="mb-3">
+							<label for="exampleInputEmail1" class="form-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">New password</label>
+							<input type="password" class="form-control" name="password" placeholder="Password" title="Please enter your password">
+						</div>
+						<div class="mb-3">
+							<label for="exampleInputPassword1" class="form-label">Confirm new password</label>
+							<input type="password" class="form-control" name="password_confirmation" placeholder="Password" title="Please enter your password">
+						</div>
+						<button type="submit" class="btn btn-green btn-sm w-100">
+							Submit
+						</button>
+					</form>
 				</div>
 			</div>
 		</div>
 	</div>
 </div>
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/designer/design_preview.blade.php b/resources/views/designer/design_preview.blade.php
index 97b2926..0cf96f3 100755
--- a/resources/views/designer/design_preview.blade.php
+++ b/resources/views/designer/design_preview.blade.php
@@ -1,140 +1,176 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta http-equiv="X-UA-Compatible" content="ie=edge">
-        <meta name="csrf_token" content="{{ csrf_token() }}" />
-        <title>Designer</title>
 
-        <!-- Latest compiled and minified CSS -->
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-    
-        <!-- ---- Include the above in your HEAD tag -------- -->
-        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-        
-        <link href="{{asset('/public/designer/css/custom-style.css')}}" rel="stylesheet">
-        <link href="{{asset('/public/designer/css/tab-styles.css')}}" rel="stylesheet">
-        <link href="{{asset('/public/designer/css/input-range-style.css')}}" rel="stylesheet">
-        <link href="{{asset('/public/designer/css/spectrum.css')}}" rel="stylesheet">
-        <link href="{{asset('/public/designer/css/one-by-one-slider.css')}}" rel="stylesheet">
-        <link href="{{asset('/public/designer/custom-fonts/custom-fonts.php')}}" rel='stylesheet' type='text/css'> 
-        <link href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" rel="stylesheet">
-        <link href="{{asset('/public/designer/css/build.css')}}" rel="stylesheet">
-        <style>
-            .custom-navbar-brand>img {
-                display: block;
-                height: 36px;
-                margin-top: -9px;
-            }
-            .carousel-inner>.item>a>img, .carousel-inner>.item>img, .img-loader, .thumbnail a>img, .thumbnail>img{
-				margin: 0 auto;
-				height: 200px;
-			}
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="csrf_token" content="{{ csrf_token() }}" />
+    <title>Designer</title>
 
-            .carousel-inner>.item>a>img, .carousel-inner>.item>img, .img-thumb-custom, .thumbnail a>img, .thumbnail>img{
-				margin: 0 auto;
-                height: 418.53px;
-            }
-            
-            .panel-design-details{
-                height: 484px;
-                overflow: auto;
-            }
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+        integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
 
-            .error{
-                color : #ff0000;
-            }
+    <!-- ---- Include the above in your HEAD tag -------- -->
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
 
-            .roster-input{
-                border-radius: 0px;
-                border-right: none;
-                border-top: none;
-            }
-            .table-bordered>thead>tr>td, .table-bordered>thead>tr>th{
-                border-bottom-width: 0px;
-            }
-            .btn-roster-action{
-                width: 20px;
-                height: 20px;
-                border-radius: 10px;
-            }
-            .btn-group-sm>.btn, .btn-roster-action {
-                padding: 0px 5px;
-            }
-            .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{
-                vertical-align: unset;
-            }
+    <link href="{{ asset('/public/designer/css/custom-style.css') }}" rel="stylesheet">
+    <link href="{{ asset('/public/designer/css/tab-styles.css') }}" rel="stylesheet">
+    <link href="{{ asset('/public/designer/css/input-range-style.css') }}" rel="stylesheet">
+    <link href="{{ asset('/public/designer/css/spectrum.css') }}" rel="stylesheet">
+    <link href="{{ asset('/public/designer/css/one-by-one-slider.css') }}" rel="stylesheet">
+    <link href="{{ asset('/public/designer/custom-fonts/custom-fonts.php') }}" rel='stylesheet' type='text/css'>
+    <link href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" rel="stylesheet">
+    <link href="{{ asset('/public/designer/css/build.css') }}" rel="stylesheet">
+    <style>
+        .custom-navbar-brand>img {
+            display: block;
+            height: 36px;
+            margin-top: -9px;
+        }
 
-            .table>thead>tr>th{
-                border-bottom:none;
-            }
-            .hide-bullets {
-                list-style:none;
-                margin-left: -40px;
-                margin-top:20px;
-                display: -webkit-inline-box;
-            }
-        </style>
+        .carousel-inner>.item>a>img,
+        .carousel-inner>.item>img,
+        .img-loader,
+        .thumbnail a>img,
+        .thumbnail>img {
+            margin: 0 auto;
+            height: 200px;
+        }
 
-        <!-- Global site tag (gtag.js) - Google Analytics -->
-		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-136108155-1"></script>
-		<script>
-		  window.dataLayer = window.dataLayer || [];
-		  function gtag(){dataLayer.push(arguments);}
-		  gtag('js', new Date());
+        .carousel-inner>.item>a>img,
+        .carousel-inner>.item>img,
+        .img-thumb-custom,
+        .thumbnail a>img,
+        .thumbnail>img {
+            margin: 0 auto;
+            height: 418.53px;
+        }
 
-		  gtag('config', 'UA-136108155-1');
-		</script>
-    </head>
-    <body>
+        .panel-design-details {
+            height: 484px;
+            overflow: auto;
+        }
+
+        .error {
+            color: #ff0000;
+        }
+
+        .roster-input {
+            border-radius: 0px;
+            border-right: none;
+            border-top: none;
+        }
+
+        .table-bordered>thead>tr>td,
+        .table-bordered>thead>tr>th {
+            border-bottom-width: 0px;
+        }
+
+        .btn-roster-action {
+            width: 20px;
+            height: 20px;
+            border-radius: 10px;
+        }
+
+        .btn-group-sm>.btn,
+        .btn-roster-action {
+            padding: 0px 5px;
+        }
+
+        .table>tbody>tr>td,
+        .table>tbody>tr>th,
+        .table>tfoot>tr>td,
+        .table>tfoot>tr>th,
+        .table>thead>tr>td,
+        .table>thead>tr>th {
+            vertical-align: unset;
+        }
+
+        .table>thead>tr>th {
+            border-bottom: none;
+        }
+
+        .hide-bullets {
+            list-style: none;
+            margin-left: -40px;
+            margin-top: 20px;
+            display: -webkit-inline-box;
+        }
+
+    </style>
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-136108155-1"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+
+        function gtag() {
+            dataLayer.push(arguments);
+        }
+        gtag('js', new Date());
+
+        gtag('config', 'UA-136108155-1');
+    </script>
+</head>
+
+<body>
     @include('layout.navbar')
-        <div class="body-spacer"></div>
-        
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 col-sm-12  col-xs-12">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h4>{{ $client_design_array[0]->DesignName }} 
-                                    <button class="btn btn-default btn-md pull-right" id="btn-reload-design" title="Reload Design"><i class="fa fa-refresh"></i></button>
-                                    </h4>	
-                                <div class="clearfix"></div>
-                            </div>
-                            <div class="panel-body">
-                                <div class="row">
-                                        <div class="col-md-12 text-center">
-                                            @foreach($templatepaths_arrays as $k => $template)
-                                                @if($k  == 0)
-                                                    <img id="{{ strtolower($template->Side) }}-image-thumb" src="{{asset('/public/images/loading-please-wait.gif')}}" class="img img-responsive img-loader main-thumbnail">
-                                                @endif
-                                            @endforeach
-                                        </div>
-                                    <!-- </div> -->
-                                </div>
-                                <div class="row">
-                                    <div class="col-md-12 text-center">
-                                        <ul class="hide-bullets">
-                                        </ul>     
-                                    </div>
-                                </div>
-                              
-                            </div>
-                            @if (!Auth::guest())
-                            <div class="panel-footer">
-                                <div id="dd_footer_button">
-                                    <!-- <a href="{{ url('user/my-designs') }}" type="button" class="btn btn-primary pull-right" style="margin-left: 10px;"><i class="fa fa-plus-square"></i> Purchase this Item</a> -->
+    <div class="body-spacer"></div>
 
-                                    <a href="{{ url('user/my-designs') }}" type="button" class="btn btn-default pull-right"><i class="fa fa-arrow-left"></i> Go to My Designs</a>
-                                </div>
-                                <div class="clearfix"></div>
-                            </div>
-                            @endif
-                        </div>
+    <div class="container">
+        <div class="row">
+            <div class="col-md-12 col-sm-12  col-xs-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4>{{ $client_design_array[0]->DesignName }}
+                            <button class="btn btn-default btn-md pull-right" id="btn-reload-design"
+                                title="Reload Design"><i class="fa fa-refresh"></i></button>
+                        </h4>
+                        <div class="clearfix"></div>
                     </div>
+                    {{-- <input type="hidden" id="images_thumb"> --}}
+                    <div class="panel-body">
+                        <div class="row">
+                            <div class="col-md-12 text-center">
+                                @foreach ($templatepaths_arrays as $k => $template)
+                                    @if ($k == 0)
+                                        <img id="{{ strtolower($template->Side) }}-image-thumb"
+                                            src="{{ asset('/public/images/loading-please-wait.gif') }}"
+                                            class="img img-responsive img-loader main-thumbnail">
+                                    @endif
+                                @endforeach
+                            </div>
+                            <!-- </div> -->
+                        </div>
+                        <div class="row">
+                            <div class="col-md-12 text-center">
+                                <ul class="hide-bullets">
+                                </ul>
+                            </div>
+                        </div>
+
+                    </div>
+                    @if (!Auth::guest())
+                        <div class="panel-footer">
+                            <div id="dd_footer_button">
+                                <button type="button" class="btn btn-primary pull-right btn-purchase"
+                                    style="margin-left: 10px;"><i class="fa fa-plus-square"></i> Purchase this
+                                    Item</button>
+
+                                <a href="{{ url('user/my-designs') }}" type="button"
+                                    class="btn btn-default pull-right"><i class="fa fa-arrow-left"></i> Go to My
+                                    Designs</a>
+                            </div>
+                            <div class="clearfix"></div>
+                        </div>
+                    @endif
                 </div>
             </div>
         </div>
+    </div>
+    </div>
 
     <!-- Footer -->
     <!-- End Footer -->
@@ -142,22 +178,23 @@
     <!-- JQUERY  -->
     <script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- Latest compiled and minified JavaScript -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
+        integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous">
+    </script>
     <!-- FABRIC JS -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/1.7.15/fabric.min.js"></script>
     <!-- FABRIC JS CURVE TEXT -->
-    <script src="https://rawgit.com/EffEPi/fabric.curvedText/master/fabric.curvedText.js"></script> 
+    <script src="https://rawgit.com/EffEPi/fabric.curvedText/master/fabric.curvedText.js"></script>
     <!-- SPECTRUM -->
-    <script src="{{asset('/public/designer/js/spectrum.js')}}"></script>
+    <script src="{{ asset('/public/designer/js/spectrum.js') }}"></script>
     <!-- CUSTOM SCRIPT -->
-    <script src="{{asset('/public/designer/js/custom-script.js')}}"></script>
+    <script src="{{ asset('/public/designer/js/custom-script.js') }}"></script>
     <!-- PRICE FORMAT -->
-    <script src="{{asset('/public/designer/js/jquery.priceformat.min.js')}}"></script>
+    <script src="{{ asset('/public/designer/js/jquery.priceformat.min.js') }}"></script>
     <!-- JQUERY VALIDATE  -->
     <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
 
     <script>
-          
         $(document).ready(function() {
             $.ajaxSetup({
                 headers: {
@@ -168,133 +205,144 @@
             myCart();
 
             $('.price_format').priceFormat({
-				prefix: '$ '
-			});
+                prefix: '$ '
+            });
 
-            $(document).on('button click', '#publish_chk', function(){
-                if(!$(this).is(':checked')){
+            $(document).on('button click', '#publish_chk', function() {
+                if (!$(this).is(':checked')) {
                     // $('#sale_chk').removeAttr("checked");
                     $('#sale_chk').prop('checked', false);
                     $('#item_price').attr("disabled", "disabled");
-                }		
+                }
             });
 
-            $(document).on('button click', '#sale_chk', function(){
+            $(document).on('button click', '#sale_chk', function() {
 
-                if($(this).is(':checked')){
+                if ($(this).is(':checked')) {
                     $('#publish_chk').prop('checked', true);
                     $('#item_price').removeAttr("disabled");
                     $('#itemName').removeAttr("disabled");
                     $('#itemDescription').removeAttr("disabled");
-                }else{
+                } else {
                     // $('#publish_chk').prop('checked', false);
                     $('#item_price').attr("disabled", "disabled");
                     $('#itemName').attr("disabled", "disabled");
                     $('#itemDescription').attr("disabled", "disabled");
                 }
-                
+
             });
 
             generateThumbnails();
             // console.log('{{ $client_design_array[0]->DesignCode }}');
             $('#toTop').click(function() {
-                $('body,html').animate({scrollTop:0},800);
-            }); 
+                $('body,html').animate({
+                    scrollTop: 0
+                }, 800);
+            });
 
-            $('#custom-navbar-brand').html('<img src="{{asset("/public/images/logo.png")}}">');
+            $('#custom-navbar-brand').html('<img src="{{ asset('/public/images/logo.png') }}">');
 
 
             $("#frm-design-details").validate({
-				rules: {
-					designName: {
-						required: true
-					},
-					itemName: {
-						required: true
-					},
-					itemDescription: {
-						required: true
-					},
-					storeId: {
-						required: true
-					}
-				},
+                rules: {
+                    designName: {
+                        required: true
+                    },
+                    itemName: {
+                        required: true
+                    },
+                    itemDescription: {
+                        required: true
+                    },
+                    storeId: {
+                        required: true
+                    }
+                },
 
-				messages: {},
-				errorPlacement: function(error, element) {
-					var placement = $(element).data('error');
-					if (placement) {
-						$(placement).append(error);
-					}else {
-						error.insertAfter(element);
-					}
-				},
-				submitHandler: submitDesignDetails
-			}); /* edit account validation */
-            
-            $(document).on('button click', '.btn-buy', function(){
+                messages: {},
+                errorPlacement: function(error, element) {
+                    var placement = $(element).data('error');
+                    if (placement) {
+                        $(placement).append(error);
+                    } else {
+                        error.insertAfter(element);
+                    }
+                },
+                submitHandler: submitDesignDetails
+            }); /* edit account validation */
+
+            $(document).on('button click', '.btn-buy', function() {
 
                 var getTemplateCode = $('#template_code').val();
 
-                $('.panel-design-details').load("{{ url('designer/a/buy-form') }}", { temp_code : getTemplateCode }, function(response, status, xhr){
+                $('.panel-design-details').load("{{ url('designer/a/buy-form') }}", {
+                    temp_code: getTemplateCode
+                }, function(response, status, xhr) {
                     // console.log(response, status, xhr)
-                    $('#dd_footer_button').html('<button type="button" class="btn btn-default pull-right" id="btn_cancel_buy" style="margin-left: 5px;">Cancel</button> ' +
-                    '<button type="submit" class="btn btn-primary pull-right" id="btn-submit-publish">Add to Cart</button>');
+                    $('#dd_footer_button').html(
+                        '<button type="button" class="btn btn-default pull-right" id="btn_cancel_buy" style="margin-left: 5px;">Cancel</button> ' +
+                        '<button type="submit" class="btn btn-primary pull-right" id="btn-submit-publish">Add to Cart</button>'
+                    );
                     $('.inputName').keyup(function() {
                         this.value = this.value.toLocaleUpperCase();
                     });
 
                     $('#frm-roster').attr("action", "{{ url('/designer/a/save-roster') }}");
                     $('#frm-roster').attr("method", "POST");
-                    
-                    
+
+
                 });
             });
 
-            $(document).on('button click', '.btn-sell', function(){
+            $(document).on('button click', '.btn-sell', function() {
 
                 // var getTemplateCode = $('#template_code').val();
                 alert("adasdas");
 
             });
-            
-            $(document).on('button click', '#btn_cancel_buy', function(){
+
+            $(document).on('button click', '#btn_cancel_buy', function() {
                 // alert("asda")
                 $('.panel-design-details').html('<div class="row"> ' +
-                                                '<div class="col-sm-12"> ' +
-                                                    '<div class="text-center" style="margin-top: 5em;"> ' +
-                                                        '<div class="form-group"> ' +
-                                                            '<button type="button" class="btn btn-info btn-lg btn-buy" style="width:150px;"><i class="fa fa-list-ol"></i> Add Roster</button>' +
-                                                        '</div> ' +
-                                                        '</div> ' +
-                                                    '</div> ' +
-                                                '</div>');
-                $('#dd_footer_button').html('<a href="{{ url('user/my-designs') }}" type="button" class="btn btn-default pull-right"><i class="fa fa-arrow-left"></i> Go to My Designs</a>');
+                    '<div class="col-sm-12"> ' +
+                    '<div class="text-center" style="margin-top: 5em;"> ' +
+                    '<div class="form-group"> ' +
+                    '<button type="button" class="btn btn-info btn-lg btn-buy" style="width:150px;"><i class="fa fa-list-ol"></i> Add Roster</button>' +
+                    '</div> ' +
+                    '</div> ' +
+                    '</div> ' +
+                    '</div>');
+                var link = "{{ url('user/my-designs') }}";
+                $('#dd_footer_button').html('<a href="' + link +
+                    '" type="button" class="btn btn-default pull-right"><i class="fa fa-arrow-left"></i> Go to My Designs</a>'
+                );
             });
 
-            $(document).on('button click', '#addNewRow', function(){
+            $(document).on('button click', '#addNewRow', function() {
 
                 var orderCounterValue = $('#orderCounterValue').val();
                 var numi = document.getElementById('orderCounterValue');
-                var num = (document.getElementById('orderCounterValue').value -1) + 2;
+                var num = (document.getElementById('orderCounterValue').value - 1) + 2;
                 numi.value = num;
 
-                $.ajax({    //create an ajax request to load_page.php
+                $.ajax({ //create an ajax request to load_page.php
 
                     type: "POST",
                     url: "{{ url('/designer/a/add-new-row') }}",
-                    data:{
+                    data: {
 
-                        itemCount : num,
-                        tempCode  : "{{ $client_design_array[0]->TemplateCode }}"
+                        itemCount: num,
+                        tempCode: "{{ $client_design_array[0]->TemplateCode }}"
 
                     },
 
-                    dataType: "html",   //expect html to be returned
+                    dataType: "html", //expect html to be returned
 
-                    success: function(response){
-                        var className = "row" +  (num - 1);
-                        $('.tr-remove-btn').html('<button type="button" class="btn btn-danger btn-sm removeRow btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>');
+                    success: function(response) {
+                        var className = "row" + (num - 1);
+                        $('.tr-remove-btn').html(
+                            '<button type="button" class="btn btn-danger btn-sm removeRow btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>'
+                        );
                         $('#addnew-btn-tbl-row').remove();
                         $('#tableRow tbody').append(response);
                         $('#orderListPanel').scrollTop($('#orderListPanel')[0].scrollHeight);
@@ -308,159 +356,202 @@
             });
 
 
-            $(document).on('button click', '.removeRow', function(){
+            $(document).on('button click', '.removeRow', function() {
                 var str = $(this).closest('tr').attr('class');
                 var trCount = $('#tableRow tbody').children('tr').length;
-                
-                if(trCount == 2){
+
+                if (trCount == 2) {
                     return false;
                 }
 
-                if(trCount == 3){
+                if (trCount == 3) {
                     $('#addnew-btn-tbl-row').remove();
-                    $('.tr-remove-btn').html('<button type="button" id="addNewRow" class="btn btn-success btn-sm btn-roster-action" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i></button>');		
+                    $('.tr-remove-btn').html(
+                        '<button type="button" id="addNewRow" class="btn btn-success btn-sm btn-roster-action" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i></button>'
+                    );
                 }
-                $('.'+str).remove();
+                $('.' + str).remove();
             });
 
-            $(document).on('select change', '.order-size', function(){
+            $(document).on('select change', '.order-size', function() {
                 var row_number = $(this).data('row-number');
-                
+
                 var jersey_size = "order_jersey_size_" + row_number;
                 var shorts_size = "order_shorts_size_" + row_number;
                 // console.log($(this, 'option').eq(1).val());
                 // if($('#'+jersey_size).val() == "none" && $('#'+shorts_size).val() == "none"){
-                        
+
                 // }
 
             });
 
-            $(document).on('a click', '.a_thumbnail', function(){
+            $(document).on('a click', '.a_thumbnail', function() {
                 $('.main-thumbnail').attr('src', $(this).find("img").attr('src'));
                 $('.a_thumbnail').removeClass('active');
                 $(this).addClass('active');
             });
-        });
 
-        function generateThumbnails(){
-			
-            var ip = "{{ config('site_config.prod_private_server_ip') }}";
-			var port = "{{ $array_cat_name[0]->Port }}";
-            var template_format = "{{ $array_templates[0]->TemplateFormat }}";
-            var gen_url;
-            
-            if(template_format == "png"){
-				if(port == 5952){
-					gen_url = ip+":"+port+"/merchbay/ap/{{ $client_design_array[0]->DesignCode }}";
-				}else{
-					gen_url = ip+":"+port+"/merchbay/mask/{{ $client_design_array[0]->DesignCode }}";
-				}
-                
-            }else{
-                if(port == 5953){
-					gen_url = ip+":"+port+"/merchbay/classic-mask/{{ $client_design_array[0]->DesignCode }}";
-				}else{
-					gen_url = ip+":"+port+"/merchbay/tb/{{ $client_design_array[0]->DesignCode }}";
-				}
-            }
-
-			$.ajax({    //create an ajax request to load_page.php
-				type: "GET",
-				url: gen_url,
-				dataType: "jsonp",   //expect html to be returned
-				beforeSend: function() {
-					console.log('loading images');
-				},
-				success: function(response){
-					
-                    var SideAndPath = {!! json_encode($templatepaths_arrays) !!};
-                    
-                    for (var i = 0; i < SideAndPath.length; i++) {
-                        if(i == 0){
-                            var sideName = SideAndPath[i]['Side'];
-                            var type = SideAndPath[i]['Type'];
-
-                            $('#'+sideName.toLowerCase()+'-image-thumb').attr('src', response['thumb_'+sideName.toLowerCase()]);
-                            $('#'+sideName.toLowerCase()+'-image-thumb').removeClass("img-loader");
-                            $('#'+sideName.toLowerCase()+'-image-thumb').addClass("img-thumb-custom");
-                        }
-                    }
-                    for (var j = 0; j < SideAndPath.length; j++) {
-                        var sideName = SideAndPath[j]['Side'];
-                        var type = SideAndPath[j]['Type'];
-
-                        if(j == 0){
-                            $('.hide-bullets').append('<div class="text-center"> ' +  
-                                                            '<li style="padding:10px" class="item-thumb"> ' + 
-                                                                '<a class="thumbnail a_thumbnail active" style="min-width: 130px;"> ' +
-                                                                    '<img style="height: 100px;" src="'+response['thumb_'+sideName.toLowerCase()]+'" class="img img-responsive">' +
-                                                                '</a> ' +
-                                                            '</li> ' +
-                                                        '</div>');
-                        }else{
-                            $('.hide-bullets').append('<div class="text-center"> ' +  
-                                                            '<li style="padding:10px" class="item-thumb"> ' + 
-                                                                '<a class="thumbnail a_thumbnail" style="min-width: 130px;"> ' +
-                                                                    '<img style="height: 100px;" src="'+response['thumb_'+sideName.toLowerCase()]+'" class="img img-responsive">' +
-                                                                '</a> ' +
-                                                            '</li> ' +
-                                                        '</div>');
-                        }
-                    }
-				}
-			});
-		}
-
-        function submitDesignDetails(){  
-			var data = $("#frm-design-details").serialize();
-            
-			$.ajax({
-				type : 'POST',
-				url  : "{{ url('/designer/a/save-design-details') }}",
-				data : data,
-                beforeSend:function(xhr){
-                    var token = $('meta[name="csrf_token"]').attr('content');
+            $(document).on('a click', '.btn-purchase', function() {
+                var designCode = "{{ $client_design_array[0]->DesignCode }}";
+                // var images_thumb = $('#images_thumb').val();
+                $.ajax({
+                    type: 'POST',
+                    url: "{{ url('/user/store-items/personal-design') }}",
+                    data: {
+                        designCode: designCode
+                    },
+                    beforeSend: function(xhr) {
+                        var token = $('meta[name="csrf_token"]').attr('content');
 
                         if (token) {
                             return xhr.setRequestHeader('X-CSRF-TOKEN', token);
                         }
-                        xhr.setRequestHeader( 'X-Requested-With',  'XMLHttpRequest');
-                        
-                        // $("#edit-account-msg").fadeOut();
-					    // $("#btn-update-account").html('Saving &nbsp; <span class="glyphicon glyphicon-transfer"></span>');
-                },
-				success :  function(response){
+                        xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+                    },
+                    success: function(response) {
+                        // console.log(response)
+                        if (response.success) {
+                            window.location = response.link;
+                        } else {
+                            alert("Something went wrong. Please try again.");
+                            location.reload();
+                        }
+                    }
+                });
+                return false;
+            });
+        });
 
-                    if(response){
+        function generateThumbnails() {
+
+            var ip = "{{ config('site_config.prod_private_server_ip') }}";
+            var port = "{{ $array_cat_name[0]->Port }}";
+            var template_format = "{{ $array_templates[0]->TemplateFormat }}";
+            var gen_url;
+
+            if (template_format == "png") {
+                if (port == 5952) {
+                    gen_url = ip + ":" + port + "/merchbay/ap/{{ $client_design_array[0]->DesignCode }}";
+                } else {
+                    gen_url = ip + ":" + port + "/merchbay/mask/{{ $client_design_array[0]->DesignCode }}";
+                }
+
+            } else {
+                if (port == 5953) {
+                    gen_url = ip + ":" + port + "/merchbay/classic-mask/{{ $client_design_array[0]->DesignCode }}";
+                } else {
+                    gen_url = ip + ":" + port + "/merchbay/tb/{{ $client_design_array[0]->DesignCode }}";
+                }
+            }
+
+            $.ajax({ //create an ajax request to load_page.php
+                type: "GET",
+                url: gen_url,
+                dataType: "jsonp", //expect html to be returned
+                beforeSend: function() {
+                    console.log('loading images');
+                },
+                success: function(response) {
+
+                    var SideAndPath = {!! json_encode($templatepaths_arrays) !!};
+
+                    for (var i = 0; i < SideAndPath.length; i++) {
+                        if (i == 0) {
+                            var sideName = SideAndPath[i]['Side'];
+                            var type = SideAndPath[i]['Type'];
+
+                            $('#' + sideName.toLowerCase() + '-image-thumb').attr('src', response['thumb_' +
+                                sideName.toLowerCase()]);
+                            $('#' + sideName.toLowerCase() + '-image-thumb').removeClass("img-loader");
+                            $('#' + sideName.toLowerCase() + '-image-thumb').addClass("img-thumb-custom");
+                        }
+                    }
+                    // var thumbs = [];
+
+                    for (var j = 0; j < SideAndPath.length; j++) {
+                        var sideName = SideAndPath[j]['Side'];
+                        var type = SideAndPath[j]['Type'];
+
+                        if (j == 0) {
+                            $('.hide-bullets').append('<div class="text-center"> ' +
+                                '<li style="padding:10px" class="item-thumb"> ' +
+                                '<a class="thumbnail a_thumbnail active" style="min-width: 130px;"> ' +
+                                '<img style="height: 100px;" src="' + response['thumb_' + sideName
+                                    .toLowerCase()] + '" class="img img-responsive">' +
+                                '</a> ' +
+                                '</li> ' +
+                                '</div>');
+                        } else {
+                            $('.hide-bullets').append('<div class="text-center"> ' +
+                                '<li style="padding:10px" class="item-thumb"> ' +
+                                '<a class="thumbnail a_thumbnail" style="min-width: 130px;"> ' +
+                                '<img style="height: 100px;" src="' + response['thumb_' + sideName
+                                    .toLowerCase()] + '" class="img img-responsive">' +
+                                '</a> ' +
+                                '</li> ' +
+                                '</div>');
+                        }
+
+                        // thumbs.push(response['thumb_' + sideName
+                        //     .toLowerCase()].replace(/^.*\/\/[^\/]+/, '').replace("/", ""))
+                    }
+
+                    // $('#images_thumb').val(thumbs.join())
+                }
+            });
+        }
+
+        function submitDesignDetails() {
+            var data = $("#frm-design-details").serialize();
+
+            $.ajax({
+                type: 'POST',
+                url: "{{ url('/designer/a/save-design-details') }}",
+                data: data,
+                beforeSend: function(xhr) {
+                    var token = $('meta[name="csrf_token"]').attr('content');
+
+                    if (token) {
+                        return xhr.setRequestHeader('X-CSRF-TOKEN', token);
+                    }
+                    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+
+                    // $("#edit-account-msg").fadeOut();
+                    // $("#btn-update-account").html('Saving &nbsp; <span class="glyphicon glyphicon-transfer"></span>');
+                },
+                success: function(response) {
+
+                    if (response) {
                         alert("Successfully saved.");
                         location.reload();
-                    }else{
+                    } else {
                         alert("Something went wrong. Please try again.");
                         location.reload();
                     }
                     // console.log(response);
                     // alert("Item is successfully added");
-					// $("#edit-account-msg").html("");
-					// $("#edit-account-msg").fadeIn(1000, function(){      
-					// 	$("#edit-account-msg").html(response);
-					// 	$("#btn-update-account").html('Save Changes');
-					// });
-				}
-			});
-			return false;
+                    // $("#edit-account-msg").html("");
+                    // $("#edit-account-msg").fadeIn(1000, function(){      
+                    // 	$("#edit-account-msg").html(response);
+                    // 	$("#btn-update-account").html('Save Changes');
+                    // });
+                }
+            });
+            return false;
         }
 
-        function myCart(){
-            $.ajax({    //create an ajax request to load_page.php
+        function myCart() {
+            $.ajax({ //create an ajax request to load_page.php
 
                 type: "GET",
-                url: "{{url('cartcount')}}",
-                dataType: "html",   
-                success: function(response){
+                url: "{{ url('cartcount') }}",
+                dataType: "html",
+                success: function(response) {
                     $("#my-cart-count").html(response);
                 }
             });
         }
     </script>
-    </body>
-</html>
\ No newline at end of file
+</body>
+
+</html>
diff --git a/resources/views/emails/password.blade.php b/resources/views/emails/password.blade.php
index 2030539..d5d90d7 100755
--- a/resources/views/emails/password.blade.php
+++ b/resources/views/emails/password.blade.php
@@ -1 +1,18 @@
-Click here to reset your password: {{ url('password/reset/'.$token) }}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Reset Password</title>
+</head>
+<body>
+
+<p> You requested a link to change your current merchbay account password.</p>
+<p>Please click this <a href="{{ url('password/reset/'.$token) }}">link</a> to set your new password.</p>
+
+<br><br><br><br><br>
+--
+This is an auto-generated email. Do not reply to this message.
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/user-layouts/my-design.blade.php b/resources/views/user-layouts/my-design.blade.php
index c82fcab..46b941e 100755
--- a/resources/views/user-layouts/my-design.blade.php
+++ b/resources/views/user-layouts/my-design.blade.php
@@ -1,63 +1,65 @@
 @extends('user-layouts.user_template')
 @section('content')
-    <style>
-        .design-name-holder{
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    </style>
-    <div class="content-wrapper" style="min-height: 916px;">
-        <!-- Content Header (Page header) -->
-        <section class="content-header">
-            <h1>
-                My Designs
-                <!-- <small>Control panel</small> -->
-            </h1>
-            <ol class="breadcrumb">
-                <li><a href="{{ url('user') }}"><i class="fa fa-home"></i> Home</a></li>
-                <li class="active">My Designs</li>
-            </ol>
-        </section>
-        <!-- Main content -->
-        <section class="content">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="box box-primary">
-                        <!-- <div class="box-header with-border">
+<style>
+    .design-name-holder {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+</style>
+<div class="content-wrapper" style="min-height: 916px;">
+    <!-- Content Header (Page header) -->
+    <section class="content-header">
+        <h1>
+            My Designs
+            <!-- <small>Control panel</small> -->
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ url('user') }}"><i class="fa fa-home"></i> Home</a></li>
+            <li class="active">My Designs</li>
+        </ol>
+    </section>
+    <!-- Main content -->
+    <section class="content">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="box box-primary">
+                    <!-- <div class="box-header with-border">
                             asda
                         </div> -->
-                        <div class="box-body custom-box-body">
-                            <div class="row">
-                                @foreach($array_client_designs as $row)
-                                    <div class="col-md-3 col-sm-6">
-                                        <span class="thumbnail">
-                                            <img src="{{ config('site_config.images_url')  }}/{{ $row->DesignCode }}-front-thumbnail.png" alt="{{ $row->DesignName }}" >
-                                            <h4 class="design-name-holder">{{ $row->DesignName }}</h4>
-                                            <small>{{ date('F j, Y g:i a', strtotime($row->DateCreated)) }}</small>
-                                            <hr class="line">
-                                                <div class="row">
-                                                    <div class="col-md-12 col-sm-12">
-                                                        <a href="{{ url('/') }}/{{ Request::path() }}/view/{{ $row->DesignCode }} " class="btn btn-warning btn-xs"><i class="fa fa-eye"></i> View</a>
-                                                        <!-- <a href="{{ url('designer/edit') }}/{{ $row->DesignCode }}" class="btn btn-default btn-xs"><i class="fa fa-edit"></i> Edit Design</a> -->
-                                                        <!-- <a href="{{ url('user/my-designs/buy-design') }}/{{ $row->DesignCode }}" class="btn btn-primary btn-xs"><i class="fa fa-shopping-cart"></i> Buy</a> -->
-                                                        @if(Auth::user()->role == "store_owner")
-                                                        <a href="{{ url('user/my-designs/sell-design/' . $row->DesignCode) }}" class="btn btn-success btn-xs"><i class="fa fa-usd"></i> Sell</a>
-                                                        @endif
-                                                    </div>
-                                                </div>
-                                        </span>
+                    <div class="box-body custom-box-body">
+                        <div class="row">
+                            @foreach($array_client_designs as $row)
+                            <div class="col-md-3 col-sm-6">
+                                <span class="thumbnail">
+                                    <img src="{{ config('site_config.images_url')  }}/{{ $row->DesignCode }}-front-thumbnail.png" alt="{{ $row->DesignName }}">
+                                    <h4 class="design-name-holder">{{ $row->DesignName }}</h4>
+                                    <small>{{ date('F j, Y g:i a', strtotime($row->DateCreated)) }}</small>
+                                    <hr class="line">
+                                    <div class="row">
+                                        <div class="col-md-12 col-sm-12">
+                                            <a href="{{ url('/') }}/{{ Request::path() }}/view/{{ $row->DesignCode }} " class="btn btn-warning btn-xs"><i class="fa fa-eye"></i> View</a>
+                                            <!-- <a href="{{ url('designer/edit') }}/{{ $row->DesignCode }}" class="btn btn-default btn-xs"><i class="fa fa-edit"></i> Edit Design</a> -->
+                                            <!-- <a href="{{ url('user/my-designs/buy-design') }}/{{ $row->DesignCode }}" class="btn btn-primary btn-xs"><i class="fa fa-shopping-cart"></i> Buy</a> -->
+                                            <button class="btn btn-primary btn-xs btn-purchase" data-design-code="{{ $row->DesignCode }}"><i class="fa fa-plus-square"></i> Purchase</a>
+                                            
+                                            @if(Auth::user()->role == "store_owner")
+                                            <a href="{{ url('user/my-designs/sell-design/' . $row->DesignCode) }}" class="btn btn-success btn-xs"><i class="fa fa-usd"></i> Sell</a>
+                                            @endif
+                                        </div>
                                     </div>
-                                @endforeach
-                                <div class="col-md-12 col-sm-12 pull-right">
-                                    {!! $array_client_designs->render() !!}
-                                </div>
+                                </span>
+                            </div>
+                            @endforeach
+                            <div class="col-md-12 col-sm-12 pull-right">
+                                {!! $array_client_designs->render() !!}
                             </div>
                         </div>
+                    </div>
                     <div>
+                    </div>
                 </div>
-            </div>
-        </section>
+    </section>
     <!-- /.content -->
-    </div>
-@endsection
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php
index 03bff89..60f1df4 100755
--- a/resources/views/user-layouts/user_template.blade.php
+++ b/resources/views/user-layouts/user_template.blade.php
@@ -1723,6 +1723,36 @@
 				return false;
 			});
 
+			$(document).on('button click', '.btn-purchase', function() {
+				// console.log()
+				var designCode = $(this).data('design-code');
+				// var images_thumb = $('#images_thumb').val();
+				$.ajax({
+					type: 'POST',
+					url: "{{ url('/user/store-items/personal-design') }}",
+					data: {
+						designCode: designCode
+					},
+					beforeSend: function(xhr) {
+						var token = $('meta[name="csrf_token"]').attr('content');
+
+						if (token) {
+							return xhr.setRequestHeader('X-CSRF-TOKEN', token);
+						}
+						xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+					},
+					success: function(response) {
+						if (response.success) {
+							window.location = response.link;
+						} else {
+							alert("Something went wrong. Please try again.");
+							location.reload();
+						}
+					}
+				});
+				return false;
+			});
+
 			// fetchUSA()
 			// fetchCanada()
 			getSelectedCountry()