diff --git a/lang/wc-invoice-pdf-de_DE-wc-recurring.json b/lang/wc-invoice-pdf-de_DE-wc-recurring.json
index 69c94fc..8c293ab 100644
--- a/lang/wc-invoice-pdf-de_DE-wc-recurring.json
+++ b/lang/wc-invoice-pdf-de_DE-wc-recurring.json
@@ -1 +1 @@
-{"domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"English"},"WC-Invoice Settings":["WC-Rechnung Einstellungen"],"A scheduler will submit the invoice %s to '%s'":["Ein Aufgabenplaner versendet die Rechnung %s an '%s'"],"A scheduler will submit the invoice once it has been created using the %s button to '%s'":["Ein Aufgabenplaner versendet die Rechnung einmalig, sobald diese über den %s Knopf ersellt wurde an '%s'"],"The scheduler is disabled for automated invoice submission. Please check the <a href='/wp-admin/admin.php?page=wcinvoicepdf_settings'>settings</a>":["Der Aufgabenplaner ist für das automatisierte versenden von Rechnungen deaktiviert. Bitte prüfe die <a href='/wp-admin/admin.php?page=wcinvoicepdf_settings'>Einstellungen</a>"],"Show all invoices":["Alle Rechnungen anzeigen"],"Reset order paid status":["Zahlungsstatus der Bestellung zurücksetzen"],"Due date in days":["Fälligkeitsdatum in Tage"],"The number of days an invoice becomes due":["Die Anzahl der Tage nachdem eine Rechnung fällig wird"],"Task Scheduler":["Aufgabenplaner"],"The schedule is properly installed and running":["Der Aufgabenplaner ist korrekt installiert und bereit"],"The scheduled task is not installed - Please try to reenable the plugin":["Der Aufgabenplaner ist nicht korrekt installiert - Bitte versuche das plugin erneut zu aktivieren"],"Email templates":["E-Mail Vorlagen"],"Export":["Exportieren"],"Generate":["Erstellen"],"Payments":["Zahlungen"],"Invoice template":["Rechnungsvorlage"],"Document Title":["Dokumenten Titel"],"Address line":["Adresszeile"],"Payment terms":["Zahlungsbedingungen"],"Offer terms":["Angebotsbedingungen"],"Protect rows from splitting":["Zeilenaufteilung vermeiden"],"Keep rows together when page breaks":["Behalte die Zeilen zusammen bei Seitenumbrüchen"],"Payment reminder":["Zahlungserinnerung"],"%s reminders sent":["%s Erinnerungen versendet"],"Recurring payments":["Regelmäßige Zahlungen"],"Enable test mode and replace all recipients with the admin email address":["Aktiviert den Test modus und ersetzt alle Empfänger mit der E - Mail des Administrators"],"Send payment reminders to customer when invoice is due":["Verschickt Zahlungserinnerungen an den Kunden, nachdem eine Zahlung überfällig ist"],"Recurring invoice %s has been created":["Wiederkehrende Rechnung %s wurde erstellt"],"Automate invoice submission":["Rechnungen automatisert versenden"],"Enable automate invoice submission to customers on a daily schedule":["Aktiviert das automatische versenden von Rechnung (täglich)"],"The next automated invoice submission is scheduled for %s":["Die nächste automatisierte Rechnungszustellung erfolgt am %s"],"The invoice %s has been submitted to %s":["Die Rechnung %s wurde an %s übermittelt"],"Invoice %s successfully created":["Rechnung %s erfolgreich erstellt"],"A reminder #%s for invoice %s has been submitted to %s":["Eine Erinnerung #%s für die Rechnung %s wurde an %s übermittelt"],"Payment report":["Zahlungsbericht"],"First reminder (days)":["Erste Erinnerung (tage)"],"The number of days (after due) when the first payment reminder should be sent to the customer":["Die Anzahl der Tage (nach Fälligkeit) an dem die erste Zahlungserinnerung an den Kunden geschickt werden soll"],"Reminder interval":["Erinnerungsinterval"],"Max reminders":["Maximale Erinnerungen"],"yearly":["jährlich"],"monthly":["monatlich"],"month":["Monat"],"per year":["pro Jahr"],"per month":["pro Monat"],"per":["pro"],"Invoice":["Rechnung"],"Invoices":["Rechnungen"],"Pay Now":["Bezahlen"],"Payment interval":["Zahlungsinterval"],"Period":["Zeitraum"],"Paid at":["Bezahlt am"],"Due at":["Fällig am"],"Paid":["Bezahlt"],"Sent":["Gesendet"],"Canceled":["Abgebrochen"],"Offer":["Angebot"],"No#":["Pos"],"Description":["Bezeichnung"],"Qty":["Menge"],"Unit Price":["Einzelpreis"],"Amount":["Gesamt"],"includes %s %s":["enthält %s %s"],"plus %s %s":["zzgl. %s %s"],"Summary":["Summe"],"Total":["Total"],"Status":["Status"],"Save":["Speichern"],"Preview":["Vorschau"],"Settings saved":["Einstellungen gespeichert"],"Services":["Dienstleistungen"],"Unit information":["Angaben zur Einheit"],"Unit":["Einheit"],"Unit (plural)":["Einheit (plural)"],"The unit next to the quantity (default: h)":["Die Einhait nach Angabe der Menge (Standardwert: h)"],"The unit when quantity is more than one (optional)":["Die Einheit wenn die Menge größer als eins (optional)"],"Webspace":["Webspeicher"],"Please enter the domain to host here":["Bitte geben Sie hier die gwünschte Domain ein"],"Subscription":["Abonnement"],"Subscription option":["Abonnement auswahl"],"Customer choose":["Kunde entscheidet"],"Allow the customer to choose between the subscriptions during checkout or fix a value":["Erlaube dem Kunden die Auswahl eines Abonnement oder setze den Wert fest"],"Enable B2C":["Aktiviere B2C"],"Create invoice compatible for Business to Customer (B2C) relationship":["Erstelle Business to Customer (B2C) kompatible Rechnungen"],"Refund from %s":["Rückerstattung vom %s"],"WC Recurring Invoice PDF":["WC Recurring Rechnung"],"https://github.com/ole1986/wc-invoice-pdf/releases":[""],"WooCommerce invoice pdf plugin with recurring payments (scheduled)":["WooCommerce Rechnungs Plugin für wiederkehrende Zahlungen"],"ole1986 <ole.koeckemann@gmail.com>":[""],"https://github.com/ole1986/wc-invoice-pdf":[""],"Invoice not found our no access to this resource":["Rechnung nicht gefunden oder kein Zugriff auf diese Resource"],"General":["Allgemein"],"Business":["Geschäft"],"Select image":["Bild auswählen"],"Clear image":["Bild löschen"],"Email details":["E-Mail Details"],"Report recipient":["Berichtsadresse"],"Reciepient address for payment reports":["Empfänger - Adresse für Zahlungsberichte"],"Sender address":["Absender - Adresse"],"Public sender address the invoice is being submitted":["Öffentliche Absender - Adresse bei Rechnungsübermittlung"],"months":["Monate"],"Company name":["Firmenname"],"Enter your company name":["Gebe hier die Firma an"],"Contact email":["Kontakt Email"],"Enter invoice contact email address":["Gebe hier die Email für Rechnungen an"],"VAT ID":["Umsatzsteuer ID"],"Enter your VAT ID":["Geben Sie hier die UST. ID an"],"Properties":["Eigenschaften"],"Content":["Inhalt"],"Customer reference ID (BT-10)":["Kundenreferenz ID (BT-10)"],"Additional customer info":["Zusätzliche Kundeninformation"],"The same placeholder from %s can be used":["Platzhalter aus %s können verwendet werden"],"Enable XInvoice":["Aktiviere XRechnung"],"Enable support for XInvoice (XML)":["Unterstützung für XRechnung (XML) aktivieren"]}}}
\ No newline at end of file
+{"domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"English"},"WC-Invoice Settings":["WC-Rechnung Einstellungen"],"A scheduler will submit the invoice %s to '%s'":["Ein Aufgabenplaner versendet die Rechnung %s an '%s'"],"A scheduler will submit the invoice once it has been created using the %s button to '%s'":["Ein Aufgabenplaner versendet die Rechnung einmalig, sobald diese über den %s Knopf ersellt wurde an '%s'"],"The scheduler is disabled for automated invoice submission. Please check the <a href='/wp-admin/admin.php?page=wcinvoicepdf_settings'>settings</a>":["Der Aufgabenplaner ist für das automatisierte versenden von Rechnungen deaktiviert. Bitte prüfe die <a href='/wp-admin/admin.php?page=wcinvoicepdf_settings'>Einstellungen</a>"],"Show all invoices":["Alle Rechnungen anzeigen"],"Reset order paid status":["Zahlungsstatus der Bestellung zurücksetzen"],"Due date in days":["Fälligkeitsdatum in Tage"],"The number of days an invoice becomes due":["Die Anzahl der Tage nachdem eine Rechnung fällig wird"],"Task Scheduler":["Aufgabenplaner"],"The schedule is properly installed and running":["Der Aufgabenplaner ist korrekt installiert und bereit"],"The scheduled task is not installed - Please try to reenable the plugin":["Der Aufgabenplaner ist nicht korrekt installiert - Bitte versuche das plugin erneut zu aktivieren"],"Email templates":["E-Mail Vorlagen"],"Export":["Exportieren"],"Generate":["Erstellen"],"Payments":["Zahlungen"],"Invoice template":["Rechnungsvorlage"],"Document Title":["Dokumenten Titel"],"Address line":["Adresszeile"],"Payment terms":["Zahlungsbedingungen"],"Offer terms":["Angebotsbedingungen"],"Protect rows from splitting":["Zeilenaufteilung vermeiden"],"Keep rows together when page breaks":["Behalte die Zeilen zusammen bei Seitenumbrüchen"],"Payment reminder":["Zahlungserinnerung"],"%s reminders sent":["%s Erinnerungen versendet"],"Recurring payments":["Regelmäßige Zahlungen"],"Enable test mode and replace all recipients with the admin email address":["Aktiviert den Test modus und ersetzt alle Empfänger mit der E - Mail des Administrators"],"Send payment reminders to customer when invoice is due":["Verschickt Zahlungserinnerungen an den Kunden, nachdem eine Zahlung überfällig ist"],"Recurring invoice %s has been created":["Wiederkehrende Rechnung %s wurde erstellt"],"Automate invoice submission":["Rechnungen automatisert versenden"],"Enable automate invoice submission to customers on a daily schedule":["Aktiviert das automatische versenden von Rechnung (täglich)"],"The next automated invoice submission is scheduled for %s":["Die nächste automatisierte Rechnungszustellung erfolgt am %s"],"The invoice %s has been submitted to %s":["Die Rechnung %s wurde an %s übermittelt"],"Invoice %s successfully created":["Rechnung %s erfolgreich erstellt"],"A reminder #%s for invoice %s has been submitted to %s":["Eine Erinnerung #%s für die Rechnung %s wurde an %s übermittelt"],"Payment report":["Zahlungsbericht"],"First reminder (days)":["Erste Erinnerung (tage)"],"The number of days (after due) when the first payment reminder should be sent to the customer":["Die Anzahl der Tage (nach Fälligkeit) an dem die erste Zahlungserinnerung an den Kunden geschickt werden soll"],"Reminder interval":["Erinnerungsinterval"],"Max reminders":["Maximale Erinnerungen"],"yearly":["jährlich"],"monthly":["monatlich"],"month":["Monat"],"per year":["pro Jahr"],"per month":["pro Monat"],"per":["pro"],"Invoice":["Rechnung"],"Invoices":["Rechnungen"],"Pay Now":["Bezahlen"],"Payment interval":["Zahlungsinterval"],"Period":["Zeitraum"],"Paid at":["Bezahlt am"],"Due at":["Fällig am"],"Paid":["Bezahlt"],"Sent":["Gesendet"],"Canceled":["Abgebrochen"],"Offer":["Angebot"],"No#":["Pos"],"Description":["Bezeichnung"],"Qty":["Menge"],"Unit Price":["Einzelpreis"],"Amount":["Gesamt"],"includes %s %s":["enthält %s %s"],"plus %s %s":["zzgl. %s %s"],"Summary":["Summe"],"Total":["Total"],"Status":["Status"],"Save":["Speichern"],"Preview":["Vorschau"],"Settings saved":["Einstellungen gespeichert"],"Services":["Dienstleistungen"],"Unit information":["Angaben zur Einheit"],"Unit":["Einheit"],"Unit (plural)":["Einheit (plural)"],"The unit next to the quantity (default: h)":["Die Einhait nach Angabe der Menge (Standardwert: h)"],"The unit when quantity is more than one (optional)":["Die Einheit wenn die Menge größer als eins (optional)"],"Webspace":["Webspeicher"],"Please enter the domain to host here":["Bitte geben Sie hier die gwünschte Domain ein"],"Subscription":["Abonnement"],"Subscription option":["Abonnement auswahl"],"Customer choose":["Kunde entscheidet"],"Allow the customer to choose between the subscriptions during checkout or fix a value":["Erlaube dem Kunden die Auswahl eines Abonnement oder setze den Wert fest"],"Enable B2C":["Aktiviere B2C"],"Create invoice compatible for Business to Customer (B2C) relationship":["Erstelle Business to Customer (B2C) kompatible Rechnungen"],"Refund from %s":["Rückerstattung vom %s"],"WC Recurring Invoice PDF":["WC Recurring Rechnung"],"https://github.com/ole1986/wc-invoice-pdf/releases":[""],"WooCommerce invoice pdf plugin with recurring payments (scheduled)":["WooCommerce Rechnungs Plugin für wiederkehrende Zahlungen"],"ole1986 <ole.koeckemann@gmail.com>":[""],"https://github.com/ole1986/wc-invoice-pdf":[""],"Invoice not found our no access to this resource":["Rechnung nicht gefunden oder kein Zugriff auf diese Resource"],"General":["Allgemein"],"Business":["Geschäft"],"Select image":["Bild auswählen"],"Clear image":["Bild löschen"],"Email details":["E-Mail Details"],"Report recipient":["Berichtsadresse"],"Reciepient address for payment reports":["Empfänger - Adresse für Zahlungsberichte"],"Sender address":["Absender - Adresse"],"Public sender address the invoice is being submitted":["Öffentliche Absender - Adresse bei Rechnungsübermittlung"],"months":["Monate"],"Company name":["Firmenname"],"Enter your company name":["Gebe hier die Firma an"],"Contact email":["Kontakt Email"],"Enter invoice contact email address":["Gebe hier die Email für Rechnungen an"],"VAT ID":["Umsatzsteuer ID"],"Enter your VAT ID":["Geben Sie hier die UST. ID an"],"Properties":["Eigenschaften"],"Content":["Inhalt"],"Customer reference ID (BT-10)":["Kundenreferenz ID (BT-10)"],"Additional customer info":["Zusätzliche Kundeninformation"],"The same placeholder from %s can be used":["Platzhalter aus %s können verwendet werden"],"Enable XInvoice":["Aktiviere XRechnung"],"Enable support for XInvoice (XML)":["Unterstützung für XRechnung (XML) aktivieren"],"Order account filter":["Konto Filter für Bestellung"],"Only show completed WooCommerce orders on customers account page":["Zeige nur abgeschlossene WooCommerce Bestellungen auf der Kundenkonto Seite"]}}}
\ No newline at end of file
diff --git a/lang/wc-invoice-pdf-de_DE.mo b/lang/wc-invoice-pdf-de_DE.mo
index 6aa2f64..cf5d6a7 100644
Binary files a/lang/wc-invoice-pdf-de_DE.mo and b/lang/wc-invoice-pdf-de_DE.mo differ
diff --git a/lang/wc-invoice-pdf-de_DE.po b/lang/wc-invoice-pdf-de_DE.po
index b0eecda..3ab29ae 100644
--- a/lang/wc-invoice-pdf-de_DE.po
+++ b/lang/wc-invoice-pdf-de_DE.po
@@ -41,15 +41,15 @@ msgstr "Alle Rechnungen anzeigen"
 msgid "Reset order paid status"
 msgstr "Zahlungsstatus der Bestellung zurücksetzen"
 
-#: src/Menu/InvoiceMenu.php:287
+#: src/Menu/InvoiceMenu.php:290
 msgid "Due date in days"
 msgstr "Fälligkeitsdatum in Tage"
 
-#: src/Menu/InvoiceMenu.php:287
+#: src/Menu/InvoiceMenu.php:290
 msgid "The number of days an invoice becomes due"
 msgstr "Die Anzahl der Tage nachdem eine Rechnung fällig wird"
 
-#: src/Menu/InvoiceMenu.php:312
+#: src/Menu/InvoiceMenu.php:315
 msgid "Task Scheduler"
 msgstr "Aufgabenplaner"
 
@@ -74,44 +74,44 @@ msgstr "Exportieren"
 msgid "Generate"
 msgstr "Erstellen"
 
-#: src/Menu/InvoiceMenu.php:429
+#: src/Menu/InvoiceMenu.php:432
 #: src/Model/InvoiceList.php:124
 #: src/WcExtend/InvoiceMetabox.php:158
 msgid "Payments"
 msgstr "Zahlungen"
 
 #: src/Menu/InvoiceMenu.php:207
-#: src/Menu/InvoiceMenu.php:434
-#: src/Menu/InvoiceMenu.php:440
+#: src/Menu/InvoiceMenu.php:437
+#: src/Menu/InvoiceMenu.php:443
 msgid "Invoice template"
 msgstr "Rechnungsvorlage"
 
-#: src/Menu/InvoiceMenu.php:333
+#: src/Menu/InvoiceMenu.php:336
 msgid "Document Title"
 msgstr "Dokumenten Titel"
 
-#: src/Menu/InvoiceMenu.php:335
+#: src/Menu/InvoiceMenu.php:338
 msgid "Address line"
 msgstr "Adresszeile"
 
-#: src/Menu/InvoiceMenu.php:336
+#: src/Menu/InvoiceMenu.php:339
 msgid "Payment terms"
 msgstr "Zahlungsbedingungen"
 
-#: src/Menu/InvoiceMenu.php:337
+#: src/Menu/InvoiceMenu.php:340
 msgid "Offer terms"
 msgstr "Angebotsbedingungen"
 
-#: src/Menu/InvoiceMenu.php:339
+#: src/Menu/InvoiceMenu.php:342
 msgid "Protect rows from splitting"
 msgstr "Zeilenaufteilung vermeiden"
 
-#: src/Menu/InvoiceMenu.php:339
+#: src/Menu/InvoiceMenu.php:342
 msgid "Keep rows together when page breaks"
 msgstr "Behalte die Zeilen zusammen bei Seitenumbrüchen"
 
-#: src/Menu/InvoiceMenu.php:318
-#: src/Menu/InvoiceMenu.php:437
+#: src/Menu/InvoiceMenu.php:321
+#: src/Menu/InvoiceMenu.php:440
 #: src/Schedule/InvoiceTask.php:278
 msgid "Payment reminder"
 msgstr "Zahlungserinnerung"
@@ -124,11 +124,11 @@ msgstr "%s Erinnerungen versendet"
 msgid "Recurring payments"
 msgstr "Regelmäßige Zahlungen"
 
-#: src/Menu/InvoiceMenu.php:315
+#: src/Menu/InvoiceMenu.php:318
 msgid "Enable test mode and replace all recipients with the admin email address"
 msgstr "Aktiviert den Test modus und ersetzt alle Empfänger mit der E - Mail des Administrators"
 
-#: src/Menu/InvoiceMenu.php:318
+#: src/Menu/InvoiceMenu.php:321
 msgid "Send payment reminders to customer when invoice is due"
 msgstr "Verschickt Zahlungserinnerungen an den Kunden, nachdem eine Zahlung überfällig ist"
 
@@ -136,12 +136,12 @@ msgstr "Verschickt Zahlungserinnerungen an den Kunden, nachdem eine Zahlung übe
 msgid "Recurring invoice %s has been created"
 msgstr "Wiederkehrende Rechnung %s wurde erstellt"
 
-#: src/Menu/InvoiceMenu.php:317
-#: src/Menu/InvoiceMenu.php:431
+#: src/Menu/InvoiceMenu.php:320
+#: src/Menu/InvoiceMenu.php:434
 msgid "Automate invoice submission"
 msgstr "Rechnungen automatisert versenden"
 
-#: src/Menu/InvoiceMenu.php:317
+#: src/Menu/InvoiceMenu.php:320
 msgid "Enable automate invoice submission to customers on a daily schedule"
 msgstr "Aktiviert das automatische versenden von Rechnung (täglich)"
 
@@ -161,35 +161,35 @@ msgstr "Rechnung %s erfolgreich erstellt"
 msgid "A reminder #%s for invoice %s has been submitted to %s"
 msgstr "Eine Erinnerung #%s für die Rechnung %s wurde an %s übermittelt"
 
-#: src/Menu/InvoiceMenu.php:316
-#: src/Menu/InvoiceMenu.php:421
-#: src/Menu/InvoiceMenu.php:427
+#: src/Menu/InvoiceMenu.php:319
+#: src/Menu/InvoiceMenu.php:424
+#: src/Menu/InvoiceMenu.php:430
 msgid "Payment report"
 msgstr "Zahlungsbericht"
 
-#: src/Menu/InvoiceMenu.php:319
+#: src/Menu/InvoiceMenu.php:322
 msgid "First reminder (days)"
 msgstr "Erste Erinnerung (tage)"
 
-#: src/Menu/InvoiceMenu.php:319
+#: src/Menu/InvoiceMenu.php:322
 msgid "The number of days (after due) when the first payment reminder should be sent to the customer"
 msgstr "Die Anzahl der Tage (nach Fälligkeit) an dem die erste Zahlungserinnerung an den Kunden geschickt werden soll"
 
-#: src/Menu/InvoiceMenu.php:320
+#: src/Menu/InvoiceMenu.php:323
 msgid "Reminder interval"
 msgstr "Erinnerungsinterval"
 
-#: src/Menu/InvoiceMenu.php:321
+#: src/Menu/InvoiceMenu.php:324
 msgid "Max reminders"
 msgstr "Maximale Erinnerungen"
 
 #: src/WcExtend/InvoiceMetabox.php:100
-#: wc-recurring.php:90
+#: wc-recurring.php:91
 msgid "yearly"
 msgstr "jährlich"
 
 #: src/WcExtend/InvoiceMetabox.php:95
-#: wc-recurring.php:90
+#: wc-recurring.php:91
 msgid "monthly"
 msgstr "monatlich"
 
@@ -209,8 +209,7 @@ msgstr "pro Monat"
 msgid "per"
 msgstr "pro"
 
-#: src/Menu/AccountInvoice.php:62
-#: src/Menu/AccountInvoice.php:102
+#: src/Menu/AccountInvoice.php:65
 #: src/Model/InvoiceList.php:67
 #: src/Model/InvoicePdf.php:57
 #: src/Schedule/InvoiceTask.php:80
@@ -220,16 +219,14 @@ msgstr "pro"
 msgid "Invoice"
 msgstr "Rechnung"
 
-#: src/Menu/AccountInvoice.php:30
+#: src/Menu/AccountInvoice.php:38
 #: src/Menu/InvoiceMenu.php:26
 #: src/Menu/InvoiceMenu.php:27
 #: src/Menu/InvoiceMenu.php:129
 msgid "Invoices"
 msgstr "Rechnungen"
 
-#: src/Menu/AccountInvoice.php:85
-#: src/Menu/AccountInvoice.php:131
-#: src/Menu/AccountInvoice.php:140
+#: src/Menu/AccountInvoice.php:88
 msgid "Pay Now"
 msgstr "Bezahlen"
 
@@ -242,14 +239,13 @@ msgstr "Zahlungsinterval"
 msgid "Period"
 msgstr "Zeitraum"
 
-#: src/Menu/AccountInvoice.php:87
-#: src/Menu/AccountInvoice.php:107
+#: src/Menu/AccountInvoice.php:90
 #: src/Model/InvoiceList.php:73
 #: src/Model/InvoicePdf.php:95
 msgid "Paid at"
 msgstr "Bezahlt am"
 
-#: src/Menu/AccountInvoice.php:65
+#: src/Menu/AccountInvoice.php:68
 #: src/Model/InvoiceList.php:72
 #: src/Schedule/InvoiceTask.php:80
 msgid "Due at"
@@ -263,7 +259,7 @@ msgstr "Bezahlt"
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/Menu/AccountInvoice.php:83
+#: src/Menu/AccountInvoice.php:86
 #: src/Model/InvoiceList.php:108
 msgid "Canceled"
 msgstr "Abgebrochen"
@@ -314,7 +310,7 @@ msgstr "Total"
 msgid "Status"
 msgstr "Status"
 
-#: src/Menu/InvoiceMenu.php:460
+#: src/Menu/InvoiceMenu.php:463
 msgid "Save"
 msgstr "Speichern"
 
@@ -363,24 +359,24 @@ msgstr "Bitte geben Sie hier die gwünschte Domain ein"
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: src/Menu/InvoiceMenu.php:291
+#: src/Menu/InvoiceMenu.php:294
 msgid "Subscription option"
 msgstr "Abonnement auswahl"
 
-#: src/Menu/InvoiceMenu.php:295
+#: src/Menu/InvoiceMenu.php:298
 msgid "Customer choose"
 msgstr "Kunde entscheidet"
 
-#: src/Menu/InvoiceMenu.php:292
+#: src/Menu/InvoiceMenu.php:295
 msgid "Allow the customer to choose between the subscriptions during checkout or fix a value"
 msgstr "Erlaube dem Kunden die Auswahl eines Abonnement oder setze den Wert fest"
 
-#: src/Menu/InvoiceMenu.php:284
+#: src/Menu/InvoiceMenu.php:287
 #: src/WcExtend/InvoiceMetabox.php:72
 msgid "Enable B2C"
 msgstr "Aktiviere B2C"
 
-#: src/Menu/InvoiceMenu.php:284
+#: src/Menu/InvoiceMenu.php:287
 #: src/WcExtend/InvoiceMetabox.php:75
 msgid "Create invoice compatible for Business to Customer (B2C) relationship"
 msgstr "Erstelle Business to Customer (B2C) kompatible Rechnungen"
@@ -420,9 +416,9 @@ msgid "Invoice not found our no access to this resource"
 msgstr "Rechnung nicht gefunden oder kein Zugriff auf diese Resource"
 
 #: src/Menu/InvoiceMenu.php:206
-#: src/Menu/InvoiceMenu.php:352
-#: src/Menu/InvoiceMenu.php:368
-#: src/Menu/InvoiceMenu.php:372
+#: src/Menu/InvoiceMenu.php:355
+#: src/Menu/InvoiceMenu.php:371
+#: src/Menu/InvoiceMenu.php:375
 msgid "General"
 msgstr "Allgemein"
 
@@ -430,32 +426,32 @@ msgstr "Allgemein"
 msgid "Business"
 msgstr "Geschäft"
 
-#: src/Menu/InvoiceMenu.php:540
+#: src/Menu/InvoiceMenu.php:543
 msgid "Select image"
 msgstr "Bild auswählen"
 
-#: src/Menu/InvoiceMenu.php:541
+#: src/Menu/InvoiceMenu.php:544
 msgid "Clear image"
 msgstr "Bild löschen"
 
-#: src/Menu/InvoiceMenu.php:304
+#: src/Menu/InvoiceMenu.php:307
 msgid "Email details"
 msgstr "E-Mail Details"
 
 #: src/Menu/InvoiceMenu.php:222
-#: src/Menu/InvoiceMenu.php:306
+#: src/Menu/InvoiceMenu.php:309
 msgid "Report recipient"
 msgstr "Berichtsadresse"
 
-#: src/Menu/InvoiceMenu.php:306
+#: src/Menu/InvoiceMenu.php:309
 msgid "Reciepient address for payment reports"
 msgstr "Empfänger - Adresse für Zahlungsberichte"
 
-#: src/Menu/InvoiceMenu.php:307
+#: src/Menu/InvoiceMenu.php:310
 msgid "Sender address"
 msgstr "Absender - Adresse"
 
-#: src/Menu/InvoiceMenu.php:307
+#: src/Menu/InvoiceMenu.php:310
 msgid "Public sender address the invoice is being submitted"
 msgstr "Öffentliche Absender - Adresse bei Rechnungsübermittlung"
 
@@ -472,9 +468,9 @@ msgid "Enter your company name"
 msgstr "Gebe hier die Firma an"
 
 #: src/Menu/InvoiceMenu.php:268
-#: src/Menu/InvoiceMenu.php:352
-#: src/Menu/InvoiceMenu.php:368
-#: src/Menu/InvoiceMenu.php:372
+#: src/Menu/InvoiceMenu.php:355
+#: src/Menu/InvoiceMenu.php:371
+#: src/Menu/InvoiceMenu.php:375
 msgid "Contact email"
 msgstr "Kontakt Email"
 
@@ -490,11 +486,11 @@ msgstr "Umsatzsteuer ID"
 msgid "Enter your VAT ID"
 msgstr "Geben Sie hier die UST. ID an"
 
-#: src/Menu/InvoiceMenu.php:330
+#: src/Menu/InvoiceMenu.php:333
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/Menu/InvoiceMenu.php:407
+#: src/Menu/InvoiceMenu.php:410
 msgid "Content"
 msgstr "Inhalt"
 
@@ -507,8 +503,8 @@ msgstr "Kundenreferenz ID (BT-10)"
 msgid "Additional customer info"
 msgstr "Zusätzliche Kundeninformation"
 
-#: src/Menu/InvoiceMenu.php:434
-#: src/Menu/InvoiceMenu.php:440
+#: src/Menu/InvoiceMenu.php:437
+#: src/Menu/InvoiceMenu.php:443
 msgid "The same placeholder from %s can be used"
 msgstr "Platzhalter aus %s können verwendet werden"
 
@@ -519,3 +515,11 @@ msgstr "Aktiviere XRechnung"
 #: src/Menu/InvoiceMenu.php:281
 msgid "Enable support for XInvoice (XML)"
 msgstr "Unterstützung für XRechnung (XML) aktivieren"
+
+#: src/Menu/InvoiceMenu.php:284
+msgid "Order account filter"
+msgstr "Konto Filter für Bestellung"
+
+#: src/Menu/InvoiceMenu.php:284
+msgid "Only show completed WooCommerce orders on customers account page"
+msgstr "Zeige nur abgeschlossene WooCommerce Bestellungen auf der Kundenkonto Seite"
diff --git a/lang/wc-invoice-pdf.pot b/lang/wc-invoice-pdf.pot
index 82bef7b..a7f103f 100644
--- a/lang/wc-invoice-pdf.pot
+++ b/lang/wc-invoice-pdf.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-11-27T13:10:44+00:00\n"
+"POT-Creation-Date: 2024-11-27T13:36:03+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: wc-invoice-pdf\n"
@@ -39,15 +39,14 @@ msgstr ""
 msgid "https://github.com/ole1986/wc-invoice-pdf"
 msgstr ""
 
-#: src/Menu/AccountInvoice.php:30
+#: src/Menu/AccountInvoice.php:38
 #: src/Menu/InvoiceMenu.php:26
 #: src/Menu/InvoiceMenu.php:27
 #: src/Menu/InvoiceMenu.php:129
 msgid "Invoices"
 msgstr ""
 
-#: src/Menu/AccountInvoice.php:62
-#: src/Menu/AccountInvoice.php:102
+#: src/Menu/AccountInvoice.php:65
 #: src/Model/InvoiceList.php:67
 #: src/Model/InvoicePdf.php:57
 #: src/Schedule/InvoiceTask.php:80
@@ -57,25 +56,22 @@ msgstr ""
 msgid "Invoice"
 msgstr ""
 
-#: src/Menu/AccountInvoice.php:65
+#: src/Menu/AccountInvoice.php:68
 #: src/Model/InvoiceList.php:72
 #: src/Schedule/InvoiceTask.php:80
 msgid "Due at"
 msgstr ""
 
-#: src/Menu/AccountInvoice.php:83
+#: src/Menu/AccountInvoice.php:86
 #: src/Model/InvoiceList.php:108
 msgid "Canceled"
 msgstr ""
 
-#: src/Menu/AccountInvoice.php:85
-#: src/Menu/AccountInvoice.php:131
-#: src/Menu/AccountInvoice.php:140
+#: src/Menu/AccountInvoice.php:88
 msgid "Pay Now"
 msgstr ""
 
-#: src/Menu/AccountInvoice.php:87
-#: src/Menu/AccountInvoice.php:107
+#: src/Menu/AccountInvoice.php:90
 #: src/Model/InvoiceList.php:73
 #: src/Model/InvoicePdf.php:95
 msgid "Paid at"
@@ -115,15 +111,15 @@ msgid "The scheduled task is not installed - Please try to reenable the plugin"
 msgstr ""
 
 #: src/Menu/InvoiceMenu.php:206
-#: src/Menu/InvoiceMenu.php:352
-#: src/Menu/InvoiceMenu.php:368
-#: src/Menu/InvoiceMenu.php:372
+#: src/Menu/InvoiceMenu.php:355
+#: src/Menu/InvoiceMenu.php:371
+#: src/Menu/InvoiceMenu.php:375
 msgid "General"
 msgstr ""
 
 #: src/Menu/InvoiceMenu.php:207
-#: src/Menu/InvoiceMenu.php:434
-#: src/Menu/InvoiceMenu.php:440
+#: src/Menu/InvoiceMenu.php:437
+#: src/Menu/InvoiceMenu.php:443
 msgid "Invoice template"
 msgstr ""
 
@@ -137,7 +133,7 @@ msgid "Export"
 msgstr ""
 
 #: src/Menu/InvoiceMenu.php:222
-#: src/Menu/InvoiceMenu.php:306
+#: src/Menu/InvoiceMenu.php:309
 msgid "Report recipient"
 msgstr ""
 
@@ -154,9 +150,9 @@ msgid "Enter your company name"
 msgstr ""
 
 #: src/Menu/InvoiceMenu.php:268
-#: src/Menu/InvoiceMenu.php:352
-#: src/Menu/InvoiceMenu.php:368
-#: src/Menu/InvoiceMenu.php:372
+#: src/Menu/InvoiceMenu.php:355
+#: src/Menu/InvoiceMenu.php:371
+#: src/Menu/InvoiceMenu.php:375
 msgid "Contact email"
 msgstr ""
 
@@ -181,152 +177,160 @@ msgid "Enable support for XInvoice (XML)"
 msgstr ""
 
 #: src/Menu/InvoiceMenu.php:284
+msgid "Order account filter"
+msgstr ""
+
+#: src/Menu/InvoiceMenu.php:284
+msgid "Only show completed WooCommerce orders on customers account page"
+msgstr ""
+
+#: src/Menu/InvoiceMenu.php:287
 #: src/WcExtend/InvoiceMetabox.php:72
 msgid "Enable B2C"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:284
+#: src/Menu/InvoiceMenu.php:287
 #: src/WcExtend/InvoiceMetabox.php:75
 msgid "Create invoice compatible for Business to Customer (B2C) relationship"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:287
+#: src/Menu/InvoiceMenu.php:290
 msgid "Due date in days"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:287
+#: src/Menu/InvoiceMenu.php:290
 msgid "The number of days an invoice becomes due"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:291
+#: src/Menu/InvoiceMenu.php:294
 msgid "Subscription option"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:292
+#: src/Menu/InvoiceMenu.php:295
 msgid "Allow the customer to choose between the subscriptions during checkout or fix a value"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:295
+#: src/Menu/InvoiceMenu.php:298
 msgid "Customer choose"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:304
+#: src/Menu/InvoiceMenu.php:307
 msgid "Email details"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:306
+#: src/Menu/InvoiceMenu.php:309
 msgid "Reciepient address for payment reports"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:307
+#: src/Menu/InvoiceMenu.php:310
 msgid "Sender address"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:307
+#: src/Menu/InvoiceMenu.php:310
 msgid "Public sender address the invoice is being submitted"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:312
+#: src/Menu/InvoiceMenu.php:315
 msgid "Task Scheduler"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:315
+#: src/Menu/InvoiceMenu.php:318
 msgid "Enable test mode and replace all recipients with the admin email address"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:316
-#: src/Menu/InvoiceMenu.php:421
-#: src/Menu/InvoiceMenu.php:427
+#: src/Menu/InvoiceMenu.php:319
+#: src/Menu/InvoiceMenu.php:424
+#: src/Menu/InvoiceMenu.php:430
 msgid "Payment report"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:317
-#: src/Menu/InvoiceMenu.php:431
+#: src/Menu/InvoiceMenu.php:320
+#: src/Menu/InvoiceMenu.php:434
 msgid "Automate invoice submission"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:317
+#: src/Menu/InvoiceMenu.php:320
 msgid "Enable automate invoice submission to customers on a daily schedule"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:318
-#: src/Menu/InvoiceMenu.php:437
+#: src/Menu/InvoiceMenu.php:321
+#: src/Menu/InvoiceMenu.php:440
 #: src/Schedule/InvoiceTask.php:278
 msgid "Payment reminder"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:318
+#: src/Menu/InvoiceMenu.php:321
 msgid "Send payment reminders to customer when invoice is due"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:319
+#: src/Menu/InvoiceMenu.php:322
 msgid "First reminder (days)"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:319
+#: src/Menu/InvoiceMenu.php:322
 msgid "The number of days (after due) when the first payment reminder should be sent to the customer"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:320
+#: src/Menu/InvoiceMenu.php:323
 msgid "Reminder interval"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:321
+#: src/Menu/InvoiceMenu.php:324
 msgid "Max reminders"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:330
+#: src/Menu/InvoiceMenu.php:333
 msgid "Properties"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:333
+#: src/Menu/InvoiceMenu.php:336
 msgid "Document Title"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:335
+#: src/Menu/InvoiceMenu.php:338
 msgid "Address line"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:336
+#: src/Menu/InvoiceMenu.php:339
 msgid "Payment terms"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:337
+#: src/Menu/InvoiceMenu.php:340
 msgid "Offer terms"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:339
+#: src/Menu/InvoiceMenu.php:342
 msgid "Protect rows from splitting"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:339
+#: src/Menu/InvoiceMenu.php:342
 msgid "Keep rows together when page breaks"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:407
+#: src/Menu/InvoiceMenu.php:410
 msgid "Content"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:429
+#: src/Menu/InvoiceMenu.php:432
 #: src/Model/InvoiceList.php:124
 #: src/WcExtend/InvoiceMetabox.php:158
 msgid "Payments"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:434
-#: src/Menu/InvoiceMenu.php:440
+#: src/Menu/InvoiceMenu.php:437
+#: src/Menu/InvoiceMenu.php:443
 msgid "The same placeholder from %s can be used"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:460
+#: src/Menu/InvoiceMenu.php:463
 msgid "Save"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:540
+#: src/Menu/InvoiceMenu.php:543
 msgid "Select image"
 msgstr ""
 
-#: src/Menu/InvoiceMenu.php:541
+#: src/Menu/InvoiceMenu.php:544
 msgid "Clear image"
 msgstr ""
 
@@ -428,12 +432,12 @@ msgid "A scheduler will submit the invoice %s to '%s'"
 msgstr ""
 
 #: src/WcExtend/InvoiceMetabox.php:95
-#: wc-recurring.php:90
+#: wc-recurring.php:91
 msgid "monthly"
 msgstr ""
 
 #: src/WcExtend/InvoiceMetabox.php:100
-#: wc-recurring.php:90
+#: wc-recurring.php:91
 msgid "yearly"
 msgstr ""
 
diff --git a/src/Menu/AccountInvoice.php b/src/Menu/AccountInvoice.php
index 79ffd64..d53cc75 100644
--- a/src/Menu/AccountInvoice.php
+++ b/src/Menu/AccountInvoice.php
@@ -2,6 +2,7 @@
 namespace WcRecurring\Menu;
 
 use WcRecurring\Model\Invoice;
+use WcRecurring\WcRecurringIndex;
 
 class AccountInvoice
 {
@@ -16,6 +17,11 @@ public function __construct()
             add_filter('woocommerce_account_menu_items', [$this, 'wc_invoice_menu']);
             add_action('woocommerce_account_invoices_endpoint', [$this, 'wc_invoice_content']);
 
+            if (!empty(WcRecurringIndex::$OPTIONS['wc_order_show_completed'])) {
+                add_filter('woocommerce_my_account_my_orders_query', [$this, 'wc_orders_query']);
+            }
+            
+
             if (isset($_GET['invoice'])) {
                 $menu = new InvoiceMenu();
                 $menu->OpenInvoice();
@@ -24,6 +30,12 @@ public function __construct()
         }
     }
 
+    public function wc_orders_query($args)
+    {
+        $args['post_status'] = 'wc-completed';
+        return $args;
+    }
+
     public function wc_invoice_menu($items)
     {
         $result = array_slice($items, 0, 2);
@@ -37,11 +49,6 @@ public function wc_invoice_menu($items)
     public function wc_invoice_content()
     {
         global $wpdb, $current_user;
-        
-        if (isset($_GET['payment'])) {
-            $this->showPaymentForInvoice(intval($_GET['payment']));
-            return;
-        }
 
         $query = "SELECT i.ID, i.invoice_number, i.created, i.due_date, i.status, i.paid_date, ISNULL(i.xinvoice) AS no_xinvoice,
                     u.user_login AS customer_name, u.user_email AS user_email, u.ID AS user_id, p.ID AS order_id, p.post_status, pm.meta_value AS ispconfig_period 
@@ -93,53 +100,4 @@ public function wc_invoice_content()
         </table>
         <?php
     }
-
-    public function showPaymentForInvoice($invoiceID)
-    {
-        $invoice = new Invoice($invoiceID);
-        $order = $invoice->order;
-        ?>
-        <h3><?php  _e('Invoice', 'wc-invoice-pdf'); ?> <?php echo $invoice->invoice_number ?></h3>
-        via <?php echo $order->get_payment_method_title() ?>
-        <p><?php _e('Order', 'woocommerce') ?># <?php echo $invoice->invoice_number ?></p>
-
-        <?php if ($invoice->status & Invoice::PAID) : ?>
-        <h4 style="text-align:center;"><?php echo __('Paid at', 'wc-invoice-pdf') . ' ' . strftime("%x", strtotime($invoice->paid_date)) ?></h4>
-            <?php return;
-        endif; ?>
-
-        <?php if ($order->get_payment_method() == 'bacs') :
-            $bacs = new \WC_Gateway_BACS(); ?>      
-            <?php $bacs->thankyou_page($order->get_id()); ?>
-            <h3>Betrag: <?php echo $order->get_total() .' ' . $order->get_currency(); ?></h3>
-        <?php elseif ($order->get_payment_method() == 'paypal') :
-            // overwrite order number to use invoice number instead
-            add_filter('woocommerce_order_number', function () use ($invoice) {
-                return $invoice->invoice_number;
-            });
-            add_filter('woocommerce_paypal_args', function ($args) use ($invoice) {
-                $args['custom'] = json_encode(array('invoice_id' => $invoice->ID));
-                return $args;
-            });
-
-            $paypal = new \WC_Gateway_Paypal();
-            $result = $paypal->process_payment($order->get_id());
-            ?>
-            <div style="text-align: center;">
-                <a href="<?php echo '?invoice=' . $invoiceID; ?>" class="button view"><?php  _e('Show');  ?></a>
-                &nbsp;&nbsp;&nbsp;
-                <a href="<?php echo $result['redirect'] ?>" class="button button-primary"><?php _e('Pay Now', 'wc-invoice-pdf') ?></a>
-            </div>
-        <?php elseif ($order->get_payment_method() == 'paynow') :
-            $paynow = new \WC_Gateway_Paynow();
-            $result = $paynow->process_payment($order->get_id());
-            ?>
-          <div style="text-align: center;">
-                <a href="<?php echo '?invoice=' . $invoiceID; ?>" class="button view"><?php  _e('Show');  ?></a>
-                &nbsp;&nbsp;&nbsp;
-                <a href="<?php echo $result['redirect'] ?>" class="button button-primary"><?php _e('Pay Now', 'wc-invoice-pdf') ?></a>
-            </div>
-        <?php endif; ?>
-        <?php
-    }
 }
diff --git a/src/Menu/InvoiceMenu.php b/src/Menu/InvoiceMenu.php
index 4886a5e..4075bde 100644
--- a/src/Menu/InvoiceMenu.php
+++ b/src/Menu/InvoiceMenu.php
@@ -280,6 +280,9 @@ public function DisplaySettings()
                             <?php
                                 $this->addField('wc_pdf_xinvoice', '<strong>' . __('Enable XInvoice', 'wc-invoice-pdf') . '</strong><br />' . __('Enable support for XInvoice (XML)', 'wc-invoice-pdf'), 'checkbox');
                             ?>
+                            <?php
+                                $this->addField('wc_order_show_completed', '<strong>' . __('Order account filter', 'wc-invoice-pdf') . '</strong><br />' . __('Only show completed WooCommerce orders on customers account page', 'wc-invoice-pdf'), 'checkbox');
+                            ?>
                             <?php
                                 $this->addField('wc_pdf_b2c', '<strong>' . __('Enable B2C', 'wc-invoice-pdf') . '</strong><br />' . __('Create invoice compatible for Business to Customer (B2C) relationship', 'wc-invoice-pdf'), 'checkbox');
                             ?>
diff --git a/wc-recurring.php b/wc-recurring.php
index ce0bc20..fde958e 100644
--- a/wc-recurring.php
+++ b/wc-recurring.php
@@ -73,7 +73,8 @@ class WcRecurringIndex
         'wc_company_name' => 'Your Company',
         'wc_company_email' => 'some@mail.tld',
         'wc_company_vat' => 'DE123456',
-        'wc_pdf_xinvoice' => 0
+        'wc_pdf_xinvoice' => 0,
+        'wc_order_show_completed' => 0
     ];
 
     public static $SUBSCRIPTIONS = [];