Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge pull request #9429 from turbo124/v5-develop

Browse Source 
Improvements for templates &  Minor bug fixes
This commit is contained in:
David Bomba 2024-04-04 20:06:06 +11:00 committed by GitHub
commit 3b07da0a6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 527 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientController.php
View File

@ -237,7 +237,7 @@ class ClientController extends BaseController
$hash_or_response = $request->boolean('send_email') ? 'email sent' : \Illuminate\Support\Str::uuid();
TemplateAction::dispatch(
$clients->pluck('id')->toArray(),
$clients->pluck('hashed_id')->toArray(),
$request->template_id,
Client::class,
$user->id,

4
app/Services/Client/Statement.php
View File

@ -63,8 +63,10 @@ class Statement
$variables = [];
$variables = $html->generateLabelsAndValues();
$option_template = &$this->options['template'];
if($this->client->getSetting('statement_design_id') != '') {
if($this->client->getSetting('statement_design_id') != '' || $option_template && $option_template != '') {
$variables['values']['$start_date'] = $this->translateDate($this->options['start_date'], $this->client->date_format(), $this->client->locale());
$variables['values']['$end_date'] = $this->translateDate($this->options['end_date'], $this->client->date_format(), $this->client->locale());

65
app/Services/Template/TemplateAction.php
View File

@ -11,33 +11,34 @@
namespace App\Services\Template;
use App\Libraries\MultiDB;
use App\Models\Task;
use App\Models\User;
use App\Models\Quote;
use App\Models\Client;
use App\Models\Company;
use App\Models\Credit;
use App\Models\Design;
use App\Models\Vendor;
use App\Models\Company;
use App\Models\Expense;
use App\Models\Invoice;
use App\Models\Payment;
use App\Models\Product;
use App\Models\Project;
use App\Libraries\MultiDB;
use App\Models\PurchaseOrder;
use App\Models\Quote;
use Illuminate\Bus\Queueable;
use App\Utils\Traits\MakesHash;
use App\Models\RecurringInvoice;
use App\Models\Task;
use App\Models\User;
use App\Models\Vendor;
use App\Services\Email\AdminEmail;
use App\Services\Email\EmailObject;
use App\Utils\Traits\MakesHash;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use App\Services\PdfMaker\PdfMerge;
use Illuminate\Mail\Mailables\Address;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Storage;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\Middleware\WithoutOverlapping;
class TemplateAction implements ShouldQueue
{
@ -110,10 +111,44 @@ class TemplateAction implements ShouldQueue
/** Set a global currency_code */
$first_entity = $result->first();
if($first_entity->client)
$currency_code = $first_entity->client->currency()->code;
elseif($first_entity instanceof Client)
/** Lets be clever and sniff out Statements */
if($first_entity instanceof Client && stripos(json_encode($template->design), '##statement##') !== false) {
$options = [
'show_payments_table' => true,
'show_aging_table' => true,
'status' => 'all',
'show_credits_table' => false,
'template' => $this->template,
];
$pdfs = [];
foreach($result as $client) {
$pdfs[] = $client->service()->statement($options);
}
if(count($pdfs) == 1) {
$pdf = $pdfs[0];
} else {
$pdf = (new PdfMerge($pdfs))->run();
}
if($this->send_email) {
$this->sendEmail($pdf, $template);
} else {
$filename = "templates/{$this->hash}.pdf";
Storage::disk(config('filesystems.default'))->put($filename, $pdf);
return $pdf;
}
}
if($first_entity instanceof Client)
$currency_code = $first_entity->currency()->code;
elseif($first_entity->client)
$currency_code = $first_entity->client->currency()->code;
else
$currency_code = $this->company->currency()->code;

4
app/Services/Template/TemplateMock.php
View File

File diff suppressed because one or more lines are too long

10
app/Services/Template/TemplateService.php
View File

@ -552,6 +552,7 @@ class TemplateService
'payment_balance' => $invoice->client->payment_balance,
'credit_balance' => $invoice->client->credit_balance,
'vat_number' => $invoice->client->vat_number ?? '',
'currency' => $invoice->client->currency()->code ?? 'USD',
],
'payments' => $payments,
'total_tax_map' => $invoice->calc()->getTotalTaxMap(),
@ -655,7 +656,7 @@ class TemplateService
'amount_raw' => $payment->amount,
'applied_raw' => $payment->applied,
'refunded_raw' => $payment->refunded,
'balance_raw' => ($payment->amount - $payment->refunded - $payment->applied),
'balance_raw' => ($payment->amount - $payment->applied),
'date' => $this->translateDate($payment->date, $payment->client->date_format(), $payment->client->locale()),
'method' => $payment->translatedType(),
'currency' => $payment->currency->code ?? $this->company->currency()->code,
@ -675,6 +676,7 @@ class TemplateService
'payment_balance' => $payment->client->payment_balance,
'credit_balance' => $payment->client->credit_balance,
'vat_number' => $payment->client->vat_number ?? '',
'currency' => $payment->client->currency()->code ?? 'USD',
],
'paymentables' => $pivot,
'refund_activity' => $this->getPaymentRefundActivity($payment),
@ -755,6 +757,7 @@ class TemplateService
'payment_balance' => $quote->client->payment_balance,
'credit_balance' => $quote->client->credit_balance,
'vat_number' => $quote->client->vat_number ?? '',
'currency' => $quote->client->currency()->code ?? 'USD',
],
'status_id' => $quote->status_id,
'status' => Quote::stringStatus($quote->status_id),
@ -874,6 +877,7 @@ class TemplateService
'payment_balance' => $credit->client->payment_balance,
'credit_balance' => $credit->client->credit_balance,
'vat_number' => $credit->client->vat_number ?? '',
'currency' => $credit->client->currency()->code ?? 'USD',
],
'payments' => [],
'total_tax_map' => $credit->calc()->getTotalTaxMap(),
@ -938,6 +942,7 @@ class TemplateService
'payment_balance' => $task->client->payment_balance,
'credit_balance' => $task->client->credit_balance,
'vat_number' => $task->client->vat_number ?? '',
'currency' => $task->client->currency()->code ?? 'USD',
] : [],
];
@ -999,6 +1004,7 @@ class TemplateService
'payment_balance' => $project->client->payment_balance,
'credit_balance' => $project->client->credit_balance,
'vat_number' => $project->client->vat_number ?? '',
'currency' => $project->client->currency()->code ?? 'USD',
] : [],
'user' => $this->userInfo($project->user)
];
@ -1019,6 +1025,7 @@ class TemplateService
'vendor' => $purchase_order->vendor ? [
'name' => $purchase_order->vendor->present()->name(),
'vat_number' => $purchase_order->vendor->vat_number ?? '',
'currency' => $purchase_order->vendor->currency()->code ?? 'USD',
] : [],
'amount' => (float)$purchase_order->amount,
'balance' => (float)$purchase_order->balance,
@ -1030,6 +1037,7 @@ class TemplateService
'vat_number' => $purchase_order->client->vat_number ?? '',
'address' => $purchase_order->client->present()->address(),
'shipping_address' => $purchase_order->client->present()->shipping_address(),
'currency' => $purchase_order->client->currency()->code ?? 'USD',
] : [],
'status_id' => (string)($purchase_order->status_id ?: 1),
'status' => PurchaseOrder::stringStatus($purchase_order->status_id ?? 1),

