Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove tech talks from invoicification #1054

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Remove tech talks from invoicification #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50c3143
feat: remove Tech Talks from invoicification
brage-andreas Nov 26, 2024
42b6fc0
fix: column widths
brage-andreas Nov 26, 2024
032e103
refactor: remove unused argument
brage-andreas Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/invoicification/src/app/form-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export enum InvoiceRelation {
COURSE_EVENT = "Kurs",
OFFLINE_ADVERTISEMENT = "Annonse i Offline",
JOB_LISTING = "Jobbannonse",
TECH_TALKS_PARTICIPATION = "Tech Talks",
EXCURSION_PARTICIPATION = "ITEX",
OTHER = "Annet",
}
Expand Down
2 changes: 1 addition & 1 deletion apps/invoicification/src/app/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const Form: FC = () => {
control={control}
name="invoiceRelation"
placeholder="Velg anledning"
options={Object.entries(InvoiceRelation).map(([key, value]) => ({
options={Object.values(InvoiceRelation).map((value) => ({
value,
label: value,
}))}
Expand Down
19 changes: 9 additions & 10 deletions packages/emails/src/emails/invoice-form-for-bedkom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export enum InvoiceRelation {
COURSE_EVENT = "Kurs",
OFFLINE_ADVERTISEMENT = "Annonse i Offline",
JOB_LISTING = "Jobbannonse",
TECH_TALKS_PARTICIPATION = "Tech Talks",
EXCURSION_PARTICIPATION = "ITEX",
OTHER = "Annet",
}
Expand Down Expand Up @@ -54,45 +53,45 @@ export default function InvoiceFormForBedkom({
<Heading as="h1">{companyName} har sendt inn fakturainformasjon.</Heading>
<Section>
<Row>
<Column>Organisasjonsnummer</Column>
<Column style={{ width: "28ch" }}>Organisasjonsnummer</Column>
<Column>{organizationNumber}</Column>
</Row>
<Row>
<Column>Bedriftsnavn</Column>
<Column style={{ width: "28ch" }}>Bedriftsnavn</Column>
<Column>{companyName}</Column>
</Row>
</Section>

<Section>
<Row>
<Column>Bedriftens kontaktperson</Column>
<Column style={{ width: "28ch" }}>Bedriftens kontaktperson</Column>
<Column>{contactName}</Column>
</Row>
<Row>
<Column>E-post adresse kontaktperson</Column>
<Column style={{ width: "28ch" }}>E-post adresse kontaktperson</Column>
<Column>{contactEmail}</Column>
</Row>
<Row>
<Column>Telefonnummer kontaktperson</Column>
<Column style={{ width: "28ch" }}>Telefonnummer kontaktperson</Column>
<Column>{contactTel}</Column>
</Row>
</Section>

<Section>
<Row>
<Column>Anledning</Column>
<Column style={{ width: "28ch" }}>Anledning</Column>
<Column>{invoiceRelation}</Column>
</Row>
<Row>
<Column>Foretrukket leveringsmetode</Column>
<Column style={{ width: "28ch" }}>Foretrukket leveringsmetode</Column>
<Column>{preferredDeliveryMethod}</Column>
</Row>
<Row>
<Column>Foretrukket bestillingsnummer</Column>
<Column style={{ width: "28ch" }}>Foretrukket bestillingsnummer</Column>
<Column>{preferredPurchaseOrderNumber ?? "Ingen preferanse"}</Column>
</Row>
<Row>
<Column>Foretrukket forfallsdato</Column>
<Column style={{ width: "28ch" }}>Foretrukket forfallsdato</Column>
<Column>{preferredDueDateLength} dager</Column>
</Row>

Expand Down