Fix on edition of Summit Registration Invitation

Signed-off-by: smarcet@gmail.com <smarcet@gmail.com>
Change-Id: I2a083fbcbfd1101d0e9ce6960bd50d562bb1411d

Author: smarcet

app/Models/Foundation/Summit/Factories/SummitRegistrationInvitationFactory.php

@@ -39,9 +39,8 @@ public static function populate(SummitRegistrationInvitation $invitation, array
         if(isset($data['last_name'])){
             $invitation->setLastName(trim($data['last_name']));
         }
-        if(isset($data['is_accepted'])){
-            $accepted = boolval($data['is_accepted']);
-            $invitation->setAccepted($accepted);
+        if(isset($data['is_accepted'])){;
+            $invitation->setAccepted(boolval($data['is_accepted']));
         }
         return $invitation;
     }

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

@@ -203,40 +203,6 @@ public function setAccepted(bool $accepted)
         $this->accepted_date = $accepted ? new \DateTime('now', new \DateTimeZone('UTC')) : null;
     }
 
-    public function isAccepted(): bool
-    {
-
-        $bought_tickets = $this->getBoughtTicketTypesExcerpt();
-
-        Log::debug(sprintf("SummitRegistrationInvitation::isAccepted %s bought_tickets %s", $this->id, json_encode($bought_tickets)));
-        // check if we fullfill the invitation
-
-        $invitation_ticket_types = $this->ticket_types;
-        if($invitation_ticket_types->count() === 0 )
-            $invitation_ticket_types = $this->summit->getTicketTypesByAudience(SummitTicketType::Audience_With_Invitation);
-
-        if($invitation_ticket_types->count() === 0)
-            throw new ValidationException
-            (
-                sprintf
-                (
-                    "There are not Ticket Types with Audience %s for Summit %s.",
-                    SummitTicketType::Audience_With_Invitation,
-                    $this->summit->getId()
-                )
-            );
-
-        foreach ($invitation_ticket_types as $ticket_type){
-            if(!isset($bought_tickets[$ticket_type->getId()])){
-                Log::debug(sprintf("SummitRegistrationInvitation::isAccepted %s ticket type %s is not purchased yet ", $this->id, $ticket_type->getId()));
-                $this->accepted_date = null;
-                return false;
-            }
-        }
-
-        return !is_null($this->accepted_date);
-    }
-
     public function isSent(): bool
     {
         return !empty($this->hash);
@@ -432,14 +398,20 @@ public function markAsAccepted(): void
 
         foreach ($invitation_ticket_types as $ticket_type){
             if(!isset($bought_tickets[$ticket_type->getId()])){
-                Log::debug(sprintf("SummitRegistrationInvitation::markAsAccepted %s ticket type is not purchased yet ", $this->id, $ticket_type->getId()));
+                Log::debug(sprintf("SummitRegistrationInvitation::markAsAccepted %s ticket type %s is not purchased yet ", $this->id, $ticket_type->getId()));
+                $this->accepted_date = null;
                 return;
             }
         }
         // once i bought all meant ticket types ... the invitation is marked as accepted
         $this->accepted_date = new \DateTime('now', new \DateTimeZone('UTC'));
     }
 
+    public function isAccepted(): bool
+    {
+        return !is_null($this->accepted_date);
+    }
+
     public function addOrder(SummitOrder $order){
         if ($this->orders->contains($order)) return;
         $this->orders->add($order);
@@ -468,7 +440,6 @@ public function addTicketType(SummitTicketType $ticketType)
         }
         if ($this->ticket_types->contains($ticketType)) return;
         $this->ticket_types->add($ticketType);
-        $this->accepted_date = null;
         $this->markAsAccepted();
     }
 

app/Services/Model/Imp/SummitRegistrationInvitationService.php

@@ -353,8 +353,6 @@ public function update(Summit $summit, int $invitation_id, array $payload): Summ
                 }
             }
 
-            $invitation = SummitRegistrationInvitationFactory::populate($invitation, $payload);
-
             if (isset($payload['email'])) {
                 $email = trim($payload['email']);
                 try {
@@ -396,7 +394,7 @@ public function update(Summit $summit, int $invitation_id, array $payload): Summ
                 }
             }
 
-            return $invitation;
+            return SummitRegistrationInvitationFactory::populate($invitation, $payload);
         });
     }