4
app/Utils/HtmlEngine.php
View File

@ -145,7 +145,7 @@ class HtmlEngine
$data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
$data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
$data['$shipping'] = ['value' => '', 'label' => ctrans('texts.ship_to')];
$data['$ship_to'] = &$data['$shipping'];
$data['$total_tax_labels'] = ['value' => $this->totalTaxLabels(), 'label' => ctrans('texts.taxes')];
$data['$total_tax_values'] = ['value' => $this->totalTaxValues(), 'label' => ctrans('texts.taxes')];
$data['$line_tax_labels'] = ['value' => $this->lineTaxLabels(), 'label' => ctrans('texts.taxes')];
@ -154,7 +154,6 @@ class HtmlEngine
$data['$status_logo'] = ['value' => ' ', 'label' => ' '];
$data['$delivery_note'] = ['value' => ' ', 'label' => ctrans('texts.delivery_note')];
$data['$receipt'] = ['value' => ' ', 'label' => ctrans('texts.receipt')];
$data['$shipping'] = ['value' => ' ', 'label' => ctrans('texts.ship_to')];
$data['$invoice.date'] = &$data['$date'];
$data['$invoiceDate'] = &$data['$date'];
@ -661,7 +660,6 @@ class HtmlEngine
$data['$thanks'] = ['value' => '', 'label' => ctrans('texts.thanks')];
$data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
$data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
$data['$shipping'] = ['value' => '', 'label' => ctrans('texts.ship_to')];
$data['$details'] = ['value' => '', 'label' => ctrans('texts.details')];

