Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
EmmanuelDemey committed Nov 29, 2024
1 parent a061dac commit 3404d79
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 19 deletions.
2 changes: 1 addition & 1 deletion functions/src/emails/template/relancePaiement.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Configuration } from '../../model';

export default (partner: Record<string, any>, configuration: Configuration) => {
export default (partner: Record<string, unknown>, configuration: Configuration) => {
return {
subject: `Partenariat ${configuration.gdg.event} ${configuration.convention.edition}: Relance Paiement`,
body: `
Expand Down
2 changes: 1 addition & 1 deletion functions/src/emails/template/step-3-payment-received.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Configuration } from '../../model';

export default (company: any, id: string, configuration: Configuration) => {
export default (company: unknown, id: string, configuration: Configuration) => {
const adress_cms4devfest = `${configuration.hosting.baseurl}/partner/${id}`;

return {
Expand Down
2 changes: 1 addition & 1 deletion functions/src/utils/files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export async function generateAndStoreInvoice(firestore: FirebaseFirestore.Fires
},
configuration
);
const publicInvoiceUrl = await storeFile('facture/', invoice as any);
const publicInvoiceUrl = await storeFile('facture/', invoice);

await firestore
.doc('companies-2025/' + id)
Expand Down
2 changes: 1 addition & 1 deletion functions/src/utils/mail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function getFrom(mail: Email): {

export function sendEmailToAllContacts(company: Company, emailFactory: { subject: string; body: string }, configuration: Configuration) {
let emails = [configuration.mail.cc];
if (configuration.mail.enabled === 'true') {
if (configuration.mail.enabled) {
emails = [...emails, ...company.email];
}
return Promise.all(
Expand Down
2 changes: 1 addition & 1 deletion public/src/app/model/company.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ export interface Company {
standPhoneNumber?: string;
}

export type PartnerType = 'esn' | 'other';
export type PartnerType = 'esn' | 'other' | null | undefined;
18 changes: 9 additions & 9 deletions public/src/app/ui/admin-filled/admin-filled.component.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div class="inline-bloc">
<form class="inline-bloc" [formGroup]="form()">
<mat-form-field class="full-width">
<mat-label>Type de société</mat-label>
<select matNativeControl required [(ngModel)]="company()!.type">
<select matNativeControl required formControlName="type">
<option value="esn">ESN</option>
<option value="other">Autres</option>
</select>
</mat-form-field>
</div>
<div class="inline-bloc">
<button color="primary" mat-raised-button (click)="update()">
<mat-icon>save</mat-icon>
Sauvegarder
</button>
</div>
<div class="inline-bloc">
<button type="submit" color="primary" mat-raised-button (click)="update()">
<mat-icon>save</mat-icon>
Sauvegarder
</button>
</div>
</form>
17 changes: 12 additions & 5 deletions public/src/app/ui/admin-filled/admin-filled.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommonModule } from '@angular/common';
import { Component, inject, input } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { Component, computed, inject, input } from '@angular/core';
import { FormBuilder, FormControl, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
Expand All @@ -11,7 +11,7 @@ import { PartnerService } from '../../services/partner.service';

@Component({
selector: 'cms-admin-filled',
imports: [CommonModule, MatFormFieldModule, FormsModule, MatButtonModule, MatInputModule, MatIconModule],
imports: [CommonModule, MatFormFieldModule, ReactiveFormsModule, MatButtonModule, MatInputModule, MatIconModule],
templateUrl: './admin-filled.component.html'
})
export class AdminFilledComponent {
Expand All @@ -20,10 +20,17 @@ export class AdminFilledComponent {
readonly step = input<WorkflowStep>();

private readonly partnerService = inject(PartnerService);
private readonly formBuilder = inject(FormBuilder);

form = computed(() => {
return this.formBuilder.group({
type: new FormControl((this.company as unknown as Company)?.type)
});
});

update() {
this.partnerService.update(this.id()!, {
type: this.company()?.type
this.partnerService.update(this.id as unknown as string, {
...this.form().value
});
}
}

0 comments on commit 3404d79

Please sign in to comment.