Skip to content

Commit

Permalink
Merge branch 'craft-3' of https://github.com/verbb/events into craft-4
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/Events.php
#	src/controllers/DownloadsController.php
#	src/controllers/PurchasedTicketsController.php
#	src/controllers/TicketController.php
#	src/elements/Event.php
#	src/elements/PurchasedTicket.php
#	src/elements/Ticket.php
#	src/elements/TicketType.php
#	src/elements/db/EventQuery.php
#	src/events/EventTypeEvent.php
#	src/events/TicketTypeEvent.php
#	src/helpers/ProjectConfigData.php
#	src/helpers/TicketHelper.php
#	src/integrations/seomatic/Event.php
#	src/migrations/Install.php
#	src/migrations/m200118_000000_resave_purchased_tickets.php
#	src/migrations/m204014_000000_cleanup_columns.php
#	src/models/EventType.php
#	src/services/EventTypes.php
#	src/services/Events.php
#	src/services/PurchasedTickets.php
  • Loading branch information
engram-design committed Jul 1, 2022
2 parents 6a7e343 + ca1dfdb commit 3a1c098
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 20 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@
- Now requires Craft `^4.0.0-beta.1`.
- Now requires Craft Commerce `^4.0.0-beta.1`.

## 1.4.12 - 2022-06-28

### Changed
- `jsvrcek/ics` dependency updated for php 8.0 support.

### Fixed
- Fix PDF generation URLs not being correct in headless environments.

## 1.4.20 - 2021-10-30

