Compare commits
No commits in common. "e21e818ac6fbc68e7ff8d16617945b0fd1c0a239" and "58d7c5671f1b7d4e646fe8188c7233a63fac7512" have entirely different histories.
e21e818ac6
...
58d7c5671f
|
@ -6,7 +6,6 @@ use App\Contribution\Data\MemberData;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Zoomyboy\Tex\Engine;
|
use Zoomyboy\Tex\Engine;
|
||||||
use Zoomyboy\Tex\Template;
|
use Zoomyboy\Tex\Template;
|
||||||
|
|
||||||
|
@ -21,7 +20,6 @@ class BdkjHesse extends ContributionDocument
|
||||||
public string $zipLocation,
|
public string $zipLocation,
|
||||||
public ?Country $country,
|
public ?Country $country,
|
||||||
public Collection $members,
|
public Collection $members,
|
||||||
public string $eventName,
|
|
||||||
public ?string $filename = '',
|
public ?string $filename = '',
|
||||||
public string $type = 'F',
|
public string $type = 'F',
|
||||||
) {
|
) {
|
||||||
|
@ -48,7 +46,6 @@ class BdkjHesse extends ContributionDocument
|
||||||
zipLocation: $request['zipLocation'],
|
zipLocation: $request['zipLocation'],
|
||||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
members: MemberData::fromModels($request['members'])->chunk(20),
|
members: MemberData::fromModels($request['members'])->chunk(20),
|
||||||
eventName: $request['eventName'],
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +60,6 @@ class BdkjHesse extends ContributionDocument
|
||||||
zipLocation: $request['zipLocation'],
|
zipLocation: $request['zipLocation'],
|
||||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
members: MemberData::fromApi($request['member_data'])->chunk(20),
|
members: MemberData::fromApi($request['member_data'])->chunk(20),
|
||||||
eventName: $request['eventName'],
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,7 +112,7 @@ class BdkjHesse extends ContributionDocument
|
||||||
|
|
||||||
public function basename(): string
|
public function basename(): string
|
||||||
{
|
{
|
||||||
return 'zuschuesse-bdkj-hessen' . Str::slug($this->eventName);
|
return 'zuschuesse-bdkj-hessen';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function view(): string
|
public function view(): string
|
||||||
|
|
|
@ -4,17 +4,13 @@ namespace App\Contribution\Documents;
|
||||||
|
|
||||||
use App\Contribution\Data\MemberData;
|
use App\Contribution\Data\MemberData;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
use App\Invoice\InvoiceSettings;
|
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Zoomyboy\Tex\Engine;
|
use Zoomyboy\Tex\Engine;
|
||||||
use Zoomyboy\Tex\Template;
|
use Zoomyboy\Tex\Template;
|
||||||
|
|
||||||
class CityFrankfurtMainDocument extends ContributionDocument
|
class CityFrankfurtMainDocument extends ContributionDocument
|
||||||
{
|
{
|
||||||
public string $fromName;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Collection<int, Collection<int, MemberData>> $members
|
* @param Collection<int, Collection<int, MemberData>> $members
|
||||||
*/
|
*/
|
||||||
|
@ -24,11 +20,9 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
||||||
public string $zipLocation,
|
public string $zipLocation,
|
||||||
public ?Country $country,
|
public ?Country $country,
|
||||||
public Collection $members,
|
public Collection $members,
|
||||||
public string $eventName,
|
|
||||||
public ?string $filename = '',
|
public ?string $filename = '',
|
||||||
public string $type = 'F',
|
public string $type = 'F',
|
||||||
) {
|
) {
|
||||||
$this->fromName = app(InvoiceSettings::class)->from_long;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -42,7 +36,6 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
||||||
zipLocation: $request['zipLocation'],
|
zipLocation: $request['zipLocation'],
|
||||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
members: MemberData::fromModels($request['members'])->chunk(15),
|
members: MemberData::fromModels($request['members'])->chunk(15),
|
||||||
eventName: $request['eventName'],
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,7 +50,6 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
||||||
zipLocation: $request['zipLocation'],
|
zipLocation: $request['zipLocation'],
|
||||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
members: MemberData::fromApi($request['member_data'])->chunk(15),
|
members: MemberData::fromApi($request['member_data'])->chunk(15),
|
||||||
eventName: $request['eventName'],
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +96,7 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
||||||
|
|
||||||
public function basename(): string
|
public function basename(): string
|
||||||
{
|
{
|
||||||
return 'zuschuesse-frankfurt-' . Str::slug($this->eventName);
|
return 'zuschuesse-frankfurt';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function view(): string
|
public function view(): string
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
|
|
||||||
@foreach($members as $i => $chunk)
|
@foreach($members as $i => $chunk)
|
||||||
\begin{tikzpicture}[remember picture,overlay,yscale=-1]
|
\begin{tikzpicture}[remember picture,overlay,yscale=-1]
|
||||||
\node[anchor=base west, text width=205.3mm] at (52.9mm,31.0mm) {\bfseries{\large{<<<!!$fromName!!>>>}}}; %Feld: Jugendverband/-Gruppe
|
%\node[anchor=base west, text width=205.3mm] at (52.9mm,31.0mm) {\bfseries{\large{}}}; %Feld: Jugendverband/-Gruppe
|
||||||
\node[anchor=base west, text width=215.9mm] at (41.3mm,38.8mm) {\bfseries{\large{<<<!!$eventName!!>>>}}}; %Feld: Art der Maßnahme
|
%\node[anchor=base west, text width=215.9mm] at (41.3mm,38.8mm) {\bfseries{\large{}}}; %Feld: Art der Maßnahme
|
||||||
\node[anchor=base west, text width=104.8mm] at (17.5mm,47.0mm) {\bfseries{\large{<<<!!$zipLocation!!>>>, <<<!!$countryName!!>>>}}};
|
\node[anchor=base west, text width=104.8mm] at (17.5mm,47.0mm) {\bfseries{\large{<<<!!$zipLocation!!>>>, <<<!!$countryName!!>>>}}};
|
||||||
\node[anchor=base west, text width=41.3mm, align=center] at (170.7mm,47.0mm) {\bfseries{\large{<<<!!$dateFromHuman()!!>>>}}};
|
\node[anchor=base west, text width=41.3mm, align=center] at (170.7mm,47.0mm) {\bfseries{\large{<<<!!$dateFromHuman()!!>>>}}};
|
||||||
\node[anchor=base west, text width=38.4mm, align=center] at (219.9mm,47.0mm) {\bfseries{\large{<<<!!$dateUntilHuman()!!>>>}}};
|
\node[anchor=base west, text width=38.4mm, align=center] at (219.9mm,47.0mm) {\bfseries{\large{<<<!!$dateUntilHuman()!!>>>}}};
|
||||||
|
|
Loading…
Reference in New Issue