+1
@@ -2,6 +2,7 @@
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-3">
|
||||
<label class="flex flex-col gap-1">First name (EN) *<kendo-textbox [(ngModel)]="firstName_en"></kendo-textbox></label>
|
||||
<label class="flex flex-col gap-1">Last name (EN) *<kendo-textbox [(ngModel)]="lastName_en"></kendo-textbox></label>
|
||||
<label class="flex flex-col gap-1 md:col-span-2">暱稱 · Nick name<kendo-textbox [(ngModel)]="nickName"></kendo-textbox></label>
|
||||
<label class="flex flex-col gap-1">名 (中)<kendo-textbox [(ngModel)]="firstName_zh"></kendo-textbox></label>
|
||||
<label class="flex flex-col gap-1">姓 (中)<kendo-textbox [(ngModel)]="lastName_zh"></kendo-textbox></label>
|
||||
<label class="flex flex-col gap-1 md:col-span-2">公司行號 · Company<kendo-textbox [(ngModel)]="entity"></kendo-textbox></label>
|
||||
|
||||
+3
-2
@@ -19,6 +19,7 @@ export class MemberQuickAddDialogComponent {
|
||||
|
||||
firstName_en = '';
|
||||
lastName_en = '';
|
||||
nickName: string | null = null;
|
||||
firstName_zh: string | null = null;
|
||||
lastName_zh: string | null = null;
|
||||
entity: string | null = null;
|
||||
@@ -33,7 +34,7 @@ export class MemberQuickAddDialogComponent {
|
||||
const req: CreateMemberRequest = {
|
||||
firstName_en: this.firstName_en,
|
||||
lastName_en: this.lastName_en,
|
||||
nickName: null,
|
||||
nickName: this.nickName,
|
||||
firstName_zh: this.firstName_zh,
|
||||
lastName_zh: this.lastName_zh,
|
||||
entity: this.entity,
|
||||
@@ -62,7 +63,7 @@ export class MemberQuickAddDialogComponent {
|
||||
id,
|
||||
firstName_en: this.firstName_en,
|
||||
lastName_en: this.lastName_en,
|
||||
nickName: null,
|
||||
nickName: this.nickName,
|
||||
firstName_zh: this.firstName_zh,
|
||||
lastName_zh: this.lastName_zh,
|
||||
entity: this.entity,
|
||||
|
||||
+5
-4
@@ -94,7 +94,7 @@ export class OfferingSessionPageComponent implements OnInit, OnDestroy {
|
||||
private memberApi: MemberApiService,
|
||||
private signalr: OfferingEntrySignalrService,
|
||||
private mealAttendanceApi: MealAttendanceApiService,
|
||||
) {}
|
||||
) { }
|
||||
|
||||
ngOnInit(): void {
|
||||
this.categoryApi.getAll(false).subscribe(c => {
|
||||
@@ -339,7 +339,7 @@ export class OfferingSessionPageComponent implements OnInit, OnDestroy {
|
||||
clearAnonymous(): void {
|
||||
this.entry.isAnonymous = false;
|
||||
}
|
||||
|
||||
lastAddedLine: OfferingBufferLine | null = null;
|
||||
addLine(): void {
|
||||
if (this.entry.amount <= 0) return;
|
||||
if (this.entry.paymentMethod === 'Check' && !this.entry.checkNumber) return;
|
||||
@@ -351,6 +351,7 @@ export class OfferingSessionPageComponent implements OnInit, OnDestroy {
|
||||
};
|
||||
if (this.editingIndex !== null) { this.buffer[this.editingIndex] = line; this.editingIndex = null; }
|
||||
else { this.buffer = [...this.buffer, line]; }
|
||||
this.lastAddedLine = line;
|
||||
this.resetEntry();
|
||||
}
|
||||
|
||||
@@ -405,7 +406,7 @@ export class OfferingSessionPageComponent implements OnInit, OnDestroy {
|
||||
switchMap(id => this.pendingProofFiles.length === 0
|
||||
? of(void 0)
|
||||
: from(buildProofPdf(this.pendingProofFiles)).pipe(
|
||||
switchMap(({ blob }) => this.api.uploadProof(id, blob)))),
|
||||
switchMap(({ blob }) => this.api.uploadProof(id, blob)))),
|
||||
).subscribe({
|
||||
next: () => {
|
||||
this.submitting = false;
|
||||
@@ -503,7 +504,7 @@ export class OfferingSessionPageComponent implements OnInit, OnDestroy {
|
||||
|
||||
private blankEntry(): OfferingBufferLine {
|
||||
return {
|
||||
memberId: null, givingCategoryId: 0, amount: 0, paymentMethod: 'Cash',
|
||||
memberId: null, givingCategoryId: this.lastAddedLine?.givingCategoryId, amount: 0, paymentMethod: this.lastAddedLine?.paymentMethod ?? 'Cash',
|
||||
checkNumber: null, zelleReferenceCode: null, payPalTransactionId: null,
|
||||
isAnonymous: false, notes: null, memberName: null, categoryName: '',
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user