### Fixed
Expand Down
8 changes: 8 additions & 0 deletions config.codekit3
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,14 @@
"oAP" : "\/src\/templates",
"oF" : 0
},
"\/src\/translations\/en\/events.php" : {
"cB" : 0,
"ft" : 8192,
"hM" : 0,
"oA" : 2,
"oAP" : "\/src\/translations\/en\/events.php",
"oF" : 0
},
"\/src\/variables" : {
"ft" : 65536,
"oA" : 1,
Expand Down
18 changes: 12 additions & 6 deletions docs/developers/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ Event::on(Pdf::class, Pdf::EVENT_AFTER_RENDER_PDF, function(PdfEvent $event) {
Plugins can get notified before an event is saved. Event handlers can prevent the event from getting saved by setting `$event->isValid` to false.

```php
use craft\events\ModelEvent;
use verbb\events\elements\Event as EventElement;
use yii\base\Event;

Event::on(EventElement::class, EventElement::EVENT_BEFORE_SAVE, function(Event $event) {
Event::on(EventElement::class, EventElement::EVENT_BEFORE_SAVE, function(ModelEvent $event) {
$isNew = $event->isNew;
$eventElement = $event->sender;
$event->isValid = false;
Expand All @@ -56,10 +57,11 @@ Event::on(EventElement::class, EventElement::EVENT_BEFORE_SAVE, function(Event $
Plugins can get notified after an event has been saved

```php
use craft\events\ModelEvent;
use verbb\events\elements\Event as EventElement;
use yii\base\Event;

Event::on(EventElement::class, EventElement::EVENT_AFTER_SAVE, function(Event $event) {
Event::on(EventElement::class, EventElement::EVENT_AFTER_SAVE, function(ModelEvent $event) {
$isNew = $event->isNew;
$eventElement = $event->sender;
});
Expand Down Expand Up @@ -132,10 +134,11 @@ Event::on(EventTypes::class, EventTypes::EVENT_AFTER_SAVE_EVENTTYPE, function(Ev
Plugins can get notified before a ticket is saved. Event handlers can prevent the ticket from getting saved by setting `$event->isValid` to false.

```php
use craft\events\ModelEvent;
use verbb\events\elements\Ticket;
use yii\base\Event;

Event::on(Ticket::class, Ticket::EVENT_BEFORE_SAVE, function(Event $event) {
Event::on(Ticket::class, Ticket::EVENT_BEFORE_SAVE, function(ModelEvent $event) {
$isNew = $event->isNew;
$ticket = $event->sender;
$event->isValid = false;
Expand All @@ -147,10 +150,11 @@ Event::on(Ticket::class, Ticket::EVENT_BEFORE_SAVE, function(Event $event) {
Plugins can get notified after a ticket has been saved

```php
use craft\events\ModelEvent;
use verbb\events\elements\Ticket;
use yii\base\Event;

Event::on(Ticket::class, Ticket::EVENT_AFTER_SAVE, function(Event $event) {
Event::on(Ticket::class, Ticket::EVENT_AFTER_SAVE, function(ModelEvent $event) {
$isNew = $event->isNew;
$ticket = $event->sender;
});
Expand Down Expand Up @@ -251,10 +255,11 @@ Event::on(EventElement::class, EventElement::EVENT_AFTER_CAPTURE_EVENT_SNAPSHOT,
Plugins can get notified before a purchased ticket is saved. Event handlers can prevent the purchased ticket from getting saved by setting `$event->isValid` to false.

```php
use craft\events\ModelEvent;
use verbb\events\elements\PurchasedTicket;
use yii\base\Event;

Event::on(PurchasedTicket::class, PurchasedTicket::EVENT_BEFORE_SAVE, function(Event $event) {
Event::on(PurchasedTicket::class, PurchasedTicket::EVENT_BEFORE_SAVE, function(ModelEvent $event) {
$isNew = $event->isNew;
$purchasedTicket = $event->sender;
$event->isValid = false;
Expand All @@ -266,10 +271,11 @@ Event::on(PurchasedTicket::class, PurchasedTicket::EVENT_BEFORE_SAVE, function(E
Plugins can get notified after a purchased ticket has been saved

```php
use craft\events\ModelEvent;
use verbb\events\elements\PurchasedTicket;
use yii\base\Event;

Event::on(PurchasedTicket::class, PurchasedTicket::EVENT_AFTER_SAVE, function(Event $event) {
Event::on(PurchasedTicket::class, PurchasedTicket::EVENT_AFTER_SAVE, function(ModelEvent $event) {
$isNew = $event->isNew;
$purchasedTicket = $event->sender;
});
Expand Down
6 changes: 3 additions & 3 deletions docs/getting-elements/event-queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ See [Searching](https://docs.craftcms.com/v3/searching.html) for a full explanat

```php PHP
// Get the search query from the 'q' query string param
$searchQuery = \Craft::$app->request->getQueryParam('q');
$searchQuery = \Craft::$app->getRequest()->getQueryParam('q');

// Fetch all events that match the search query
$events = \verbb\events\elements\Event::find()
Expand Down Expand Up @@ -657,7 +657,7 @@ Possible values include:

```php PHP
// Get the requested event slug from the URL
$requestedSlug = \Craft::$app->request->getSegment(3);
$requestedSlug = \Craft::$app->getRequest()->getSegment(3);

// Fetch the event with that slug
$event = \verbb\events\elements\Event::find()
Expand Down Expand Up @@ -882,7 +882,7 @@ Possible values include:

```php PHP
// Get the requested URI
$requestedUri = \Craft::$app->request->getPathInfo();
$requestedUri = \Craft::$app->getRequest()->getPathInfo();

// Fetch the event with that URI
$event = \verbb\events\elements\Event::find()
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-elements/purchased-ticket-queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ See [Searching](https://docs.craftcms.com/v3/searching.html) for a full explanat

```php PHP
// Get the search query from the 'q' query string param
$searchQuery = \Craft::$app->request->getQueryParam('q');
$searchQuery = \Craft::$app->getRequest()->getQueryParam('q');

// Fetch all purchased tickets that match the search query
$purchasedTickets = \verbb\events\elements\PurchasedTicket::find()
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-elements/ticket-queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ See [Searching](https://docs.craftcms.com/v3/searching.html) for a full explanat

```php PHP
// Get the search query from the 'q' query string param
$searchQuery = \Craft::$app->request->getQueryParam('q');
$searchQuery = \Craft::$app->getRequest()->getQueryParam('q');

// Fetch all tickets that match the search query
$tickets = \verbb\events\elements\Ticket::find()
Expand Down Expand Up @@ -524,7 +524,7 @@ Possible values include:

```php PHP
// Get the requested ticket SKU from the URL
$requestedSlug = \Craft::$app->request->getSegment(3);
$requestedSlug = \Craft::$app->getRequest()->getSegment(3);

// Fetch the ticket with that slug
$ticket = \verbb\events\elements\Ticket::find()
Expand Down
10 changes: 5 additions & 5 deletions src/controllers/TicketController.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private function _handleResponse($variables): Response|string
return $this->redirect('events/purchased-tickets');
}

$oldMode = Craft::$app->view->getTemplateMode();
$oldMode = Craft::$app->getView()->getTemplateMode();
$templateMode = View::TEMPLATE_MODE_CP;
$template = 'events/check-in';

Expand All @@ -102,10 +102,10 @@ private function _handleResponse($variables): Response|string
$template = $settings->checkinTemplate;
}

Craft::$app->view->setTemplateMode($templateMode);
$html = Craft::$app->view->renderTemplate($template, $variables);
Craft::$app->view->setTemplateMode($oldMode);
Craft::$app->getView()->setTemplateMode($templateMode);
$html = Craft::$app->getView()->renderTemplate($template, $variables);
Craft::$app->getView()->setTemplateMode($oldMode);

return $html;
}
}
}
2 changes: 1 addition & 1 deletion src/elements/TicketType.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,4 @@ public function beforeDelete(): bool

return true;
}
}
}
2 changes: 1 addition & 1 deletion src/helpers/TicketHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ public static function generateTicketSKU(): string

return $ticketKey;
}
}
}
2 changes: 1 addition & 1 deletion src/services/PurchasedTickets.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ public function unCheckInPurchasedTicket(PurchasedTicket $purchasedTicket): void

$record->save(false);
}
}
}
5 changes: 5 additions & 0 deletions src/translations/en/events.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

return [

];

0 comments on commit 3a1c098

Please sign in to comment.