silva
/
adrema
2
1
Fork 0
Code Issues 23 Pull Requests 1 Projects 1 Releases 106 Wiki Activity

Add sidebar for payments

This commit is contained in:
Philipp Lang 2023-10-13 15:48:29 +02:00
parent bfc4663ba4
commit 37a6dd8330
14 changed files with 237 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Member/MemberController.php
View File

@ -23,7 +23,7 @@ class MemberController extends Controller
'data' => MemberResource::collection(Member::search($filter->search)->query(
fn ($q) => $q->select('*')
->withFilter($filter)
->with(['payments.subscription', 'courses', 'subscription', 'leaderMemberships', 'ageGroupMemberships'])
->with(['courses', 'subscription', 'leaderMemberships', 'ageGroupMemberships'])
->withPendingPayment()
->ordered()
)->paginate(15)),

2
app/Member/MemberResource.php
View File

@ -106,6 +106,7 @@ class MemberResource extends JsonResource
'lon' => $this->lon,
'links' => [
'membership_index' => route('member.membership.index', ['member' => $this->getModel()]),
'payment_index' => route('member.payment.index', ['member' => $this->getModel()]),
'show' => route('member.show', ['member' => $this->getModel()]),
'edit' => route('member.edit', ['member' => $this->getModel()]),
],
@ -135,7 +136,6 @@ class MemberResource extends JsonResource
'filter' => FilterScope::fromRequest(request()->input('filter', '')),
'courses' => Course::pluck('name', 'id'),
'regions' => Region::forSelect(),
'statuses' => Status::pluck('name', 'id'),
'subscriptions' => Subscription::pluck('name', 'id'),
'countries' => Country::pluck('name', 'id'),
'genders' => Gender::pluck('name', 'id'),

31
app/Payment/Actions/ApiIndexAction.php Normal file
View File

@ -0,0 +1,31 @@
<?php
namespace App\Payment\Actions;
use App\Member\Member;
use App\Payment\Payment;
use App\Payment\PaymentResource;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Lorisleiva\Actions\Concerns\AsAction;
class ApiIndexAction
{
use AsAction;
/**
* @return Collection<int, Payment>
*/
public function handle(Member $member): Collection
{
return $member->payments()->with('subscription')->get();
}
public function asController(Member $member): AnonymousResourceCollection
{
return PaymentResource::collection($this->handle($member))
->additional([
'meta' => PaymentResource::memberMeta($member),
]);
}
}

13
app/Payment/PaymentController.php
View File

@ -7,10 +7,11 @@ use App\Lib\Events\ClientMessage;
use App\Member\Member;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class PaymentController extends Controller
{
public function store(Request $request, Member $member): RedirectResponse
public function store(Request $request, Member $member): Response
{
$member->createPayment($request->validate([
'nr' => 'required',
@ -20,10 +21,10 @@ class PaymentController extends Controller
ClientMessage::make('Zahlung erstellt.')->shouldReload()->dispatch();
return redirect()->back();
return response('');
}
public function update(Request $request, Member $member, Payment $payment): RedirectResponse
public function update(Request $request, Member $member, Payment $payment): Response
{
$payment->update($request->validate([
'nr' => 'required',
@ -33,15 +34,15 @@ class PaymentController extends Controller
ClientMessage::make('Zahlung aktualisiert.')->shouldReload()->dispatch();
return redirect()->back();
return response('');
}
public function destroy(Request $request, Member $member, Payment $payment): RedirectResponse
public function destroy(Request $request, Member $member, Payment $payment): Response
{
$payment->delete();
ClientMessage::make('Zahlung gelöscht.')->shouldReload()->dispatch();
return redirect()->back();
return response('');
}
}

24
app/Payment/PaymentResource.php
View File

@ -2,6 +2,7 @@
namespace App\Payment;
use App\Member\Member;
use Illuminate\Http\Resources\Json\JsonResource;
/**
@ -26,6 +27,29 @@ class PaymentResource extends JsonResource
'nr' => $this->nr,
'id' => $this->id,
'is_accepted' => $this->status->isAccepted(),
'links' => [
'update' => route('member.payment.update', ['payment' => $this->getModel(), 'member' => $this->getModel()->member]),
'destroy' => route('member.payment.destroy', ['payment' => $this->getModel(), 'member' => $this->getModel()->member]),
]
];
}
/**
* @return array<string, mixed>
*/
public static function memberMeta(Member $member): array
{
return [
'statuses' => Status::forSelect(),
'subscriptions' => Subscription::forSelect(),
'default' => [
'nr' => '',
'subscription_id' => null,
'status_id' => null
],
'links' => [
'store' => route('member.payment.store', ['member' => $member]),
]
];
}
}

8
app/Payment/Status.php
View File

@ -38,4 +38,12 @@ class Status extends Model
return $query->where('is_bill', true)->orWhere('is_remember', true);
});
}
/**
* @return array<int, array{name: string, id: int}>
*/
public static function forSelect(): array
{
return static::select('name', 'id')->get()->toArray();
}
}

8
app/Payment/Subscription.php
View File

@ -50,4 +50,12 @@ class Subscription extends Model
{
static::deleting(fn ($model) => $model->children()->delete());
}
/**
* @return array<int, array{name: string, id: int}>
*/
public static function forSelect(): array
{
return static::select('name', 'id')->get()->toArray();
}
}