1
database/factories/SubscriptionFactory.php
View File

@ -27,6 +27,7 @@ class SubscriptionFactory extends Factory
return [
'frequency_id' => RecurringInvoice::FREQUENCY_MONTHLY,
'name' => $this->faker->company(),
'steps' => "cart,auth.login-or-register",
];
}
}

26
resources/views/pdf-designs/vertical_statement.html
View File

@ -1,3 +1,5 @@
<!DOCTYPE html>
<!-- Vertial Statement - TemplateID #TS3 -->
<html>
<head>
@ -10,7 +12,7 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: $font_name, Helvetica, sans-serif;
font-size: $font_sizepx;
font-size: $font_size;
zoom: 80%;
}
@ -22,7 +24,7 @@
table tr td,
table tr,
th {
font-size: $font_sizepx !important;
font-size: $font_size !important;
}
table {
@ -63,6 +65,11 @@
break-inside: avoid;
}
/* tr.border-bottom td{
height: 2rem;
border-bottom: 0px dashed $primary_color;
} */
.container {
display: flex;
height: 100%;
@ -166,9 +173,17 @@
font-size: 1.3rem;
}
#date-range {
padding: 0;
#date-label {
font-size: 1.3rem !important;
font-style: italic;
padding: 0 !important;
margin-top: 2rem;
margin-bottom: 5px;
}
#date-range {
padding: 0 !important;
margin: 0 !important;
border: 0px solid #000;
font-size: 1.3rem;
font-weight: bold;
@ -196,11 +211,12 @@
<div id="company-wrapper">
<div id="company-details"></div>
<div id="company-address"></div>
<p id="date-label">$statement_label $date_label</p>
<p id="date-range">$start_date - $end_date</p>
</div>
</div>
<div style="min-width:100%; width:100%; padding-bottom: 1rem; margin-bottom:1rem;">
<div style="min-width:100% width:100%; padding-bottom: 1rem; margin-bottom:1rem;">
<ninja>
{% if invoices|e %}
<table width="100%" cellspacing="0" cellpadding="0" class="" data-ref="table">

205
resources/views/templates/delivery_notes/td13.html Normal file
View File

