joshuacoles/wallos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show notes to subscriptions list on the dashboard

Browse Source
This commit is contained in:
Miguel Ribeiro 2024-02-14 18:00:03 +01:00
parent 323679e771
commit f53f2535d0
6 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
endpoints/subscriptions/get.php
View File

@ -55,6 +55,7 @@
$print[$id]['payer_user_id'] = $subscription['payer_user_id']; $print[$id]['payer_user_id'] = $subscription['payer_user_id'];
$print[$id]['price'] = floatval($subscription['price']); $print[$id]['price'] = floatval($subscription['price']);
$print[$id]['url'] = $subscription['url']; $print[$id]['url'] = $subscription['url'];
$print[$id]['notes'] = $subscription['notes'];
if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) { if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
$print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db); $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

BIN
images/siteicons/notes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 846 B

12
includes/list_subscriptions.php
View File

@ -124,6 +124,18 @@
} }
?> ?>
</div> </div>
<?php
if ($subscription['notes'] != "") {
?>
<div class="subscription-notes">
<span class="notes">
<img src="images/siteicons/notes.png" alt="<?= translate('notes', $i18n) ?>" />
<?= $subscription['notes'] ?>
</span>
</div>
<?php
}
?>
</div> </div>
<?php <?php
} }

2
includes/version.php
View File

@ -1,3 +1,3 @@
<?php <?php
$version = "v1.2.4"; $version = "v1.2.5";
?> ?>

1
index.php
View File

@ -88,6 +88,7 @@
$print[$id]['payer_user_id'] = $subscription['payer_user_id']; $print[$id]['payer_user_id'] = $subscription['payer_user_id'];
$print[$id]['price'] = floatval($subscription['price']); $print[$id]['price'] = floatval($subscription['price']);
$print[$id]['url'] = $subscription['url']; $print[$id]['url'] = $subscription['url'];
$print[$id]['notes'] = $subscription['notes'];
if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) { if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
$print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db); $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

19
styles/styles.css
View File

@ -218,6 +218,13 @@ main > .contain {
overflow: hidden; overflow: hidden;
} }
.subscription-notes {
display: none;
flex-direction: row;
padding: 6px 5px;
overflow: hidden;
}
.subscription-main > span, .subscription-main > span,
.subscription-secondary > span { .subscription-secondary > span {
display: flex; display: flex;
@ -294,6 +301,12 @@ main > .contain {
cursor: pointer; cursor: pointer;
} }
.subscription-notes > span {
display: flex;
align-items: center;
font-size: 14px;
}
@media (max-width: 768px) { @media (max-width: 768px) {
.subscription-main > .name { .subscription-main > .name {
display: none; display: none;
@ -316,11 +329,13 @@ main > .contain {
} }
} }
.subscription.is-open .subscription-secondary { .subscription.is-open .subscription-secondary,
.subscription.is-open .subscription-notes {
display: flex; display: flex;
} }
.subscription-secondary img { .subscription-secondary img,
.subscription-notes img {
height: 20px; height: 20px;
margin-right: 10px; margin-right: 10px;
} }