@myclub_se/data-access 2.8.1 → 2.9.0

package/fesm2020/myclub_se-data-access.mjs

@@ -884,7 +884,7 @@ class MemberInvoice {
 }
 
 class MemberInvoiceRow {
-    constructor(id, amount, amountPaid, balance, created, datePaid, fee, hasCreditType, invoice, isCredit, isPaid, updated) {
+    constructor(id, amount, amountPaid, balance, created, datePaid, fee, hasCreditType, invoice, isCredit, isPaid, text, updated) {
         this.id = id;
         this.amount = amount;
         this.amountPaid = amountPaid;
@@ -896,6 +896,7 @@ class MemberInvoiceRow {
         this.invoice = invoice;
         this.isCredit = isCredit;
         this.isPaid = isPaid;
+        this.text = text;
         this.updated = updated;
     }
 }
@@ -1366,7 +1367,7 @@ class News {
 }
 
 class OpenActivity {
-    constructor(id, activity_group_id, activity_type_id, club_id, location_id, member_id, team_id, activity_location, activity_type_name, allow_maybe, calendar_name, created, current_num_attendants, day, description, end, end_time, file, invitation_text, invite_first_days, invite_groups, invite_hide_before_sent, invite_last_response_date, invite_remind, invite_remind_receivers, invite_second_days, invite_settings, invited_members, last_response_date, location_name, max_num_attendants, max_num_attendants_type, meet_up_place, meet_up_time, meet_up_time_display, meet_up_time_show, member_name, open_activity, repeat, repeat_num, repeat_to_day, repeat_type, show_other_invited, start, start_time, status, title, updated, use_invite, update_repeating) {
+    constructor(id, activity_group_id, activity_type_id, club_id, location_id, member_id, team_id, activity_location, activity_type_name, allow_maybe, calendar_name, created, current_num_attendants, day, default_fee, description, end, end_time, file, invitation_text, invite_first_days, invite_groups, invite_hide_before_sent, invite_last_response_date, invite_remind, invite_remind_receivers, invite_second_days, invite_settings, invited_members, last_response_date, location_name, max_num_attendants, max_num_attendants_type, meet_up_place, meet_up_time, meet_up_time_display, meet_up_time_show, member_invoice, member_name, open_activity, optional_fees, optional_fee_required, optional_fee_type, repeat, repeat_num, repeat_to_day, repeat_type, show_other_invited, start, start_time, status, title, updated, use_invite, update_repeating) {
         this.id = id;
         this.activity_group_id = activity_group_id;
         this.activity_type_id = activity_type_id;
@@ -1381,6 +1382,7 @@ class OpenActivity {
         this.created = created;
         this.current_num_attendants = current_num_attendants;
         this.day = day;
+        this.default_fee = default_fee;
         this.description = description;
         this.end = end;
         this.end_time = end_time;
@@ -1403,8 +1405,12 @@ class OpenActivity {
         this.meet_up_time = meet_up_time;
         this.meet_up_time_display = meet_up_time_display;
         this.meet_up_time_show = meet_up_time_show;
+        this.member_invoice = member_invoice;
         this.member_name = member_name;
         this.open_activity = open_activity;
+        this.optional_fees = optional_fees;
+        this.optional_fee_required = optional_fee_required;
+        this.optional_fee_type = optional_fee_type;
         this.repeat = repeat;
         this.repeat_num = repeat_num;
         this.repeat_to_day = repeat_to_day;
@@ -1737,7 +1743,7 @@ const swishFactory = (apiSwish) => new Swish(apiSwish.club_id, apiSwish.section_
 
 const zimplerFactory = (apiZimpler) => new Zimpler(apiZimpler.club_id, apiZimpler.section_id, apiZimpler.default_activated, apiZimpler.merchant_id, apiZimpler.name, apiZimpler.status, apiZimpler.test_account);
 
-const memberInvoiceRowFactory = (apiMemberInvoiceRow) => new MemberInvoiceRow(apiMemberInvoiceRow.id, apiMemberInvoiceRow.amount, apiMemberInvoiceRow.amount_paid, apiMemberInvoiceRow.balance, apiMemberInvoiceRow.created, apiMemberInvoiceRow.date_paid, memberFeeFactory(apiMemberInvoiceRow.fee), apiMemberInvoiceRow.has_credit_type, apiMemberInvoiceRow.invoice, apiMemberInvoiceRow.is_credit, apiMemberInvoiceRow.is_paid, apiMemberInvoiceRow.updated);
+const memberInvoiceRowFactory = (apiMemberInvoiceRow) => new MemberInvoiceRow(apiMemberInvoiceRow.id, apiMemberInvoiceRow.amount, apiMemberInvoiceRow.amount_paid, apiMemberInvoiceRow.balance, apiMemberInvoiceRow.created, apiMemberInvoiceRow.date_paid, memberFeeFactory(apiMemberInvoiceRow.fee), apiMemberInvoiceRow.has_credit_type, apiMemberInvoiceRow.invoice, apiMemberInvoiceRow.is_credit, apiMemberInvoiceRow.is_paid, apiMemberInvoiceRow.text, apiMemberInvoiceRow.updated);
 
 const memberInvoiceFactory = (apiMemberInvoice) => new MemberInvoice(apiMemberInvoice.id, apiMemberInvoice.amount, apiMemberInvoice.amount_paid, apiMemberInvoice.balance, apiMemberInvoice.club_bill_id, apiMemberInvoice.club_name, apiMemberInvoice.credit_card ? creditCardFactory(apiMemberInvoice.credit_card) : null, apiMemberInvoice.date_paid, apiMemberInvoice.due_date, apiMemberInvoice.giro ? giroFactory(apiMemberInvoice.giro) : null, apiMemberInvoice.invoice_rows.map((row) => memberInvoiceRowFactory(row)), apiMemberInvoice.invoice_text, apiMemberInvoice.is_paid, apiMemberInvoice.member_id, apiMemberInvoice.organisation_name, apiMemberInvoice.payee, apiMemberInvoice.payment_url, apiMemberInvoice.reference, apiMemberInvoice.swish ? swishFactory(apiMemberInvoice.swish) : null, apiMemberInvoice.zimpler ? zimplerFactory(apiMemberInvoice.zimpler) : null);
 
@@ -1779,7 +1785,20 @@ const memberTeamThroughFactory = (apiMemberTeamThrough) => new MemberTeamThrough
 
 const newsFactory = (apiNews) => new News(apiNews.id, apiNews.club_id, apiNews.created, apiNews.created_by_id, apiNews.section_id, apiNews.team_id, apiNews.active_to, apiNews.author, apiNews.ingress, apiNews.news_image, apiNews.news_image_text, apiNews.published_date, apiNews.read, apiNews.show_on_my_pages, apiNews.show_on_webpage, apiNews.text, apiNews.title, apiNews.updated, apiNews.urls ? imageUrlsFactory(apiNews.urls) : null);
 
-const openActivityFactory = (apiOpenActivity) => new OpenActivity(apiOpenActivity.id, apiOpenActivity.activity_group_id, apiOpenActivity.activity_type_id, apiOpenActivity.club_id, apiOpenActivity.location_id, apiOpenActivity.member_id, apiOpenActivity.team_id, apiOpenActivity.activity_location, apiOpenActivity.activity_type_name, apiOpenActivity.allow_maybe, apiOpenActivity.calendar_name, apiOpenActivity.created, apiOpenActivity.current_num_attendants, apiOpenActivity.day, apiOpenActivity.description, apiOpenActivity.end, apiOpenActivity.end_time, apiOpenActivity.file, apiOpenActivity.invitation_text, apiOpenActivity.invite_first_days, [], apiOpenActivity.invite_hide_before_sent, apiOpenActivity.invite_last_response_date, apiOpenActivity.invite_remind, apiOpenActivity.invite_remind_receivers, apiOpenActivity.invite_second_days, 'same_as_last', (apiOpenActivity.invited_members && apiOpenActivity.invited_members.length) ? apiOpenActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiOpenActivity.last_response_date, apiOpenActivity.location_name, apiOpenActivity.max_num_attendants, apiOpenActivity.max_num_attendants_type, apiOpenActivity.meet_up_place, apiOpenActivity.meet_up_time, apiOpenActivity.meet_up_time_display, apiOpenActivity.meet_up_time_show, apiOpenActivity.member_name, apiOpenActivity.open_activity, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiOpenActivity.show_other_invited, apiOpenActivity.start, apiOpenActivity.start_time, apiOpenActivity.status, apiOpenActivity.title, apiOpenActivity.updated, apiOpenActivity.use_invite, false);
+class OptionalFee {
+    constructor(id, activity_id, fee_id, amount, text) {
+        this.id = id;
+        this.activity_id = activity_id;
+        this.fee_id = fee_id;
+        this.amount = amount;
+        this.text = text;
+        this.checked = false;
+    }
+}
+
+const optionalFeeFactory = (apiOptionalFee) => new OptionalFee(apiOptionalFee.id, apiOptionalFee.activity_id, apiOptionalFee.fee_id, apiOptionalFee.amount, apiOptionalFee.text);
+
+const openActivityFactory = (apiOpenActivity) => new OpenActivity(apiOpenActivity.id, apiOpenActivity.activity_group_id, apiOpenActivity.activity_type_id, apiOpenActivity.club_id, apiOpenActivity.location_id, apiOpenActivity.member_id, apiOpenActivity.team_id, apiOpenActivity.activity_location, apiOpenActivity.activity_type_name, apiOpenActivity.allow_maybe, apiOpenActivity.calendar_name, apiOpenActivity.created, apiOpenActivity.current_num_attendants, apiOpenActivity.day, apiOpenActivity.default_fee, apiOpenActivity.description, apiOpenActivity.end, apiOpenActivity.end_time, apiOpenActivity.file, apiOpenActivity.invitation_text, apiOpenActivity.invite_first_days, [], apiOpenActivity.invite_hide_before_sent, apiOpenActivity.invite_last_response_date, apiOpenActivity.invite_remind, apiOpenActivity.invite_remind_receivers, apiOpenActivity.invite_second_days, 'same_as_last', (apiOpenActivity.invited_members && apiOpenActivity.invited_members.length) ? apiOpenActivity.invited_members.map((invitedMember) => memberActivityInviteFactory(invitedMember)) : [], apiOpenActivity.last_response_date, apiOpenActivity.location_name, apiOpenActivity.max_num_attendants, apiOpenActivity.max_num_attendants_type, apiOpenActivity.meet_up_place, apiOpenActivity.meet_up_time, apiOpenActivity.meet_up_time_display, apiOpenActivity.meet_up_time_show, apiOpenActivity.member_invoice, apiOpenActivity.member_name, apiOpenActivity.open_activity, (apiOpenActivity.optional_fees && apiOpenActivity.optional_fees.length) ? apiOpenActivity.optional_fees.map((fee) => optionalFeeFactory(fee)) : [], apiOpenActivity.optional_fee_required, apiOpenActivity.optional_fee_type, 'none', 6, format(new Date(), 'yyyy-MM-dd'), 'repeat_until', apiOpenActivity.show_other_invited, apiOpenActivity.start, apiOpenActivity.start_time, apiOpenActivity.status, apiOpenActivity.title, apiOpenActivity.updated, apiOpenActivity.use_invite, false);
 
 const otherMemberFieldFactory = (apiOtherMemberFieldFactory) => new OtherMemberField(apiOtherMemberFieldFactory.display_name, apiOtherMemberFieldFactory.field_name, apiOtherMemberFieldFactory.value);
 
@@ -2340,13 +2359,14 @@ class ActivityService {
             activityId
         });
     }
-    signUpMemberOpenActivity(memberId, activityId, comment) {
+    signUpMemberOpenActivity(memberId, activityId, comment, optionalFees) {
         return this.apiService
             .updateResourceNoResponse(Role.MemberAdmin, MEMBER_OPEN_ACTIVITY_RESPOND_PATH, {
             memberId,
             activityId
         }, {
-            comment
+            comment,
+            optional_fees: optionalFees
         });
     }
     updateMemberActivity(memberId, activityInviteId, activityInvite) {