Skip to content

Commit 5feab8c

Browse files
committed
Added handling for no active subscriptions
1 parent 964e8a0 commit 5feab8c

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

scripts/requests.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const errorTranslations = {
3737
bike_in_repair: "Bicicleta a ser reparada.",
3838
not_enough_balance:
3939
'Saldo negativo. Se isto se deve a uma viagem mal terminada, por favor contacte <a href="mailto:gira@emel.pt">gira@emel.pt</a>',
40+
has_no_active_subscriptions: "Não tem um passe ativo.",
4041
};
4142

4243
async function makePostRequest(body, accessToken = null) {

scripts/user.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ async function openUserSettings() {
272272
if (!userObj.activeUserSubscriptions) userObj = await getUserInformation();
273273

274274
// Get subscription expiration
275-
const subscriptionExpiration = new Date(userObj.activeUserSubscriptions[0].expirationDate);
275+
const subscriptionExpiration = new Date(userObj.activeUserSubscriptions?.[0]?.expirationDate ?? 0);
276276

277277
// Populate the element
278278
settingsElement.innerHTML = `
@@ -299,8 +299,16 @@ async function openUserSettings() {
299299
<div id="subscriptionContainer">
300300
<div>
301301
<i class="bi bi-credit-card" id="cardSVG"></i>
302-
<div id="subscriptionName">Passe ${toPascalCase(userObj.activeUserSubscriptions[0].type)}</div>
303-
<div id="subscriptionValidity">Válido até ${subscriptionExpiration.toLocaleDateString("pt")}</div>
302+
${
303+
userObj.activeUserSubscriptions?.length > 0
304+
? `
305+
<div id="subscriptionName">Passe ${toPascalCase(userObj.activeUserSubscriptions[0].type)}</div>
306+
<div id="subscriptionValidity">Válido até ${subscriptionExpiration.toLocaleDateString("pt")}</div>
307+
`
308+
: `
309+
<div id="subscriptionValidity">Nenhum passe ativo</div>
310+
`
311+
}
304312
</div>
305313
</div>
306314
<div id="statisticsMenuButtonContainer">

0 commit comments

Comments
 (0)