From babe80e01d7f100d3ac3970f063f309ffbdf1fc7 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Mon, 10 Jan 2022 19:50:03 +0800
Subject: [PATCH] updated

---
 resources/views/emails/orders.blade.php | 1162 ++++++++++++-----------
 resources/views/merchbay/cart.blade.php |    2 +-
 2 files changed, 625 insertions(+), 539 deletions(-)
diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php
index 75b092e..06fdad6 100755
--- a/resources/views/emails/orders.blade.php
+++ b/resources/views/emails/orders.blade.php
@@ -1,619 +1,705 @@
 <!doctype html>
 <html>
-  <head>
+
+<head>
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>Order Details</title>
     <style>
-      /* -------------------------------------
+        /* -------------------------------------
           GLOBAL RESETS
       ------------------------------------- */
-      
-      /*All the styling goes here*/
-      
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; 
-      }
 
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 12px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; 
-      }
+        /*All the styling goes here*/
+
+        img {
+            border: none;
+            -ms-interpolation-mode: bicubic;
+            max-width: 100%;
+        }
+
+        body {
+            background-color: #f6f6f6;
+            font-family: sans-serif;
+            -webkit-font-smoothing: antialiased;
+            font-size: 12px;
+            line-height: 1.4;
+            margin: 0;
+            padding: 0;
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+}
+
+        table {
+            border-collapse: separate;
+            mso-table-lspace: 0pt;
+            mso-table-rspace: 0pt;
+            width: 100%;
+        }
 
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
         table td {
-          font-family: sans-serif;
-          font-size: 12px;
-          vertical-align: top; 
-      }
+            font-family: sans-serif;
+            font-size: 12px;
+            vertical-align: top;
+        }
 
-      /* -------------------------------------
+        /* -------------------------------------
           BODY & CONTAINER
       ------------------------------------- */
 
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; 
-      }
+        .body {
+            background-color: #f6f6f6;
+            width: 100%;
+        }
 
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 680px;
-        padding: 10px;
-        width: 680px; 
-      }
+        /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+        .container {
+            display: block;
+            margin: 0 auto !important;
+            /* makes it centered */
+            max-width: 680px;
+            padding: 10px;
+            width: 680px;
+        }
 
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        margin: 0 auto;
-        max-width: 680px;
-        padding: 10px; 
-      }
+        /* This should also be a block element, so that it will fill 100% of the .container */
+        .content {
+            box-sizing: border-box;
+            display: block;
+            margin: 0 auto;
+            max-width: 680px;
+            padding: 10px;
+        }
 
-      /* -------------------------------------
+        /* -------------------------------------
           HEADER, FOOTER, MAIN
       ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; 
-      }
+        .main {
+            background: #ffffff;
+            border-radius: 3px;
+            width: 100%;
+        }
 
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; 
-      }
+        .wrapper {
+            box-sizing: border-box;
+            padding: 20px;
+        }
 
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
+        .content-block {
+            padding-bottom: 10px;
+            padding-top: 10px;
+        }
+
+        .footer {
+            clear: both;
+            margin-top: 10px;
+            text-align: center;
+            width: 100%;
+        }
 
-      .footer {
-        clear: both;
-        margin-top: 10px;
-        text-align: center;
-        width: 100%; 
-      }
         .footer td,
         .footer p,
         .footer span,
         .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; 
-      }
+            color: #999999;
+            font-size: 12px;
+            text-align: center;
+        }
 
-      /* -------------------------------------
+        /* -------------------------------------
           TYPOGRAPHY
       ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        margin-bottom: 20px; 
-      }
+        h1,
+        h2,
+        h3,
+        h4 {
+            color: #000000;
+            font-family: sans-serif;
+            font-weight: 400;
+            line-height: 1.4;
+            margin: 0;
+            margin-bottom: 20px;
+        }
 
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; 
-      }
+        h1 {
+            font-size: 35px;
+            font-weight: 300;
+            text-align: center;
+            text-transform: capitalize;
+        }
+
+        p,
+        ul,
+        ol {
+            font-family: sans-serif;
+            font-size: 14px;
+            font-weight: normal;
+            margin: 0;
+            margin-bottom: 15px;
+        }
 
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        margin-bottom: 15px; 
-      }
         p li,
         ul li,
         ol li {
-          list-style-position: inside;
-          margin-left: 5px; 
-      }
+            list-style-position: inside;
+            margin-left: 5px;
+        }
 
-      a {
-        color: #3498db;
-        text-decoration: underline; 
-      }
+        a {
+            color: #3498db;
+            text-decoration: underline;
+        }
 
-      /* -------------------------------------
+        /* -------------------------------------
           BUTTONS
       ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
+        .btn {
+            box-sizing: border-box;
+            width: 100%;
+        }
+
+        .btn>tbody>tr>td {
+            padding-bottom: 15px;
+        }
+
         .btn table {
-          width: auto; 
-      }
+            width: auto;
+        }
+
         .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; 
-      }
+            background-color: #ffffff;
+            border-radius: 5px;
+            text-align: center;
+        }
+
         .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; 
-      }
+            background-color: #ffffff;
+            border: solid 1px #3498db;
+            border-radius: 5px;
+            box-sizing: border-box;
+            color: #3498db;
+            cursor: pointer;
+            display: inline-block;
+            font-size: 14px;
+            font-weight: bold;
+            margin: 0;
+            padding: 12px 25px;
+            text-decoration: none;
+            text-transform: capitalize;
+        }
 
-      .btn-primary table td {
-        background-color: #3498db; 
-      }
+        .btn-primary table td {
+            background-color: #3498db;
+        }
 
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; 
-      }
+        .btn-primary a {
+            background-color: #3498db;
+            border-color: #3498db;
+            color: #ffffff;
+        }
 
-      /* -------------------------------------
+        /* -------------------------------------
           OTHER STYLES THAT MIGHT BE USEFUL
       ------------------------------------- */
