-
Notifications
You must be signed in to change notification settings - Fork 1
Feat/#274 add payment reminder email #420
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
Open
Sintry1
wants to merge
24
commits into
development
Choose a base branch
from
feat/#274-add-payment-reminder-email
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
457a6a6
feat: 🎸 Add paymentReminderSent field to order
Kwandes c422bb2
feat: 🎸 Add payment reminder email
Kwandes 77b9ca9
feat: 🎸 Add commented out scheduled method
d155beb
feat: 🎸 Add get unpayed orders list method
Sintry1 e915942
feat: 🎸 Add Spring Import
a86bfb6
feat: 🎸 Change payment reminder email slightly
Sintry1 fb69653
feat: 🎸 Add logic to scheduled method
Sintry1 666583c
feat: 🎸 Add logic to OrderService method
Sintry1 4b84fa0
feat: 🎸 Add logic to fetch order method
Sintry1 2dc8ee5
feat: 🎸 Add logic to OrderService method
Sintry1 5e37582
feat: 🎸 Move fetch order logic to OrderService
Sintry1 18bee32
feat: 🎸 Fix conflicts
Sintry1 c1b0ac4
feat: 🎸 Remove unneeded line
Sintry1 daba1c1
feat: 🎸 Change frequency of cron expression
Sintry1 9a645a5
feat: 🎸 Add payment link to template
Sintry1 a42677c
feat: 🎸 Add check for time to scheduled method
Sintry1 3a82171
feat: 🎸 Fix payment link in email template and add time check
Sintry1 7aa9b64
feat: 🎸 Change CRON to 1hr
Sintry1 c46d823
style: 💄 Formatting
Sintry1 3cedbcc
Merge branch 'development' into feat/#274-add-payment-reminder-email
Teodor25 2ceebe2
Merge branch 'development' into feat/#274-add-payment-reminder-email
Kwandes e817732
refactor: 💡 Rename paymentReminderSent variable in data.sql
Kwandes 1b372f1
chore: 🤖 Fix order of fields in data.sql
Kwandes 5ad6f9b
Merge branch 'development' into feat/#274-add-payment-reminder-email
Kwandes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 159 additions & 0 deletions
159
apps/api/src/main/resources/templates/emails/payment-reminder.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
| <!--[if gte mso 9 | ||
| ]><xml | ||
| ><o:OfficeDocumentSettings | ||
| ><o:AllowPNG /><o:PixelsPerInch>96</o:PixelsPerInch></o:OfficeDocumentSettings | ||
| ></xml | ||
| ><! | ||
| [endif]--> | ||
| <meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> | ||
| <meta content="width=device-width" name="viewport" /> | ||
| <!--[if !mso]><!--> | ||
| <meta content="IE=edge" http-equiv="X-UA-Compatible" /> | ||
| <!--<![endif]--> | ||
| <title></title> | ||
| <!--[if !mso]><!--> | ||
| <!--<![endif]--> | ||
| <style type="text/css"> | ||
| body { | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| table, | ||
| td, | ||
| tr { | ||
| vertical-align: top; | ||
| border-collapse: collapse; | ||
| } | ||
|
|
||
| * { | ||
| line-height: inherit; | ||
| } | ||
|
|
||
| a[x-apple-data-detectors='true'] { | ||
| color: #af7949 !important; | ||
| text-decoration: none !important; | ||
| } | ||
| </style> | ||
| <style id="media-query" type="text/css"> | ||
| @media (max-width: 580px) { | ||
| .block-grid, | ||
| .col { | ||
| min-width: 320px !important; | ||
| max-width: 100% !important; | ||
| display: block !important; | ||
| } | ||
|
|
||
| .block-grid { | ||
| width: 100% !important; | ||
| } | ||
|
|
||
| .col { | ||
| width: 100% !important; | ||
| } | ||
|
|
||
| .col_cont { | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| img.fullwidth, | ||
| img.fullwidthOnMobile { | ||
| width: 100% !important; | ||
| } | ||
|
|
||
| .no-stack .col { | ||
| min-width: 0 !important; | ||
| display: table-cell !important; | ||
| } | ||
|
|
||
| .no-stack.two-up .col { | ||
| width: 50% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num2 { | ||
| width: 16.6% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num3 { | ||
| width: 25% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num4 { | ||
| width: 33% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num5 { | ||
| width: 41.6% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num6 { | ||
| width: 50% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num7 { | ||
| width: 58.3% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num8 { | ||
| width: 66.6% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num9 { | ||
| width: 75% !important; | ||
| } | ||
|
|
||
| .no-stack .col.num10 { | ||
| width: 83.3% !important; | ||
| } | ||
|
|
||
| .video-block { | ||
| max-width: none !important; | ||
| } | ||
|
|
||
| .mobile_hide { | ||
| min-height: 0px; | ||
| max-height: 0px; | ||
| max-width: 0px; | ||
| display: none; | ||
| overflow: hidden; | ||
| font-size: 0px; | ||
| } | ||
|
|
||
| .desktop_hide { | ||
| display: block !important; | ||
| max-height: none !important; | ||
| } | ||
|
|
||
| .img-container.big img { | ||
| width: auto !important; | ||
| } | ||
| } | ||
| </style> | ||
| <style id="icon-media-query" type="text/css"> | ||
| @media (max-width: 580px) { | ||
| .icons-inner { | ||
| text-align: center; | ||
| } | ||
|
|
||
| .icons-inner td { | ||
| margin: 0 auto; | ||
| } | ||
| } | ||
| </style> | ||
| </head> | ||
|
|
||
| <body class="clean-body" style="margin: 0; padding: 0; -webkit-text-size-adjust: 100%; background-color: #ffffff"> | ||
| <div> | ||
| <p>Here's your payment link: <a th:href="${paymentLink}" target="_blank" | ||
| style=" | ||
| text-decoration: underline; | ||
| color: #000000; | ||
| " | ||
| rel="noopener">Complete Payment</a> | ||
| </p> | ||
| </div> | ||
| </body> | ||
| </html> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Don't use normal console logs for this, use the Logger
But this log is redundant anyway since the ordersService already logs this, so it can be removed