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

Show member name when sorting by members

Browse Source
This commit is contained in:
ellite 2023-11-11 21:34:46 +01:00
parent 1e8d0d05da
commit 73a7ae66ed
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/commands.sql
View File

@ -32,7 +32,7 @@ CREATE TABLE subscriptions (
FOREIGN KEY(cycle) REFERENCES cycles(id), FOREIGN KEY(cycle) REFERENCES cycles(id),
FOREIGN KEY(frequency) REFERENCES frequencies(id), FOREIGN KEY(frequency) REFERENCES frequencies(id),
FOREIGN KEY(payment_method_id) REFERENCES payment_methods(id), FOREIGN KEY(payment_method_id) REFERENCES payment_methods(id),
FOREIGN KEY(payer_user_id) REFERENCES user(id) FOREIGN KEY(payer_user_id) REFERENCES household(id)
FOREIGN KEY(category_id) REFERENCES categories(id) FOREIGN KEY(category_id) REFERENCES categories(id)
); );

2
endpoints/cronjobs/createdatabase.php
View File

@ -43,7 +43,7 @@ if (!file_exists($databaseFile)) {
FOREIGN KEY(cycle) REFERENCES cycles(id), FOREIGN KEY(cycle) REFERENCES cycles(id),
FOREIGN KEY(frequency) REFERENCES frequencies(id), FOREIGN KEY(frequency) REFERENCES frequencies(id),
FOREIGN KEY(payment_method_id) REFERENCES payment_methods(id), FOREIGN KEY(payment_method_id) REFERENCES payment_methods(id),
FOREIGN KEY(payer_user_id) REFERENCES user(id) FOREIGN KEY(payer_user_id) REFERENCES household(id)
FOREIGN KEY(category_id) REFERENCES categories(id) FOREIGN KEY(category_id) REFERENCES categories(id)
)'); )');

3
endpoints/subscriptions/get.php
View File

@ -50,6 +50,7 @@
$print[$id]['payment_method_icon'] = "images/uploads/icons/" . $payment_methods[$paymentMethodId]['icon']; $print[$id]['payment_method_icon'] = "images/uploads/icons/" . $payment_methods[$paymentMethodId]['icon'];
$print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name']; $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];
$print[$id]['category_id'] = $subscription['category_id']; $print[$id]['category_id'] = $subscription['category_id'];
$print[$id]['payer_user_id'] = $subscription['payer_user_id'];
$print[$id]['price'] = $subscription['price']; $print[$id]['price'] = $subscription['price'];
if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) { if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
@ -66,7 +67,7 @@
} }
if (isset($print)) { if (isset($print)) {
printSubscriptons($print, $sort, $categories); printSubscriptons($print, $sort, $categories, $members);
} }
if (count($subscriptions) == 0) { if (count($subscriptions) == 0) {

5
index.php
View File

@ -78,6 +78,7 @@
$print[$id]['payment_method_icon'] = "images/uploads/icons/" . $payment_methods[$paymentMethodId]['icon']; $print[$id]['payment_method_icon'] = "images/uploads/icons/" . $payment_methods[$paymentMethodId]['icon'];
$print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name']; $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];
$print[$id]['category_id'] = $subscription['category_id']; $print[$id]['category_id'] = $subscription['category_id'];
$print[$id]['payer_user_id'] = $subscription['payer_user_id'];
$print[$id]['price'] = $subscription['price']; $print[$id]['price'] = $subscription['price'];
if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) { if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
@ -94,7 +95,7 @@
} }
if (isset($print)) { if (isset($print)) {
printSubscriptons($print, $sort, $categories); printSubscriptons($print, $sort, $categories, $members);
} }
$db->close(); $db->close();
@ -110,7 +111,7 @@
Add First Subscription Add First Subscription
</button> </button>
</div> </div>
<?php <?
} }
?> ?>
</div> </div>