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
Send order confirmation mail after store payment received #2956
Merged
nanaya
merged 9 commits into
ppy:master
from
notbakaneko:feature/store/confirmation-mail
Apr 12, 2018
Merged
Send order confirmation mail after store payment received #2956
nanaya
merged 9 commits into
ppy:master
from
notbakaneko:feature/store/confirmation-mail
Apr 12, 2018
Conversation
This file contains 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
nanaya
requested changes
Apr 10, 2018
app/Mail/StorePaymentCompleted.php
Outdated
return $this->text(i18n_view('emails.store.payment_completed')) | ||
->with($this->params) | ||
->from('osustore@ppy.sh', 'osu!store team') | ||
->subject('We received your osu!store order!'); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
@endforeach | ||
@if ($order->requiresShipping()) | ||
|
||
We have received your payment and are preparing your order for shipping. It may take a few days for us to send it out, depending on the quantity of orders. You can follow the progress of your order at {{ route('store.invoice.show', $order) }}, including tracking details where available. |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
{{ $item->quantity }} x {{ $item->getDisplayName() }} ({{ currency($item->subtotal()) }}) | ||
@endforeach | ||
@if ($order->requiresShipping()) | ||
|
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
app/Models/Store/Order.php
Outdated
@@ -119,6 +122,17 @@ public function scopeWherePaymentTransactionId($query, $transactionId, $provider | |||
->where('cancelled', false)); | |||
} | |||
|
|||
public function dispatchMail() |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
nanaya
reviewed
Apr 12, 2018
{{ $item->quantity }} x {{ $item->getDisplayName() }} ({{ currency($item->subtotal()) }}) | ||
@endforeach | ||
|
||
@if ($order->shipping) |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
nanaya
approved these changes
Apr 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #2895