Peter Muturi 1 an în urmă
părinte
comite
cc19ed5684

+ 1 - 1
resources/views/emails/call-to-action-button.blade.php

@@ -2,4 +2,4 @@
   $appInternalName = config('app.internalName');
   $appConfig = config('constants.' . $appInternalName);
  ?>
-<p style="text-align:center; padding:30px; 0"><a href="{{ $link }}" style="padding: 15px 0;color: #fff;text-decoration: none; width: 400px;display: block;margin: auto; text-align: center;background:{{$appConfig['primaryColor']}};border-radius: 5px;">{{$label}}</a> </p>
+<p style="text-align:center; padding:10px; 0"><a href="{{ $link }}" style="padding: 15px 0;color: #fff;text-decoration: none; border-radius: 50px; width: 400px;display: block;margin: auto; text-align: center;background:{{$appConfig['primaryColor']}};">{{$label}}</a> </p>

+ 14 - 19
resources/views/emails/layout.blade.php

@@ -291,11 +291,11 @@
 <body style="background-color: #F4F4F7; color: #000; font-family:Arial, sans-serif;">
 <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation" style="margin: 0; padding: 25px 0;" border="0" bgcolor="#F4F4F7">
     <tr>
-        <td align="center" style="color: #000; font-family:Arial, sans-serif; font-size: 16px; word-break: break-word;">
+        <td align="center" style="color: #fff; font-family:Arial, sans-serif; font-size: 16px; word-break: break-word;">
             <table class="email-content" width="650" cellpadding="0" cellspacing="0" role="presentation" style="margin: 0; padding: 0;" border="0">
                 <tr>
-                    <td class="email-masthead" style="background-color:#191919;color: #000; font-family:Arial, sans-serif; font-size: 16px; padding: 15px; text-align: left; word-break: break-word;">
-                        <img src="{{$appConfig['productUrl']}}/{{config('app.internalName')}}/img/logo_white.png" alt=""  height="41"  style="border: none;max-width:200px;object-fit:contain;">
+                    <td class="email-masthead" style="border-bottom:1px solid #191919; background-color: #ffffff;color: #000; font-family:Arial, sans-serif; font-size: 16px; padding: 15px; text-align: left; word-break: break-word;">
+                        <img src="{{$appConfig['logo']}}" alt=""  style="border: none;max-width:150px;object-fit:contain;">
                     </td>
                 </tr>
                 <!-- Email Body -->
@@ -305,44 +305,39 @@
                             <!-- Body content -->
                             <tr>
                                 <td class="content-cell" style="color: #000; font-family:Arial, sans-serif; font-size: 16px; padding: 15px 15px; word-break: break-word;">
-                                    <div class="f-fallback">
+                                    <div>
 
 
-                                        <p class="f-fallback" style=" font-weight: bold; color: #000; font-size: 24px; padding: 0 15px; line-height: 58px; margin: .4em 0;">@yield('salutation')</p>
+                                        <p style=" font-weight: bold; color: #000; font-size: 20px; padding: 0 15px; line-height: 58px; margin: .1em 0;">@yield('salutation')</p>
 
                                         @yield('content')
 
