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.

Sign up for GitHub

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

Jump to bottom

[210] Fixed scaling on the invoice template page and print preview page #262

Merged
merged 6 commits into from
Apr 4, 2024
Merged

[210] Fixed scaling on the invoice template page and print preview page #262

merged 6 commits into from
Apr 4, 2024

Conversation

v-j-jpg
Copy link
Contributor

@v-j-jpg v-j-jpg commented Apr 1, 2024

Description

Added margins and padding in order to fix the scaling issues. Images below show the invoices with new changes:
Screenshot 2024-04-01 at 09 49 30
Screenshot 2024-04-01 at 09 49 18
Screenshot 2024-04-01 at 09 48 54
Screenshot 2024-04-01 at 09 48 37
Screenshot 2024-04-01 at 09 47 53

Checklist

  • [ ✓] Ran the Black Formatter and
    djLint-er on any new code
    (checks
    will
    fail without)
  • Made any changes or additions to the documentation where required
  • [ ✓] Changes generate no new warnings/errors
  • [ ✓] New and existing unit tests pass locally with my
    changes

What type of PR is this?

  • 🐛 Bug Fix

Added/updated tests?

  • 🙅 no, because they aren't needed

Related PRs, Issues etc

@v-j-jpg
Copy link
Contributor Author

v-j-jpg commented Apr 1, 2024

Invoices with multiple services:
Screenshot 2024-04-01 at 09 59 25
Screenshot 2024-04-01 at 09 59 12

@TreyWW
Copy link
Owner

TreyWW commented Apr 1, 2024

Any chance you could take a look at the conflicts, thanks

image

@TreyWW TreyWW marked this pull request as draft April 1, 2024 15:58
@v-j-jpg
Copy link
Contributor Author

v-j-jpg commented Apr 2, 2024

After merging with the main branch the invoices page::
Screenshot 2024-04-02 at 13 30 10
Screenshot 2024-04-02 at 13 29 23
Screenshot 2024-04-02 at 13 29 03
Screenshot 2024-04-02 at 13 28 46
Screenshot 2024-04-02 at 13 28 32

@v-j-jpg v-j-jpg marked this pull request as ready for review April 2, 2024 11:45
@TreyWW
Copy link
Owner

TreyWW commented Apr 2, 2024

Hey,

Sorry about the back and fourths.

Before PR
image

After PR
image

Also the margins for credits is a little messed up

image

@TreyWW TreyWW marked this pull request as draft April 2, 2024 20:12
@v-j-jpg
Copy link
Contributor Author

v-j-jpg commented Apr 3, 2024

Hey @TreyWW, I fixed the margins that were the issue. After the changes:
image
image

If there is anything else that needs to be fixed, please let me now :D

@v-j-jpg v-j-jpg marked this pull request as ready for review April 3, 2024 11:12
@TreyWW TreyWW merged commit 908a7e4 into TreyWW:main Apr 4, 2024
@TreyWW TreyWW mentioned this pull request Apr 4, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TreyWW TreyWW TreyWW approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@v-j-jpg @TreyWW