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

Add split for subscription
continuous-integration/drone/push Build is failing Details

This commit is contained in:
philipp lang 2022-12-14 00:23:03 +01:00
parent 49417981f1
commit bd34c3e835
17 changed files with 204 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Letter/Page.php
View File

@ -46,11 +46,20 @@ class Page
*/ */
public function getPositions(): array public function getPositions(): array
{ {
return $this->getPayments()->mapWithKeys(function (Payment $payment) { /** @var array<string, string> */
$key = "Beitrag {$payment->nr} für {$payment->member->firstname} {$payment->member->lastname} ({$payment->subscription->name})"; $result = [];
return [$key => $this->number($payment->subscription->getAmount())]; foreach ($this->getPayments() as $payment) {
})->toArray(); if ($payment->subscription->split) {
foreach ($payment->subscription->children as $child) {
$result["{$payment->subscription->name} ({$child->name}) {$payment->nr} für {$payment->member->firstname} {$payment->member->lastname}"] = $this->number($child->amount);
}
} else {
$result["{$payment->subscription->name} {$payment->nr} für {$payment->member->firstname} {$payment->member->lastname}"] = $this->number($payment->subscription->getAmount());
}
}
return $result;
} }
/** /**

12
app/Payment/Subscription.php
View File

@ -12,7 +12,17 @@ class Subscription extends Model
{ {
use HasFactory; use HasFactory;
public $fillable = ['name', 'amount', 'fee_id']; /**
* @var array<int, string>
*/
public $fillable = ['name', 'fee_id', 'split'];
/**
* @var array<string, string>
*/
public $casts = [
'split' => 'boolean',
];
public function getAmount(): int public function getAmount(): int
{ {

2
app/Payment/SubscriptionController.php
View File

@ -39,6 +39,7 @@ class SubscriptionController extends Controller
{ {
$subscriptionParams = $request->validate([ $subscriptionParams = $request->validate([
'name' => 'required|max:255', 'name' => 'required|max:255',
'split' => 'present|boolean',
'fee_id' => 'required|exists:fees,id', 'fee_id' => 'required|exists:fees,id',
], [], [ ], [], [
'fee_id' => 'Nami-Beitrag', 'fee_id' => 'Nami-Beitrag',
@ -72,6 +73,7 @@ class SubscriptionController extends Controller
{ {
$subscriptionParams = $request->validate([ $subscriptionParams = $request->validate([
'name' => 'required|max:255', 'name' => 'required|max:255',
'split' => 'present|boolean',
'fee_id' => 'required|exists:fees,id', 'fee_id' => 'required|exists:fees,id',
], [], [ ], [], [
'fee_id' => 'Nami-Beitrag', 'fee_id' => 'Nami-Beitrag',

1
app/Payment/SubscriptionResource.php
View File

@ -25,6 +25,7 @@ class SubscriptionResource extends JsonResource
'fee_name' => $this->fee->name, 'fee_name' => $this->fee->name,
'amount_human' => number_format($this->getAmount() / 100, 2, ',', '.').' €', 'amount_human' => number_format($this->getAmount() / 100, 2, ',', '.').' €',
'amount' => $this->getAmount(), 'amount' => $this->getAmount(),
'split' => $this->split,
'children' => SubscriptionChildResource::collection($this->whenLoaded('children')), 'children' => SubscriptionChildResource::collection($this->whenLoaded('children')),
]; ];
} }

5
database/factories/Payment/PaymentFactory.php
View File

@ -40,11 +40,12 @@ class PaymentFactory extends Factory
/** /**
* @param array<int, Child> $children * @param array<int, Child> $children
* @param array<string, mixed> $state
*/ */
public function subscription(string $name, array $children): self public function subscription(string $name, array $children, array $state = []): self
{ {
return $this->for( return $this->for(
Subscription::factory()->state(['name' => $name])->for(Fee::factory())->children($children) Subscription::factory()->state(['name' => $name])->for(Fee::factory())->children($children)->state($state)
); );
} }
} }

1
database/migrations/2022_12_13_203644_create_subscription_children_table.php
View File

@ -17,6 +17,7 @@ return new class() extends Migration {
Schema::table('subscriptions', function (Blueprint $table) { Schema::table('subscriptions', function (Blueprint $table) {
$table->dropColumn('amount'); $table->dropColumn('amount');
$table->boolean('split')->default(false);
}); });
Schema::create('subscription_children', function (Blueprint $table) { Schema::create('subscription_children', function (Blueprint $table) {

277
remember.log
View File

@ -1,55 +1,39 @@
This is pdfTeX, Version 3.14159265-2.6-1.40.21 (TeX Live 2020) (preloaded format=pdflatex 2020.9.29) 29 OCT 2021 21:37 This is XeTeX, Version 3.141592653-2.6-0.999994 (TeX Live 2022) (preloaded format=xelatex 2022.5.14) 14 DEC 2022 00:20
entering extended mode entering extended mode
restricted \write18 enabled. restricted \write18 enabled.
%&-line parsing enabled. %&-line parsing enabled.
**resources/views/tex/remember.tex **resources/views/tex/remember.tex
(./resources/views/tex/remember.tex (./resources/views/tex/remember.tex
LaTeX2e <2020-02-02> patch level 5 LaTeX2e <2021-11-15> patch level 1
L3 programming layer <2020-09-24> L3 programming layer <2022-05-04>
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/scrlttr2.cls (/usr/local/texlive/texmf-dist/tex/latex/koma-script/scrlttr2.cls
Document Class: scrlttr2 2020/09/21 v3.32 KOMA-Script document class (letter) Document Class: scrlttr2 2022/05/01 v3.36 KOMA-Script document class (letter)
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/scrkbase.sty (/usr/local/texlive/texmf-dist/tex/latex/koma-script/scrkbase.sty
Package: scrkbase 2020/09/21 v3.32 KOMA-Script package (KOMA-Script-dependent b Package: scrkbase 2022/05/01 v3.36 KOMA-Script package (KOMA-Script-dependent b
asics and keyval usage) asics and keyval usage)
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/scrbase.sty (/usr/local/texlive/texmf-dist/tex/latex/koma-script/scrbase.sty
Package: scrbase 2020/09/21 v3.32 KOMA-Script package (KOMA-Script-independent Package: scrbase 2022/05/01 v3.36 KOMA-Script package (KOMA-Script-independent
basics and keyval usage) basics and keyval usage)
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/scrlfile.sty (/usr/local/texlive/texmf-dist/tex/latex/koma-script/scrlfile.sty
Package: scrlfile 2020/09/21 v3.32 KOMA-Script package (file load hooks) Package: scrlfile 2022/05/01 v3.36 KOMA-Script package (file load hooks)
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/scrlfile-patch (/usr/local/texlive/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty
oldlatex.sty Package: scrlfile-hook 2022/05/01 v3.36 KOMA-Script package (using LaTeX hooks)
Package: scrlfile-patcholdlatex 2020/09/21 v3.32 KOMA-Script package (patching
old LaTeX kernels)
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/scrlogo.sty
Package: scrlogo 2020/09/21 v3.32 KOMA-Script package (logo)
))
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/l3packages/xparse/xparse.s
ty (/home/pille/.local/lib/texlive/texmf-dist/tex/latex/l3kernel/expl3.sty
Package: expl3 2020-09-24 L3 programming layer (loader)
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/l3backend/l3backend-pdftex (/usr/local/texlive/texmf-dist/tex/latex/koma-script/scrlogo.sty
.def Package: scrlogo 2022/05/01 v3.36 KOMA-Script package (logo)
File: l3backend-pdftex.def 2020-09-24 L3 backend support: PDF output (pdfTeX)
\l__kernel_color_stack_int=\count168
\l__pdf_internal_box=\box45
))
Package: xparse 2020-05-15 L3 Experimental document command parser
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/l3packages/xparse/xparse-g
eneric.tex
\l__xparse_current_arg_int=\count169
\g__xparse_grabber_int=\count170
\l__xparse_m_args_int=\count171
\l__xparse_v_nesting_int=\count172
))) )))
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/graphics/keyval.sty (/usr/local/texlive/texmf-dist/tex/latex/graphics/keyval.sty
Package: keyval 2014/10/28 v1.15 key=value parser (DPC) Package: keyval 2014/10/28 v1.15 key=value parser (DPC)
\KV@toks@=\toks15 \KV@toks@=\toks16
))) )
Applying: [2021/05/01] Usage of raw or classic option list on input line 252.
Already applied: [0000/00/00] Usage of raw or classic option list on input line
368.
))
Package scrlttr2 Info: You've used standard option `12pt'. Package scrlttr2 Info: You've used standard option `12pt'.
(scrlttr2) This is correct! (scrlttr2) This is correct!
(scrlttr2) Internally I'm using `fontsize=12pt'. (scrlttr2) Internally I'm using `fontsize=12pt'.
@ -57,17 +41,16 @@ Package scrlttr2 Info: You've used standard option `12pt'.
(scrlttr2) you'd have to use `fontsize=12pt' there (scrlttr2) you'd have to use `fontsize=12pt' there
(scrlttr2) instead of `12pt', too. (scrlttr2) instead of `12pt', too.
Class scrlttr2 Info: File `scrsize12pt.clo' used to setup font sizes on input l Class scrlttr2 Info: File `scrsize12pt.clo' used to setup font sizes on input l
ine 1898. ine 1880.
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/scrsize12pt.cl (/usr/local/texlive/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
o File: scrsize12pt.clo 2022/05/01 v3.36 KOMA-Script font size class option (12pt
File: scrsize12pt.clo 2020/09/21 v3.32 KOMA-Script font size class option (12pt
) )
) )
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/typearea.sty (/usr/local/texlive/texmf-dist/tex/latex/koma-script/typearea.sty
Package: typearea 2020/09/21 v3.32 KOMA-Script package (type area) Package: typearea 2022/05/01 v3.36 KOMA-Script package (type area)
\ta@bcor=\skip47 \ta@bcor=\skip47
\ta@div=\count173 \ta@div=\count181
\ta@hblk=\skip48 \ta@hblk=\skip48
\ta@vblk=\skip49 \ta@vblk=\skip49
\ta@temp=\skip50 \ta@temp=\skip50
@ -88,13 +71,22 @@ Package typearea Info: These are the values describing the layout:
(typearea) \topskip = 12.0pt (typearea) \topskip = 12.0pt
(typearea) \footskip = 50.75pt (typearea) \footskip = 50.75pt
(typearea) \baselineskip = 14.5pt (typearea) \baselineskip = 14.5pt
(typearea) on input line 1740. (typearea) on input line 1744.
) )
\c@letter=\count174 \c@letter=\count182
) )
Class scrlttr2 Info: Letter-Class-Option `DIN' loaded on input line 2. Class scrlttr2 Info: Letter-Class-Option `DIN' loaded on input line 2.
(/home/pille/.local/lib/texlive/texmf-dist/tex/latex/koma-script/DIN.lco
File: DIN.lco 2020/09/21 v3.32 KOMA-Script letter-class-option (/usr/local/texlive/texmf-dist/tex/latex/koma-script/DIN.lco
File: DIN.lco 2022/05/01 v3.36 KOMA-Script letter-class-option
)
(/usr/local/texlive/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
File: l3backend-xetex.def 2022-04-20 L3 backend support: XeTeX
\g__graphics_track_int=\count183
\l__pdf_internal_box=\box50
\g__pdf_backend_object_int=\count184
\g__pdf_backend_annotation_int=\count185
\g__pdf_backend_link_int=\count186
) )
LaTeX Warning: Unused global option(s): LaTeX Warning: Unused global option(s):
@ -103,98 +95,105 @@ LaTeX Warning: Unused global option(s):
(./remember.aux) (./remember.aux)
\openout1 = `remember.aux'. \openout1 = `remember.aux'.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 5. LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 13.
LaTeX Font Info: ... okay on input line 5. LaTeX Font Info: ... okay on input line 13.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 5. LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 13.
LaTeX Font Info: ... okay on input line 5. LaTeX Font Info: ... okay on input line 13.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 5. LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 13.
LaTeX Font Info: ... okay on input line 5. LaTeX Font Info: ... okay on input line 13.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 5. LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 13.
LaTeX Font Info: ... okay on input line 5. LaTeX Font Info: ... okay on input line 13.
LaTeX Font Info: Checking defaults for TS1/cmr/m/n on input line 5. LaTeX Font Info: Checking defaults for TS1/cmr/m/n on input line 13.
LaTeX Font Info: ... okay on input line 5. LaTeX Font Info: Trying to load font information for TS1+cmr on input line 1
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 5. 3.
LaTeX Font Info: ... okay on input line 5. (/usr/local/texlive/texmf-dist/tex/latex/base/ts1cmr.fd
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 5. File: ts1cmr.fd 2019/12/16 v2.5j Standard LaTeX font definitions
LaTeX Font Info: ... okay on input line 5. )
Package scrbase Info: activating english \yourrefname on input line 5. LaTeX Font Info: ... okay on input line 13.
Package scrbase Info: activating english \yourmailname on input line 5. LaTeX Font Info: Checking defaults for TU/lmr/m/n on input line 13.
Package scrbase Info: activating english \myrefname on input line 5. LaTeX Font Info: ... okay on input line 13.
Package scrbase Info: activating english \customername on input line 5. LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 13.
Package scrbase Info: activating english \invoicename on input line 5. LaTeX Font Info: ... okay on input line 13.
Package scrbase Info: activating english \subjectname on input line 5. LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 13.
Package scrbase Info: activating english \ccname on input line 5. LaTeX Font Info: ... okay on input line 13.
Package scrbase Info: activating english \enclname on input line 5. Package scrbase Info: activating english \yourrefname on input line 13.
Package scrbase Info: activating english \headtoname on input line 5. Package scrbase Info: activating english \yourmailname on input line 13.
Package scrbase Info: activating english \headfromname on input line 5. Package scrbase Info: activating english \myrefname on input line 13.
Package scrbase Info: activating english \datename on input line 5. Package scrbase Info: activating english \customername on input line 13.
Package scrbase Info: activating english \pagename on input line 5. Package scrbase Info: activating english \invoicename on input line 13.
Package scrbase Info: activating english \phonename on input line 5. Package scrbase Info: activating english \subjectname on input line 13.
Package scrbase Info: activating english \mobilephonename on input line 5. Package scrbase Info: activating english \ccname on input line 13.
Package scrbase Info: activating english \faxname on input line 5. Package scrbase Info: activating english \enclname on input line 13.
Package scrbase Info: activating english \emailname on input line 5. Package scrbase Info: activating english \headtoname on input line 13.
Package scrbase Info: activating english \wwwname on input line 5. Package scrbase Info: activating english \headfromname on input line 13.
Package scrbase Info: activating english \bankname on input line 5. Package scrbase Info: activating english \datename on input line 13.
Package scrbase Info: activating english \pagename on input line 13.
Package scrbase Info: activating english \phonename on input line 13.
Package scrbase Info: activating english \mobilephonename on input line 13.
Package scrbase Info: activating english \faxname on input line 13.
Package scrbase Info: activating english \emailname on input line 13.
Package scrbase Info: activating english \wwwname on input line 13.
Package scrbase Info: activating english \bankname on input line 13.
Class scrlttr2 Info: no date found for language `american' Class scrlttr2 Info: no date found for language `american'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `australian' Class scrlttr2 Info: no date found for language `australian'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `british' Class scrlttr2 Info: no date found for language `british'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `canadian' Class scrlttr2 Info: no date found for language `canadian'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `newzealand' Class scrlttr2 Info: no date found for language `newzealand'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `UKenglish' Class scrlttr2 Info: no date found for language `UKenglish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `ukenglish' Class scrlttr2 Info: no date found for language `ukenglish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `USenglish' Class scrlttr2 Info: no date found for language `USenglish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `usenglish' Class scrlttr2 Info: no date found for language `usenglish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `german' Class scrlttr2 Info: no date found for language `german'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `ngerman' Class scrlttr2 Info: no date found for language `ngerman'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `austrian' Class scrlttr2 Info: no date found for language `austrian'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `naustrian' Class scrlttr2 Info: no date found for language `naustrian'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `swissgerman' Class scrlttr2 Info: no date found for language `swissgerman'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `nswissgerman' Class scrlttr2 Info: no date found for language `nswissgerman'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `acadian' Class scrlttr2 Info: no date found for language `acadian'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `canadien' Class scrlttr2 Info: no date found for language `canadien'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `francais' Class scrlttr2 Info: no date found for language `francais'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `french' Class scrlttr2 Info: no date found for language `french'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `italian' Class scrlttr2 Info: no date found for language `italian'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `spanish' Class scrlttr2 Info: no date found for language `spanish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `croatian' Class scrlttr2 Info: no date found for language `croatian'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `dutch' Class scrlttr2 Info: no date found for language `dutch'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `finnish' Class scrlttr2 Info: no date found for language `finnish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `norsk' Class scrlttr2 Info: no date found for language `norsk'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `swedish' Class scrlttr2 Info: no date found for language `swedish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `polish' Class scrlttr2 Info: no date found for language `polish'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `czech' Class scrlttr2 Info: no date found for language `czech'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: no date found for language `slovak' Class scrlttr2 Info: no date found for language `slovak'
(scrlttr2) --> skipped on input line 5. (scrlttr2) --> skipped on input line 13.
Class scrlttr2 Info: trying to activate captions and date Class scrlttr2 Info: trying to activate captions and date
(scrlttr2) of language `english' on input line 5. (scrlttr2) of language `english' on input line 13.
Class scrlttr2 Info: used language is `english'. Class scrlttr2 Info: used language is `english'.
(scrlttr2) Supported languages are: `english', `UKenglish', (scrlttr2) Supported languages are: `english', `UKenglish',
(scrlttr2) `ukenglish', `british', `american', `USenglish', (scrlttr2) `ukenglish', `british', `american', `USenglish',
@ -204,46 +203,36 @@ Class scrlttr2 Info: used language is `english'.
(scrlttr2) `acadian', `canadien', `francais', `french', (scrlttr2) `acadian', `canadien', `francais', `french',
(scrlttr2) `dutch', `italian', `spanish', `polish', (scrlttr2) `dutch', `italian', `spanish', `polish',
(scrlttr2) `croatian', `finnish', `norsk', `swedish', (scrlttr2) `croatian', `finnish', `norsk', `swedish',
(scrlttr2) `czech', `slovak' on input line 5. (scrlttr2) `czech', `slovak' on input line 13.
LaTeX Font Info: External font `cmex10' loaded for size LaTeX Font Info: External font `cmex10' loaded for size
(Font) <12> on input line 6. (Font) <12> on input line 14.
LaTeX Font Info: External font `cmex10' loaded for size LaTeX Font Info: External font `cmex10' loaded for size
(Font) <8> on input line 6. (Font) <8> on input line 14.
LaTeX Font Info: External font `cmex10' loaded for size LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line 6. (Font) <6> on input line 14.
[1
{/home/pille/.local/lib/texlive/texmf-var/fonts/map/pdftex/updmap/pdftex.map}] [1
]
Foldmarks: yes Foldmarks: yes
Head of first page Head of first page
Foot of first page
Address (backaddress, addressee) ! LaTeX Error: There's no line here to end.
Location field: empty
Title: no See the LaTeX manual or LaTeX Companion for explanation.
Subject: before opening Type H <return> for immediate help.
! Missing $ inserted. ...
<inserted text>
$ l.18 ...{Liebe Familie <<< $page->familyName >>>,}
l.10 ...ilie <<< $data->getFamilyName($page) >>>,}
? X ? X
Here is how much of TeX's memory you used: Here is how much of TeX's memory you used:
2210 strings out of 480875 2092 strings out of 476133
44496 string characters out of 5904128 42463 string characters out of 5810668
350442 words of memory out of 5000000 441136 words of memory out of 5000000
17872 multiletter control sequences out of 15000+600000 22930 multiletter control sequences out of 15000+600000
538738 words of font info for 41 fonts, out of 8000000 for 9000 472011 words of font info for 39 fonts, out of 8000000 for 9000
1141 hyphenation exceptions out of 8191 1348 hyphenation exceptions out of 8191
68i,9n,64p,350b,289s stack positions out of 5000i,500n,10000p,200000b,80000s 108i,10n,106p,289b,255s stack positions out of 10000i,1000n,20000p,200000b,200000s
</home/pille/.local/lib/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi1 Output written on remember.pdf (1 page).
2.pfb></home/pille/.local/lib/texlive/texmf-dist/fonts/type1/public/amsfonts/cm
/cmr12.pfb></home/pille/.local/lib/texlive/texmf-dist/fonts/type1/public/amsfon
ts/cm/cmsy10.pfb>
Output written on remember.pdf (1 page, 27611 bytes).
PDF statistics:
20 PDF objects out of 1000 (max. 8388607)
13 compressed objects within 1 object stream
0 named destinations out of 1000 (max. 500000)
1 words of extra memory for PDF output out of 10000 (max. 10000000)

BIN
remember.pdf
View File

Binary file not shown.

1
resources/js/views/subscription/SubscriptionForm.vue
View File

@ -13,6 +13,7 @@
size="sm" size="sm"
required required
></f-select> ></f-select>
<f-switch id="split" label="Rechnung aufsplitten" v-model="inner.split" size="sm"></f-switch>
</div> </div>
</box> </box>
<box heading="Positionen"> <box heading="Positionen">

2
resources/views/tex/bill.tex
View File

@ -20,7 +20,7 @@
Hiermit stellen wir Ihnen den aktuellen Mitgliedsbeitrag für den \usekomavar*{fromname} und die DPSG in Rechnung. Dieser setzt sich wie folgt zusammen: Hiermit stellen wir Ihnen den aktuellen Mitgliedsbeitrag für den \usekomavar*{fromname} und die DPSG in Rechnung. Dieser setzt sich wie folgt zusammen:
\begin{center} \begin{center}
\begin{tabular}{@{}p{0.5\textwidth}|r} \begin{tabular}{@{}p{0.8\textwidth}|r}
@foreach($page->positions as $desc => $price) @foreach($page->positions as $desc => $price)
\product{<<< $desc >>>}{<<< $price >>>} \product{<<< $desc >>>}{<<< $price >>>}
@endforeach @endforeach

2
resources/views/tex/remember.tex
View File

@ -20,7 +20,7 @@
Ihr Mitgliedbeitrag ist noch ausstehend. Dieser setzt sich wie folgt zusammen: Ihr Mitgliedbeitrag ist noch ausstehend. Dieser setzt sich wie folgt zusammen:
\begin{center} \begin{center}
\begin{tabular}{@{}p{0.5\textwidth}|r} \begin{tabular}{@{}p{0.8\textwidth}|r}
@foreach($page->positions as $desc => $price) @foreach($page->positions as $desc => $price)
\product{<<< $desc >>>}{<<< $price >>>} \product{<<< $desc >>>}{<<< $price >>>}
@endforeach @endforeach

28
tests/Feature/Letter/DocumentFactoryTest.php
View File

@ -52,12 +52,38 @@ class DocumentFactoryTest extends TestCase
$letter->assertHasAllContent([ $letter->assertHasAllContent([
'Rechnung', 'Rechnung',
'15.00', '15.00',
'Beitrag 1995 für ::firstname:: ::lastname:: (::subName::)', '::subName:: 1995 für ::firstname:: ::lastname::',
'Mitgliedsbeitrag für ::lastname::', 'Mitgliedsbeitrag für ::lastname::',
'Familie ::lastname::\\\\::street::\\\\::zip:: ::location::', 'Familie ::lastname::\\\\::street::\\\\::zip:: ::location::',
]); ]);
} }
public function testItDisplaysSplitPayments(): void
{
$member = Member::factory()
->defaults()
->state([
'firstname' => '::firstname::',
'lastname' => '::lastname::',
])
->has(Payment::factory()->notPaid()->nr('1995')->subscription('::subName::', [
new Child('a', 1000),
new Child('b', 500),
], ['split' => true]))
->create();
$letter = app(DocumentFactory::class)->singleLetter(BillDocument::class, $this->query($member));
$letter->assertHasAllContent([
'Rechnung',
'10.00',
'5.00',
'::subName:: (a) 1995 für ::firstname:: ::lastname::',
'::subName:: (b) 1995 für ::firstname:: ::lastname::',
'Mitgliedsbeitrag für ::lastname::',
]);
}
public function testBillSetsFilename(): void public function testBillSetsFilename(): void
{ {
$member = Member::factory() $member = Member::factory()

2
tests/Feature/Letter/LetterSendActionTest.php
View File

@ -54,7 +54,7 @@ class LetterSendActionTest extends TestCase
LetterSendAction::run(); LetterSendAction::run();
Tex::assertCompiled(BillDocument::class, fn ($document) => 'Mom' === $document->pages->first()->familyName Tex::assertCompiled(BillDocument::class, fn ($document) => 'Mom' === $document->pages->first()->familyName
&& $document->pages->first()->getPositions() === ['Beitrag 1997 für Lah Mom (tollerbeitrag)' => '54.00'] && $document->pages->first()->getPositions() === ['tollerbeitrag 1997 für Lah Mom' => '54.00']
); );
} }
} }

3
tests/Feature/Subscription/EditTest.php
View File

@ -18,7 +18,7 @@ class EditTest extends TestCase
$subscription = Subscription::factory()->name('hi')->for(Fee::factory())->children([ $subscription = Subscription::factory()->name('hi')->for(Fee::factory())->children([
new Child('a', 1400), new Child('a', 1400),
new Child('b', 1500), new Child('b', 1500),
])->create(); ])->create(['split' => true]);
$response = $this->get("/subscription/{$subscription->id}/edit"); $response = $this->get("/subscription/{$subscription->id}/edit");
@ -29,6 +29,7 @@ class EditTest extends TestCase
], ],
'name' => 'hi', 'name' => 'hi',
'id' => $subscription->id, 'id' => $subscription->id,
'split' => true,
], $response, 'data'); ], $response, 'data');
} }
} }

3
tests/Feature/Subscription/StoreTest.php
View File

@ -22,7 +22,7 @@ class StoreTest extends TestCase
'/subscription', '/subscription',
SubscriptionRequestFactory::new()->fee($fee)->name('lorem')->children([ SubscriptionRequestFactory::new()->fee($fee)->name('lorem')->children([
new Child('ch', 2500), new Child('ch', 2500),
])->create() ])->create(['split' => true])
); );
$response->assertRedirect('/subscription'); $response->assertRedirect('/subscription');
@ -30,6 +30,7 @@ class StoreTest extends TestCase
$this->assertDatabaseHas('subscriptions', [ $this->assertDatabaseHas('subscriptions', [
'fee_id' => $fee->id, 'fee_id' => $fee->id,
'name' => 'lorem', 'name' => 'lorem',
'split' => true,
]); ]);
$this->assertDatabaseHas('subscription_children', [ $this->assertDatabaseHas('subscription_children', [
'name' => 'ch', 'name' => 'ch',

5
tests/Feature/Subscription/UpdateTest.php
View File

@ -16,12 +16,12 @@ class UpdateTest extends TestCase
public function testItUpdatesASubscription(): void public function testItUpdatesASubscription(): void
{ {
$this->withoutExceptionHandling()->login()->loginNami(); $this->withoutExceptionHandling()->login()->loginNami();
$subscription = Subscription::factory()->name('hi')->for(Fee::factory())->create(); $subscription = Subscription::factory()->name('hi')->for(Fee::factory())->create(['split' => true]);
$fee = Fee::factory()->create(); $fee = Fee::factory()->create();
$response = $this->from("/subscription/{$subscription->id}")->patch( $response = $this->from("/subscription/{$subscription->id}")->patch(
"/subscription/{$subscription->id}", "/subscription/{$subscription->id}",
SubscriptionRequestFactory::new()->amount(2500)->fee($fee)->name('lorem')->create() SubscriptionRequestFactory::new()->amount(2500)->fee($fee)->name('lorem')->create(['split' => false])
); );
$response->assertRedirect('/subscription'); $response->assertRedirect('/subscription');
@ -29,6 +29,7 @@ class UpdateTest extends TestCase
'id' => $subscription->id, 'id' => $subscription->id,
'fee_id' => $fee->id, 'fee_id' => $fee->id,
'name' => 'Lorem', 'name' => 'Lorem',
'split' => false,
]); ]);
} }

1
tests/RequestFactories/SubscriptionRequestFactory.php
View File

@ -15,6 +15,7 @@ class SubscriptionRequestFactory extends RequestFactory
return [ return [
'fee_id' => Fee::factory()->create()->id, 'fee_id' => Fee::factory()->create()->id,
'name' => $this->faker->words(5, true), 'name' => $this->faker->words(5, true),
'split' => $this->faker->boolean(),
'children' => [], 'children' => [],
]; ];
} }