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

Lint

This commit is contained in:
philipp lang 2024-12-13 02:16:09 +01:00
parent 286ceea0d4
commit 4ac89da124
9 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Contribution/ContributionFactory.php
View File

@ -32,7 +32,7 @@ class ContributionFactory
public function compilerSelect(): Collection
{
return collect($this->documents)->map(fn ($document) => [
'title' => $document::getName(),
'title' => $document::buttonName(),
'class' => $document,
]);
}

2
app/Contribution/Documents/BdkjHesse.php
View File

@ -143,7 +143,7 @@ class BdkjHesse extends ContributionDocument
public static function getName(): string
{
return 'Für BDKJ Hessen erstellen';
return 'BDKJ Hessen';
}
/**

2
app/Contribution/Documents/CityFrankfurtMainDocument.php
View File

@ -131,7 +131,7 @@ class CityFrankfurtMainDocument extends ContributionDocument
public static function getName(): string
{
return 'Für Frankfurt erstellen';
return 'Frankfurt';
}
/**

6
app/Contribution/Documents/CityRemscheidDocument.php
View File

@ -25,7 +25,9 @@ class CityRemscheidDocument extends ContributionDocument
public Collection $children,
public ?string $filename = '',
public string $type = 'F',
public string $eventName = '',
) {
$this->setEventName($eventName);
}
public function niceDateFrom(): string
@ -52,6 +54,7 @@ class CityRemscheidDocument extends ContributionDocument
country: Country::where('id', $request['country'])->firstOrFail(),
leaders: $leaders->values()->toBase()->chunk(6),
children: $children->values()->toBase()->chunk(20),
eventName: $request['eventName'],
);
}
@ -70,6 +73,7 @@ class CityRemscheidDocument extends ContributionDocument
country: Country::where('id', $request['country'])->firstOrFail(),
leaders: $leaders->values()->toBase()->chunk(6),
children: $children->values()->toBase()->chunk(20),
eventName: $request['eventName'],
);
}
@ -102,7 +106,7 @@ class CityRemscheidDocument extends ContributionDocument
public static function getName(): string
{
return 'Für Remscheid erstellen';
return 'Remscheid';
}
/**

3
app/Contribution/Documents/CitySolingenDocument.php
View File

@ -25,6 +25,7 @@ class CitySolingenDocument extends ContributionDocument
public string $eventName,
public string $type = 'F',
) {
$this->setEventName($eventName);
$this->fromName = app(InvoiceSettings::class)->from_long;
}
@ -111,7 +112,7 @@ class CitySolingenDocument extends ContributionDocument
public static function getName(): string
{
return 'Für Stadt Solingen erstellen';
return 'Stadt Solingen';
}
/**

12
app/Contribution/Documents/ContributionDocument.php
View File

@ -6,6 +6,8 @@ use Zoomyboy\Tex\Document;
abstract class ContributionDocument extends Document
{
private string $eventName;
abstract public static function getName(): string;
/**
@ -33,4 +35,14 @@ abstract class ContributionDocument extends Document
'members.*' => 'integer|exists:members,id',
];
}
public static function buttonName(): string
{
return 'Für ' . static::getName() . ' erstellen';;
}
public function setEventName(string $eventName): void
{
$this->eventName = $eventName;
}
}

7
app/Contribution/Documents/GallierDocument.php
View File

@ -22,7 +22,9 @@ class GallierDocument extends ContributionDocument
public Collection $members,
public ?string $filename = '',
public string $type = 'F',
public string $eventName = '',
) {
$this->setEventName($eventName);
}
public function dateFromHuman(): string
@ -46,6 +48,7 @@ class GallierDocument extends ContributionDocument
zipLocation: $request['zipLocation'],
country: Country::where('id', $request['country'])->firstOrFail(),
members: MemberData::fromModels($request['members'])->chunk(14),
eventName: $request['eventName'],
);
}
@ -60,6 +63,7 @@ class GallierDocument extends ContributionDocument
zipLocation: $request['zipLocation'],
country: Country::where('id', $request['country'])->firstOrFail(),
members: MemberData::fromApi($request['member_data'])->chunk(14),
eventName: $request['eventName'],
);
}
@ -92,7 +96,7 @@ class GallierDocument extends ContributionDocument
public static function getName(): string
{
return 'Für Gallier erstellen';
return 'Gallier';
}
/**
@ -104,6 +108,7 @@ class GallierDocument extends ContributionDocument
'dateFrom' => 'required|string|date_format:Y-m-d',
'dateUntil' => 'required|string|date_format:Y-m-d',
'zipLocation' => 'required|string',
'eventName' => 'required|string',
];
}
}

6
app/Contribution/Documents/RdpNrwDocument.php
View File

@ -22,7 +22,9 @@ class RdpNrwDocument extends ContributionDocument
public Collection $members,
public ?string $filename = '',
public string $type = 'F',
public string $eventName = '',
) {
$this->setEventName($eventName);
}
public function dateRange(): string
@ -43,6 +45,7 @@ class RdpNrwDocument extends ContributionDocument
zipLocation: $request['zipLocation'],
country: Country::where('id', $request['country'])->firstOrFail(),
members: MemberData::fromModels($request['members'])->chunk(17),
eventName: $request['eventName'],
);
}
@ -57,6 +60,7 @@ class RdpNrwDocument extends ContributionDocument
zipLocation: $request['zipLocation'],
country: Country::where('id', $request['country'])->firstOrFail(),
members: MemberData::fromApi($request['member_data'])->chunk(17),
eventName: $request['eventName'],
);
}
@ -123,7 +127,7 @@ class RdpNrwDocument extends ContributionDocument
public static function getName(): string
{
return 'Für RdP NRW erstellen';
return 'RdP NRW';
}
/**

4
tests/Feature/Contribution/StoreTest.php
View File

@ -107,8 +107,8 @@ it('compiles documents via api', function (string $type, array $bodyChecks) {
$this->withoutExceptionHandling();
Tex::spy();
$this->login()->loginNami();
$member1 = Member::factory()->defaults()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']);
$member2 = Member::factory()->defaults()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']);
$member1 = Member::factory()->defaults()->male()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']);
$member2 = Member::factory()->defaults()->female()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']);
$response = $this->call('GET', '/contribution-generate', [
'payload' => ContributionRequestFactory::new()->type($type)->state([