Skip to content

Commit e0abad2

Browse files
committed
fix: managed tickets
clear manager setting
1 parent dde1c9b commit e0abad2

3 files changed

Lines changed: 26 additions & 18 deletions

File tree

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,19 @@ public static function populate
107107
}
108108
}
109109

110-
if(!is_null($manager)){
111-
if(empty($attendee->getEmail()) || $email_override || $attendee->getEmail() == $manager->getEmail()){
112-
$attendee->setManagerAndUseManagerEmailAddress($manager);
110+
// manager setting
111+
if(isset($payload['manager_id'])){
112+
$manager_id = intval($payload['manager_id']);
113+
if($manager_id === 0){
114+
$attendee->clearManager();
115+
}
116+
else if(!is_null($manager)){
117+
if(empty($attendee->getEmail()) || $email_override || $attendee->getEmail() == $manager->getEmail()){
118+
$attendee->setManagerAndUseManagerEmailAddress($manager);
119+
}
120+
else
121+
$attendee->setManager($manager);
113122
}
114-
else
115-
$attendee->setManager($manager);
116123
}
117124

118125
$summit->addAttendee($attendee);

app/Services/Model/AttendeeService.php

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -272,19 +272,20 @@ public function deleteAttendee(Summit $summit, $attendee_id)
272272
/**
273273
* @param Summit $summit
274274
* @param int $attendee_id
275-
* @param array $data
275+
* @param array $payload
276276
* @return SummitAttendee
277277
* @throws ValidationException
278278
* @throws EntityNotFoundException
279279
*/
280-
public function updateAttendee(Summit $summit, $attendee_id, array $data)
280+
public function updateAttendee(Summit $summit, $attendee_id, array $payload)
281281
{
282-
return $this->tx_service->transaction(function () use ($summit, $attendee_id, $data) {
282+
return $this->tx_service->transaction(function () use ($summit, $attendee_id, $payload) {
283283

284-
$manager_id = $data['manager_id'] ?? 0;
285-
$member_id = $data['member_id'] ?? 0;
284+
Log::debug(sprintf("SummitAttendeeService::updateAttendee summit %s attendee %s payload %s", $summit->getId(), $attendee_id, json_encode($payload)));
285+
$manager_id = $payload['manager_id'] ?? 0;
286+
$member_id = $payload['member_id'] ?? 0;
286287
$member_id = intval($member_id);
287-
$email = $data['email'] ?? null;
288+
$email = $payload['email'] ?? null;
288289

289290
$attendee = $summit->getAttendeeById($attendee_id);
290291
if (is_null($attendee))
@@ -309,15 +310,15 @@ public function updateAttendee(Summit $summit, $attendee_id, array $data)
309310
}
310311

311312
// check if attendee already exist for this summit
312-
if (isset($data['extra_questions']) && !$attendee->hasAllowedExtraQuestions()) {
313+
if (isset($payload['extra_questions']) && !$attendee->hasAllowedExtraQuestions()) {
313314
Log::debug(sprintf("SummitAttendeeService::updateAttendee attendee %s does not have allowed extra questions.", $attendee->getId()));
314315
// dont not overwrite extra questions
315-
unset($data['extra_questions']);
316+
unset($payload['extra_questions']);
316317
}
317318

318319
// tags
319-
if (isset($data['tags'])) {
320-
$attendee = $this->populateTags($attendee, $data);
320+
if (isset($payload['tags'])) {
321+
$attendee = $this->populateTags($attendee, $payload);
321322
}
322323

323324
$manager = null;
@@ -327,7 +328,7 @@ public function updateAttendee(Summit $summit, $attendee_id, array $data)
327328
throw new EntityNotFoundException("Manager not found.");
328329
}
329330

330-
SummitAttendeeFactory::populate($summit, $attendee, $data, $member, false, $manager);
331+
SummitAttendeeFactory::populate($summit, $attendee, $payload, $member, false, $manager);
331332

332333
$attendee->updateStatus();
333334
return $attendee;

app/Services/Model/IAttendeeService.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public function deleteAttendee(Summit $summit, $attendee_id);
4747
/**
4848
* @param Summit $summit
4949
* @param int $attendee_id
50-
* @param array $data
50+
* @param array $payload
5151
* @return SummitAttendee
5252
* @throws ValidationException
5353
* @throws EntityNotFoundException
5454
*/
55-
public function updateAttendee(Summit $summit, $attendee_id, array $data);
55+
public function updateAttendee(Summit $summit, $attendee_id, array $payload);
5656

5757
/**
5858
* @param SummitAttendee $attendee

0 commit comments

Comments
 (0)