6
resources/js/composables/useApiIndex.js vendored
View File

@ -58,6 +58,10 @@ export function useApiIndex(url, siteName) {
};
}
function cancel() {
single.value = null;
}
startListener();
onBeforeUnmount(() => stopListener());
@ -73,5 +77,7 @@ export function useApiIndex(url, siteName) {
router,
submit,
remove,
cancel,
axios,
};
}

57
resources/js/views/member/MemberCourses.vue
View File

@ -1,21 +1,24 @@
<template>
<div class="sidebar flex flex-col group is-bright">
<page-header @close="$emit('close')" title="Ausbildungen">
<page-header title="Ausbildungen" @close="$emit('close')">
<template #toolbar>
<page-toolbar-button @click.prevent="create" color="primary" icon="plus" v-if="single === null">Neue Ausbildung</page-toolbar-button>
<page-toolbar-button @click.prevent="cancel" color="primary" icon="undo" v-if="single !== null">Zurück</page-toolbar-button>
<page-toolbar-button v-if="single === null" color="primary" icon="plus" @click.prevent="create">Neue
Ausbildung</page-toolbar-button>
<page-toolbar-button v-if="single !== null" color="primary" icon="undo"
@click.prevent="cancel">Zurück</page-toolbar-button>
</template>
</page-header>
<form v-if="single" class="p-6 grid gap-4 justify-start" @submit.prevent="submit">
<f-text id="completed_at" type="date" v-model="single.completed_at" label="Datum" required></f-text>
<f-select id="course_id" name="course_id" :options="courses" v-model="single.course_id" label="Baustein" required></f-select>
<f-text id="completed_at" v-model="single.completed_at" type="date" label="Datum" required></f-text>
<f-select id="course_id" v-model="single.course_id" name="course_id" :options="courses" label="Baustein"
required></f-select>
<f-text id="event_name" v-model="single.event_name" label="Veranstaltung" required></f-text>
<f-text id="organizer" v-model="single.organizer" label="Veranstalter" required></f-text>
<button type="submit" class="btn btn-primary">Absenden</button>
</form>
<div class="grow" v-else>
<div v-else class="grow">
<table class="custom-table custom-table-light custom-table-sm text-sm grow">
<thead>
<th>Baustein</th>
@ -31,16 +34,12 @@
<td v-text="course.organizer"></td>
<td v-text="course.completed_at_human"></td>
<td class="flex">
<a
href="#"
@click.prevent="
single = course;
mode = 'edit';
"
class="inline-flex btn btn-warning btn-sm"
><ui-sprite src="pencil"></ui-sprite
></a>
<i-link href="#" @click.prevent="remove(course)" class="inline-flex btn btn-danger btn-sm"><ui-sprite src="trash"></ui-sprite></i-link>
<a href="#" class="inline-flex btn btn-warning btn-sm" @click.prevent="
single = course;
mode = 'edit';
"><ui-sprite src="pencil"></ui-sprite></a>
<i-link href="#" class="inline-flex btn btn-danger btn-sm"
@click.prevent="remove(course)"><ui-sprite src="trash"></ui-sprite></i-link>
</td>
</tr>
</table>
@ -50,6 +49,11 @@
<script>
export default {
props: {
courses: {},
value: {},
},
data: function () {
return {
mode: null,
@ -57,11 +61,6 @@ export default {
};
},
props: {
courses: {},
value: {},
},
methods: {
create() {
this.mode = 'create';
@ -87,15 +86,15 @@ export default {
this.mode === 'create'
? this.$inertia.post(`/member/${this.value.id}/course`, this.single, {
onFinish() {
_self.single = null;
},
})
onFinish() {
_self.single = null;
},
})
: this.$inertia.patch(`/member/${this.value.id}/course/${this.single.id}`, this.single, {
onFinish() {
_self.single = null;
},
});
onFinish() {
_self.single = null;
},
});
},
},
};

