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

updated

Browse Source
This commit is contained in:
franknstayn
2023-06-02 22:34:35 +08:00
parent 36bc532fb8
commit dd29e3ba80
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,7 +399,7 @@ class PaypalController extends Controller
if (count($grouped_item) <= 0) {
$tax_value = 0;
} else {
if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244 || $grouped_item[0]->StoreId == 301 || $grouped_item[0]->StoreId == 1) {
if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244 || $grouped_item[0]->StoreId == 301 || $grouped_item[0]->StoreId == 1 || $grouped_item[0]->StoreId == 329) {
$tax_value = 0;
} else {
$tax_value = 0.10;
@@ -581,7 +581,7 @@ class PaypalController extends Controller
'array_payment_details' => $array_payment_details,
'receiver' => $user_email,
'email_cc' => $explode_other_email,
'subject' => $sName . ' ORDERS',
'subject' => ucwords($sName) . ' Confirmation',
);
Mail::send('emails.orders', $data, function ($message) use ($data) {

16
resources/views/emails/orders.blade.php
View File

@@ -90,6 +90,12 @@
padding-top: 10px;
}
.content-block1{
padding-bottom: 40px;
padding-top: 40px;
}
.footer {
clear: both;
margin-top: 10px;
@@ -685,9 +691,17 @@
<!-- START FOOTER -->
<div class="footer">
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="content-block1">
<p style="font-size: 10px; color: #d2d2d2;">All sales are final. No returns or exchanges will be accepted
Your order is printed on-demand, please allow 4-6 weeks for delivery</p>
<p style="font-size: 10px; color: #d2d2d2;">Thank you for your order! We appreciate your business! </p>
</td>
</tr>
<tr>
<td class="content-block">
<span class="apple-link">Copyright &copy {{ date('Y') }} <a
<span class="apple-link">Copyright &copy; {{ date('Y') }} <a
href="https://merchbay.com">merchbay.com</a>. All rights
reserved.</span>
</td>