Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 13:04:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2023-05-01 20:14:26 +10:00
commit b2d6109907
27 changed files with 80 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Import/Definitions/BankTransactionMap.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Definitions/ExpenseMap.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Definitions/VendorMap.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

3
app/Import/Providers/BaseImport.php
View File

@ -428,7 +428,8 @@ class BaseImport
foreach ($invoices as $raw_invoice) { foreach ($invoices as $raw_invoice) {
try { try {
$invoice_data = $invoice_transformer->transform($raw_invoice); $invoice_data = $invoice_transformer->transform($raw_invoice);
$invoice_data['user_id'] = $this->company->owner()->id;
$invoice_data['line_items'] = $this->cleanItems( $invoice_data['line_items'] = $this->cleanItems(
$invoice_data['line_items'] ?? [] $invoice_data['line_items'] ?? []
); );

6
app/Import/Transformer/Bank/BankTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Csv/ClientTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Csv/ExpenseTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Csv/InvoiceTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * client Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. client Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Csv/PaymentTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Csv/QuoteTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Csv/RecurringInvoiceTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Csv/VendorTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

4
app/Import/Transformer/Freshbooks/ClientTransformer.php
View File

@ -2,9 +2,9 @@
/** /**
* Invoice Ninja (https://clientninja.com). * Invoice Ninja (https://clientninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Freshbooks/InvoiceTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Invoice2Go/InvoiceTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

4
app/Import/Transformer/Invoicely/ClientTransformer.php
View File

@ -2,9 +2,9 @@
/** /**
* Invoice Ninja (https://clientninja.com). * Invoice Ninja (https://clientninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Invoicely/InvoiceTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

4
app/Import/Transformer/Wave/ClientTransformer.php
View File

@ -2,9 +2,9 @@
/** /**
* Invoice Ninja (https://clientninja.com). * Invoice Ninja (https://clientninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Wave/ExpenseTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

2
app/Import/Transformer/Wave/InvoiceTransformer.php
View File

@ -2,7 +2,7 @@
/** /**
* Invoice Ninja (https://invoiceninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. Invoice Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://clientninja.com)
* *

4
app/Import/Transformer/Wave/VendorTransformer.php
View File

@ -2,9 +2,9 @@
/** /**
* Invoice Ninja (https://clientninja.com). * Invoice Ninja (https://clientninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

4
app/Import/Transformer/Zoho/ClientTransformer.php
View File

@ -2,9 +2,9 @@
/** /**
* Invoice Ninja (https://clientninja.com). * Invoice Ninja (https://clientninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

6
app/Import/Transformer/Zoho/InvoiceTransformer.php
View File

@ -1,10 +1,10 @@
<?php <?php
/** /**
* client Ninja (https://clientninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
* @link https://github.com/clientninja/clientninja source repository * @link https://github.com/invoiceninja/invoiceninja source repository
* *
* @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com) * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
* *
* @license https://www.elastic.co/licensing/elastic-license * @license https://www.elastic.co/licensing/elastic-license
*/ */

1
app/Mail/Client/ClientStatement.php
View File

@ -57,7 +57,6 @@ class ClientStatement extends Mailable
with: [ with: [
'text_body' => $this->data['body'], 'text_body' => $this->data['body'],
'body' => $this->data['body'], 'body' => $this->data['body'],
'whitelabel' => $this->data['whitelabel'],
'settings' => $this->data['settings'], 'settings' => $this->data['settings'],
'whitelabel' => $this->data['whitelabel'], 'whitelabel' => $this->data['whitelabel'],
'logo' => $this->data['logo'], 'logo' => $this->data['logo'],

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

@ -245,17 +245,17 @@ class Statement
switch ($status) { switch ($status) {
case 'all': case 'all':
return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID]; return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID];
break;
case 'paid': case 'paid':
return [Invoice::STATUS_PAID]; return [Invoice::STATUS_PAID];
break;
case 'unpaid': case 'unpaid':
return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]; return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL];
break;
default: default:
return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID]; return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID];
break;
} }
} }

12
lang/en/texts.php
View File

@ -5068,6 +5068,18 @@ $LANG = array(
'tax_exempt' => 'Tax Exempt', 'tax_exempt' => 'Tax Exempt',
'late_fee_added_locked_invoice' => 'Late fee for invoice :invoice added on :date', 'late_fee_added_locked_invoice' => 'Late fee for invoice :invoice added on :date',
'lang_Khmer' => 'Khmer', 'lang_Khmer' => 'Khmer',
'routing_id' => 'Routing ID',
'enable_e_invoice' => 'Enable E-Invoice',
'e_invoice_type' => 'E-Invoice Type',
'reduced_tax' => 'Reduced Tax',
'override_tax' => 'Override Tax',
'zero_rated' => 'Zero Rated',
'reverse_tax' => 'Reverse Tax',
'updated_tax_category' => 'Successfully updated the tax category',
'updated_tax_categories' => 'Successfully updated the tax categories',
'set_tax_category' => 'Set Tax Category',
'payment_manual' => 'Payment Manual',
'expense_payment_type' => 'Expense Payment Type',
); );

3
tests/Pdf/PdfServiceTest.php
View File

@ -36,6 +36,9 @@ class PdfServiceTest extends TestCase
public function testPdfGeneration() public function testPdfGeneration()
{ {
if(config('ninja.testvars.travis'))
$this->markTestSkipped();
$invitation = $this->invoice->invitations->first(); $invitation = $this->invoice->invitations->first();
$service = (new PdfService($invitation))->boot(); $service = (new PdfService($invitation))->boot();