From 973c24358d39abe41b21921ee333aecedbe35663 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Sat, 18 Sep 2021 19:32:39 +0800
Subject: [PATCH] added other email field

---
 app/Http/Controllers/user/UserController.php        |  3 ++-
 resources/views/merchbay/cart.blade.php             |  3 +++
 resources/views/user-layouts/edit_profile.blade.php |  9 +++++++--
 resources/views/user-layouts/profile.blade.php      | 12 ++++++++++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php
index 40cf83a..a6d05a8 100755
--- a/app/Http/Controllers/user/UserController.php
+++ b/app/Http/Controllers/user/UserController.php
@@ -152,7 +152,8 @@ class UserController extends Controller {
 
 		$user_logins_data = array(
 								'name'			=> $post['fullname'],
-								'email'			=> $post['email']
+								'email'			=> $post['email'],
+								'other_email'			=> $post['other_email'],
 							);
 
 		$user_info_data = array(
diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php
index b81d87a..2bb9ad4 100755
--- a/resources/views/merchbay/cart.blade.php
+++ b/resources/views/merchbay/cart.blade.php
@@ -316,6 +316,9 @@
 
 								<div style="border: 1px solid #e2e2e2; padding: 10px;">
 										<a @if($getSubtotal <= 0 ) disabled  @endif href="{{ url('getCheckout') }}" class="btn btn-primary w-100" style="background-color: #ffc300; border-color: #e2ad00; text-align: -webkit-center;" ><img src="{{asset('/public/images/paypal1.png')}}" class="img img-responsive" style="height:30px;"></a><br>
+										<!-- <div class="my-2">
+											<button class="btn btn-lg btn-info w-100">Checkout with Voucher</button>
+										</div> -->
 										<div class="bg-info p-2 mt-2">
 											Be advised payments made on merchbay will show up as crewsportswear on your receipt 
 										</div>
diff --git a/resources/views/user-layouts/edit_profile.blade.php b/resources/views/user-layouts/edit_profile.blade.php
index c311409..f5b5aa6 100755
--- a/resources/views/user-layouts/edit_profile.blade.php
+++ b/resources/views/user-layouts/edit_profile.blade.php
@@ -41,6 +41,12 @@
                                             <input type="email" class="form-control" name="email" placeholder="Please enter your email address" value="{{ $array_profile_info[0]->email }}"> 
                                         </div>
                                     </div>
+                                    <div class="col-md-4">
+                                        <div class="form-group">
+                                            <label>Other Email Address</label>
+                                            <input type="email" class="form-control" name="other_email" placeholder="Please enter your other email address" value="{{ $array_profile_info[0]->other_email }}"> 
+                                        </div>
+                                    </div>
                                     <div class="col-md-4">
                                         <div class="form-group">
                                             <label>Mobile Number</label>
@@ -49,8 +55,7 @@
                                             </p>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="row">
+                        
                                     <div class="col-md-4">
                                         <div class="form-group">
                                             <label>Birthday</label>
diff --git a/resources/views/user-layouts/profile.blade.php b/resources/views/user-layouts/profile.blade.php
index 138b252..7717b54 100755
--- a/resources/views/user-layouts/profile.blade.php
+++ b/resources/views/user-layouts/profile.blade.php
@@ -48,6 +48,15 @@
                                             </small></p>
                                         </div>
                                     </div>
+
+                                    <div class="col-md-4">
+                                        <div class="form-group">
+                                            <label>Other Email Address</label>
+                                            <p>
+                                            {{ $array_profile_info[0]->other_email }} 
+                                           </p>
+                                        </div>
+                                    </div>
                                     <div class="col-md-4">
                                         <div class="form-group">
                                             <label>Mobile Number</label>
@@ -60,8 +69,7 @@
                                             </p>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="row">
+                        
                                     <div class="col-md-4">
                                         <div class="form-group">
                                             <label>Birthday</label>