merge main to production

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitAttendeesApiController.php

@@ -685,7 +685,7 @@ public function addAttendeeTicket($summit_id, $attendee_id)
             if ($attendee->hasMember())
                 $payload['owner_id'] = $attendee->getMemberId();
 
-            $ticket = $this->summit_order_service->createOrderSingleTicket($summit, $payload);
+            $ticket = $this->summit_order_service->createOfflineOrder($summit, $payload);
 
             return $this->created(SerializerRegistry::getInstance()->getSerializer($ticket)->serialize
             (

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitOrdersApiController.php

@@ -764,23 +764,26 @@ public function updateTicket($summit_id, $order_id, $ticket_id){
      */
     public function addTicket($summit_id, $order_id){
         try {
+
             $summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->getResourceServerContext())->find($summit_id);
             if (is_null($summit)) return $this->error404();
 
             $payload = $this->getJsonPayload([
                 'ticket_type_id'      => 'required|integer',
+                'ticket_qty'          => 'required|integer|min:1',
+                'promo_code'          => 'sometimes|string',
                 'badge_type_id'       => 'nullable|integer',
                 'attendee_first_name' => 'nullable|string|max:255',
                 'attendee_last_name'  => 'nullable|string|max:255',
-                'attendee_email'      => 'required|string|max:255|email',
+                'attendee_email'      => 'sometimes|string|max:255|email',
                 'attendee_company'    => 'nullable|string|max:255',
                 'disclaimer_accepted' => 'nullable|boolean',
                 'extra_questions'     => 'sometimes|extra_question_dto_array'
             ]);
 
-            $ticket = $this->service->addTicket($summit, intval($order_id), $payload);
+            $order = $this->service->addTickets($summit, intval($order_id), $payload);
 
-            return $this->created(SerializerRegistry::getInstance()->getSerializer($ticket)->serialize( Request::input('expand', '')));
+            return $this->created(SerializerRegistry::getInstance()->getSerializer($order)->serialize(Request::input('expand', '')));
 
         }
         catch(\InvalidArgumentException $ex){
@@ -1112,8 +1115,9 @@ function getAddValidationRules(array $payload): array
             'owner_last_name'           => 'required_without:owner_id|string|max:255',
             'owner_email'               => 'required_without:owner_id|string|max:255|email',
             'owner_id'                  => 'required_without:owner_first_name,owner_last_name,owner_email|int',
-            'ticket_type_id'            => 'required|int',
+            'ticket_type_id'            => 'required|integer',
             'promo_code'                => 'sometimes|string',
+            'ticket_qty'                => 'required|integer|min:1',
             'extra_questions'           => 'sometimes|extra_question_dto_array',
             'owner_company'             => 'required|string|max:255',
             'billing_address_1'         => 'sometimes|string|max:255',
@@ -1132,7 +1136,7 @@ function getAddValidationRules(array $payload): array
      */
     protected function addChild(Summit $summit, array $payload): IEntity
     {
-       return $this->service->createOrderSingleTicket($summit, $payload);
+       return $this->service->createOfflineOrder($summit, $payload);
     }
 
     protected function getChildFromSummit(Summit $summit, $child_id): ?IEntity

app/Jobs/Emails/Registration/RegisteredMemberOrderPaidMail.php

@@ -81,7 +81,7 @@ public function __construct(SummitOrder $order)
                 'ticket_type_name' => $ticket->getTicketType()->getName(),
                 'has_owner' => false,
                 'price' => FormatUtils::getNiceFloat($ticket->getFinalAmount()),
-                'currency' => $ticket->getCurrencySymbol(),
+                'currency' => $ticket->getCurrency(),
                 'currency_symbol' => $ticket->getCurrencySymbol(),
                 'need_details' => false,
             ];

app/Models/Foundation/Summit/Registration/SummitOrder.php

@@ -454,10 +454,13 @@ public function getQRCode(): ?string
      */
     public function getOwnerFirstName(): ?string
     {
+        $res = '';
         if($this->hasOwner()){
-            return $this->owner->getFirstName();
+            $res = $this->owner->getFirstName();
         }
-        return $this->owner_first_name;
+        if(empty($res))
+            $res = $this->owner_first_name;
+        return $res;
     }
 
     /**
@@ -473,10 +476,13 @@ public function setOwnerFirstName(string $owner_first_name): void
      */
     public function getOwnerSurname(): ?string
     {
+        $res = '';
         if($this->hasOwner()){
-            return $this->owner->getLastName();
+            $res = $this->owner->getLastName();
         }
-        return $this->owner_surname;
+        if(empty($res))
+            $res = $this->owner_surname;
+        return $res;
     }
 
     /**

app/Models/Foundation/Summit/Summit.php

@@ -5065,13 +5065,12 @@ public function getSummitDaysWithEvents():array {
         $days = $this->getSummitDays();
         $list = [];
         foreach ($days as $day){
-            //Log::debug(sprintf("Summit::getSummitDaysWithEvents day %s", $day->format('Y-m-d H:i:s')));
+            Log::debug(sprintf("Summit::getSummitDaysWithEvents day %s", $day->format('Y-m-d H:i:s')));
             $begin = clone($day);
             $begin = $begin->setTime(0,0,0)->setTimezone(new \DateTimeZone('UTC'));
             $end   = clone($day);
             $end = $end->setTime(23,59,59)->setTimezone(new \DateTimeZone('UTC'));
-
-            //Log::debug(sprintf("Summit::getSummitDaysWithEvents UTC begin date %s UTC end date %s", $begin->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+            Log::debug(sprintf("Summit::getSummitDaysWithEvents UTC begin date %s UTC end date %s", $begin->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
             $count = 0;
             try {
                 $sql = <<<SQL
@@ -5090,11 +5089,12 @@ public function getSummitDaysWithEvents():array {
                 ]);
                 $res = $stmt->fetchAll(\PDO::FETCH_COLUMN);
                 $count = count($res) > 0 ? $res[0] : 0;
+                Log::debug(sprintf("Summit::getSummitDaysWithEvents summit %s begin %s end %s count %s", $this->id, $begin->format("Y-m-d H:i:s"), $end->format('Y-m-d H:i:s'), $count));
             } catch (\Exception $ex) {
+                Log::debug($ex);
                 $count = 0;
             }
             if($count > 0){
-                //Log::debug(sprintf("Summit::getSummitDaysWithEvents UTC begin date %s UTC end date %s count %s", $begin->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s'), $count));
                 $list[] = $day;
             }
         }

app/Services/Model/ISummitOrderService.php

@@ -100,7 +100,7 @@ public function ownerAssignTicket(Member $current_user, int $order_id, int $tick
      * @throws EntityNotFoundException
      * @throws ValidationException
      */
-    public function addTicket(Summit $summit, int $order_id, array $payload):SummitAttendeeTicket;
+    public function addTickets(Summit $summit, int $order_id, array $payload):SummitOrder;
 
     /**
      * @param Summit $summit
@@ -213,7 +213,7 @@ public function updateTicketsByOrderHash(string $order_hash, array $payload): Su
      * @throws EntityNotFoundException
      * @throws ValidationException
      */
-    public function createOrderSingleTicket(Summit $summit, array $payload):SummitOrder;
+    public function createOfflineOrder(Summit $summit, array $payload):SummitOrder;
 
     /**
      * @param Summit $summit