feat: add new prices property

morethingsdigital · Nov 20, 2024 · bdad8ef · bdad8ef
1 parent 54386e0
commit bdad8ef
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/backend/app/DomainObjects/TicketPriceDomainObject.php b/backend/app/DomainObjects/TicketPriceDomainObject.php
@@ -59,6 +59,11 @@ public function getPriceIncludingTaxAndServiceFee(): float
         return Currency::round($this->getPrice() + $this->getTaxTotal() + $this->getFeeTotal());
     }
 
+    public function getPriceIncludingTax(): float
+    {
+        return Currency::round($this->getPrice() + $this->getTaxTotal());
+    }
+
     public function isBeforeSaleStartDate(): bool
     {
         return (!is_null($this->getSaleStartDate())

diff --git a/backend/app/Resources/Ticket/TicketPriceResource.php b/backend/app/Resources/Ticket/TicketPriceResource.php
@@ -28,6 +28,7 @@ public function toArray(Request $request): array
             'is_hidden' => $this->getIsHidden(),
             'off_sale_reason' => $this->getOffSaleReason(),
             'price_including_taxes_and_fees' => $this->getPriceIncludingTaxAndServiceFee(),
+            'price_including_taxes' => $this->getPriceIncludingTax(),
         ];
     }
 }
diff --git a/backend/app/Resources/Ticket/TicketPriceResourcePublic.php b/backend/app/Resources/Ticket/TicketPriceResourcePublic.php
@@ -22,6 +22,7 @@ public function toArray(Request $request): array
             'sale_start_date' => $this->getSaleStartDate(),
             'sale_end_date' => $this->getSaleEndDate(),
             'price_including_taxes_and_fees' => $this->getPriceIncludingTaxAndServiceFee(),
+            'price_including_taxes' => $this->getPriceIncludingTax(),
             'price_before_discount' => $this->getPriceBeforeDiscount(),
             'is_discounted' => (bool)$this->getPriceBeforeDiscount(),
             'tax_total' => $this->getTaxTotal(),

diff --git a/frontend/src/components/routes/ticket-widget/SelectTickets/Prices/Tiered/index.tsx b/frontend/src/components/routes/ticket-widget/SelectTickets/Prices/Tiered/index.tsx
@@ -48,7 +48,7 @@ export const TieredPricing = ({ticket, event, form, ticketIndex}: TieredPricingP
                                     )}
                                     {ticket.type !== 'DONATION' && (
                                         <TicketPriceDisplay
-                                            price={ticket.price_before_discount + ticket.tax_total}
+                                            price={ticket.price_including_taxes}
                                             ticket={ticket}
                                             currency={event?.currency}
                                             className={'hi-price-tier-price-amount'}

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -322,6 +322,7 @@ export interface Ticket {
     tax_total?: number;
     service_fee_total?: number;
     price_including_taxes_and_fees?: number;
+    price_including_taxes?: number;
     tax_and_fee_ids?: IdParam[];
     taxes_and_fees?: TaxAndFee[];
     is_hidden?: boolean;