Skip to content

Commit

Permalink
BUGFIX: set correct package deps and update Swiftmailer
Browse files Browse the repository at this point in the history
  • Loading branch information
dimaip committed Feb 1, 2017
1 parent 00640bb commit e5f0307
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Classes/Psmb/Newsletter/Service/FusionMailService.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Neos\Flow\Mvc\Controller\ControllerContext;
use Neos\Flow\Mvc\Routing\UriBuilder;
use Neos\Neos\Service\LinkingService;
use TYPO3\SwiftMailer\Message;
use Neos\SwiftMailer\Message;
use Neos\ContentRepository\Domain\Model\Node;
use Neos\ContentRepository\Domain\Model\NodeInterface;
use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
Expand Down Expand Up @@ -259,4 +259,4 @@ protected function getSiteNode($dimensions = [])
return $context->getCurrentSiteNode();
}

}
}
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Psmb:
interval: manual
```

Define as many subscription types under Psmb.Newsletter.subscriptions as you need.
Define as many subscription types under Psmb.Newsletter.subscriptions as you need.

| setting key | description |
| --- | --- |
Expand All @@ -62,7 +62,7 @@ Then define a Fusion object like this for each renderer:
prototype(Your.NameSpace:WeeklyLetterRenderer) < prototype(Psmb.Newsletter:MailRenderer) {
subject = 'Our weekly digest'
body = 'Generate message body. Use your imagination.'
# You may automatically inline all css styles.
# [email protected] = Psmb.Newsletter:CssToInline {
# cssPath = 'resource://Your.Package/Public/Path/To/Your/Styles.css'
Expand Down Expand Up @@ -95,7 +95,7 @@ prototype(Sfi.Site:DigestMail) < prototype(Psmb.Newsletter:MailRenderer) {
@context.nodes = ${Search.query(site).nodeType('Sfi.Site:News').exactMatch('type', 'ourNews').greaterThan('date', Date.format(Date.subtract(Date.now(), subscription.interval), "Y-m-d\TH:i:sP").sortDesc('date').execute()}
@if.notEmpty = ${q(nodes).count() > 0}
subject = ${Translation.translate('newsletter.digestSubject', null, [], null, 'Sfi.Site')}
body = TYPO3.TypoScript:Collection {
body = Neos.Fusion:Collection {
collection = ${nodes}
itemName = 'node'
itemRenderer = Sfi.Site:DigestArticle
Expand All @@ -105,7 +105,7 @@ prototype(Sfi.Site:DigestMail) < prototype(Psmb.Newsletter:MailRenderer) {
}
}
prototype(Sfi.Site:DigestArticle) < prototype(TYPO3.TypoScript:Tag) {
prototype(Sfi.Site:DigestArticle) < prototype(Neos.Fusion:Tag) {
tagName = 'a'
attributes.href = NodeUri {
node = ${node}
Expand All @@ -124,7 +124,7 @@ prototype(Sfi.Site:DigestArticle) < prototype(TYPO3.TypoScript:Tag) {
|`Psmb.Newsletter:UnsubscribeLink`|Generated a link to unsubscribe action of the plugin|
|`Psmb.Newsletter:CssToInline`|Processor to automatically inline CSS styles|
|`Psmb.Newsletter:SubscriptionCase`|Rendering entry point. Usually no need to touch this one|
|`Psmb.Newsletter:SubscriptionPlugin`|Configured `TYPO3.Neos:Plugin` instance that insert Flow signup plugin.|
|`Psmb.Newsletter:SubscriptionPlugin`|Configured `Neos.Neos:Plugin` instance that insert Flow signup plugin.|

To customize the confirmation mail, override `Psmb.Newsletter:ConfirmationMailRenderer`.

Expand Down Expand Up @@ -153,7 +153,7 @@ Create a `Views.yaml` file in Configuration:
- 'resource://Psmb.Newsletter/Private/Partials/'
layoutRootPaths:
- 'resource://Sfi.Site/Private/Newsletter/Layouts/'
```

## Sending things out
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"license": "GPL-3.0+",
"require": {
"neos/neos": "^3.0",
"psmb/registry": "*",
"typo3/swiftmailer": "*",
"psmb/registry": "^2.0",
"neos/swiftmailer": "*",
"tijsverkoyen/css-to-inline-styles": "^2.2",
"flowpack/jobqueue-common": "*"
},
Expand Down

0 comments on commit e5f0307

Please sign in to comment.