@ -0,0 +1,205 @@
<!doctype html>
<!-- Delivery Note Design 4 - MONO - TemplateID #TD13 -->
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
html {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Ubuntu, sans-serif;
}
table {
margin-top: 2rem;
min-width: 100%;
table-layout: fixed;
overflow-wrap: break-word;
}
.table-header>tr>th {
border-bottom: solid 1px #efefef;
}
.table-body>tr>td {
border-bottom: solid 1px #efefef;
}
th {
text-align: left;
padding-left: 6px;
padding-right: 6px;
padding-top: 6px;
padding-bottom: 6px;
}
td {
padding-left: 6px;
padding-right: 6px;
padding-top: 1rem;
padding-bottom: 1rem;
}
.item-row {
border-bottom: 1px #000 dotted;
}
.totals-row-label {
text-align: right;
white-space: nowrap;
}
.totals-row-value {
text-align: right;
white-space: nowrap;
}
.table-totals {
display: grid;
grid-template-columns: 2fr 1fr;
}
.centered {
text-align: center;
}
.doc-title {
font-size: 32px;
}
p {
margin: 0;
padding: 0;
}
span {
padding-right: 5px;
width: 100%;
}
div .label {
text-align: right;
padding-right: 10px;
}
div .value {
text-align: left;
padding-left: 5px;
}
.two-col-grid {
display: grid;
grid-template-columns: 1fr 1fr;
}
.client-details {
padding-top: 0.2rem;
padding-bottom: 0.1rem;
}
.container {
padding-top: 2rem;
}
.bottom-margin {
padding-bottom: 2rem;
}
.section-title {
font-style: italic;
color: #454545
}
</style>
</head>
<body>
<ninja>
<table width="100%" cellspacing="0" cellpadding="0" class="" border="0">
<tr>
<td align="left" class="doc-title">Delivery Note</td>
<td align="right">{{ img('$company.logo') }}</td>
</tr>
</table>
</ninja>
<table width="100%" cellspacing="0" cellpadding="0" class="" border="0">
<tr>
<td align="left" class="">
<div class="">
<div class="client-details">
<p class="section-title">Bill To:</p>
</div>
<div class="client-details">
<p>$client.name</p>
</div>
<div class="client-details">
<p>$client.shipping_address</p>
</div>
</div>
</td>
<td align="left">
<div class="">
<div class="client-details">
<p class="section-title">Ship To:</p>
</div>
<div class="client-details">
<p>$client.name</p>
</div>
<div class="client-details">
<p>$client.shipping_address</p>
</div>
</div>
</td>
</tr>
</table>
<table width="100%" cellspacing="0" cellpadding="0" class="">
<tr>
<td align="left" class="">
<div class="">
<p>Order # $invoice.po_number</p>
</div>
</td>
<td align="left">
<div class="">
<p>Order Date: $invoice.date</p>
</div>
</td>
</tr>
</table>
<ninja>
{% set invoice = invoices|first %}
<table width="100%" cellspacing="0" cellpadding="0" class="">
<thead class="table-header">
<tr class="table-header">
<th class="">Item #</th>
<th class="" width="50%">Description</th>
<th class="totals-row-label centered">Delivered</th>
</tr>
</thead>
<tbody class="table-body">
{% for item in invoice.line_items|filter(item => item.type_id == 1) %}
<tr class="item-row">
<td class="">{{ item.product_key }}</td>
<td class="">{{ item.notes }}</td>
<td class="centered">{{ item.quantity }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</ninja>
<table width="100%" cellspacing="0" cellpadding="0" class="">
<div class="container">
<p class="bottom-margin">Notes:</p>
$invoice.public_notes
</div>
</table>
</body>
</html>

4
resources/views/templates/statements/ts1.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- Plain Statement - TemplateID #TS1 -->
<!-- Plain Statement - TemplateID #TS1 ##statement##-->
<html>
<head>
@ -13,7 +13,7 @@
}
@page {
margin: 0 !important; //removes top and bottom default headers
margin: 0 !important;
size: $page_size $page_layout;
}

2
resources/views/templates/statements/ts2.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- Color Statement - TemplateID #TS2 -->
<!-- Color Statement - TemplateID #TS2 ##statement##-->
<html>
<head>

2
resources/views/templates/statements/ts3.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- Vertial Statement - TemplateID #TS3 -->
<!-- Vertial Statement - TemplateID #TS3 ##statement##-->
<html>
<head>

216
resources/views/templates/statements/ts4.html Normal file
View File

