diff --git a/app/Import/Definitions/BankTransactionMap.php b/app/Import/Definitions/BankTransactionMap.php index b6482926ee8c..fb30efd891f0 100644 --- a/app/Import/Definitions/BankTransactionMap.php +++ b/app/Import/Definitions/BankTransactionMap.php @@ -1,10 +1,10 @@ transform($raw_invoice); - + $invoice_data['user_id'] = $this->company->owner()->id; + $invoice_data['line_items'] = $this->cleanItems( $invoice_data['line_items'] ?? [] ); diff --git a/app/Import/Transformer/Bank/BankTransformer.php b/app/Import/Transformer/Bank/BankTransformer.php index bff66a30e895..d9377edc09de 100644 --- a/app/Import/Transformer/Bank/BankTransformer.php +++ b/app/Import/Transformer/Bank/BankTransformer.php @@ -1,10 +1,10 @@ $this->data['body'], 'body' => $this->data['body'], - 'whitelabel' => $this->data['whitelabel'], 'settings' => $this->data['settings'], 'whitelabel' => $this->data['whitelabel'], 'logo' => $this->data['logo'], diff --git a/app/Services/Client/Statement.php b/app/Services/Client/Statement.php index db1fcb0cd899..e315b5e7d464 100644 --- a/app/Services/Client/Statement.php +++ b/app/Services/Client/Statement.php @@ -245,17 +245,17 @@ class Statement switch ($status) { case 'all': return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID]; - break; + case 'paid': return [Invoice::STATUS_PAID]; - break; + case 'unpaid': return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]; - break; + default: return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID]; - break; + } } diff --git a/lang/en/texts.php b/lang/en/texts.php index 7499b0386f21..03f5170af4d7 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5068,6 +5068,18 @@ $LANG = array( 'tax_exempt' => 'Tax Exempt', 'late_fee_added_locked_invoice' => 'Late fee for invoice :invoice added on :date', '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', ); diff --git a/tests/Pdf/PdfServiceTest.php b/tests/Pdf/PdfServiceTest.php index 4bba1ff7b01d..625783cef598 100644 --- a/tests/Pdf/PdfServiceTest.php +++ b/tests/Pdf/PdfServiceTest.php @@ -36,6 +36,9 @@ class PdfServiceTest extends TestCase public function testPdfGeneration() { + if(config('ninja.testvars.travis')) + $this->markTestSkipped(); + $invitation = $this->invoice->invitations->first(); $service = (new PdfService($invitation))->boot();