diff --git a/resources/views/includes/status.blade.php b/resources/views/includes/status.blade.php index 80f5a8975..fbdfbf2db 100644 --- a/resources/views/includes/status.blade.php +++ b/resources/views/includes/status.blade.php @@ -3,6 +3,7 @@ use App\Http\Controllers\Backend\Helper\StatusHelper;use App\Http\Controllers\Backend\Transport\StationController; use App\Http\Controllers\Backend\Transport\StatusController;use App\Http\Controllers\Backend\User\ProfilePictureController;use Illuminate\Support\Facades\Gate; @endphp +@php /** @var App\Models\Status $status */ @endphp
- - {{__('status.join')}} - + @if(auth()->check() && auth()->user()->hasRole('open-beta')) + + + {{__('status.join')}} + + @else + + @endif diff --git a/resources/vue/components/CheckinLineRun.vue b/resources/vue/components/CheckinLineRun.vue index f8a0fd2f6..897ee3abb 100644 --- a/resources/vue/components/CheckinLineRun.vue +++ b/resources/vue/components/CheckinLineRun.vue @@ -16,7 +16,7 @@ export default { required: false, default: {} }, - fastCheckinIbnr: { + fastCheckinId: { type: Number, required: false, }, @@ -69,7 +69,7 @@ export default { } return !remove; }); - if (this.$props.fastCheckinIbnr) { + if (this.$props.fastCheckinId) { this.fastCheckin(); } }); @@ -79,9 +79,16 @@ export default { }); }, fastCheckin() { - const destination = this.lineRun.stopovers.find((item) => { - return Number(item.evaIdentifier) === Number(this.fastCheckinIbnr); - }) + let destination = null; + if (this.useInternalIdentifiers) { + destination = this.lineRun.stopovers.find((item) => { + return Number(item.id) === Number(this.fastCheckinId); + }); + } else { + destination = this.lineRun.stopovers.find((item) => { + return Number(item.evaIdentifier) === Number(this.fastCheckinId); + }); + } if (destination) { this.handleSetDestination(destination); diff --git a/resources/vue/components/Stationboard.vue b/resources/vue/components/Stationboard.vue index 796b1cbb3..e0325c68f 100644 --- a/resources/vue/components/Stationboard.vue +++ b/resources/vue/components/Stationboard.vue @@ -258,7 +258,7 @@ export default {