From 4a35e07ee1728b522d77a327b02b999914aa9ace Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Fri, 17 Sep 2021 22:02:55 +0800
Subject: [PATCH] used crew paypal

---
 .../Controllers/paypal/PaypalController.php   |  2 +-
 .../teamstore/TeamStoreController.php         | 10 +++----
 config/services.php                           | 26 ++++++++++++++-----
 resources/views/merchbay/cart.blade.php       | 12 +++------
 .../product-details.blade.php                 |  4 +--
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index 2ebde6f..26cc1a5 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -415,7 +415,7 @@ class PaypalController extends Controller
 		);
 
 		Mail::send('emails.orders', $data, function ($message) use ($data) {
-			$message->from('no-reply@crewsportswear.com', 'Merchbay');
+			$message->from('support@merchbay.com', 'Merchbay');
 			$message->bcc($data['email_cc'], 'Orders From Merchbay');
 			$message->to($data['receiver'])->subject($data['subject']);
 		});
diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index b9b8203..daa1e8f 100755
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -744,14 +744,10 @@ class TeamStoreController extends Controller
 				$offData = $getVoucher[0]->VoucherValue . ' ' . $store_array[0]->StoreCurrency;
 			}
 
-			$message = '<div class="btn-group">
-							<button type="button" class="btn btn-default btn-xs">' . $getVoucher[0]->VoucherCode . ' ' . $offData . ' OFF</button>
-							<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-								<span class="caret"></span>
-								<span class="sr-only"></span>
-							</button>
+			$message = '<div class="btn-group mb-2">
+							<button type="button" class="btn btn-black btn-sm dropdown-toggle"  data-bs-toggle="dropdown">' . $getVoucher[0]->VoucherCode . ' ' . $offData . ' OFF</button>
 							<ul class="dropdown-menu">
-								<li><a href="' . $removeItemURL . '"><i class="fa fa-times"></i> Remove</a></li>
+								<li><a class="dropdown-item" href="' . $removeItemURL . '">Remove</a></li>
 							</ul>
 						</div>';
 
diff --git a/config/services.php b/config/services.php
index 53e7b19..f1c9e70 100755
--- a/config/services.php
+++ b/config/services.php
@@ -47,14 +47,26 @@ return [
 	// ],
 
 		// sandbox merchbay
-	'paypal_sandbox' => [
-		'client_id' => 'AWBh_7_t3c3zo1FAXo-lgUB6LgBkMjE3hsUaX0eQZUbugfTx3djrAJjzgSF2FsctkwtOPb-q3XjZOF3F',
-		'secret' => 'EColKouxhzsY9HV904V0KOq6MYNixWg4lqQQ3mpEC2ZDmwuHOf6fN0LzprfgSkaGAhzhorEdWncH2GA1'
-	], 
+	// 'paypal_sandbox' => [
+	// 	'client_id' => 'AWBh_7_t3c3zo1FAXo-lgUB6LgBkMjE3hsUaX0eQZUbugfTx3djrAJjzgSF2FsctkwtOPb-q3XjZOF3F',
+	// 	'secret' => 'EColKouxhzsY9HV904V0KOq6MYNixWg4lqQQ3mpEC2ZDmwuHOf6fN0LzprfgSkaGAhzhorEdWncH2GA1'
+	// ], 
 
-	// live merchbay
+	// // live merchbay
+	// 'paypal_live' => [
+	// 	'client_id' => 'Ab4VS4QGjGw0z6jtyCaARI1SoUKfq76Qr1MVh0NM0WKGxhu0zE-h3oBplIQFnAzAMiuS7FBiTch3YKcr',
+	// 	'secret' => 'EEbk7SwRC1iOOsE6g23v-YCI52uGdTN3NMjoAqfTmtd48M0iS0U_kvL5wZTZoLXBA19gwj3ftXp96iSC'
+	// ],
+
+	// sandbox crew
+	// 'paypal_sandbox' => [
+  //   'client_id' => 'AQuz-HKzQiL7FygkG8skSekaWf-RP6Rgj4f1XeX1Ghp86bUFj7tQXVT1xbpluu5_WCGRbQpOVGtlJKVB',
+	// 	'secret' => 'EJAMKxQsl-mFkL_4J_90cvTamYfcsgswqgIxz9wQPiRAwJ6sy_wNsttMlmrXIpxI96JpYzdMXkLCHAPz'
+	// ], 
+	
+	// live crew
 	'paypal_live' => [
-		'client_id' => 'Ab4VS4QGjGw0z6jtyCaARI1SoUKfq76Qr1MVh0NM0WKGxhu0zE-h3oBplIQFnAzAMiuS7FBiTch3YKcr',
-		'secret' => 'EEbk7SwRC1iOOsE6g23v-YCI52uGdTN3NMjoAqfTmtd48M0iS0U_kvL5wZTZoLXBA19gwj3ftXp96iSC'
+    'client_id' => 'AUqBUFW5lfyYmrlBtFZA3RNw45sttM3ltbvS_d4qCVBMrkcMG9rEeivGvtNFSy8XTiEp50YyQ6khKxbq',
+	 	'secret' => 'ELlnuiupoFKwGUSc2g5j-sD1EmsvKpdhth1gFV7njpfvyNtKsK8WwIKUMOS0ehJcRatV865eMhfgsnd_'
 	],
 ];
diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php
index 14125b5..28db2fb 100755
--- a/resources/views/merchbay/cart.blade.php
+++ b/resources/views/merchbay/cart.blade.php
@@ -288,18 +288,14 @@
 										<div class="form-group" id="voucher_list">
 												@foreach($row as $item)
 														@if($item->VoucherId != null)
-																<div class="btn-group">
+																<div class="btn-group mb-2">
 																		@if($item->VoucherType == "Percentage")
-																				<button type="button" class="btn btn-default btn-xs">{{ $item->VoucherCode . ' ' . $item->VoucherValue . '%' }}   OFF</button>
+																				<button type="button" class="btn btn-black btn-sm dropdown-toggle"  data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . '%' }}   OFF</button>
 																		@else
-																				<button type="button" class="btn btn-default btn-xs">{{ $item->VoucherCode . ' ' . $item->VoucherValue . ' ' . $store_array[0]->StoreCurrency }} OFF</button>
+																				<button type="button" class="btn btn-black btn-sm dropdown-toggle"  data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . ' ' . $store_array[0]->StoreCurrency }} OFF</button>
 																		@endif
-																		<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-																				<span class="caret"></span>
-																				<span class="sr-only"></span>
-																		</button>
 																		<ul class="dropdown-menu">
-																				<li><a href="{{ url('removeitem') . '/' . $item->Id }}"><i class="fa fa-times"></i> Remove</a></li>
+																			<li><a class="dropdown-item" href="{{ url('removeitem') . '/' . $item->Id }}">Remove</a></li>
 																		</ul>
 																</div>
 														@endif
diff --git a/resources/views/teamstore-sublayouts/product-details.blade.php b/resources/views/teamstore-sublayouts/product-details.blade.php
index 1776a80..b915b9a 100755
--- a/resources/views/teamstore-sublayouts/product-details.blade.php
+++ b/resources/views/teamstore-sublayouts/product-details.blade.php
@@ -192,11 +192,11 @@
             border-bottom-width: 0px;
         }
 
-        .btn-roster-action {
+        /* .btn-roster-action { */
             /* width: 20px;
             height: 20px;
             border-radius: 10px; */
-        }
+        /* } */
 
         .btn-group-sm>.btn {
             padding: 0px 0px;