Skip to content
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 invoice date and paid date to invoice and invoices lists and tables #4019

Merged
merged 8 commits into from
Sep 12, 2024

Conversation

sandeepsajan0
Copy link
Member

@sandeepsajan0 sandeepsajan0 commented Jun 28, 2024

Fixes #3537

Invoice date:
image

image

image

image

Paid Date:

image

Test Steps

@frjo frjo added Type: Feature This is something new (not an enhancement of an existing thing). Type: Minor Minor change, used in release drafter labels Jul 2, 2024
@sandeepsajan0 sandeepsajan0 changed the title Add invoice date to invoice and invoices lists and tables Add invoice date and paid date to invoice and invoices lists and tables Jul 4, 2024
@frjo frjo added Status: Needs testing Tickets that need testing/qa Status: Needs user testing 👷 Tasks that should be tested by OTF's user test team and removed Status: Needs testing Tickets that need testing/qa Status: Needs user testing 👷 Tasks that should be tested by OTF's user test team labels Jul 5, 2024
@frjo
Copy link
Contributor

frjo commented Jul 5, 2024

Migration conflict with another PR on test so we wait to test this for a bit.

@frjo frjo force-pushed the enhancement/invoice-dates branch from 41652b7 to 47bcb6d Compare July 12, 2024 09:34
@frjo frjo force-pushed the enhancement/invoice-dates branch from 47bcb6d to 1372124 Compare August 12, 2024 11:52
@frjo frjo added Status: Needs testing Tickets that need testing/qa Status: Needs dev testing 🧑‍💻 Tasks that should be tested by the dev team Status: Needs user testing 👷 Tasks that should be tested by OTF's user test team and removed Status: Needs dev testing 🧑‍💻 Tasks that should be tested by the dev team labels Aug 12, 2024
@wes-otf
Copy link
Contributor

wes-otf commented Aug 30, 2024

Just had a demo meeting with finance and they liked it! When the pay date is set via the update status modal, where is that info displayed? I couldn't find where that was listed after it was set.

@wes-otf
Copy link
Contributor

wes-otf commented Aug 30, 2024

two other quick notes:

  1. do we need the timestamp on the Invoice Date field or could it only be the date (like the Pay Date field)?
  2. the Update status button formatting breaks when in the staff admin role, while for finance it looks fine. Not sure if this is a result of this PR or something else, though:
    Screenshot 2024-08-30 at 10 38 04

@frjo
Copy link
Contributor

frjo commented Sep 2, 2024

  1. I think we can use DateField instead of DateTimeField for both paid_date and invoice_date.
  2. @wes I think you was the "applicant" as well if you could see the delete button. According to the code only applicants see the delete button in the table.

{% can_delete invoice user as user_can_delete_request %}
{% if user.is_applicant and user_can_delete_request %}
<a class="data-block__action-icon-link text-red-500" href="{% url 'apply:projects:invoice-delete' pk=invoice.project.pk invoice_pk=invoice.pk %}">
{% heroicon_micro "trash" aria_hidden=true class="me-1" %}
{% trans "Delete" %}
</a>
{% endif %}

@@ -182,6 +182,8 @@ class Invoice(models.Model):
null=True,
verbose_name=_("Invoice amount"),
)
invoice_date = models.DateTimeField(null=True, verbose_name=_("Invoice date"))
paid_date = models.DateTimeField(null=True, verbose_name=_("Paid date"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can use DateField for both these fields.

@frjo frjo added Status: Tested - approved for live ✅ and removed Status: Needs testing Tickets that need testing/qa Status: Needs user testing 👷 Tasks that should be tested by OTF's user test team labels Sep 12, 2024
@frjo frjo merged commit dc0b394 into main Sep 12, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Tested - approved for live ✅ Type: Feature This is something new (not an enhancement of an existing thing). Type: Minor Minor change, used in release drafter
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Finance Role] Invoice Table on Project Page
3 participants