webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

used crew paypal

Browse Source
This commit is contained in:
franknstayn
2021-09-17 22:02:55 +08:00
parent d0a720347a
commit 4a35e07ee1
5 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -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']);
});

10
app/Http/Controllers/teamstore/TeamStoreController.php
View File

@@ -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>';

26
config/services.php
View File

@@ -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_'
],
];

12
resources/views/merchbay/cart.blade.php
View File

@@ -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

4
resources/views/teamstore-sublayouts/product-details.blade.php
View File

@@ -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;