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
2022-01-10 19:50:03 +08:00
parent e49bff8c5f
commit babe80e01d
2 changed files with 625 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
<!doctype html> <!doctype html>
<html> <html>
<head>
<head>
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Order Details</title> <title>Order Details</title>
@@ -27,13 +28,15 @@
padding: 0; padding: 0;
-ms-text-size-adjust: 100%; -ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
} }
table { table {
border-collapse: separate; border-collapse: separate;
mso-table-lspace: 0pt; mso-table-lspace: 0pt;
mso-table-rspace: 0pt; mso-table-rspace: 0pt;
width: 100%; } width: 100%;
}
table td { table td {
font-family: sans-serif; font-family: sans-serif;
font-size: 12px; font-size: 12px;
@@ -93,6 +96,7 @@
text-align: center; text-align: center;
width: 100%; width: 100%;
} }
.footer td, .footer td,
.footer p, .footer p,
.footer span, .footer span,
@@ -133,6 +137,7 @@
margin: 0; margin: 0;
margin-bottom: 15px; margin-bottom: 15px;
} }
p li, p li,
ul li, ul li,
ol li { ol li {
@@ -150,17 +155,23 @@
------------------------------------- */ ------------------------------------- */
.btn { .btn {
box-sizing: border-box; box-sizing: border-box;
width: 100%; } width: 100%;
.btn > tbody > tr > td { }
padding-bottom: 15px; }
.btn>tbody>tr>td {
padding-bottom: 15px;
}
.btn table { .btn table {
width: auto; width: auto;
} }
.btn table td { .btn table td {
background-color: #ffffff; background-color: #ffffff;
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;
} }
.btn a { .btn a {
background-color: #ffffff; background-color: #ffffff;
border: solid 1px #3498db; border: solid 1px #3498db;
@@ -253,6 +264,7 @@
font-size: 28px !important; font-size: 28px !important;
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
table[class=body] p, table[class=body] p,
table[class=body] ul, table[class=body] ul,
table[class=body] ol, table[class=body] ol,
@@ -261,28 +273,35 @@
table[class=body] a { table[class=body] a {
font-size: 12px !important; font-size: 12px !important;
} }
table[class=body] .wrapper, table[class=body] .wrapper,
table[class=body] .article { table[class=body] .article {
padding: 10px !important; padding: 10px !important;
} }
table[class=body] .content { table[class=body] .content {
padding: 0 !important; padding: 0 !important;
} }
table[class=body] .container { table[class=body] .container {
padding: 0 !important; padding: 0 !important;
width: 100% !important; width: 100% !important;
} }
table[class=body] .main { table[class=body] .main {
border-left-width: 0 !important; border-left-width: 0 !important;
border-radius: 0 !important; border-radius: 0 !important;
border-right-width: 0 !important; border-right-width: 0 !important;
} }
table[class=body] .btn table { table[class=body] .btn table {
width: 100% !important; width: 100% !important;
} }
table[class=body] .btn a { table[class=body] .btn a {
width: 100% !important; width: 100% !important;
} }
table[class=body] .img-responsive { table[class=body] .img-responsive {
height: auto !important; height: auto !important;
max-width: 100% !important; max-width: 100% !important;
@@ -297,6 +316,7 @@
.ExternalClass { .ExternalClass {
width: 100%; width: 100%;
} }
.ExternalClass, .ExternalClass,
.ExternalClass p, .ExternalClass p,
.ExternalClass span, .ExternalClass span,
@@ -305,6 +325,7 @@
.ExternalClass div { .ExternalClass div {
line-height: 100%; line-height: 100%;
} }
.apple-link a { .apple-link a {
color: inherit !important; color: inherit !important;
font-family: inherit !important; font-family: inherit !important;
@@ -313,9 +334,11 @@
line-height: inherit !important; line-height: inherit !important;
text-decoration: none !important; text-decoration: none !important;
} }
.btn-primary table td:hover { .btn-primary table td:hover {
background-color: #34495e !important; background-color: #34495e !important;
} }
.btn-primary a:hover { .btn-primary a:hover {
background-color: #34495e !important; background-color: #34495e !important;
border-color: #34495e !important; border-color: #34495e !important;
@@ -333,9 +356,11 @@
overflow: hidden; overflow: hidden;
object-fit: contain; object-fit: contain;
} }
</style> </style>
</head> </head>
<body class="">
<body class="">
<table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body"> <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body">
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
@@ -352,13 +377,15 @@
<tr> <tr>
<td> <td>
<h3 class="align-center"><b>Order Details</b></h3> <h3 class="align-center"><b>Order Details</b></h3>
<table class="table table-condensed table-bordered" width="100%" style="width: 100%; border-collapse: collapse; "> <table class="table table-condensed table-bordered" width="100%"
<tr > style="width: 100%; border-collapse: collapse; ">
<tr>
<td class="text-center" colspan="2"><b>Payer Information</b></td> <td class="text-center" colspan="2"><b>Payer Information</b></td>
</tr> </tr>
<tr> <tr>
<td class="col-md-3">Payer Name</td> <td class="col-md-3">Payer Name</td>
<td>{{ $array_payment_details[0]->Payer_Firstname . ' ' . $array_payment_details[0]->Payer_Lastname }}</td> <td>{{ $array_payment_details[0]->Payer_Firstname . ' ' . $array_payment_details[0]->Payer_Lastname }}
</td>
</tr> </tr>
<tr> <tr>
<td class="col-md-3">Payer Email Address</td> <td class="col-md-3">Payer Email Address</td>
@@ -368,28 +395,34 @@
<td class="col-md-3">Payment Method</td> <td class="col-md-3">Payment Method</td>
<td>{{ $array_payment_details[0]->PaymentMethod }}</td> <td>{{ $array_payment_details[0]->PaymentMethod }}</td>
</tr> </tr>
<tr > <tr>
<td class="text-center" colspan="2"><b>Transaction Information</b></td> <td class="text-center" colspan="2"><b>Transaction
Information</b></td>
</tr> </tr>
<tr> <tr>
<td class="col-md-3">Subtotal</td> <td class="col-md-3">Subtotal</td>
<td>{{ $array_payment_details[0]->SubTotal . ' ' . $array_payment_details[0]->Currency }}</td> <td>{{ $array_payment_details[0]->SubTotal . ' ' . $array_payment_details[0]->Currency }}
</td>
</tr> </tr>
@foreach($item_goup_array as $item) @foreach ($item_goup_array as $item)
@if($item->VoucherId != null) @if ($item->VoucherId != null)
<tr> <tr>
<th class="col-md-3">Discount</th> <th class="col-md-3">Discount</th>
<td>Voucher Code: <b>{{ $item->ProductName }} </b> / {{ $item->Price . ' ' . $array_payment_details[0]->Currency }}</td> <td>Voucher Code: <b>{{ $item->ProductName }} </b> /
{{ $item->Price . ' ' . $array_payment_details[0]->Currency }}
</td>
</tr> </tr>
@endif @endif
@endforeach @endforeach
<tr> <tr>
<td class="col-md-3">Tax</td> <td class="col-md-3">Tax</td>
<td>{{ $array_payment_details[0]->Tax . ' ' . $array_payment_details[0]->Currency }}</td> <td>{{ $array_payment_details[0]->Tax . ' ' . $array_payment_details[0]->Currency }}
</td>
</tr> </tr>
<tr> <tr>
<td class="col-md-3">Total</td> <td class="col-md-3">Total</td>
<td>{{ $array_payment_details[0]->Total . ' ' . $array_payment_details[0]->Currency }}</td> <td>{{ $array_payment_details[0]->Total . ' ' . $array_payment_details[0]->Currency }}
</td>
</tr> </tr>
<tr> <tr>
<td class="col-md-3">Invoice #</td> <td class="col-md-3">Invoice #</td>
@@ -398,24 +431,33 @@
</table> </table>
<br> <br>
<p>Item Order(s):</p> <p>Item Order(s):</p>
@foreach($item_goup_array as $item) @foreach ($item_goup_array as $item)
@if($item->VoucherId == null) @if ($item->VoucherId == null)
<div style="border: 1px solid #e2e2e2; padding: 10px; margin-bottom: 10px;"> <div
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%"> style="border: 1px solid #e2e2e2; padding: 10px; margin-bottom: 10px;">
<table role="presentation" border="0" cellpadding="0"
cellspacing="0" width="100%">
<tbody> <tbody>
<tr> <tr>
<td align="left" style="width: 180px;"> <td align="left" style="width: 180px;">
@foreach($img_thumb as $img) @foreach ($img_thumb as $img)
@if($img->ProductId == $item->ProductId) @if ($img->ProductId == $item->ProductId)
<img style="height: 200px; overflow: hidden; object-fit: contain;" src="{{ config('site_config.images_url') }}/{{ $img->Image }}"> <img style="height: 200px; overflow: hidden; object-fit: contain;"
src="{{ config('site_config.images_url') }}/{{ $img->Image }}">
@endif @endif
@endforeach @endforeach
</td> </td>
<td> <td>
<div style="font-size: 14px;"><a href="{{ url('teamstore') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a></div> <div style="font-size: 14px;"><a
Total Price: ${{ $item->total_price }} &bull; Row(s): {{ $item->qty }} href="{{ url('store') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a>
<table class="table table-condensed table-bordered" width="100%" style="width: 100%; border-collapse: collapse;"> </div>
@if($item->FormUsed=="jersey-and-shorts-form") Total Price: ${{ $item->total_price }} &bull;
Row(s): {{ $item->qty }}
<table
class="table table-condensed table-bordered"
width="100%"
style="width: 100%; border-collapse: collapse;">
@if ($item->FormUsed == 'jersey-and-shorts-form')
<tr> <tr>
<td><b>Name</b></td> <td><b>Name</b></td>
<td><b>Number</b></td> <td><b>Number</b></td>
@@ -496,83 +538,124 @@
@endif @endif
<!-- table header --> <!-- table header -->
<!-- table body --> <!-- table body -->
@foreach($order_item_array as $sub_item) @foreach ($order_item_array as $sub_item)
@if($sub_item->ProductId == $item->ProductId) @if ($sub_item->ProductId == $item->ProductId)
@if($item->FormUsed=="jersey-and-shorts-form") @if ($item->FormUsed == 'jersey-and-shorts-form')
<tr> <tr>
<td> @if($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif </td> <td> @if ($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif
<td>{{ $sub_item->Number }}</td> </td>
<td>{{ $sub_item->JerseySize }}</td> <td>{{ $sub_item->Number }}
<td>{{ $sub_item->ShortsSize }}</td> </td>
<td>{{ $sub_item->Price }}</td> <td>{{ $sub_item->JerseySize }}
<td>{{ $sub_item->Quantity }}</td> </td>
<td>{{ $sub_item->ShortsSize }}
</td>
<td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="tshirt-form") @elseif($item->FormUsed=="tshirt-form")
<tr> <tr>
<td>{{ $sub_item->Size }}</td> <td>{{ $sub_item->Size }}
<td>{{ $sub_item->Price }}</td> </td>
<td>{{ $sub_item->Quantity }}</td> <td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="quantity-form") @elseif($item->FormUsed=="quantity-form")
<tr> <tr>
<td>{{ $sub_item->Price }}</td> <td>{{ $sub_item->Price }}
<td>{{ $sub_item->Quantity }}</td> </td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="name-number-form") @elseif($item->FormUsed=="name-number-form")
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}
<td>{{ $sub_item->Number }}</td> </td>
<td>{{ $sub_item->Price }}</td> <td>{{ $sub_item->Number }}
<td>{{ $sub_item->Quantity }}</td> </td>
<td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="name-number-size-form") @elseif($item->FormUsed=="name-number-size-form")
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}
<td>{{ $sub_item->Number }}</td> </td>
<td>{{ $sub_item->Size }}</td> <td>{{ $sub_item->Number }}
<td>{{ $sub_item->Price }}</td> </td>
<td>{{ $sub_item->Quantity }}</td> <td>{{ $sub_item->Size }}
</td>
<td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="number-form") @elseif($item->FormUsed=="number-form")
<tr> <tr>
<td>{{ $sub_item->Number }}</td> <td>{{ $sub_item->Number }}
<td>{{ $sub_item->Price }}</td> </td>
<td>{{ $sub_item->Quantity }}</td> <td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="name-name2-size-form") @elseif($item->FormUsed=="name-name2-size-form")
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}
<td>{{ $sub_item->Name2 }}</td> </td>
<td>{{ $sub_item->Size }}</td> <td>{{ $sub_item->Name2 }}
<td>{{ $sub_item->Price }}</td> </td>
<td>{{ $sub_item->Quantity }}</td> <td>{{ $sub_item->Size }}
</td>
<td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="name-size-form") @elseif($item->FormUsed=="name-size-form")
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}
<td>{{ $sub_item->Size }}</td> </td>
<td>{{ $sub_item->Price }}</td> <td>{{ $sub_item->Size }}
<td>{{ $sub_item->Quantity }}</td> </td>
<td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="jersey-and-shorts-quantity-form") @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
<tr> <tr>
<td>{{ $sub_item->JerseySize }}</td> <td>{{ $sub_item->JerseySize }}
<td>{{ $sub_item->ShortsSize }}</td> </td>
<td>{{ $sub_item->Price }}</td> <td>{{ $sub_item->ShortsSize }}
<td>{{ $sub_item->Quantity }}</td> </td>
<td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@elseif($item->FormUsed=="number-jersey-shorts-form") @elseif($item->FormUsed=="number-jersey-shorts-form")
<tr> <tr>
<td>{{ $sub_item->Number }}</td> <td>{{ $sub_item->Number }}
<td>{{ $sub_item->JerseySize }}</td> </td>
<td>{{ $sub_item->ShortsSize }}</td> <td>{{ $sub_item->JerseySize }}
<td>{{ $sub_item->Price }}</td> </td>
<td>{{ $sub_item->Quantity }}</td> <td>{{ $sub_item->ShortsSize }}
</td>
<td>{{ $sub_item->Price }}
</td>
<td>{{ $sub_item->Quantity }}
</td>
</tr> </tr>
@else @else
@@ -603,7 +686,9 @@
<table role="presentation" border="0" cellpadding="0" cellspacing="0"> <table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr> <tr>
<td class="content-block"> <td class="content-block">
<span class="apple-link">Copyright &copy 2019 <a href="https://crewsportswear.com">crewsportswear.com</a>. All rights reserved.</span> <span class="apple-link">Copyright &copy 2019 <a
href="https://crewsportswear.com">crewsportswear.com</a>. All rights
reserved.</span>
</td> </td>
</tr> </tr>
</table> </table>
@@ -615,5 +700,6 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
</table> </table>
</body> </body>
</html> </html>

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

@@ -360,7 +360,7 @@
<small>{{ $store_array[0]->StoreCurrency }}</small> <small>{{ $store_array[0]->StoreCurrency }}</small>
</h3> </h3>
@if ($getSubtotal >= 100) @if ($getSubtotal >= 1)
<div class="border rounded-2 p-2 mt-2"> <div class="border rounded-2 p-2 mt-2">
If you order $150 worth of product you get free shipping (pre tax) If you order $150 worth of product you get free shipping (pre tax)
</div> </div>