diff --git a/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.html b/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.html
index e245f00..74998c0 100644
--- a/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.html
+++ b/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.html
@@ -2,6 +2,7 @@
+
diff --git a/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.ts b/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.ts
index 501ba4a..78127cf 100644
--- a/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.ts
+++ b/APP/src/app/features/giving/components/member-quick-add-dialog/member-quick-add-dialog.component.ts
@@ -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,
diff --git a/APP/src/app/features/giving/pages/offering-session-page/offering-session-page.component.ts b/APP/src/app/features/giving/pages/offering-session-page/offering-session-page.component.ts
index 797e95e..698c69f 100644
--- a/APP/src/app/features/giving/pages/offering-session-page/offering-session-page.component.ts
+++ b/APP/src/app/features/giving/pages/offering-session-page/offering-session-page.component.ts
@@ -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: '',
};