-                                        <p class="f-fallback" style="color: #000; line-height: 1.625; margin: .4em 0 1.1875em;padding: 0 15px;">If you have any questions, feel free to <a href="mailto:{{ $stringMappingConfig['supportEmail'] }}">email our customer success team</a>. <br> (We're lightning quick at replying.)</p>
+                                        <p style="color: #000; line-height: 1.625; margin: .4em 0 1.1875em;padding: 0 15px;">If you have any questions, feel free to <a href="mailto:{{ $stringMappingConfig['supportEmail'] }}">email our customer success team</a>. <br> (We're lightning quick at replying.)</p>
 
 
 
-                                        <p class="f-fallback" style="color: #000; font-size: 16px; line-height: 1.625; margin: .4em 0 1.1875em;padding: 0 15px;">Cheers,</p>
+                                        <p style="color: #000; font-size: 15px; line-height: 1.625; margin: .4em 0 1.1875em;padding: 0 15px;">Cheers,</p>
 
-                                        <p class="f-fallback" style="color: #000; font-size: 16px; line-height: 1.625; margin: .4em 0 1.1875em;padding: 0 15px;"><b>The {{$stringMappingConfig['name']}} Team</b>
-                                        <a href="{{$stringMappingConfig['productUrl']}}" target="_blank" style="margin-top:10px;display:block;color:#1C3D80;text-decoration:none;">{{$stringMappingConfig['productUrl']}}</a>
-                                        <span style="display:block;">Basic Nutrition, Inc.</span>
-
-                                        11140 Rockville Pike<br>
-                                        Rockville, MD 20852
-                                        </p>
+                                        <p style="color: #000; font-size: 15px; line-height: 1.625; letter-spacing: 0; margin: .4em 0 1.1875em;padding: 0 15px;"><b>{{$stringMappingConfig['name']}} Team</b>
+                                        <a href="{{$stringMappingConfig['productUrl']}}" target="_blank" style="margin-top:0px;display:block;color:#1C3D80;text-decoration:none;">{{$stringMappingConfig['productUrl']}}</a></p>
                                     </div>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="background:rgba(0,0,0,0.03) ;color: #000; font-family:Arial, sans-serif; font-size: 16px; word-break: break-word;">
+                                <td style="background:#e9f8fe ;color: #000; font-family:Arial, sans-serif; font-size: 16px; word-break: break-word;">
                                     <table class="email-footer" align="center" width="650" cellpadding="0" cellspacing="0" role="presentation" style="margin: 0 auto; padding: 0; " border="0">
                                         <tr>
                                             <td class="content-cell" align="center" style="color: #000; font-family:Arial, sans-serif; font-size: 16px; padding: 0;word-break: break-word;">
                                                 <p style="text-align:center;padding:15px 0 15px; margin:0;">
-                                                    <img src="{{$appUrl}}/{{ config('app.internalName') }}/img/phone.png" style="width:20px;height:20px;vertical-align: middle;" alt=""><a href="tel:{{ $stringMappingConfig['supportPhone'] }}" style="color:#000;text-decoration: none;font-size:16px;margin-left:7px;">{{ $stringMappingConfig['supportPhone'] }}</a>
-                                                    <img src="{{$appUrl}}/{{ config('app.internalName') }}/img/email.png" style="width:20px;height:20px;vertical-align: middle;margin-left:50px" alt=""><a href="mailto:{{ $stringMappingConfig['supportEmail'] }}" style="color:#000;text-decoration: none;font-size:16px;margin-left:7px;">{{ $stringMappingConfig['supportEmail'] }}</a></p>
+                                                    <img src="{{$appUrl}}/{{ config('app.internalName') }}/img/phone.png" style="height:20px;vertical-align: middle;" alt=""><a href="tel:{{ $stringMappingConfig['supportPhone'] }}" style="color:#000;text-decoration: none;font-size:16px;margin-left:7px;">{{ $stringMappingConfig['supportPhone'] }}</a>
+                                                    <img src="{{$appUrl}}/{{ config('app.internalName') }}/img/email.png" style="height:20px;vertical-align: middle;margin-left:50px" alt=""><a href="mailto:{{ $stringMappingConfig['supportEmail'] }}" style="color:#000;text-decoration: none;font-size:16px;margin-left:7px;">{{ $stringMappingConfig['supportEmail'] }}</a></p>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="background:rgba(0,0,0,0.1) ;color: #000; font-family:Arial, sans-serif; font-size: 16px; word-break: break-word;">
+                                <td style="background:#c5ecfa ;color: #000; font-family:Arial, sans-serif; font-size: 16px; word-break: break-word;">
                                     <table class="email-footer" align="center" width="650" cellpadding="0" cellspacing="0" role="presentation" style="margin: 0 auto; padding: 0; " border="0">
                                         <tr>
                                             <td class="content-cell" align="center" style="color: #000; font-family:Arial, sans-serif; font-size: 16px; padding: 0;word-break: break-word;">
@@ -353,7 +348,7 @@
                                                 }
                                             ?>
                                                 @if($entity)
-                                                <p class="f-fallback" style="color: #000; line-height: 1.625; margin: 0;padding: 15px;">Don’t want to receive any more e-mails? <a href="{{ $stringMappingConfig['clientUrl'] . '/emails/unsubscribe/' . $entity->uid }}" style="color:#1C3D80">Unsubscribe</a>.</p>
+                                                <p style="color: #000; line-height: 1.625; margin: 0; font-size: 14px;padding: 15px;">Don’t want to receive any more e-mails? <a href="{{ route('unsubscribe-from-emails', $entity->uid) }}" style="color:#1C3D80">unsubscribe</a></p>
                                                 @endif
                                             </td>
                                         </tr>

+ 16 - 56
resources/views/emails/templates/invoice.blade.php

@@ -1,14 +1,15 @@
 @extends('emails.layout')
 @section('salutation')
-<span style="color:#00685f">ORDER INVOICE</span>
+<span style="color:#24315E">ORDER INVOICE</span>
 @endsection
 
 @section('content')
 <?php
 $appInternalName = config('app.internalName');
 $appConfig = config('constants.' . $appInternalName);
+$selectedItems = $storeOrder->testsRequested();
 ?>
-<table border="0" cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse;border-spacing:0;margin-bottom:30px;margin-top:10px;margin-inline:auto;">
+<table border="0" cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse;border-spacing:0;margin-bottom:30px;margin-top:0px;margin-inline:auto;">
     <tbody>
         <tr>
             <td>
@@ -37,25 +38,16 @@ $appConfig = config('constants.' . $appInternalName);
                         <tr height="15">
                             <td colspan="5"></td>
                         </tr>
+                        @foreach($selectedItems as $item)
                         <tr>
-                            <td valign="top" style="margin:0;width:64px">
-                                <div style="padding:5px;margin:0;display:grid;place-items:center;border-radius:14px;border:1px solid rgba(128,128,128,0.2);width:64px;height:64px;">
-                                    <img src="{{asset($appConfig['productImages'][0])}}" border="0" alt="" style="object-fit:contain;width:100%;max-height:64px">
-                                </div>
-                            </td>
-                            <td colspan="2" style="padding:0 0 0 15px;vertical-align:top;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
-                                <span style="font-weight:600;"><a href="{{$appUrl .'/my-account'}}" style="color:#000;text-decoration:none;">{{$appConfig['productName']}}</a></span><br>
-                                <span style="color:#333;display:block;margin-top:8px">Qty: {{$storeOrder->number_of_units}}</span>
+                            <td colspan="3" style="padding:0 0 10px 0px;vertical-align:top;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
+                                <span style="font-weight:300;"><a href="{{$appUrl .'/my-account'}}" style="color:#000;text-decoration:none;">{{config('constants.tests.'.$item)}}</a></span><br>
                             </td>
                             <td align="right" valign="top" style="padding:0 5px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
-                                @if($storeOrder->promoCode)
-                                <span style="font-weight:600;white-space:nowrap;display:block;">${{$storeOrder->promoCode->discounted_price_per_unit}}</span>
-                                <del style="font-weight:400;white-space:nowrap;color:#aaa">${{$appConfig['standardUnitPrice']}}</del>
-                                @else
-                                <span style="font-weight:600;white-space:nowrap;display:block;">${{$appConfig['standardUnitPrice']}}</span>
-                                @endif
+                              <span style="font-weight:500;white-space:nowrap;display:block;">${{config('app.'.$item)}}</span>
                             </td>
                         </tr>
+                        @endforeach
                     </tbody>
                 </table>
             </td>
@@ -72,34 +64,11 @@ $appConfig = config('constants.' . $appInternalName);
                                 <div style="line-height:1px;height:1px;background-color:rgb(238,238,238)"></div>
                             </td>
                         </tr>
-                        @if($storeOrder->promoCode)
-                        <tr height="28">
-                            <td align="right" style="color:#00685f;font-size:14px;font-weight:600;padding:0 30px 0 0;border-width:1px;border-color:rgb(238,238,238)">Promo Code</td>
-                            <td width="1" style="background-color:rgb(238,238,238);width:1px"></td>
-                            <td width="90" align="right" style="width:120px;color:#00685f;font-size:15px;font-weight:600;white-space:nowrap">
-                                {{$storeOrder->promoCode->code}}
-                            </td>
-                        </tr>
-                        @endif
-                        <tr height="28">
-                            <td align="right" style="color:#000;font-size:14px;font-weight:500;padding:0 30px 0 0;border-width:1px;border-color:rgb(238,238,238)">Items</td>
-                            <td width="1" style="background-color:rgb(238,238,238);width:1px"></td>
-                            <td width="90" align="right" style="width:120px;font-size:16px;font-weight:500;white-space:nowrap">
-                                ${{$storeOrder->content_total}}
-                            </td>
-                        </tr>
-                        <tr height="28">
-                            <td align="right" style="color:#000;font-size:14px;font-weight:500;padding:0 30px 0 0;border-width:1px;border-color:rgb(238,238,238)">Shipping Total</td>
-                            <td width="1" style="background-color:rgb(238,238,238);width:1px"></td>
-                            <td width="90" align="right" style="width:120px;font-size:16px;font-weight:500;white-space:nowrap">
-                                ${{$storeOrder->shipping_total}}
-                            </td>
-                        </tr>
                         <tr height="28">
                             <td align="right" style="color:#000;font-size:14px;font-weight:600;padding:0 30px 0 0;border-width:1px;border-color:rgb(238,238,238)">TOTAL</td>
                             <td width="1" style="background-color:rgb(238,238,238);width:1px"></td>
                             <td width="90" align="right" style="width:120px;font-size:16px;font-weight:600;white-space:nowrap">
-                                ${{$storeOrder->final_total}}
+                                ${{$storeOrder->total()}}
                             </td>
                         </tr>
                         <tr height="10">
@@ -119,24 +88,15 @@ $appConfig = config('constants.' . $appInternalName);
                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0;color:rgb(51,51,51);background-color:rgb(250,250,250);border-radius:3px;font-size:12px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
                     <tbody>
                         <tr height="66">
-                            <td width="620" rowspan="3" style="vertical-align:initial;padding:20px;border-style:solid;border-color:white;border-left-width:0px;border-right-width:0px;border-top-width:0px;border-bottom-width:0px">
-                                <span style="color:#000;font-size:15px;padding:5px 0;text-transform:uppercase;font-weight:600;">Shipping Information</span><br> <br>
-                                <span style="font-weight:bold;display:block;margin-bottom:10px;">Ship To:</span>
-                                {{$storeOrder->client->mailing_address_line1}} {{$storeOrder->client->mailing_address_line2}} <br>
-                                {{$storeOrder->client->mailing_address_city}},
-                                {{$storeOrder->client->mailing_address_state}},
-                                {{$storeOrder->client->mailing_address_zip}}<br>
-                                <br>
-                                <span style="font-weight:bold;display:block;margin-bottom:10px;">Shipping Method:</span>
-                                {{$storeOrder->client->upcoming_fill_shipping_method}}
+                            <td width="620" rowspan="3" style="vertical-align:initial;padding:20px;font-size:14px;border-style:solid;border-color:white;border-left-width:0px;border-right-width:0px;border-top-width:0px;border-bottom-width:0px">
+                                <span style="color:#000;font-size:14px;padding:5px 0;text-transform:uppercase;font-weight:600;">Lab Information</span><br> <br>
+                                <span style="display:block;padding-bottom:8px">{{$storeOrder->lab()->name}}</span>
+                                <span style="font-weight:300;" >{!! $storeOrder->lab()->address() !!}</span>
                             </td>
-                            <td width="595" rowspan="3" style="vertical-align:initial;padding:20px;border-style:solid;border-color:white;border-left-width:0px;border-right-width:0px;border-top-width:0px;border-bottom-width:0px">
-                                <span style="color:#000;font-size:15px;padding:5px 0;text-transform:uppercase;font-weight:600;">Billing Information</span><br> <br>
-                                <span style="font-weight:bold;display:block;margin-bottom:10px;">Bill To:</span>
+                            <td width="595" rowspan="3" style="vertical-align:initial;padding:20px;font-size:14px;border-style:solid;border-color:white;border-left-width:0px;border-right-width:0px;border-top-width:0px;border-bottom-width:0px">
+                                <span style="color:#000;font-size:14px;padding:5px 0;text-transform:uppercase;font-weight:600;">Billing Information</span><br> <br>
+                                <span style="font-weight:bold;">Bill To:</span> <br>
                                 {{$storeOrder->client->displayName()}}<br>
-                                <br>
-                                <span style="font-weight:bold;display:block;margin-bottom:10px;">Payment Method:</span>
-                                <span style="margin-right:5px;text-transform:uppercase;">{!! strip_tags($storeOrder->client->defaultPaymentMethod->displayNameShort()) !!}</span>
                             </td>
                         </tr>
                     </tbody>