-      .last {
-        margin-bottom: 0; 
-      }
+        .last {
+            margin-bottom: 0;
+        }
 
-      .first {
-        margin-top: 0; 
-      }
+        .first {
+            margin-top: 0;
+        }
 
-      .align-center {
-        text-align: center; 
-      }
+        .align-center {
+            text-align: center;
+        }
 
-      .align-right {
-        text-align: right; 
-      }
+        .align-right {
+            text-align: right;
+        }
 
-      .align-left {
-        text-align: left; 
-      }
+        .align-left {
+            text-align: left;
+        }
 
-      .clear {
-        clear: both; 
-      }
+        .clear {
+            clear: both;
+        }
 
-      .mt0 {
-        margin-top: 0; 
-      }
+        .mt0 {
+            margin-top: 0;
+        }
 
-      .mb0 {
-        margin-bottom: 0; 
-      }
+        .mb0 {
+            margin-bottom: 0;
+        }
 
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; 
-      }
+        .preheader {
+            color: transparent;
+            display: none;
+            height: 0;
+            max-height: 0;
+            max-width: 0;
+            opacity: 0;
+            overflow: hidden;
+            mso-hide: all;
+            visibility: hidden;
+            width: 0;
+        }
 
-      .powered-by a {
-        text-decoration: none; 
-      }
+        .powered-by a {
+            text-decoration: none;
+        }
 
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        margin: 20px 0; 
-      }
+        hr {
+            border: 0;
+            border-bottom: 1px solid #f6f6f6;
+            margin: 20px 0;
+        }
 
