Fix on get tax type
Change-Id: I40d20daf013d08ef0438e3c96308622002801752 Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
parent
2ceaad7e55
commit
bb7dd557ae
|
@ -762,7 +762,7 @@ Route::group([
|
||||||
|
|
||||||
// tax-types
|
// tax-types
|
||||||
Route::group(['prefix' => 'tax-types'], function () {
|
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::post('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitTaxTypeApiController@add']);
|
||||||
Route::group(['prefix' => '{tax_id}'], function () {
|
Route::group(['prefix' => '{tax_id}'], function () {
|
||||||
Route::get('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitTaxTypeApiController@get']);
|
Route::get('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitTaxTypeApiController@get']);
|
||||||
|
|
|
@ -61,6 +61,14 @@ class BaseSummitAttendeeTicketSerializer extends SilverStripeSerializer
|
||||||
|
|
||||||
Log::debug(sprintf("BaseSummitAttendeeTicketSerializer::serialize expand %s", $expand));
|
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)) {
|
if (!empty($expand)) {
|
||||||
$exp_expand = explode(',', $expand);
|
$exp_expand = explode(',', $expand);
|
||||||
foreach ($exp_expand as $relation) {
|
foreach ($exp_expand as $relation) {
|
||||||
|
|
|
@ -1198,11 +1198,6 @@ class ApiEndpointsSeeder extends Seeder
|
||||||
sprintf(SummitScopes::ReadSummitData, $current_realm),
|
sprintf(SummitScopes::ReadSummitData, $current_realm),
|
||||||
sprintf(SummitScopes::ReadAllSummitData, $current_realm)
|
sprintf(SummitScopes::ReadAllSummitData, $current_realm)
|
||||||
],
|
],
|
||||||
'authz_groups' => [
|
|
||||||
IGroup::SuperAdmins,
|
|
||||||
IGroup::Administrators,
|
|
||||||
IGroup::SummitAdministrators,
|
|
||||||
]
|
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'name' => 'add-tax-types',
|
'name' => 'add-tax-types',
|
||||||
|
|
Loading…
Reference in New Issue