From 3b3d4fb9e9a17b2ec3c756c5fce6cd4e49750a31 Mon Sep 17 00:00:00 2001 From: Dominik Hebeler <dominik@hebeler.club> Date: Sat, 15 Apr 2023 11:40:33 +0200 Subject: [PATCH] showing always the expiration for the next order --- pass/app/Key.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pass/app/Key.js b/pass/app/Key.js index 3567ec9..294b58c 100644 --- a/pass/app/Key.js +++ b/pass/app/Key.js @@ -78,7 +78,10 @@ class Key { get_charge(payment_reference_id = null) { let sum = 0; this.#key_orders.forEach((key_order) => { - if (payment_reference_id === null || payment_reference_id === key_order.payment_reference_id) { + if ( + payment_reference_id === null || + payment_reference_id === key_order.payment_reference_id + ) { sum += key_order.amount; } }); @@ -98,7 +101,7 @@ class Key { this.#key_orders.forEach((key_order) => { if (expiration === null) { expiration = key_order.expiration; - } else if (expiration.isBefore(key_order.expiration)) { + } else if (expiration.isAfter(key_order.expiration)) { expiration = key_order.expiration; } }); @@ -163,7 +166,10 @@ class Key { discharge_key(amount, payment_reference_id = null) { let discharged_amount = null; this.#key_orders.every((key_order, index) => { - if (payment_reference_id === null || key_order.payment_reference_id === payment_reference_id) { + if ( + payment_reference_id === null || + key_order.payment_reference_id === payment_reference_id + ) { if (discharged_amount === null) { discharged_amount = 0; } -- GitLab