Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for clean design

Browse Source
This commit is contained in:
David Bomba 2022-01-06 20:03:30 +11:00
parent 057cf9cd42
commit f5f2395d7e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/ClientPortal/ApplePayDomainController.php
View File

@ -38,8 +38,8 @@ class ApplePayDomainController extends Controller
foreach($cgs as $cg) foreach($cgs as $cg)
{ {
if($cg->getConfigField('appleMerchantId')){ if($cg->getConfigField('appleDomainVerification')){
return response($cg->getConfigField('appleMerchantId'),200); return response($cg->getConfigField('appleDomainVerification'),200);
} }
@ -90,8 +90,8 @@ class ApplePayDomainController extends Controller
foreach($cgs as $cg) foreach($cgs as $cg)
{ {
if($cg->getConfigField('appleMerchantId')){ if($cg->getConfigField('appleDomainVerification')){
return response($cg->getConfigField('appleMerchantId'),200); return response($cg->getConfigField('appleDomainVerification'),200);
} }
} }

7
resources/views/pdf-designs/clean.html
View File

@ -117,17 +117,22 @@
[data-ref="table"] > tbody > tr > td { [data-ref="table"] > tbody > tr > td {
border-top: 1px solid #d8d8d8; border-top: 1px solid #d8d8d8;
border-bottom: 1px solid #d8d8d8; border-bottom: 1px solid #d8d8d8;
padding: 1.5rem; padding: 1.5rem 1rem;
} }
[data-ref="table"] > tbody > tr > td:first-child { [data-ref="table"] > tbody > tr > td:first-child {
color: var(--primary-color); color: var(--primary-color);
} }
[data-ref="table"] > thead > tr > th:last-child,
[data-ref="table"] > tbody > tr > td:last-child { [data-ref="table"] > tbody > tr > td:last-child {
text-align: right; text-align: right;
} }
[data-ref="table"] > thead > tr > th:last-child {
padding-right: 1rem;
}
[data-ref="table"] > tbody > tr:nth-child(odd) { [data-ref="table"] > tbody > tr:nth-child(odd) {
background-color: #f5f5f5; background-color: #f5f5f5;
} }

2
tests/Feature/ApplePayDomainMerchantUrlTest.php
View File

@ -46,7 +46,7 @@ class ApplePayDomainMerchantUrlTest extends TestCase
$config = new \stdClass; $config = new \stdClass;
$config->publishableKey = "pk_test"; $config->publishableKey = "pk_test";
$config->apiKey = "sk_test"; $config->apiKey = "sk_test";
$config->appleMerchantId = "merchant_id"; $config->appleDomainVerification = "merchant_id";
$cg = new CompanyGateway; $cg = new CompanyGateway;
$cg->company_id = $this->company->id; $cg->company_id = $this->company->id;