diff --git a/app/Http/routes.php b/app/Http/routes.php index 4bbad850..725d0fd1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -762,7 +762,7 @@ Route::group([ // tax-types Route::group(['prefix' => 'tax-types'], function () { - Route::get('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitTaxTypeApiController@getAllBySummit']); + Route::get('', [ 'uses' => 'OAuth2SummitTaxTypeApiController@getAllBySummit']); Route::post('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitTaxTypeApiController@add']); Route::group(['prefix' => '{tax_id}'], function () { Route::get('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitTaxTypeApiController@get']); diff --git a/app/ModelSerializers/Summit/Registration/BaseSummitAttendeeTicketSerializer.php b/app/ModelSerializers/Summit/Registration/BaseSummitAttendeeTicketSerializer.php index b518d1f5..61155e5a 100644 --- a/app/ModelSerializers/Summit/Registration/BaseSummitAttendeeTicketSerializer.php +++ b/app/ModelSerializers/Summit/Registration/BaseSummitAttendeeTicketSerializer.php @@ -61,6 +61,14 @@ class BaseSummitAttendeeTicketSerializer extends SilverStripeSerializer Log::debug(sprintf("BaseSummitAttendeeTicketSerializer::serialize expand %s", $expand)); + if (in_array('applied_taxes', $relations)) { + $applied_taxes = []; + foreach ($ticket->getAppliedTaxes() as $tax) { + $applied_taxes[] = $tax->getId(); + } + $values['applied_taxes'] = $applied_taxes; + } + if (!empty($expand)) { $exp_expand = explode(',', $expand); foreach ($exp_expand as $relation) { diff --git a/database/seeds/ApiEndpointsSeeder.php b/database/seeds/ApiEndpointsSeeder.php index e80b8b11..11d7acd3 100644 --- a/database/seeds/ApiEndpointsSeeder.php +++ b/database/seeds/ApiEndpointsSeeder.php @@ -1198,11 +1198,6 @@ class ApiEndpointsSeeder extends Seeder sprintf(SummitScopes::ReadSummitData, $current_realm), sprintf(SummitScopes::ReadAllSummitData, $current_realm) ], - 'authz_groups' => [ - IGroup::SuperAdmins, - IGroup::Administrators, - IGroup::SummitAdministrators, - ] ], [ 'name' => 'add-tax-types',