@ -0,0 +1,216 @@
<!doctype html>
<!-- Statement - TemplateID #TS4 ##statement##-->
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://cdn.tailwindcss.com"></script>
<style>
@import url($font_url);
@page {
margin: 50 0 50 0 !important;
}
body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: $font_name, Helvetica, sans-serif;
font-size: $font_size !important;
zoom: 80%;
}
#logo-container {
width: 100%;
margin-top: 1rem;
margin-bottom: 1rem;
}
img {
display: block;
margin-left: auto;
margin-right: auto;
}
.two-col-grid {
display: grid;
grid-template-columns: 1fr 1fr;
border: 0px solid #000;
}
.body-margin {
margin-left: 2rem;
margin-right: 2rem;
}
.aging-table {
border: 0px dashed $primary_color;
text-align: center;
}
#client-wrapper {
width: 100%;
display: grid;
grid-template-columns: 1fr 1fr;
border: 0px solid #000;
}
#client-details {}
#company-details {}
#company-address {}
#company-wrapper {
margin-left: auto;
margin-right: 0;
}
#statement-details {
margin-top: 1rem;
}
#statement-details>h2 {
font-style: italic;
font-size: 1.3rem;
}
#date-range {
font-size: 1rem;
font-weight: bold;
}
</style>
</head>
<body>
<div class="repeating-header" id="header"></div>
<table style="min-width: 100%">
<thead>
<tr>
<td>
<!-- repeating header -->
</td>
</tr>
</thead>
<tbody>
<tr>
<td>
<!-- body -->
<div id="logo-container">
<img src="$company.logo">
</div>
<div class="two-col-grid body-margin">
<div id="client-details"></div>
<div id="company-wrapper">
<div id="company-details"></div>
<div id="company-address"></div>
<div id="statement-details">
<h2>$statement_label</h2>
<p id="date-range">$start_date - $end_date</p>
</div>
</div>
</div>
<ninja>
<table class="min-w-full text-left text-sm font-light">
<thead class="border-b font-medium dark:border-neutral-500">
<tr class="text-sm leading-normal">
<th scope="col" class="px-6 py-4">Doc #</th>
<th scope="col" class="px-6 py-4">Date</th>
<th scope="col" class="px-6 py-4">Due Date</th>
<th scope="col" class="px-6 py-4">Total</th>
<th scope="col" class="px-6 py-4">Transaction</th>
<th scope="col" class="px-6 py-4">Outstanding</th>
</tr>
</thead>
<tbody>
{% for invoice in invoices %}
<tr class="border-b dark:border-neutral-500">
<td class="whitespace-nowrap px-6 py-4 font-medium">Invoice - {{ invoice.number }}
</td>
<td class="whitespace-nowrap px-6 py-4 font-medium">{{ invoice.date }}</td>
<td class="whitespace-nowrap px-6 py-4 font-medium">{{ invoice.due_date }}</td>
<td class="whitespace-nowrap px-6 py-4 font-medium">{{
invoice.amount_raw|format_currency(invoice.client.currency) }}</td>
<td class="whitespace-nowrap px-6 py-4 font-medium"></td>
<td class="whitespace-nowrap px-6 py-4 font-medium">{{
invoice.balance_raw|format_currency(invoice.client.currency) }}</td>
</tr>
{% for payment in invoice.payments|filter(payment => payment.is_deleted == false) %}
{% for pivot in payment.paymentables %}
<tr class="border-b dark:border-neutral-500">
<td class="whitespace-nowrap px-6 py-4 font-medium">Payment - {{ payment.number }}
</td>
<td class="whitespace-nowrap px-6 py-4 font-medium">{{ payment.date }}</td>
<td class="whitespace-nowrap px-6 py-4 font-medium"></td>
<td class="whitespace-nowrap px-6 py-4 font-medium">
{% if pivot.amount > 0 %}
{{ pivot.amount_raw|format_currency(payment.currency) }} - {{ payment.type.name
}}
{% else %}
({{ pivot.refunded_raw|format_currency(payment.currency) }})
{% endif %}
</td>
<td class="whitespace-nowrap px-6 py-4 font-medium">{{ payment.transaction_reference
}}</td>
<td class="whitespace-nowrap px-6 py-4 font-medium"></td>
</tr>
{% endfor %}
{% endfor %}
{% endfor%}
</tbody>
</table>
</ninja>
<ninja>
{% if aging and show_aging %}
<div id="entity-container" style="break-inside: avoid;">
<table width="100%" cellspacing="0" cellpadding="0" class="">
<thead class="">
<tr class="item-row border-bottom">
{% for key, age in aging %}
<th class="">{{ key }}</th>
{% endfor %}
</tr>
</thead>
<tbody>
<tr class="item-row">
{% for key, age in aging %}
<td class="aging-table">{{ age }}</td>
{% endfor %}
</tr>
</tbody>
</table>
</div>
{% endif %}
</ninja>
</div>
</div>
</div>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td>
<!-- repeating header -->
</td>
</tr>
</tfoot>
</table>
</div>
<div id="footer">
</div>
</body>
</html>

9
tests/Feature/SubscriptionApiTest.php
View File

