From f5f2395d7eb34928d213239cae807c709f924997 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 6 Jan 2022 20:03:30 +1100
Subject: [PATCH] Fixes for clean design

---
 .../Controllers/ClientPortal/ApplePayDomainController.php | 8 ++++----
 resources/views/pdf-designs/clean.html                    | 7 ++++++-
 tests/Feature/ApplePayDomainMerchantUrlTest.php           | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/ApplePayDomainController.php b/app/Http/Controllers/ClientPortal/ApplePayDomainController.php
index a62249313a69..ab89cc869035 100644
--- a/app/Http/Controllers/ClientPortal/ApplePayDomainController.php
+++ b/app/Http/Controllers/ClientPortal/ApplePayDomainController.php
@@ -38,8 +38,8 @@ class ApplePayDomainController extends Controller
             foreach($cgs as $cg)
             {
 
-                if($cg->getConfigField('appleMerchantId')){
-                   return response($cg->getConfigField('appleMerchantId'),200);
+                if($cg->getConfigField('appleDomainVerification')){
+                   return response($cg->getConfigField('appleDomainVerification'),200);
                                     
                 }
 
@@ -90,8 +90,8 @@ class ApplePayDomainController extends Controller
         foreach($cgs as $cg)
         {
 
-            if($cg->getConfigField('appleMerchantId')){
-               return response($cg->getConfigField('appleMerchantId'),200);
+            if($cg->getConfigField('appleDomainVerification')){
+               return response($cg->getConfigField('appleDomainVerification'),200);
             }
 
         }
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index e23a1a111b12..aac1b3969f96 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -117,17 +117,22 @@
     [data-ref="table"] > tbody > tr > td {
         border-top: 1px solid #d8d8d8;
         border-bottom: 1px solid #d8d8d8;
-        padding: 1.5rem;
+        padding: 1.5rem 1rem;
     }
 
     [data-ref="table"] > tbody > tr > td:first-child {
         color: var(--primary-color);
     }
 
+    [data-ref="table"] > thead > tr > th:last-child,
     [data-ref="table"] > tbody > tr > td:last-child {
         text-align: right;
     }
 
+    [data-ref="table"] > thead > tr > th:last-child {
+        padding-right: 1rem;
+    }
+
     [data-ref="table"] > tbody > tr:nth-child(odd) {
         background-color: #f5f5f5;
     }
diff --git a/tests/Feature/ApplePayDomainMerchantUrlTest.php b/tests/Feature/ApplePayDomainMerchantUrlTest.php
index b670970db5bd..a2387f5f3536 100644
--- a/tests/Feature/ApplePayDomainMerchantUrlTest.php
+++ b/tests/Feature/ApplePayDomainMerchantUrlTest.php
@@ -46,7 +46,7 @@ class ApplePayDomainMerchantUrlTest extends TestCase
         $config = new \stdClass;
         $config->publishableKey = "pk_test";
         $config->apiKey = "sk_test";
-        $config->appleMerchantId = "merchant_id";
+        $config->appleDomainVerification = "merchant_id";
 
         $cg = new CompanyGateway;
         $cg->company_id = $this->company->id;