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; + } }