Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7379276
Rename tickets to products
daveearley Sep 20, 2024
e3b5a72
Update config and tests
daveearley Sep 20, 2024
8871867
Update ticket creation form
daveearley Sep 20, 2024
d007041
Merge branch 'develop' into add-products
daveearley Sep 23, 2024
3a671d0
continued work on migration from tickets to products
daveearley Oct 19, 2024
d64d11f
continued work on migration from tickets to products
daveearley Oct 19, 2024
e1c9cf3
Various semantic changes in email text, footer, and changes event pag…
grablair Oct 19, 2024
bb0eb59
Allow the header of emails to link to a webpage other than the app URL
grablair Oct 19, 2024
f2ce929
Fix app name variable
grablair Oct 19, 2024
791dbde
Merge pull request #263 from grablair/feat/email-logo-link-configuration
daveearley Oct 20, 2024
e05cd1d
Merge pull request #262 from grablair/fix/semantic-changes
daveearley Oct 20, 2024
fcca120
Merge branch 'develop' into add-products
daveearley Oct 20, 2024
35c5d5d
Start work on responsive colors for QR code scans
grablair Oct 27, 2024
eef5657
Modify colors, add in-progress
grablair Oct 27, 2024
b45e09b
Update sorting logic for tickets. Continue work on product migration
daveearley Oct 28, 2024
60eb4db
type fix
daveearley Oct 28, 2024
fd7d28f
Merge pull request #269 from grablair/feat/qr-scan-response-improvements
daveearley Oct 28, 2024
8fdd298
Fix all-in-one Docker setup
daveearley Oct 29, 2024
c85050a
Merge pull request #271 from HiEventsDev/fix-all-in-one-docker-setup
daveearley Oct 29, 2024
8a621ec
Merge branch 'develop' into add-products
daveearley Oct 31, 2024
c71df0c
Update tests and order and attendee modals
daveearley Nov 1, 2024
05df93e
Update testHandleUpdatesProductQuantitiesForFreeOrder
daveearley Nov 1, 2024
204f118
Update testHandleDoesNotUpdateProductQuantitiesForPaidOrder
daveearley Nov 1, 2024
18862b1
Update attendees modals/forms
daveearley Nov 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions backend/app/DomainObjects/AttendeeDomainObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class AttendeeDomainObject extends Generated\AttendeeDomainObjectAbstract implem
{
private ?OrderDomainObject $order = null;

private ?TicketDomainObject $ticket = null;
private ?ProductDomainObject $product = null;

/** @var Collection<QuestionAndAnswerViewDomainObject>|null */
public ?Collection $questionAndAnswerViews = null;
Expand Down Expand Up @@ -60,7 +60,7 @@ public static function getAllowedFilterFields(): array
{
return [
self::STATUS,
self::TICKET_ID,
self::PRODUCT_ID,
];
}

Expand All @@ -79,14 +79,14 @@ public function getFullName(): string
return $this->first_name . ' ' . $this->last_name;
}

public function getTicket(): ?TicketDomainObject
public function getProduct(): ?ProductDomainObject
{
return $this->ticket;
return $this->product;
}

public function setTicket(?TicketDomainObject $ticket): self
public function setProduct(?ProductDomainObject $product): self
{
$this->ticket = $ticket;
$this->product = $product;

return $this;
}
Expand Down
10 changes: 5 additions & 5 deletions backend/app/DomainObjects/CapacityAssignmentDomainObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class CapacityAssignmentDomainObject extends Generated\CapacityAssignmentDomainObjectAbstract implements IsSortable
{
public ?Collection $tickets = null;
public ?Collection $products = null;

public static function getDefaultSort(): string
{
Expand Down Expand Up @@ -58,14 +58,14 @@ public function getPercentageUsed(): float
return round(($this->getUsedCapacity() / $this->getCapacity()) * 100, 2);
}

public function getTickets(): ?Collection
public function getProducts(): ?Collection
{
return $this->tickets;
return $this->products;
}

public function setTickets(?Collection $tickets): static
public function setProducts(?Collection $products): static
{
$this->tickets = $tickets;
$this->products = $products;

return $this;
}
Expand Down
10 changes: 5 additions & 5 deletions backend/app/DomainObjects/CheckInListDomainObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class CheckInListDomainObject extends Generated\CheckInListDomainObjectAbstract implements IsSortable
{
private ?Collection $tickets = null;
private ?Collection $products = null;

private ?EventDomainObject $event = null;

Expand Down Expand Up @@ -53,14 +53,14 @@ public static function getAllowedSorts(): AllowedSorts
);
}

public function getTickets(): ?Collection
public function getProducts(): ?Collection
{
return $this->tickets;
return $this->products;
}

