akaunting 3.0 (the last dance)

app/Exports/Sales/Revenues.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Exports\Sales;
-
-use App\Abstracts\Export;
-use App\Models\Banking\Transaction as Model;
-use Maatwebsite\Excel\Concerns\WithColumnFormatting;
-use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-
-class Revenues extends Export implements WithColumnFormatting
-{
-    public function collection()
-    {
-        return Model::with('account', 'category', 'contact', 'invoice')->income()->collectForExport($this->ids, ['paid_at' => 'desc']);
-    }
-
-    public function map($model): array
-    {
-        $model->account_name = $model->account->name;
-        $model->invoice_number = $model->invoice->document_number ?? 0;
-        $model->contact_email = $model->contact->email;
-        $model->category_name = $model->category->name;
-
-        return parent::map($model);
-    }
-
-    public function fields(): array
-    {
-        return [
-            'paid_at',
-            'amount',
-            'currency_code',
-            'currency_rate',
-            'account_name',
-            'invoice_number',
-            'contact_email',
-            'category_name',
-            'description',
-            'payment_method',
-            'reference',
-            'reconciled',
-        ];
-    }
-
-    public function columnFormats(): array
-    {
-        return [
-            'A' => NumberFormat::FORMAT_DATE_YYYYMMDD,
-        ];
-    }
-}

app/Exports/Sales/Sheets/InvoiceTransactions.php

@@ -26,6 +26,7 @@ class InvoiceTransactions extends Export implements WithColumnFormatting
         $model->account_name = $model->account->name;
         $model->category_name = $model->category->name;
         $model->contact_email = $model->contact->email;
+        $model->transaction_number = $model->number;
 
         return parent::map($model);
     }
@@ -34,6 +35,7 @@ class InvoiceTransactions extends Export implements WithColumnFormatting
     {
         return [
             'invoice_number',
+            'transaction_number',
             'paid_at',
             'amount',
             'currency_code',

app/Exports/Sales/Sheets/Invoices.php

@@ -11,7 +11,7 @@ class Invoices extends Export implements WithColumnFormatting
 {
     public function collection()
     {
-        return Model::with('category')->invoice()->collectForExport($this->ids, ['document_number' => 'desc']);
+        return Model::with('category')->invoice()->isNotRecurring()->collectForExport($this->ids, ['document_number' => 'desc']);
     }
 
     public function map($model): array