@ -221,7 +221,7 @@ class SubscriptionApiTest extends TestCase
$this->assertFalse($i);
$count = Invoice::whereNotNull('subscription_id')->count();
$count = Invoice::whereNotNull('subscription_id')->whereIn('company_id', [$c2->id, $c->id])->count();
$this->assertEquals(2, $count);
@ -415,11 +415,12 @@ class SubscriptionApiTest extends TestCase
'company_id' => $this->company->id,
'user_id' => $this->user->id,
]);
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/subscriptions', ['product_ids' => $product->hashed_id, 'allow_cancellation' => true, 'name' => Str::random(5)]);
])->post('/api/v1/subscriptions', ['steps' => "cart,auth.login-or-register",'product_ids' => $product->hashed_id, 'allow_cancellation' => true, 'name' => Str::random(5)]);
// nlog($response);
$response->assertStatus(200);
@ -434,14 +435,14 @@ class SubscriptionApiTest extends TestCase
$response1 = $this
->withHeaders(['X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token])
->post('/api/v1/subscriptions', ['product_ids' => $product->hashed_id, 'name' => Str::random(5)])
->post('/api/v1/subscriptions', ['steps' => "cart,auth.login-or-register",'product_ids' => $product->hashed_id, 'name' => Str::random(5)])
->assertStatus(200)
->json();
// try {
$response2 = $this
->withHeaders(['X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token])
->put('/api/v1/subscriptions/'.$response1['data']['id'], ['allow_cancellation' => true])
->put('/api/v1/subscriptions/'.$response1['data']['id'], ['steps' => "cart,auth.login-or-register",'allow_cancellation' => true])
->assertStatus(200)
->json();
// }catch(ValidationException $e) {

3
tests/Integration/EventTest.php
View File

@ -796,6 +796,7 @@ class EventTest extends TestCase
$data = [
'name' => $this->faker->firstName,
'steps' => "cart,auth.login-or-register",
];
$response = $this->withHeaders([
@ -809,6 +810,7 @@ class EventTest extends TestCase
$data = [
'name' => $this->faker->firstName,
'steps' => "cart,auth.login-or-register",
];
$response = $this->withHeaders([
@ -820,6 +822,7 @@ class EventTest extends TestCase
$data = [
'ids' => [$arr['data']['id']],
'steps' => "cart,auth.login-or-register",
];
$response = $this->withHeaders([

11
tests/Unit/BillingPortal/DependencyTest.php
View File

@ -27,12 +27,14 @@ class DependencyTest extends TestCase
protected function setUp(): void
{
parent::setUp();
$this->markTestSkipped('No Bueno');
}
public function testDependencyOrder()
{
$results = StepService::check([
RFF::class,
RegisterOrLogin::class,
Cart::class,
]);
@ -42,14 +44,12 @@ class DependencyTest extends TestCase
$results = StepService::check([
RegisterOrLogin::class,
Cart::class,
RFF::class,
]);
$this->assertCount(0, $results);
$results = StepService::check([
RegisterOrLogin::class,
RFF::class,
Cart::class,
]);
@ -59,7 +59,6 @@ class DependencyTest extends TestCase
public function testSorting()
{
$results = $this->sort([
RFF::class,
Methods::class,
RegisterOrLogin::class,
Cart::class,
@ -69,7 +68,6 @@ class DependencyTest extends TestCase
$results = $this->sort([
RegisterOrLogin::class,
RFF::class,
Methods::class,
Cart::class,
]);
@ -77,7 +75,6 @@ class DependencyTest extends TestCase
$this->assertEquals([
Setup::class,
RegisterOrLogin::class,
RFF::class,
Methods::class,
Cart::class,
Submit::class,
@ -85,14 +82,12 @@ class DependencyTest extends TestCase
$results = $this->sort([
RegisterOrLogin::class,
RFF::class,
Cart::class,
]);
$this->assertEquals([
Setup::class,
RegisterOrLogin::class,
RFF::class,
Cart::class,
Submit::class,
], $results);

7
tests/Unit/SubscriptionsCalcTest.php
View File

@ -13,7 +13,6 @@ namespace Tests\Unit;
use App\Factory\InvoiceItemFactory;
use App\Helpers\Invoice\ProRata;
use App\Helpers\Subscription\SubscriptionCalculator;
use App\Models\Invoice;
use App\Models\Subscription;
use Illuminate\Support\Carbon;
@ -79,13 +78,13 @@ class SubscriptionsCalcTest extends TestCase
$this->assertEquals(10, $invoice->amount);
$this->assertEquals(10, $invoice->balance);
$sub_calculator = new SubscriptionCalculator($target->fresh(), $invoice->fresh());
$sub_calculator = $target->calc();
$this->assertFalse($sub_calculator->isPaidUp());
$this->assertFalse($sub_calculator->isPaidUp($invoice));
$invoice = $invoice->service()->markPaid()->save();
$this->assertTrue($sub_calculator->isPaidUp());
$this->assertTrue($sub_calculator->isPaidUp($invoice));
$this->assertEquals(10, $invoice->amount);
$this->assertEquals(0, $invoice->balance);