public function setTickets(?Collection $tickets): static
public function setProducts(?Collection $products): static
{
$this->tickets = $tickets;
$this->products = $products;

return $this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ enum CapacityAssignmentAppliesTo
{
use BaseEnum;

case TICKETS;
case PRODUCTS;
case EVENT;
}
2 changes: 1 addition & 1 deletion backend/app/DomainObjects/Enums/MessageTypeEnum.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ enum MessageTypeEnum
use BaseEnum;

case ORDER;
case TICKET;
case PRODUCT;
case ATTENDEE;
case EVENT;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace HiEvents\DomainObjects\Enums;

enum TicketType
enum ProductPriceType
{
use BaseEnum;

Expand Down
11 changes: 11 additions & 0 deletions backend/app/DomainObjects/Enums/ProductType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace HiEvents\DomainObjects\Enums;

enum ProductType
{
use BaseEnum;

case TICKET;
case GENERAL;
}
2 changes: 1 addition & 1 deletion backend/app/DomainObjects/Enums/QuestionBelongsTo.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ enum QuestionBelongsTo
{
use BaseEnum;

case TICKET;
case PRODUCT;
case ORDER;
}
23 changes: 18 additions & 5 deletions backend/app/DomainObjects/EventDomainObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

class EventDomainObject extends Generated\EventDomainObjectAbstract implements IsSortable, IsFilterable
{
private ?Collection $tickets = null;
private ?Collection $products = null;

private ?Collection $productCategories = null;

private ?Collection $questions = null;

Expand Down Expand Up @@ -79,16 +81,16 @@ public static function getDefaultSortDirection(): string
return 'asc';
}

public function setTickets(Collection $tickets): self
public function setProducts(Collection $products): self
{
$this->tickets = $tickets;
$this->products = $products;

return $this;
}

public function getTickets(): ?Collection
public function getProducts(): ?Collection
{
return $this->tickets;
return $this->products;
}

public function setQuestions(?Collection $questions): EventDomainObject
Expand Down Expand Up @@ -259,4 +261,15 @@ public function setEventStatistics(?EventStatisticDomainObject $eventStatistics)
$this->eventStatistics = $eventStatistics;
return $this;
}

public function setProductCategories(?Collection $productCategories): EventDomainObject
{
$this->productCategories = $productCategories;
return $this;
}

public function getProductCategories(): ?Collection
{
return $this->productCategories;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec
final public const PLURAL_NAME = 'attendee_check_ins';
final public const ID = 'id';
final public const CHECK_IN_LIST_ID = 'check_in_list_id';
final public const TICKET_ID = 'ticket_id';
final public const PRODUCT_ID = 'product_id';
final public const ATTENDEE_ID = 'attendee_id';
final public const EVENT_ID = 'event_id';
final public const SHORT_ID = 'short_id';
Expand All @@ -23,7 +23,7 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec

protected int $id;
protected int $check_in_list_id;
protected int $ticket_id;
protected int $product_id;
protected int $attendee_id;
protected int $event_id;
protected string $short_id;
Expand All @@ -37,7 +37,7 @@ public function toArray(): array
return [
'id' => $this->id ?? null,
'check_in_list_id' => $this->check_in_list_id ?? null,
'ticket_id' => $this->ticket_id ?? null,
'product_id' => $this->product_id ?? null,
'attendee_id' => $this->attendee_id ?? null,
'event_id' => $this->event_id ?? null,
'short_id' => $this->short_id ?? null,
Expand Down Expand Up @@ -70,15 +70,15 @@ public function getCheckInListId(): int
return $this->check_in_list_id;
}

public function setTicketId(int $ticket_id): self
public function setProductId(int $product_id): self
{
$this->ticket_id = $ticket_id;
$this->product_id = $product_id;
return $this;
}

public function getTicketId(): int
public function getProductId(): int
{
return $this->ticket_id;
return $this->product_id;
}

public function setAttendeeId(int $attendee_id): self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
final public const PLURAL_NAME = 'attendees';
final public const ID = 'id';
final public const ORDER_ID = 'order_id';
final public const TICKET_ID = 'ticket_id';
final public const PRODUCT_ID = 'product_id';
final public const EVENT_ID = 'event_id';
final public const CHECKED_IN_BY = 'checked_in_by';
final public const CHECKED_OUT_BY = 'checked_out_by';
final public const TICKET_PRICE_ID = 'ticket_price_id';
final public const PRODUCT_PRICE_ID = 'product_price_id';
final public const SHORT_ID = 'short_id';
final public const FIRST_NAME = 'first_name';
final public const LAST_NAME = 'last_name';
Expand All @@ -31,11 +31,11 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst

protected int $id;
protected int $order_id;
protected int $ticket_id;
protected int $product_id;
protected int $event_id;
protected ?int $checked_in_by = null;
protected ?int $checked_out_by = null;
protected int $ticket_price_id;
protected int $product_price_id;
protected string $short_id;
protected string $first_name = '';
protected string $last_name = '';
Expand All @@ -53,11 +53,11 @@ public function toArray(): array
return [
'id' => $this->id ?? null,
'order_id' => $this->order_id ?? null,
'ticket_id' => $this->ticket_id ?? null,
'product_id' => $this->product_id ?? null,
'event_id' => $this->event_id ?? null,
'checked_in_by' => $this->checked_in_by ?? null,
'checked_out_by' => $this->checked_out_by ?? null,
'ticket_price_id' => $this->ticket_price_id ?? null,
'product_price_id' => $this->product_price_id ?? null,
'short_id' => $this->short_id ?? null,
'first_name' => $this->first_name ?? null,
'last_name' => $this->last_name ?? null,
Expand Down Expand Up @@ -94,15 +94,15 @@ public function getOrderId(): int
return $this->order_id;
}

public function setTicketId(int $ticket_id): self
public function setProductId(int $product_id): self
{
$this->ticket_id = $ticket_id;
$this->product_id = $product_id;
return $this;
}

public function getTicketId(): int
public function getProductId(): int
{
return $this->ticket_id;
return $this->product_id;
}

public function setEventId(int $event_id): self
Expand Down Expand Up @@ -138,15 +138,15 @@ public function getCheckedOutBy(): ?int
return $this->checked_out_by;
}

public function setTicketPriceId(int $ticket_price_id): self
public function setProductPriceId(int $product_price_id): self
{
$this->ticket_price_id = $ticket_price_id;
$this->product_price_id = $product_price_id;
return $this;
}

public function getTicketPriceId(): int
public function getProductPriceId(): int
{
return $this->ticket_price_id;
return $this->product_price_id;
}

public function setShortId(string $short_id): self
Expand Down
Loading