Skip to content

Commit

Permalink
Merge pull request #328 from art-institute-of-chicago/develop
Browse files Browse the repository at this point in the history
Final punchlist for My Museum Tour [WEB-2826]
  • Loading branch information
nikhiltri authored Apr 3, 2024
2 parents 18f8e9d + 2fd51dd commit 629cf15
Show file tree
Hide file tree
Showing 21 changed files with 251 additions and 156 deletions.
6 changes: 4 additions & 2 deletions app/Console/Commands/SendConfirmations.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ protected function send($model)
{
$to = $model->creator_email;
$apiCode = config('sendgrid.api_key');
$sender = config('sendgrid.email');
$senderEmail = config('sendgrid.email');
$senderName = config('sendgrid.name');
$templateId = config('sendgrid.template_id');

$baseUrl = config('aic.protocol') . '://' . config('app.url');
Expand All @@ -96,7 +97,8 @@ protected function send($model)
]
],
'from' => [
'email' => $sender
'email' => $senderEmail,
'name' => $senderName,
],
'template_id' => $templateId,
];
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/MyMuseumTourController.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public function qrcode(Request $request, $id)
'eccLevel' => EccLevel::L,
'outputType' => QROutputInterface::GDIMAGE_PNG,
'version' => 5,
'quietzoneSize' => 0,
]
);

Expand Down
10 changes: 5 additions & 5 deletions config/galleries.php
Original file line number Diff line number Diff line change
Expand Up @@ -845,14 +845,14 @@
26772 => [
"gallery_title" => "Gallery 150",
"gallery_level" => "first level",
"gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ",
"gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ",
],


26773 => [
"gallery_title" => "Gallery 151",
"gallery_level" => "first level",
"gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ",
"gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ",
],


Expand All @@ -866,21 +866,21 @@
26774 => [
"gallery_title" => "Gallery 152",
"gallery_level" => "first level",
"gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ",
"gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ",
],


26776 => [
"gallery_title" => "Gallery 153",
"gallery_level" => "first level",
"gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ",
"gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ",
],


26777 => [
"gallery_title" => "Gallery 154",
"gallery_level" => "first level",
"gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ",
"gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ",
],


Expand Down
1 change: 1 addition & 0 deletions config/sendgrid.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
'api_url' => env('SENDGRID_API_URL'),
'api_key' => env('SENDGRID_API_KEY'),
'email' => env('SENDGRID_EMAIL'),
'name' => env('SENDGRID_NAME'),
'template_id' => env('SENDGRID_TEMPLATE_ID'),
];
98 changes: 67 additions & 31 deletions frontend/icons/bloomberg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 3 additions & 34 deletions frontend/icons/choose.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 629cf15

Please sign in to comment.