-      /* -------------------------------------
+        /* -------------------------------------
           RESPONSIVE AND MOBILE FRIENDLY STYLES
       ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; 
-        }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 12px !important; 
-        }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; 
-        }
-        table[class=body] .content {
-          padding: 0 !important; 
-        }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; 
-        }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; 
-        }
-        table[class=body] .btn table {
-          width: 100% !important; 
-        }
-        table[class=body] .btn a {
-          width: 100% !important; 
-        }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; 
-        }
-      }
+        @media only screen and (max-width: 620px) {
+            table[class=body] h1 {
+                font-size: 28px !important;
+                margin-bottom: 10px !important;
+            }
 
-      /* -------------------------------------
+            table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+                font-size: 12px !important;
+            }
+
+            table[class=body] .wrapper,
+            table[class=body] .article {
+                padding: 10px !important;
+            }
+
+            table[class=body] .content {
+                padding: 0 !important;
+            }
+
+            table[class=body] .container {
+                padding: 0 !important;
+                width: 100% !important;
+            }
+
+            table[class=body] .main {
+                border-left-width: 0 !important;
+                border-radius: 0 !important;
+                border-right-width: 0 !important;
+            }
+
+            table[class=body] .btn table {
+                width: 100% !important;
+            }
+
+            table[class=body] .btn a {
+                width: 100% !important;
+            }
+
+            table[class=body] .img-responsive {
+                height: auto !important;
+                max-width: 100% !important;
+                width: auto !important;
+            }
+        }
+
+        /* -------------------------------------
           PRESERVE THESE STYLES IN THE HEAD
       ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; 
+        @media all {
+            .ExternalClass {
+                width: 100%;
+            }
+
+            .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+                line-height: 100%;
+            }
+
+            .apple-link a {
+                color: inherit !important;
+                font-family: inherit !important;
+                font-size: inherit !important;
+                font-weight: inherit !important;
+                line-height: inherit !important;
+                text-decoration: none !important;
+            }
+
+            .btn-primary table td:hover {
+                background-color: #34495e !important;
+            }
+
+            .btn-primary a:hover {
+                background-color: #34495e !important;
+                border-color: #34495e !important;
+            }
         }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; 
+
+
+        .table-bordered td {
+            border: 1px solid black;
+            padding: 2px;
         }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; 
+
+        .previewImage {
+            height: 200px;
+            overflow: hidden;
+            object-fit: contain;
         }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; 
-        }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; 
-        } 
-      }
-	  
-	 
-	.table-bordered td {
-		border: 1px solid black;
-		padding: 2px;
-	}
-	
-	.previewImage {
-		height: 200px;
-		overflow: hidden;
-		object-fit: contain;
-	}
+
     </style>
-  </head>
-  <body class="">
+</head>
+
+<body class="">
     <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body">
-      <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-          <div class="content">
+        <tr>
+            <td>&nbsp;</td>
+            <td class="container">
+                <div class="content">
 
-            <!-- START CENTERED WHITE CONTAINER -->
-            <table role="presentation" class="main">
+                    <!-- START CENTERED WHITE CONTAINER -->
+                    <table role="presentation" class="main">
 
-              <!-- START MAIN CONTENT AREA -->
-              <tr>
-                <td class="wrapper">
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                    <tr>
-                      <td>
-                        <h3 class="align-center"><b>Order Details</b></h3>
-                          <table class="table table-condensed table-bordered" width="100%" style="width: 100%; border-collapse: collapse; ">
-                            <tr >
-                              <td class="text-center" colspan="2"><b>Payer Information</b></td>
-                            </tr>
-                            <tr>
-                              <td class="col-md-3">Payer Name</td>
-                              <td>{{ $array_payment_details[0]->Payer_Firstname . ' ' . $array_payment_details[0]->Payer_Lastname }}</td>
-                            </tr>
-                            <tr>
-                              <td class="col-md-3">Payer Email Address</td>
-                              <td>{{ $array_payment_details[0]->Payer_Email }}</td>
-                            </tr>
-                            <tr>
-                              <td class="col-md-3">Payment Method</td>
-                              <td>{{ $array_payment_details[0]->PaymentMethod }}</td>
-                            </tr>
-                            <tr >
-                              <td class="text-center" colspan="2"><b>Transaction Information</b></td>
-                            </tr>
-                            <tr>
-                              <td class="col-md-3">Subtotal</td>
-                              <td>{{ $array_payment_details[0]->SubTotal . ' ' . $array_payment_details[0]->Currency }}</td>
-                            </tr>
-                            @foreach($item_goup_array as $item)
-                                @if($item->VoucherId != null)
+                        <!-- START MAIN CONTENT AREA -->
+                        <tr>
+                            <td class="wrapper">
+                                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
                                     <tr>
-                                        <th class="col-md-3">Discount</th>
-                                        <td>Voucher Code: <b>{{ $item->ProductName }} </b> / {{ $item->Price . ' ' . $array_payment_details[0]->Currency }}</td>
-                                    </tr>
-                                @endif
-                            @endforeach
-                            <tr>
-                              <td class="col-md-3">Tax</td>
-                              <td>{{ $array_payment_details[0]->Tax . ' ' . $array_payment_details[0]->Currency }}</td>
-                            </tr>
-                            <tr>
-                              <td class="col-md-3">Total</td>
-                              <td>{{ $array_payment_details[0]->Total . ' ' . $array_payment_details[0]->Currency  }}</td>
-                            </tr>
-                            <tr>
-                              <td class="col-md-3">Invoice #</td>
-                              <td>{{ $array_payment_details[0]->InvoiceNumber  }}</td>
-                            </tr>
-                          </table>
-						<br>
-						<p>Item Order(s):</p>
-                        @foreach($item_goup_array as $item)
-                          @if($item->VoucherId == null)
-                            <div style="border: 1px solid #e2e2e2; padding: 10px; margin-bottom: 10px;">
-                                <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
-                                    <tbody>
-                                        <tr>
-                                            <td align="left" style="width: 180px;">
-                                                @foreach($img_thumb as $img)
-                                                    @if($img->ProductId  == $item->ProductId)
-                                                        <img style="height: 200px; overflow: hidden; object-fit: contain;" src="{{ config('site_config.images_url')  }}/{{  $img->Image }}">
+                                        <td>
+                                            <h3 class="align-center"><b>Order Details</b></h3>
+                                            <table class="table table-condensed table-bordered" width="100%"
+                                                style="width: 100%; border-collapse: collapse; ">
+                                                <tr>
+                                                    <td class="text-center" colspan="2"><b>Payer Information</b></td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="col-md-3">Payer Name</td>
+                                                    <td>{{ $array_payment_details[0]->Payer_Firstname . ' ' . $array_payment_details[0]->Payer_Lastname }}
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="col-md-3">Payer Email Address</td>
+                                                    <td>{{ $array_payment_details[0]->Payer_Email }}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="col-md-3">Payment Method</td>
+                                                    <td>{{ $array_payment_details[0]->PaymentMethod }}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="text-center" colspan="2"><b>Transaction
+                                                            Information</b></td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="col-md-3">Subtotal</td>
+                                                    <td>{{ $array_payment_details[0]->SubTotal . ' ' . $array_payment_details[0]->Currency }}
+                                                    </td>
+                                                </tr>
+                                                @foreach ($item_goup_array as $item)
+                                                    @if ($item->VoucherId != null)
+                                                        <tr>
+                                                            <th class="col-md-3">Discount</th>
+                                                            <td>Voucher Code: <b>{{ $item->ProductName }} </b> /
+                                                                {{ $item->Price . ' ' . $array_payment_details[0]->Currency }}
+                                                            </td>
+                                                        </tr>
                                                     @endif
                                                 @endforeach
-                                            </td>
-                                            <td>
-                                                <div style="font-size: 14px;"><a href="{{ url('teamstore') . '/' . $item->StoreURL . '/' . 'product/' .  $item->ProductURL }}">{{ $item->ProductName }}</a></div>
-                                                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>
-                                                            <td><b>Name</b></td>
-                                                            <td><b>Number</b></td>
-                                                            <td><b>Jersey Size</b></td>
-                                                            <td><b>Shorts Size</b></td>
-                                                            <td><b>Price</b></td>
-                                                            <td><b>Quantity</b></td>
-                                                        </tr>
-                                                    @elseif($item->FormUsed=="tshirt-form")
-                                                        <tr>
-                                                            <td><b>Size</b></td>
-                                                            <td><b>Price</b></td>
-                                                            <td><b>Quantity</b></td>
-                                                        </tr>
-                                                    @elseif($item->FormUsed=="quantity-form")
-                                                        <tr>
-                                                            <td><b>Price</b></td>
-                                                            <td>Quantity</b></td>
-                                                        </tr>
-
-                                                    @elseif($item->FormUsed=="name-number-form")
-                                                        <tr>
-                                                            <td><b>Name</b></td>
-                                                            <td><b>Number</b></td>
-                                                            <td><b>Price</b></td>
-                                                            <td><b>Quantity</b></td>
-                                                        </tr>
-													
-                                                    @elseif($item->FormUsed=="name-number-size-form")
-                                                      <tr>
-                                                        <th>Name</th>
-                                                        <th>Number</th>
-                                                        <th>Size</th>
-                                                        <th>Price</th>
-                                                        <th>Quantity</th>
-                                                      </tr>
-
-                                                    @elseif($item->FormUsed=="number-form")
-                                                        <tr>
-                                                          <th>Number</th>
-                                                          <th>Price</th>
-                                                          <th>Quantity</th>
-                                                        </tr>
-													
-                                                    @elseif($item->FormUsed=="name-name2-size-form")
-                                                      <tr>
-                                                        <th>Gamer Tag</th>
-                                                        <th>Name</th>
-                                                        <th>Size</th>
-                                                        <th>Price</th>
-                                                        <th>Quantity</th>
-                                                      </tr>
-                                                    @elseif($item->FormUsed=="name-size-form")
-                                                      <tr>
-                                                          <th>Name</th>
-                                                          <th>Size</th>
-                                                          <th>Price</th>
-                                                          <th>Quantity</th>
-                                                      </tr>
-                                                    @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
-                                                      <tr>
-                                                          <th>Jersey Size</th>
-                                                          <th>Shorts Size</th>
-                                                          <th>Price</th>
-                                                          <th>Quantity</th>
-                                                      </tr>
-                                                    @elseif($item->FormUsed=="number-jersey-shorts-form")
-                                                      <tr>
-                                                          <td><b>Number</b></td>
-                                                          <td><b>Jersey Size</b></td>
-                                                          <td><b>Shorts Size</b></td>
-                                                          <td><b>Price</b></td>
-                                                          <td><b>Quantity</b></td>
-                                                      </tr>
-                                                    @else
-
-
-                                                    @endif
-                                                    <!-- table header  -->
-                                                    <!-- table body -->
-                                                    @foreach($order_item_array as $sub_item)
-                                                        @if($sub_item->ProductId == $item->ProductId)
-
-                                                            @if($item->FormUsed=="jersey-and-shorts-form")
+                                                <tr>
+                                                    <td class="col-md-3">Tax</td>
+                                                    <td>{{ $array_payment_details[0]->Tax . ' ' . $array_payment_details[0]->Currency }}
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="col-md-3">Total</td>
+                                                    <td>{{ $array_payment_details[0]->Total . ' ' . $array_payment_details[0]->Currency }}
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="col-md-3">Invoice #</td>
+                                                    <td>{{ $array_payment_details[0]->InvoiceNumber }}</td>
+                                                </tr>
+                                            </table>
+                                            <br>
+                                            <p>Item Order(s):</p>
+                                            @foreach ($item_goup_array as $item)
+                                                @if ($item->VoucherId == null)
+                                                    <div
+                                                        style="border: 1px solid #e2e2e2; padding: 10px; margin-bottom: 10px;">
+                                                        <table role="presentation" border="0" cellpadding="0"
+                                                            cellspacing="0" width="100%">
+                                                            <tbody>
                                                                 <tr>
-                                                                    <td> @if($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif </td>
-                                                                    <td>{{ $sub_item->Number }}</td>
-                                                                    <td>{{ $sub_item->JerseySize }}</td>
-                                                                    <td>{{ $sub_item->ShortsSize }}</td>
-                                                                    <td>{{ $sub_item->Price }}</td>
-                                                                    <td>{{ $sub_item->Quantity }}</td>
-                                                                
-                                                                </tr>
-                                                            @elseif($item->FormUsed=="tshirt-form")
-                                                                <tr>
-                                                                    <td>{{ $sub_item->Size }}</td>
-                                                                    <td>{{ $sub_item->Price }}</td>
-                                                                    <td>{{ $sub_item->Quantity }}</td>
-                                                                    
-                                                                </tr>
-                                                            @elseif($item->FormUsed=="quantity-form")
-                                                                <tr>
-                                                                    <td>{{ $sub_item->Price }}</td>
-                                                                    <td>{{ $sub_item->Quantity }}</td>
-                                                                </tr>
-                                                            @elseif($item->FormUsed=="name-number-form")
-                                                                <tr>
-                                                                    <td>{{ $sub_item->Name }}</td>
-                                                                    <td>{{ $sub_item->Number }}</td>
-                                                                    <td>{{ $sub_item->Price }}</td>
-                                                                    <td>{{ $sub_item->Quantity }}</td>
-                                                                    
-                                                                </tr>
-                                                            @elseif($item->FormUsed=="name-number-size-form")
-                                                              <tr>
-                                                                <td>{{ $sub_item->Name }}</td>
-                                                                <td>{{ $sub_item->Number }}</td>
-                                                                <td>{{ $sub_item->Size }}</td>
-                                                                <td>{{ $sub_item->Price }}</td>
-                                                                <td>{{ $sub_item->Quantity }}</td>
-                                                              </tr>
-                                                            
-                                                            @elseif($item->FormUsed=="number-form")
-                                                              <tr>
-                                                                <td>{{ $sub_item->Number }}</td>
-                                                                <td>{{ $sub_item->Price }}</td>
-                                                                <td>{{ $sub_item->Quantity }}</td>
-                                                              </tr>
-                                                            @elseif($item->FormUsed=="name-name2-size-form")
-                                                              <tr>
-                                                                <td>{{ $sub_item->Name }}</td>
-                                                                <td>{{ $sub_item->Name2 }}</td>
-                                                                <td>{{ $sub_item->Size }}</td>
-                                                                <td>{{ $sub_item->Price }}</td>
-                                                                <td>{{ $sub_item->Quantity }}</td>
-                                                              </tr>
-                                                            @elseif($item->FormUsed=="name-size-form")
-                                                              <tr>
-                                                                <td>{{ $sub_item->Name }}</td>
-                                                                <td>{{ $sub_item->Size }}</td>
-                                                                <td>{{ $sub_item->Price }}</td>
-                                                                <td>{{ $sub_item->Quantity }}</td>
-                                                              </tr>
-                                                            @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
-                                                             <tr>
-                                                                <td>{{ $sub_item->JerseySize }}</td>
-                                                                <td>{{ $sub_item->ShortsSize }}</td>
-                                                                <td>{{ $sub_item->Price }}</td>
-                                                                <td>{{ $sub_item->Quantity }}</td>
-                                                              </tr>
-                                                            @elseif($item->FormUsed=="number-jersey-shorts-form")
-                                                              <tr>
-                                                                  <td>{{ $sub_item->Number }}</td>
-                                                                  <td>{{ $sub_item->JerseySize }}</td>
-                                                                  <td>{{ $sub_item->ShortsSize }}</td>
-                                                                  <td>{{ $sub_item->Price }}</td>
-                                                                  <td>{{ $sub_item->Quantity }}</td>
-                                                              </tr>
-                                                            @else
+                                                                    <td align="left" style="width: 180px;">
+                                                                        @foreach ($img_thumb as $img)
+                                                                            @if ($img->ProductId == $item->ProductId)
+                                                                                <img style="height: 200px; overflow: hidden; object-fit: contain;"
+                                                                                    src="{{ config('site_config.images_url') }}/{{ $img->Image }}">
+                                                                            @endif
+                                                                        @endforeach
+                                                                    </td>
+                                                                    <td>
+                                                                        <div style="font-size: 14px;"><a
+                                                                                href="{{ url('store') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a>
+                                                                        </div>
+                                                                        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>
+                                                                                    <td><b>Name</b></td>
+                                                                                    <td><b>Number</b></td>
+                                                                                    <td><b>Jersey Size</b></td>
+                                                                                    <td><b>Shorts Size</b></td>
+                                                                                    <td><b>Price</b></td>
+                                                                                    <td><b>Quantity</b></td>
+                                                                                </tr>
+                                                                            @elseif($item->FormUsed=="tshirt-form")
+                                                                                <tr>
+                                                                                    <td><b>Size</b></td>
+                                                                                    <td><b>Price</b></td>
+                                                                                    <td><b>Quantity</b></td>
+                                                                                </tr>
+                                                                            @elseif($item->FormUsed=="quantity-form")
+                                                                                <tr>
+                                                                                    <td><b>Price</b></td>
+                                                                                    <td>Quantity</b></td>
+                                                                                </tr>
 
-                                                            @endif
-                                                        
-                                                        @endif
-                                                    @endforeach
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </tbody>
+                                                                            @elseif($item->FormUsed=="name-number-form")
+                                                                                <tr>
+                                                                                    <td><b>Name</b></td>
+                                                                                    <td><b>Number</b></td>
+                                                                                    <td><b>Price</b></td>
+                                                                                    <td><b>Quantity</b></td>
+                                                                                </tr>
+
+                                                                            @elseif($item->FormUsed=="name-number-size-form")
+                                                                                <tr>
+                                                                                    <th>Name</th>
+                                                                                    <th>Number</th>
+                                                                                    <th>Size</th>
+                                                                                    <th>Price</th>
+                                                                                    <th>Quantity</th>
+                                                                                </tr>
+
+                                                                            @elseif($item->FormUsed=="number-form")
+                                                                                <tr>
+                                                                                    <th>Number</th>
+                                                                                    <th>Price</th>
+                                                                                    <th>Quantity</th>
+                                                                                </tr>
+
+                                                                            @elseif($item->FormUsed=="name-name2-size-form")
+                                                                                <tr>
+                                                                                    <th>Gamer Tag</th>
+                                                                                    <th>Name</th>
+                                                                                    <th>Size</th>
+                                                                                    <th>Price</th>
+                                                                                    <th>Quantity</th>
+                                                                                </tr>
+                                                                            @elseif($item->FormUsed=="name-size-form")
+                                                                                <tr>
+                                                                                    <th>Name</th>
+                                                                                    <th>Size</th>
+                                                                                    <th>Price</th>
+                                                                                    <th>Quantity</th>
+                                                                                </tr>
+                                                                            @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                                                <tr>
+                                                                                    <th>Jersey Size</th>
+                                                                                    <th>Shorts Size</th>
+                                                                                    <th>Price</th>
+                                                                                    <th>Quantity</th>
+                                                                                </tr>
+                                                                            @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                                                <tr>
+                                                                                    <td><b>Number</b></td>
+                                                                                    <td><b>Jersey Size</b></td>
+                                                                                    <td><b>Shorts Size</b></td>
+                                                                                    <td><b>Price</b></td>
+                                                                                    <td><b>Quantity</b></td>
+                                                                                </tr>
+                                                                            @else
+
+
+                                                                            @endif
+                                                                            <!-- table header  -->
+                                                                            <!-- table body -->
+                                                                            @foreach ($order_item_array as $sub_item)
+                                                                                @if ($sub_item->ProductId == $item->ProductId)
+
+                                                                                    @if ($item->FormUsed == 'jersey-and-shorts-form')
+                                                                                        <tr>
+                                                                                            <td> @if ($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Number }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->JerseySize }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->ShortsSize }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="tshirt-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Size }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="quantity-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="name-number-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Name }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Number }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="name-number-size-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Name }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Number }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Size }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+                                                                                        </tr>
+
+                                                                                    @elseif($item->FormUsed=="number-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Number }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="name-name2-size-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Name }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Name2 }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Size }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="name-size-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Name }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Size }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->JerseySize }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->ShortsSize }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+                                                                                        </tr>
+                                                                                    @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                                                        <tr>
+                                                                                            <td>{{ $sub_item->Number }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->JerseySize }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->ShortsSize }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Price }}
+                                                                                            </td>
+                                                                                            <td>{{ $sub_item->Quantity }}
+                                                                                            </td>
+                                                                                        </tr>
+                                                                                    @else
+
+                                                                                    @endif
+
+                                                                                @endif
+                                                                            @endforeach
+                                                                        </table>
+                                                                    </td>
+                                                                </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </div>
+                                                @endif
+                                            @endforeach
+                                        </td>
+                                    </tr>
                                 </table>
-                            </div>
-                          @endif
-                        @endforeach
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
+                            </td>
+                        </tr>
 
-            <!-- END MAIN CONTENT AREA -->
-            </table>
-            <!-- END CENTERED WHITE CONTAINER -->
+                        <!-- END MAIN CONTENT AREA -->
+                    </table>
+                    <!-- END CENTERED WHITE CONTAINER -->
 
-            <!-- START FOOTER -->
-            <div class="footer">
-              <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td class="content-block">
-                    <span class="apple-link">Copyright &copy 2019 <a href="https://crewsportswear.com">crewsportswear.com</a>. All rights reserved.</span>
-                  </td>
-                </tr>
-              </table>
-            </div>
-            <!-- END FOOTER -->
+                    <!-- START FOOTER -->
+                    <div class="footer">
+                        <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                            <tr>
+                                <td class="content-block">
+                                    <span class="apple-link">Copyright &copy 2019 <a
+                                            href="https://crewsportswear.com">crewsportswear.com</a>. All rights
+                                        reserved.</span>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <!-- END FOOTER -->
 
-          </div>
-        </td>
-        <td>&nbsp;</td>
-      </tr>
+                </div>
+            </td>
+            <td>&nbsp;</td>
+        </tr>
     </table>
-  </body>
+</body>
+
 </html>
diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php
index 88b9a80..81f3be5 100755
--- a/resources/views/merchbay/cart.blade.php
+++ b/resources/views/merchbay/cart.blade.php
@@ -360,7 +360,7 @@
                                     <small>{{ $store_array[0]->StoreCurrency }}</small>
                                 </h3>
 
-                                @if ($getSubtotal >= 100)
+                                @if ($getSubtotal >= 1)
                                     <div class="border rounded-2 p-2 mt-2">
                                         If you order $150 worth of product you get free shipping (pre tax)
                                     </div>
