From cb77e3b423073750acc54c87a97f6c64f22272d5 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Sat, 9 Oct 2021 20:45:22 +0800
Subject: [PATCH] updated again

---
 app/Http/Controllers/paypal/PaypalController.php     | 6 ++++--
 resources/views/merchbay/cart.blade.php              | 4 ++--
 resources/views/user-layouts/user_template.blade.php | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index b7c26e2..a79aaca 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -30,7 +30,7 @@ class PaypalController extends Controller
 
 	public function __construct()
 	{
-		$paypal_env = "live";
+		$paypal_env = "sandbox";
 		$paypal_apiUrl = 'https://api.paypal.com'; // default
 
 		if ($paypal_env == 'live') {
@@ -87,6 +87,8 @@ class PaypalController extends Controller
 
 		$userId = Auth::user()->id;
 		$array_address_book 	= 	$UserModel->selectAddresBook('UserId', $userId);
+		$shipping_address_url = "user/address-book/edit/" . $array_address_book[0]->Id;
+
 		if (
 			count($array_address_book) <= 0 ||
 			$array_address_book[0]->Fullname == null ||
@@ -97,7 +99,7 @@ class PaypalController extends Controller
 			$array_address_book[0]->ZipCode == null
 
 		) {
-			$message = 'Please complete your <a href="'.url('user/address-book').'"><u>shipping address</u></a>.';
+			$message = 'Please complete your shipping address. <a href="' . url($shipping_address_url) . '"> <strong> <u>click here</u> </strong></a>.';
 			Session::flash('cartkeyError', $message);
 			return Redirect::back();
 		}
diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php
index 838cc6e..9b81aa0 100755
--- a/resources/views/merchbay/cart.blade.php
+++ b/resources/views/merchbay/cart.blade.php
@@ -329,13 +329,13 @@
                                 <p><strong>Ship to:</strong></p>
                                 
                                     @if ($address_book === null)
-                                        <a href="{{ url('user/address-book') }}">[ Add ]</a>
+                                        <a href="{{ url('user/address-book/create') }}">[ Add ]</a>
                                     @else
                                         <div>{{ $address_book[0]->Fullname }}</div>
                                         <div>{{ $address_book[0]->ContactNumber }}</div>
                                         <div>
                                             {{ $address_book[0]->Address . ', ' . $address_book[0]->State . ', ' . $address_book[0]->City . ', ' . $address_book[0]->Country . ', ' . $address_book[0]->CountryCode . ' ' . $address_book[0]->ZipCode }}
-                                            <a href="{{ url('user/address-book') }}">[ Edit ]</a>
+                                            <a href="{{ url('user/address-book/edit/'.$address_book[0]->Id) }}">[ Edit ]</a>
                                         </div>
                                     @endif
                             
diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php
index d83046d..59f8a72 100755
--- a/resources/views/user-layouts/user_template.blade.php
+++ b/resources/views/user-layouts/user_template.blade.php
@@ -1981,7 +1981,7 @@
 					// console.log(response);
 					if (response) {
 						alert("Address is successfully added.");
-						window.location = "{{ url('user/address-book') }}";
+						window.location = "{{ url('/cart') }}";
 					} else {
 						alert("Something went wrong. Please try again!");
 						location.reload();
@@ -2013,7 +2013,7 @@
 					// console.log(response);
 					if (response) {
 						alert("Address is successfully updated.");
-						window.location = "{{ url('user/address-book') }}";
+						window.location = "{{ url('/cart') }}";
 					} else {
 						alert("Something went wrong. Please try again!");
 						location.reload();