155
resources/js/views/member/MemberPayments.vue
View File

@ -1,117 +1,66 @@
<template>
<div class="sidebar flex flex-col group is-bright">
<page-header title="Zahlungen" @close="$emit('close')">
<template #toolbar>
<page-toolbar-button v-if="single === null" color="primary" icon="plus" @click.prevent="create">Neue Zahlung</page-toolbar-button>
<page-toolbar-button v-if="single !== null" color="primary" icon="undo" @click.prevent="cancel">Zurück</page-toolbar-button>
</template>
</page-header>
<page-header title="Zahlungen" @close="$emit('close')">
<template #toolbar>
<page-toolbar-button v-if="single === null" color="primary" icon="plus" @click.prevent="create">Neue
Zahlung</page-toolbar-button>
<page-toolbar-button v-if="single !== null" color="primary" icon="undo"
@click.prevent="cancel">Zurück</page-toolbar-button>
</template>
</page-header>
<form v-if="single" class="p-6 grid gap-4 justify-start" @submit.prevent="submit">
<f-text id="nr" v-model="single.nr" label="Jahr" required></f-text>
<f-select id="subscription_id" v-model="single.subscription_id" name="subscription_id" :options="subscriptions" label="Beitrag" required></f-select>
<f-select id="status_id" v-model="single.status_id" name="status_id" :options="statuses" label="Status" required></f-select>
<button type="submit" class="btn btn-primary">Absenden</button>
</form>
<form v-if="single" class="p-6 grid gap-4 justify-start" @submit.prevent="submit">
<f-text id="nr" v-model="single.nr" label="Jahr" required></f-text>
<f-select id="subscription_id" v-model="single.subscription_id" name="subscription_id" :options="meta.subscriptions"
label="Beitrag" required></f-select>
<f-select id="status_id" v-model="single.status_id" name="status_id" :options="meta.statuses" label="Status"
required></f-select>
<button type="submit" class="btn btn-primary">Absenden</button>
</form>
<div v-else class="grow">
<table class="custom-table custom-table-light custom-table-sm text-sm">
<thead>
<th>Nr</th>
<th>Status</th>
<th>Beitrag</th>
<th></th>
</thead>
<div v-else class="grow">
<table class="custom-table custom-table-light custom-table-sm text-sm">
<thead>
<th>Nr</th>
<th>Status</th>
<th>Beitrag</th>
<th></th>
</thead>
<tr v-for="(payment, index) in value.payments" :key="index">
<td v-text="payment.nr"></td>
<td v-text="payment.status_name"></td>
<td v-text="payment.subscription.name"></td>
<td class="flex">
<a
href="#"
class="inline-flex btn btn-warning btn-sm"
@click.prevent="
single = payment;
mode = 'edit';
"
><ui-sprite src="pencil"></ui-sprite
></a>
<i-link v-show="!payment.is_accepted" href="#" class="inline-flex btn btn-success btn-sm" @click.prevent="accept(payment)"><ui-sprite src="check"></ui-sprite></i-link>
<i-link href="#" class="inline-flex btn btn-danger btn-sm" @click.prevent="remove(payment)"><ui-sprite src="trash"></ui-sprite></i-link>
</td>
</tr>
</table>
</div>
<div class="flex flex-col pb-6 px-6">
<a
v-for="(link, index) in value.payment_links"
:key="index"
href="#"
:class="{disabled: link.disabled}"
target="_BLANK"
class="mt-1 text-center btn btn-primary"
@click.prevent="openLink(link)"
v-text="link.label"
></a>
</div>
<tr v-for="(payment, index) in data" :key="index">
<td v-text="payment.nr"></td>
<td v-text="payment.status_name"></td>
<td v-text="payment.subscription.name"></td>
<td class="flex">
<a href="#" class="inline-flex btn btn-warning btn-sm" @click.prevent="edit(payment)"><ui-sprite
src="pencil"></ui-sprite></a>
<button v-show="!payment.is_accepted" href="#" class="inline-flex btn btn-success btn-sm"
@click.prevent="accept(payment)"><ui-sprite src="check"></ui-sprite></button>
<button class="inline-flex btn btn-danger btn-sm" @click.prevent="remove(payment)"><ui-sprite
src="trash"></ui-sprite></button>
</td>
</tr>
</table>
</div>
</template>
<script>
export default {
<script setup>
defineEmits(['close']);
import { useApiIndex } from '../../composables/useApiIndex.js';
props: {
value: {},
subscriptions: {},
statuses: {},
},
data: function () {
return {
mode: null,
single: null,
};
const props = defineProps({
url: {
type: String,
required: true,
},
});
methods: {
create() {
this.mode = 'create';
this.single = {};
},
cancel() {
this.mode = this.single = null;
},
remove(payment) {
this.$inertia.delete(`/member/${this.value.id}/payment/${payment.id}`);
},
const { axios, data, meta, reload, cancel, single, create, edit, submit, remove } = useApiIndex(props.url, 'payment');
accept(payment) {
this.$inertia.patch(`/member/${this.value.id}/payment/${payment.id}`, {...payment, status_id: 3});
},
async function accept(payment) {
await axios.patch(payment.links.update, { ...payment, status_id: 3 });
openLink(link) {
if (link.disabled) {
return;
}
await reload();
}
window.open(link.href);
},
submit() {
var _self = this;
this.mode === 'create'
? this.$inertia.post(`/member/${this.value.id}/payment`, this.single, {
onFinish() {
_self.single = null;
},
})
: this.$inertia.patch(`/member/${this.value.id}/payment/${this.single.id}`, this.single, {
onFinish() {
_self.single = null;
},
});
},
},
};
await reload();
</script>

2
resources/js/views/member/VIndex.vue
View File

@ -121,7 +121,7 @@
</div>
<ui-sidebar v-if="single !== null" @close="closeSidebar">
<member-payments v-if="single.type === 'payment'" :subscriptions="meta.subscriptions" :statuses="meta.statuses" :value="single.model" @close="closeSidebar"></member-payments>
<member-payments v-if="single.type === 'payment'" :url="single.model.links.payment_index" @close="closeSidebar"></member-payments>
<member-memberships v-if="single.type === 'membership'" :url="single.model.links.membership_index" @close="closeSidebar"></member-memberships>
<member-courses v-if="single.type === 'courses'" :courses="meta.courses" :value="single.model" @close="closeSidebar"></member-courses>
</ui-sidebar>

22
routes/web.php
View File

@ -43,6 +43,7 @@ use App\Membership\Actions\MembershipUpdateAction;
use App\Membership\Actions\SyncAction;
use App\Payment\Actions\AllpaymentPageAction;
use App\Payment\Actions\AllpaymentStoreAction;
use App\Payment\Actions\ApiIndexAction as PaymentApiIndexAction;
use App\Payment\PaymentController;
use App\Payment\SendpaymentController;
use App\Payment\SubscriptionController;
@ -57,16 +58,11 @@ Route::group(['middleware' => 'auth:web'], function (): void {
Route::post('/nami/login-check', NamiLoginCheckAction::class)->name('nami.login-check');
Route::post('/nami/get-search-layer', NamiGetSearchLayerAction::class)->name('nami.get-search-layer');
Route::post('/nami/search', NamiSearchAction::class)->name('nami.search');
Route::post('/api/member/search', SearchAction::class)->name('member.search');
Route::post('/api/membership/member-list', ApiListAction::class)->name('membership.member-list');
Route::post('/api/membership/sync', SyncAction::class)->name('membership.sync');
Route::post('/api/member/{member}/membership', ApiIndexAction::class)->name('member.membership.index');
Route::get('/initialize', InitializeFormAction::class)->name('initialize.form');
Route::post('/initialize', InitializeAction::class)->name('initialize.store');
Route::resource('member', MemberController::class)->except('show', 'destroy');
Route::delete('/member/{member}', MemberDeleteAction::class);
Route::get('/member/{member}', MemberShowAction::class)->name('member.show');
Route::apiResource('member.payment', PaymentController::class);
Route::get('allpayment', AllpaymentPageAction::class)->name('allpayment.page');
Route::post('allpayment', AllpaymentStoreAction::class)->name('allpayment.store');
Route::resource('subscription', SubscriptionController::class);
@ -74,9 +70,6 @@ Route::group(['middleware' => 'auth:web'], function (): void {
->name('member.singlepdf');
Route::get('/sendpayment', [SendpaymentController::class, 'create'])->name('sendpayment.create');
Route::get('/sendpayment/pdf', [SendpaymentController::class, 'send'])->name('sendpayment.pdf');
Route::post('/member/{member}/membership', MembershipStoreAction::class)->name('member.membership.store');
Route::patch('/membership/{membership}', MembershipUpdateAction::class)->name('membership.update');
Route::delete('/membership/{membership}', MembershipDestroyAction::class)->name('membership.destroy');
Route::resource('member.course', CourseController::class);
Route::get('/member/{member}/efz', ShowEfzDocumentAction::class)->name('efz');
Route::get('/member/{member}/resync', MemberResyncAction::class)->name('member.resync');
@ -90,6 +83,7 @@ Route::group(['middleware' => 'auth:web'], function (): void {
Route::post('/subactivity', SubactivityStoreAction::class)->name('api.subactivity.store');
Route::patch('/subactivity/{subactivity}', SubactivityUpdateAction::class)->name('api.subactivity.update');
Route::get('/subactivity/{subactivity}', SubactivityShowAction::class)->name('api.subactivity.show');
Route::post('/api/member/search', SearchAction::class)->name('member.search');
// ------------------------------- Contributions -------------------------------
Route::get('/contribution', ContributionFormAction::class)->name('contribution.form');
@ -108,4 +102,16 @@ Route::group(['middleware' => 'auth:web'], function (): void {
// ----------------------------------- group -----------------------------------
Route::get('/group', ListAction::class)->name('group.index');
// ---------------------------------- payment ----------------------------------
Route::apiResource('member.payment', PaymentController::class);
Route::post('/api/member/{member}/payment', PaymentApiIndexAction::class)->name('member.payment.index');
// --------------------------------- membership --------------------------------
Route::post('/member/{member}/membership', MembershipStoreAction::class)->name('member.membership.store');
Route::patch('/membership/{membership}', MembershipUpdateAction::class)->name('membership.update');
Route::delete('/membership/{membership}', MembershipDestroyAction::class)->name('membership.destroy');
Route::post('/api/membership/member-list', ApiListAction::class)->name('membership.member-list');
Route::post('/api/membership/sync', SyncAction::class)->name('membership.sync');
Route::post('/api/member/{member}/membership', ApiIndexAction::class)->name('member.membership.index');
});

48
tests/Feature/Member/IndexTest.php
View File

@ -20,12 +20,13 @@ class IndexTest extends TestCase
{
$this->withoutExceptionHandling()->login()->loginNami();
$group = Group::factory()->create();
$member = Member::factory()->defaults()->for($group)->create([
'firstname' => '::firstname::',
'address' => 'Kölner Str 3',
'zip' => 33333,
'location' => 'Hilden',
]);
$member = Member::factory()->defaults()->for($group)
->create([
'firstname' => '::firstname::',
'address' => 'Kölner Str 3',
'zip' => 33333,
'location' => 'Hilden',
]);
$response = $this->get('/member');
@ -35,7 +36,12 @@ class IndexTest extends TestCase
$this->assertInertiaHas('Kölner Str 3, 33333 Hilden', $response, 'data.data.0.full_address');
$this->assertInertiaHas($group->id, $response, 'data.data.0.group_id');
$this->assertInertiaHas(null, $response, 'data.data.0.memberships');
$this->assertInertiaHas(route('member.membership.index', ['member' => $member]), $response, 'data.data.0.links.membership_index');
$this->assertInertiaHas("/api/member/{$member->id}/membership", $response, 'data.data.0.links.membership_index');
$this->assertInertiaHas("/api/member/{$member->id}/payment", $response, 'data.data.0.links.payment_index');
$this->assertInertiaHas([
'id' => $member->subscription->id,
'name' => $member->subscription->name,
], $response, 'data.data.0.subscription');
}
public function testFieldsCanBeNull(): void
@ -132,34 +138,6 @@ class IndexTest extends TestCase
$this->assertInertiaHas('€ Mitglied', $response, "data.meta.formActivities.{$activity->id}");
}
public function testItReturnsPayments(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = Member::factory()
->has(Payment::factory()->notPaid()->nr('2019')->subscription('Free', [
new Child('a', 1000),
new Child('b', 50),
]))
->defaults()->create();
$response = $this->get('/member');
$this->assertInertiaHas([
'subscription' => [
'name' => 'Free',
'id' => $member->payments->first()->subscription->id,
'amount' => 1050,
],
'subscription_id' => $member->payments->first()->subscription->id,
'status_name' => 'Nicht bezahlt',
'nr' => '2019',
], $response, 'data.data.0.payments.0');
$this->assertInertiaHas([
'id' => $member->subscription->id,
'name' => $member->subscription->name,
], $response, 'data.data.0.subscription');
}
public function testItCanFilterForBillKinds(): void
{
$this->withoutExceptionHandling()->login()->loginNami();

43
tests/Feature/Payment/IndexTest.php Normal file
View File

@ -0,0 +1,43 @@
<?php
namespace Tests\Feature\Payment;
use App\Member\Member;
use App\Payment\Payment;
use App\Payment\Subscription;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\RequestFactories\Child;
use Tests\TestCase;
class IndexTest extends TestCase
{
use DatabaseTransactions;
public function testItShowsPayments(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$member = Member::factory()
->has(Payment::factory()->notPaid()->nr('2019')->subscription('Free', [
new Child('a', 1000),
new Child('b', 50),
]))
->defaults()->create();
$payment = $member->payments->first();
$this->postJson("/api/member/{$member->id}/payment")
->assertJsonPath('data.0.subscription.name', 'Free')
->assertJsonPath('data.0.subscription.id', $payment->subscription->id)
->assertJsonPath('data.0.subscription.amount', 1050)
->assertJsonPath('data.0.subscription_id', $payment->subscription->id)
->assertJsonPath('data.0.status_name', 'Nicht bezahlt')
->assertJsonPath('data.0.nr', '2019')
->assertJsonPath('data.0.links.update', url("/member/{$member->id}/payment/{$payment->id}"))
->assertJsonPath('data.0.links.destroy', url("/member/{$member->id}/payment/{$payment->id}"))
->assertJsonPath('meta.statuses.0.name', 'Nicht bezahlt')
->assertJsonPath('meta.statuses.0.id', $payment->status->id)
->assertJsonPath('meta.subscriptions.0.id', Subscription::first()->id)
->assertJsonPath('meta.subscriptions.0.name', Subscription::first()->name)
->assertJsonPath('meta.links.store', url("/member/{$member->id}/payment"));
}
}