-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add logic for reminder generation #219
Changes from 21 commits
29e947e
5ed3972
f745895
4489eb6
000e1aa
adccafb
e76d759
2d2e6ad
ef788ca
1bcc255
e12885a
7a6b8ed
6374582
e2c5b00
d49b802
6b24e4c
c059462
9072a3a
ff1df3e
7b987a9
f0c7a80
58753de
0329955
3553315
4179a8c
1d20f78
a2445c6
630d85a
764d7a9
428c193
e7dab81
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -7,6 +7,7 @@ | |||||||||
'invoice_number_format' => '#%06d', | ||||||||||
//contains the class file to create the pdf for the invoice, if set to false pdf-creation is disabled | ||||||||||
'invoice_pdfbuilder_class' => false, //implements org_openpsa_invoices_interfaces_pdfbuilder | ||||||||||
'invoice_pdfbuilder_reminder_class' => false, | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider enhancing the comment for the -//contains the class file to create the pdf for the invoice, if set to false pdf-creation is disabled
+// Specifies the class file to create PDFs for invoice reminders. If set to false, PDF creation for reminders is disabled.
+// When enabled, the specified class should implement the org_openpsa_invoices_interfaces_pdfbuilder interface or follow a compatible pattern. Committable suggestion
Suggested change
|
||||||||||
|
||||||||||
'invoice_mail_bcc' => false, | ||||||||||
'invoice_mail_from_address' => '[email protected]', | ||||||||||
|
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -126,6 +126,10 @@ Rechnungsdaten | |||||||||||||
Diese Rechnung wurde bereits verschickt. Soll die Datei trotzdem neu erzeugt werden? | ||||||||||||||
---STRINGEND | ||||||||||||||
|
||||||||||||||
---STRING reminder has already been sent. should it be replaced? | ||||||||||||||
Diese Mahnung wurde bereits verschickt. Soll die Datei trotzdem neu erzeugt werden? | ||||||||||||||
---STRINGEND | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The addition of the string for handling cases where a reminder has already been sent is clear and correctly translates the intended message. However, to maintain consistency with the rest of the file, consider starting the sentence with an uppercase letter. - ---STRING reminder has already been sent. should it be replaced?
+ ---STRING Reminder has already been sent. Should it be replaced? Committable suggestion
Suggested change
|
||||||||||||||
|
||||||||||||||
---STRING invoice items | ||||||||||||||
Rechnungspositionen | ||||||||||||||
---STRINGEND | ||||||||||||||
|
@@ -414,14 +418,26 @@ Die derzeitige PDF-Datei wurde manuell hochgeladen. Soll diese Datei wirklich er | |||||||||||||
PDF erzeugen | ||||||||||||||
---STRINGEND | ||||||||||||||
|
||||||||||||||
---STRING create_reminder | ||||||||||||||
Mahnung erzeugen | ||||||||||||||
---STRINGEND | ||||||||||||||
|
||||||||||||||
---STRING pdf created | ||||||||||||||
PDF-Datei wurde erfolgreich erzeugt | ||||||||||||||
---STRINGEND | ||||||||||||||
|
||||||||||||||
---STRING reminder pdf created | ||||||||||||||
Mahnungs PDF-Datei wurde erfolgreich erzeugt | ||||||||||||||
---STRINGEND | ||||||||||||||
Comment on lines
+429
to
+431
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ensure the translation for "reminder pdf created" is consistent with the updated terminology. - Mahnungs PDF-Datei wurde erfolgreich erzeugt
+ Zahlungserinnerungs-PDF wurde erfolgreich erstellt This adjustment aligns the terminology with the suggested changes for "reminder" and "create_reminder", maintaining consistency across the application. Committable suggestion
Suggested change
|
||||||||||||||
|
||||||||||||||
---STRING pdf creation failed | ||||||||||||||
PDF-Datei konnte nicht erzeugt werden | ||||||||||||||
---STRINGEND | ||||||||||||||
|
||||||||||||||
---STRING reminder pdf creation failed | ||||||||||||||
Mahnungs PDF-Datei konnte nicht erzeugt werden | ||||||||||||||
---STRINGEND | ||||||||||||||
Comment on lines
+437
to
+439
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Revise the translation for "reminder pdf creation failed" to match the updated terminology. - Mahnungs PDF-Datei konnte nicht erzeugt werden
+ Erstellung der Zahlungserinnerungs-PDF fehlgeschlagen This modification ensures consistency in terminology and clarifies the error message for users. Committable suggestion
Suggested change
|
||||||||||||||
|
||||||||||||||
---STRING position | ||||||||||||||
Position | ||||||||||||||
---STRINGEND |
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -130,6 +130,10 @@ Invoice data | |||||||||||||
This invoice has already been sent. Should the file be regenerated anyways? | ||||||||||||||
---STRINGEND | ||||||||||||||
|
||||||||||||||
---STRING reminder has already been sent. should it be replaced? | ||||||||||||||
This reminder has already been sent. Should the file be regenerated anyways? | ||||||||||||||
---STRINGEND | ||||||||||||||
SimonRautenberg marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||
|
||||||||||||||
---STRING invoice items | ||||||||||||||
Invoice items | ||||||||||||||
---STRINGEND | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
The punctuation and spacing around question marks should be consistent with standard English grammar rules. Consider the following adjustments for clarity and consistency: - shall it be replaced ? The current PDF file was manually uploaded. So shall it really be replaced ?
+ shall it be replaced? The current PDF file was manually uploaded. So, shall it really be replaced? |
||||||||||||||
|
@@ -425,3 +429,7 @@ Could not create PDF | |||||||||||||
---STRING position | ||||||||||||||
Position | ||||||||||||||
---STRINGEND | ||||||||||||||
|
||||||||||||||
---STRING create_reminder | ||||||||||||||
create reminder | ||||||||||||||
---STRINGEND | ||||||||||||||
Comment on lines
+429
to
+431
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The string value for "create reminder" should follow the capitalization style of other UI elements for consistency. Consider capitalizing the first letter of each word: ---STRING create_reminder
-create reminder
+Create Reminder Committable suggestion
Suggested change
|
Original file line number | Diff line number | Diff line change | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -124,6 +124,10 @@ | |||||||||||||||||
<p><strong><?php echo $data['l10n']->get('pdf file'); ?></strong></p> | ||||||||||||||||||
<?php echo org_openpsa_helpers_fileinfo::render($invoice, 'pdf_file'); | ||||||||||||||||||
} | ||||||||||||||||||
if ($view['pdf_file_reminder'] != "") { ?> | ||||||||||||||||||
<p><strong><?php echo $data['l10n']->get('pdf file'); ?></strong></p> | ||||||||||||||||||
SimonRautenberg marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||||||
<?php echo org_openpsa_helpers_fileinfo::render($invoice, 'pdf_file_reminder'); | ||||||||||||||||||
} | ||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The conditional block for displaying the PDF file reminder is correctly implemented and integrates well with the existing code. However, the label used for the reminder PDF is the same as the one used for the original invoice PDF, which could lead to confusion for users. Consider using a distinct label for the reminder PDF to clearly differentiate it from the original invoice PDF. Committable suggestion
Suggested change
|
||||||||||||||||||
|
||||||||||||||||||
$tabs = []; | ||||||||||||||||||
if ($expenses_url) { | ||||||||||||||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this in the PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i didn't see any changes. perhaps my IDE removed a space on saving.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gets removed with the next comit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's still here..