Compare commits
No commits in common. "48881ef4ed51621f3cd652af0c0fc0788f18bdd1" and "37c9021e762bb9f6ca15e049ca49f2b0746fc420" have entirely different histories.
48881ef4ed
...
37c9021e76
|
@ -84,9 +84,6 @@ class MemberRequest extends FormRequest
|
|||
'salutation' => '',
|
||||
'comment' => '',
|
||||
'keepdata' => 'boolean',
|
||||
'bank_account' => 'array|exclude',
|
||||
'bank_account.iban' => 'nullable|string|max:255',
|
||||
'bank_account.bic' => 'nullable|string|max:255',
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -97,7 +94,6 @@ class MemberRequest extends FormRequest
|
|||
'group_id' => Group::where('nami_id', $settings->default_group_id)->firstOrFail()->id,
|
||||
]);
|
||||
$member->updatePhoneNumbers()->save();
|
||||
$member->bankAccount->update($this->input('bank_account'));
|
||||
|
||||
if ($this->input('has_nami')) {
|
||||
$this->storeFreshMemberInNami($member);
|
||||
|
@ -121,7 +117,6 @@ class MemberRequest extends FormRequest
|
|||
$namiSync = $member->isDirty(Member::$namiFields);
|
||||
|
||||
$member->save();
|
||||
$member->bankAccount->update($this->input('bank_account'));
|
||||
|
||||
if ($this->input('has_nami') && null === $member->nami_id) {
|
||||
$this->storeFreshMemberInNami($member);
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
<?php
|
||||
|
||||
use App\Member\Member;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
@ -23,10 +22,6 @@ return new class extends Migration
|
|||
$table->string('account_number')->nullable();
|
||||
$table->timestamps();
|
||||
});
|
||||
|
||||
foreach (Member::get() as $member) {
|
||||
$member->bankAccount()->create([]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -92,8 +92,6 @@ services:
|
|||
|
||||
socketi:
|
||||
image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian
|
||||
ports:
|
||||
- '6001:6001'
|
||||
environment:
|
||||
SOKETI_DEFAULT_APP_ID: adremaid
|
||||
SOKETI_DEFAULT_APP_KEY: adremakey
|
||||
|
@ -106,8 +104,6 @@ services:
|
|||
|
||||
meilisearch:
|
||||
image: getmeili/meilisearch:v1.6
|
||||
ports:
|
||||
- '7700:7700'
|
||||
volumes:
|
||||
- ./data/meilisearch:/meili_data
|
||||
env_file:
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 7189511a550ecce5c9b8f6a0b31e3b4e011752a2
|
||||
Subproject commit f905c316ee7913cbf85c386021fbaa28b4b2a158
|
|
@ -17,242 +17,277 @@ use App\Region;
|
|||
use App\Subactivity;
|
||||
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||
use Tests\Lib\MergesAttributes;
|
||||
use Tests\RequestFactories\MemberStoreRequestFactory;
|
||||
use Tests\TestCase;
|
||||
use Zoomyboy\LaravelNami\Fakes\MemberFake;
|
||||
|
||||
uses(DatabaseTransactions::class);
|
||||
class StoreTest extends TestCase
|
||||
{
|
||||
use DatabaseTransactions;
|
||||
use MergesAttributes;
|
||||
|
||||
beforeEach(function () {
|
||||
Confession::factory()->create(['is_null' => true]);
|
||||
PullMemberAction::shouldRun();
|
||||
PullMembershipsAction::shouldRun();
|
||||
});
|
||||
public function testItCanStoreAMember(): void
|
||||
{
|
||||
app(MemberFake::class)->stores(55, 103);
|
||||
Fee::factory()->create();
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$country = Country::factory()->create();
|
||||
$gender = Gender::factory()->create();
|
||||
$region = Region::factory()->create();
|
||||
$nationality = Nationality::factory()->create();
|
||||
$activity = Activity::factory()->inNami(89)->create();
|
||||
$subactivity = Subactivity::factory()->inNami(90)->create();
|
||||
$subscription = Subscription::factory()->forFee()->create();
|
||||
$confesstion = Confession::factory()->create(['is_null' => true]);
|
||||
PullMemberAction::shouldRun();
|
||||
PullMembershipsAction::shouldRun();
|
||||
|
||||
it('can store a member', function () {
|
||||
app(MemberFake::class)->stores(55, 103);
|
||||
Fee::factory()->create();
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$country = Country::factory()->create();
|
||||
$gender = Gender::factory()->create();
|
||||
$region = Region::factory()->create();
|
||||
$nationality = Nationality::factory()->create();
|
||||
$activity = Activity::factory()->inNami(89)->create();
|
||||
$subactivity = Subactivity::factory()->inNami(90)->create();
|
||||
$subscription = Subscription::factory()->forFee()->create();
|
||||
$response = $this
|
||||
->from('/member/create')
|
||||
->post('/member', $this->attributes([
|
||||
'country_id' => $country->id,
|
||||
'gender_id' => $gender->id,
|
||||
'region_id' => $region->id,
|
||||
'nationality_id' => $nationality->id,
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
'subscription_id' => $subscription->id,
|
||||
'bill_kind' => 'Post',
|
||||
'salutation' => 'Doktor',
|
||||
'comment' => 'Lorem bla',
|
||||
]))->assertSessionHasNoErrors();
|
||||
|
||||
$response = $this
|
||||
->from('/member/create')
|
||||
->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'country_id' => $country->id,
|
||||
'gender_id' => $gender->id,
|
||||
'region_id' => $region->id,
|
||||
'nationality_id' => $nationality->id,
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
'subscription_id' => $subscription->id,
|
||||
$response->assertRedirect('/member')->assertSessionHasNoErrors();
|
||||
$member = Member::firstWhere('firstname', 'Joe');
|
||||
$this->assertDatabaseHas('members', [
|
||||
'address' => 'Bavert 50',
|
||||
'bill_kind' => 'Post',
|
||||
'birthday' => '2013-02-19',
|
||||
'children_phone' => '+49 176 70512778',
|
||||
'country_id' => $country->id,
|
||||
'email_parents' => 'osloot@aol.com',
|
||||
'firstname' => 'Joe',
|
||||
'gender_id' => $gender->id,
|
||||
'joined_at' => '2022-08-12',
|
||||
'lastname' => 'Muster',
|
||||
'letter_address' => null,
|
||||
'location' => 'Solingen',
|
||||
'main_phone' => '+49 212 337056',
|
||||
'mobile_phone' => '+49 176 70512774',
|
||||
'nationality_id' => $nationality->id,
|
||||
'region_id' => $region->id,
|
||||
'send_newspaper' => '1',
|
||||
'subscription_id' => $subscription->id,
|
||||
'zip' => '42719',
|
||||
'fax' => '+49 212 4732223',
|
||||
'salutation' => 'Doktor',
|
||||
'comment' => 'Lorem bla',
|
||||
]))->assertSessionHasNoErrors();
|
||||
]);
|
||||
|
||||
$response->assertRedirect('/member')->assertSessionHasNoErrors();
|
||||
$this->assertDatabaseHas('members', [
|
||||
'address' => 'Bavert 50',
|
||||
'bill_kind' => 'Post',
|
||||
'birthday' => '2013-02-19',
|
||||
'children_phone' => '+49 176 70512778',
|
||||
'country_id' => $country->id,
|
||||
'email_parents' => 'osloot@aol.com',
|
||||
'firstname' => 'Joe',
|
||||
'gender_id' => $gender->id,
|
||||
'joined_at' => '2022-08-12',
|
||||
'lastname' => 'Muster',
|
||||
'letter_address' => null,
|
||||
'location' => 'Solingen',
|
||||
'main_phone' => '+49 212 337056',
|
||||
'mobile_phone' => '+49 176 70512774',
|
||||
'nationality_id' => $nationality->id,
|
||||
'region_id' => $region->id,
|
||||
'send_newspaper' => '1',
|
||||
'subscription_id' => $subscription->id,
|
||||
'zip' => '42719',
|
||||
'fax' => '+49 212 4732223',
|
||||
'salutation' => 'Doktor',
|
||||
'comment' => 'Lorem bla',
|
||||
]);
|
||||
app(MemberFake::class)->assertStored(55, [
|
||||
'ersteTaetigkeitId' => 89,
|
||||
'ersteUntergliederungId' => 90,
|
||||
]);
|
||||
}
|
||||
|
||||
app(MemberFake::class)->assertStored(55, [
|
||||
'ersteTaetigkeitId' => 89,
|
||||
'ersteUntergliederungId' => 90,
|
||||
]);
|
||||
});
|
||||
public function testItStoresWiederverwendenFlag(): void
|
||||
{
|
||||
app(MemberFake::class)->stores(55, 103);
|
||||
Fee::factory()->create();
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$activity = Activity::factory()->inNami(89)->create();
|
||||
$subactivity = Subactivity::factory()->inNami(90)->create();
|
||||
$subscription = Subscription::factory()->forFee()->create();
|
||||
$confesstion = Confession::factory()->create(['is_null' => true]);
|
||||
PullMemberAction::shouldRun();
|
||||
PullMembershipsAction::shouldRun();
|
||||
|
||||
it('can store iban and bic', function () {
|
||||
app(MemberFake::class)->stores(55, 103);
|
||||
Fee::factory()->create();
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$this
|
||||
->from('/member/create')
|
||||
->post('/member', $this->attributes([
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
'subscription_id' => $subscription->id,
|
||||
'keepdata' => true,
|
||||
]))->assertSessionHasNoErrors();
|
||||
|
||||
$this->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'bank_account.iban' => '666',
|
||||
'bank_account.bic' => 'SOLSDE',
|
||||
]))->assertSessionHasNoErrors();
|
||||
|
||||
$this->assertDatabaseHas('bank_accounts', [
|
||||
'iban' => '666',
|
||||
'bic' => 'SOLSDE',
|
||||
'member_id' => Member::first()->id,
|
||||
]);
|
||||
|
||||
app(MemberFake::class)->assertStored(55, function ($payload) {
|
||||
$bank = json_decode($payload['kontoverbindung'], true);
|
||||
return $bank['iban'] === '666' && $bank['bic'] === 'SOLSDE';
|
||||
});
|
||||
});
|
||||
|
||||
it('testItStoresWiederverwendenFlag', function () {
|
||||
app(MemberFake::class)->stores(55, 103);
|
||||
Fee::factory()->create();
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$activity = Activity::factory()->inNami(89)->create();
|
||||
$subactivity = Subactivity::factory()->inNami(90)->create();
|
||||
$subscription = Subscription::factory()->forFee()->create();
|
||||
|
||||
$this
|
||||
->from('/member/create')
|
||||
->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
'subscription_id' => $subscription->id,
|
||||
$this->assertDatabaseHas('members', [
|
||||
'keepdata' => true,
|
||||
]))->assertSessionHasNoErrors();
|
||||
]);
|
||||
app(MemberFake::class)->assertStored(55, [
|
||||
'wiederverwendenFlag' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
$this->assertDatabaseHas('members', [
|
||||
'keepdata' => true,
|
||||
]);
|
||||
app(MemberFake::class)->assertStored(55, [
|
||||
'wiederverwendenFlag' => true,
|
||||
]);
|
||||
});
|
||||
public function testItCanStoreAMemberWithoutNami(): void
|
||||
{
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$activity = Activity::factory()->create();
|
||||
$subactivity = Subactivity::factory()->create();
|
||||
|
||||
it('testItCanStoreAMemberWithoutNami', function () {
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$activity = Activity::factory()->create();
|
||||
$subactivity = Subactivity::factory()->create();
|
||||
$response = $this
|
||||
->from('/member/create')
|
||||
->post('/member', $this->attributes([
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
'has_nami' => false,
|
||||
]));
|
||||
|
||||
$response = $this
|
||||
->from('/member/create')
|
||||
->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
$response->assertSessionHasNoErrors();
|
||||
$this->assertDatabaseHas('members', [
|
||||
'nami_id' => null,
|
||||
]);
|
||||
NamiPutMemberAction::spy()->shouldNotHaveReceived('handle');
|
||||
}
|
||||
|
||||
public function testItUpdatesPhoneNumber(): void
|
||||
{
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
|
||||
$this->post('/member', $this->attributes([
|
||||
'has_nami' => false,
|
||||
'main_phone' => '02103 4455129',
|
||||
'fax' => '02103 4455130',
|
||||
'children_phone' => '02103 4455130',
|
||||
]));
|
||||
|
||||
$response->assertSessionHasNoErrors();
|
||||
$this->assertDatabaseHas('members', [
|
||||
'nami_id' => null,
|
||||
]);
|
||||
NamiPutMemberAction::spy()->shouldNotHaveReceived('handle');
|
||||
});
|
||||
$this->assertDatabaseHas('members', [
|
||||
'main_phone' => '+49 2103 4455129',
|
||||
'fax' => '+49 2103 4455130',
|
||||
'children_phone' => '+49 2103 4455130',
|
||||
]);
|
||||
}
|
||||
|
||||
it('testItUpdatesPhoneNumber', function () {
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
public function testItHasErrorWhenPhoneNumberIsInvalid(): void
|
||||
{
|
||||
$this->login()->loginNami();
|
||||
|
||||
$this->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'has_nami' => false,
|
||||
'main_phone' => '02103 4455129',
|
||||
'fax' => '02103 4455130',
|
||||
'children_phone' => '02103 4455130',
|
||||
]));
|
||||
$response = $this->post('/member', $this->attributes([
|
||||
'has_nami' => false,
|
||||
'main_phone' => '1111111111111111',
|
||||
'mobile_phone' => '1111111111111111',
|
||||
'fax' => '1111111111111111',
|
||||
'children_phone' => '1111111111111111',
|
||||
]));
|
||||
|
||||
$this->assertDatabaseHas('members', [
|
||||
'main_phone' => '+49 2103 4455129',
|
||||
'fax' => '+49 2103 4455130',
|
||||
'children_phone' => '+49 2103 4455130',
|
||||
]);
|
||||
});
|
||||
$response->assertSessionHasErrors([
|
||||
'main_phone' => 'Telefon (Eltern) ist keine valide Nummer.',
|
||||
'mobile_phone' => 'Handy (Eltern) ist keine valide Nummer.',
|
||||
'children_phone' => 'Telefon (Kind) ist keine valide Nummer.',
|
||||
'fax' => 'Fax ist keine valide Nummer.',
|
||||
]);
|
||||
}
|
||||
|
||||
it('testItHasErrorWhenPhoneNumberIsInvalid', function () {
|
||||
$this->login()->loginNami();
|
||||
public function testItDoesntRequireBirthdayWhenNotInNami(): void
|
||||
{
|
||||
$this->login()->loginNami();
|
||||
|
||||
$response = $this->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'has_nami' => false,
|
||||
'main_phone' => '1111111111111111',
|
||||
'mobile_phone' => '1111111111111111',
|
||||
'fax' => '1111111111111111',
|
||||
'children_phone' => '1111111111111111',
|
||||
]));
|
||||
|
||||
$response->assertSessionHasErrors([
|
||||
'main_phone' => 'Telefon (Eltern) ist keine valide Nummer.',
|
||||
'mobile_phone' => 'Handy (Eltern) ist keine valide Nummer.',
|
||||
'children_phone' => 'Telefon (Kind) ist keine valide Nummer.',
|
||||
'fax' => 'Fax ist keine valide Nummer.',
|
||||
]);
|
||||
});
|
||||
|
||||
it('testItDoesntRequireBirthdayWhenNotInNami', function () {
|
||||
$this->login()->loginNami();
|
||||
|
||||
$this
|
||||
->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
$this
|
||||
->post('/member', $this->attributes([
|
||||
'nationality_id' => null,
|
||||
'birthday' => null,
|
||||
'has_nami' => false,
|
||||
'address' => null,
|
||||
'zip' => null,
|
||||
'location' => null,
|
||||
'joined_at' => null,
|
||||
]))->assertSessionDoesntHaveErrors();
|
||||
$this->assertDatabaseHas('members', [
|
||||
'nationality_id' => null,
|
||||
'birthday' => null,
|
||||
'has_nami' => false,
|
||||
'address' => null,
|
||||
'zip' => null,
|
||||
'location' => null,
|
||||
'joined_at' => null,
|
||||
]))->assertSessionDoesntHaveErrors();
|
||||
$this->assertDatabaseHas('members', [
|
||||
'nationality_id' => null,
|
||||
'birthday' => null,
|
||||
'address' => null,
|
||||
'zip' => null,
|
||||
'location' => null,
|
||||
'joined_at' => null,
|
||||
]);
|
||||
});
|
||||
]);
|
||||
}
|
||||
|
||||
it('testItDoesntNeedSubscription', function () {
|
||||
$this->login()->loginNami();
|
||||
public function testItDoesntNeedSubscription(): void
|
||||
{
|
||||
$this->login()->loginNami();
|
||||
|
||||
$this
|
||||
->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'has_nami' => false,
|
||||
$this
|
||||
->post('/member', $this->attributes([
|
||||
'has_nami' => false,
|
||||
'subscription_id' => null,
|
||||
]))->assertSessionDoesntHaveErrors();
|
||||
$this->assertDatabaseHas('members', [
|
||||
'subscription_id' => null,
|
||||
]))->assertSessionDoesntHaveErrors();
|
||||
$this->assertDatabaseHas('members', [
|
||||
'subscription_id' => null,
|
||||
]);
|
||||
});
|
||||
]);
|
||||
}
|
||||
|
||||
it('testItRequiresFields', function () {
|
||||
$this->login()->loginNami();
|
||||
public function testItRequiresFields(): void
|
||||
{
|
||||
$this->login()->loginNami();
|
||||
|
||||
$this
|
||||
->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'nationality_id' => null,
|
||||
'birthday' => '',
|
||||
'address' => '',
|
||||
'zip' => '',
|
||||
'location' => '',
|
||||
'joined_at' => '',
|
||||
]))
|
||||
->assertSessionHasErrors(['nationality_id', 'birthday', 'address', 'zip', 'location', 'joined_at']);
|
||||
});
|
||||
$this
|
||||
->post('/member', $this->attributes([
|
||||
'nationality_id' => null,
|
||||
'birthday' => '',
|
||||
'address' => '',
|
||||
'zip' => '',
|
||||
'location' => '',
|
||||
'joined_at' => '',
|
||||
]))
|
||||
->assertSessionHasErrors(['nationality_id', 'birthday', 'address', 'zip', 'location', 'joined_at']);
|
||||
}
|
||||
|
||||
it('testSubscriptionIsRequiredIfFirstActivityIsPaid', function () {
|
||||
$this->login()->loginNami();
|
||||
$activity = Activity::factory()->name('€ Mitglied')->create();
|
||||
$subactivity = Subactivity::factory()->create();
|
||||
public function testSubscriptionIsRequiredIfFirstActivityIsPaid(): void
|
||||
{
|
||||
$this->login()->loginNami();
|
||||
$activity = Activity::factory()->name('€ Mitglied')->create();
|
||||
$subactivity = Subactivity::factory()->create();
|
||||
|
||||
$this
|
||||
->from('/member/create')
|
||||
->post('/member', MemberStoreRequestFactory::new()->create([
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
'subscription_id' => null,
|
||||
]))
|
||||
->assertSessionHasErrors(['subscription_id' => 'Beitragsart ist erforderlich.']);
|
||||
});
|
||||
$this
|
||||
->from('/member/create')
|
||||
->post('/member', $this->attributes([
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
'subscription_id' => null,
|
||||
]))
|
||||
->assertSessionHasErrors(['subscription_id' => 'Beitragsart ist erforderlich.']);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function defaults(): array
|
||||
{
|
||||
$country = Country::factory()->create();
|
||||
$nationality = Nationality::factory()->create();
|
||||
$subscription = Subscription::factory()->forFee()->create();
|
||||
|
||||
return [
|
||||
'address' => 'Bavert 50',
|
||||
'birthday' => '2013-02-19',
|
||||
'children_phone' => '+49 176 70512778',
|
||||
'efz' => '',
|
||||
'email' => '',
|
||||
'email_parents' => 'osloot@aol.com',
|
||||
'fax' => '+49 212 4732223',
|
||||
'firstname' => 'Joe',
|
||||
'further_address' => '',
|
||||
'has_nami' => true,
|
||||
'has_svk' => false,
|
||||
'has_vk' => false,
|
||||
'joined_at' => '2022-08-12',
|
||||
'lastname' => 'Muster',
|
||||
'letter_address' => '',
|
||||
'location' => 'Solingen',
|
||||
'main_phone' => '+49 212 337056',
|
||||
'mobile_phone' => '+49 176 70512774',
|
||||
'more_ps_at' => '',
|
||||
'multiply_more_pv' => false,
|
||||
'multiply_pv' => false,
|
||||
'other_country' => '',
|
||||
'ps_at' => '',
|
||||
'send_newspaper' => true,
|
||||
'without_education_at' => '',
|
||||
'without_efz_at' => '',
|
||||
'work_phone' => '',
|
||||
'zip' => '42719',
|
||||
'country_id' => $country->id,
|
||||
'nationality_id' => $nationality->id,
|
||||
'subscription_id' => $subscription->id,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ class UpdateTest extends TestCase
|
|||
|
||||
$response = $this
|
||||
->from("/member/{$member->id}")
|
||||
->patch("/member/{$member->id}", array_merge($member->getAttributes(), ['has_nami' => true, 'bank_account' => []]));
|
||||
->patch("/member/{$member->id}", array_merge($member->getAttributes(), ['has_nami' => true]));
|
||||
|
||||
$response->assertRedirect('/member');
|
||||
NamiPutMemberAction::spy()->shouldHaveReceived('handle')->withArgs(
|
||||
|
@ -51,7 +51,7 @@ class UpdateTest extends TestCase
|
|||
|
||||
$response = $this
|
||||
->from("/member/{$member->id}")
|
||||
->patch("/member/{$member->id}", array_merge($member->getAttributes(), ['has_nami' => true, 'firstname' => '::firstname::', 'bank_account' => []]));
|
||||
->patch("/member/{$member->id}", array_merge($member->getAttributes(), ['has_nami' => true, 'firstname' => '::firstname::']));
|
||||
|
||||
$response->assertRedirect("/member/{$member->id}/edit?conflict=1");
|
||||
}
|
||||
|
@ -64,7 +64,6 @@ class UpdateTest extends TestCase
|
|||
NamiPutMemberAction::allowToRun();
|
||||
|
||||
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
|
||||
'bank_account' => [],
|
||||
'main_phone' => '02103 4455129',
|
||||
'fax' => '02103 4455130',
|
||||
'children_phone' => '02103 4455130',
|
||||
|
@ -78,25 +77,6 @@ class UpdateTest extends TestCase
|
|||
]);
|
||||
}
|
||||
|
||||
public function testItUpdatesKontoverbindung(): void
|
||||
{
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
$member = $this->member();
|
||||
$this->fakeRequest();
|
||||
NamiPutMemberAction::allowToRun();
|
||||
|
||||
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
|
||||
'bank_account' => ['iban' => 'SSS', 'bic' => 'AAA'],
|
||||
'has_nami' => true,
|
||||
]));
|
||||
|
||||
$this->assertDatabaseHas('bank_accounts', [
|
||||
'member_id' => $member->id,
|
||||
'iban' => 'SSS',
|
||||
'bic' => 'AAA',
|
||||
]);
|
||||
}
|
||||
|
||||
public function testItUpdatesWiederverwendenFlag(): void
|
||||
{
|
||||
$this->withoutExceptionHandling()->login()->loginNami();
|
||||
|
@ -105,7 +85,6 @@ class UpdateTest extends TestCase
|
|||
NamiPutMemberAction::allowToRun();
|
||||
|
||||
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
|
||||
'bank_account' => [],
|
||||
'keepdata' => true,
|
||||
'has_nami' => true,
|
||||
]));
|
||||
|
@ -123,7 +102,6 @@ class UpdateTest extends TestCase
|
|||
NamiPutMemberAction::allowToRun();
|
||||
|
||||
$this->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
|
||||
'bank_account' => [],
|
||||
'location' => null,
|
||||
]));
|
||||
|
||||
|
@ -141,7 +119,6 @@ class UpdateTest extends TestCase
|
|||
$response = $this
|
||||
->from("/member/{$member->id}")
|
||||
->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
|
||||
'bank_account' => [],
|
||||
'other_country' => 'englisch',
|
||||
]));
|
||||
|
||||
|
@ -161,7 +138,6 @@ class UpdateTest extends TestCase
|
|||
|
||||
$this->patch("/member/{$member->id}", [
|
||||
...$member->getAttributes(),
|
||||
'bank_account' => [],
|
||||
'has_nami' => true,
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
|
@ -202,7 +178,6 @@ class UpdateTest extends TestCase
|
|||
$response = $this
|
||||
->from("/member/{$member->id}")
|
||||
->patch("/member/{$member->id}", array_merge($member->getAttributes(), [
|
||||
'bank_account' => [],
|
||||
'ps_at' => '2021-02-01',
|
||||
'more_ps_at' => '2021-02-02',
|
||||
'has_svk' => true,
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Tests\RequestFactories;
|
||||
|
||||
use App\Activity;
|
||||
use App\Country;
|
||||
use App\Nationality;
|
||||
use App\Payment\Subscription;
|
||||
use App\Subactivity;
|
||||
use Worksome\RequestFactories\RequestFactory;
|
||||
|
||||
class MemberStoreRequestFactory extends RequestFactory
|
||||
{
|
||||
public function definition(): array
|
||||
{
|
||||
$country = Country::factory()->create();
|
||||
$nationality = Nationality::factory()->create();
|
||||
$subscription = Subscription::factory()->forFee()->create();
|
||||
$activity = Activity::factory()->inNami(89)->create();
|
||||
$subactivity = Subactivity::factory()->inNami(90)->create();
|
||||
|
||||
return [
|
||||
'bank_account' => [
|
||||
'iban' => '',
|
||||
'bic' => '',
|
||||
],
|
||||
'address' => 'Bavert 50',
|
||||
'birthday' => '2013-02-19',
|
||||
'children_phone' => '+49 176 70512778',
|
||||
'efz' => '',
|
||||
'email' => '',
|
||||
'email_parents' => 'osloot@aol.com',
|
||||
'fax' => '+49 212 4732223',
|
||||
'firstname' => 'Joe',
|
||||
'further_address' => '',
|
||||
'has_nami' => true,
|
||||
'has_svk' => false,
|
||||
'has_vk' => false,
|
||||
'joined_at' => '2022-08-12',
|
||||
'lastname' => 'Muster',
|
||||
'letter_address' => '',
|
||||
'location' => 'Solingen',
|
||||
'main_phone' => '+49 212 337056',
|
||||
'mobile_phone' => '+49 176 70512774',
|
||||
'more_ps_at' => '',
|
||||
'multiply_more_pv' => false,
|
||||
'multiply_pv' => false,
|
||||
'other_country' => '',
|
||||
'ps_at' => '',
|
||||
'send_newspaper' => true,
|
||||
'without_education_at' => '',
|
||||
'without_efz_at' => '',
|
||||
'work_phone' => '',
|
||||
'zip' => '42719',
|
||||
'country_id' => $country->id,
|
||||
'nationality_id' => $nationality->id,
|
||||
'subscription_id' => $subscription->id,
|
||||
'first_activity_id' => $activity->id,
|
||||
'first_subactivity_id' => $subactivity->id,
|
||||
];
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue