diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index 2b65b2f..15c297a 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -182,16 +182,25 @@ class PaypalController extends Controller
 		$item_list = PayPal::ItemList();
 		$item_list->setItems($order_items);
 
+		$payment = PayPal::Payment();
 
-		$shipping = PayPal::ShippingAddress();
-		$shipping->setRecipientName($array_address_book[0]->Fullname);
-		$shipping->setLine1($array_address_book[0]->Address);
-		$shipping->setCity($array_address_book[0]->City);
-		$shipping->setCountryCode($array_address_book[0]->CountryCode);
-		$shipping->setPostalCode($array_address_book[0]->ZipCode);
-		$shipping->setState($array_address_book[0]->State);
-		$shipping->setPhone($array_address_book[0]->ContactNumber);
-		$item_list->setShippingAddress($shipping);
+		// var_dump(array($transaction));
+		if($array_address_book[0]->CountryCode == "CA"){
+			
+			$shipping = PayPal::ShippingAddress();
+			$shipping->setRecipientName($array_address_book[0]->Fullname);
+			$shipping->setLine1($array_address_book[0]->Address);
+			$shipping->setCity($array_address_book[0]->City);
+			$shipping->setCountryCode($array_address_book[0]->CountryCode);
+			$shipping->setPostalCode($array_address_book[0]->ZipCode);
+			$shipping->setState($array_address_book[0]->State);
+			$shipping->setPhone($array_address_book[0]->ContactNumber);
+			$item_list->setShippingAddress($shipping);
+
+			$payment->setExperienceProfileId($this->createWebProfile());
+		}
+
+	
 		// var_dump($item_list);
 
 		$amount_details = PayPal::Details();
@@ -216,11 +225,8 @@ class PaypalController extends Controller
 		$redirectUrls->setCancelUrl(route('getCancel'));
 		// var_dump($shippingAddress)
 
-		$payment = PayPal::Payment();
 
-		var_dump(array($transaction));
-
-		$payment->setExperienceProfileId($this->createWebProfile());
+		
 		$payment->setIntent('sale');
 		$payment->setPayer($payer);
 		$payment->setRedirectUrls($redirectUrls);
@@ -264,7 +270,11 @@ class PaypalController extends Controller
 
 		$m		 		= new TeamStoreModel;
 		$UserModel		 		= new UserModel;
-		$userId = Auth::user()->id;
+		$userId = 0;
+		if (!Auth::guest()) {
+			$userId = Auth::user()->id;
+		}
+
 
 
 		$items 	 		= $m->myCart($cartKey); // item from cart_tmp
diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index c7c69d3..4b53d70 100755
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -587,13 +587,20 @@ class TeamStoreController extends Controller
 
 		$m		 		= new TeamStoreModel;
 		$UserModel				= new UserModel;
-
-		$userId = Auth::user()->id;
-		$array_address_book 	= 	$UserModel->selectAddresBook('UserId', $userId);
-		if (count($array_address_book) <= 0) {
-			$array_address_book = null;
+		$array_address_book = null;
+		
+		if(!Auth::guest()){
+			$userId = Auth::user()->id;
+				$array_address_book 	= 	$UserModel->selectAddresBook('UserId', $userId);
+				if (count($array_address_book) <= 0) {
+					$array_address_book = null;
+				}
 		}
 
+
+
+		
+
 		$cartKey 		= $request->session()->get('cartkey');
 		$items 	 		= $m->myCart($cartKey);
 		$getSubtotal 	= $m->getSubtotal($cartKey);