Add NFC chore submission feature and enhance family settings
- Introduced NFC support for chore submissions, allowing specific person credit after Head of Household approval. - Updated family settings to include NFC base URL, scan cooldown, and confirmation page options. - Enhanced chore management with options for anyone to complete chores and NFC link generation. - Improved API endpoints for handling NFC tokens and chore submissions. - Updated readme to reflect new NFC features and settings.
This commit is contained in:
+25
-10
@@ -7,7 +7,7 @@ if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
sendJson(['success' => false, 'error' => 'Method not allowed'], 405);
|
||||
}
|
||||
|
||||
$people = normalizePeopleList(readJsonFile('people.json'));
|
||||
$people = migrateAllPeople(normalizePeopleList(readJsonFile('people.json')));
|
||||
$actor = requireActivePerson($people);
|
||||
if (($actor['role'] ?? '') !== ROLE_HEAD || !isHohVerified()) {
|
||||
sendJson(['success' => false, 'error' => 'Only a verified Head of household can review chores'], 403);
|
||||
@@ -46,13 +46,10 @@ if ($decision === 'reject') {
|
||||
sendJson(['success' => true]);
|
||||
}
|
||||
|
||||
$assignees = $row['assignee_ids'] ?? [];
|
||||
if (!is_array($assignees)) {
|
||||
$assignees = [];
|
||||
}
|
||||
$submittedBy = trim((string) ($pending['submitted_by'] ?? ''));
|
||||
$value = (float) ($row['value'] ?? 0);
|
||||
$n = count($assignees);
|
||||
$share = $n > 0 ? round($value / $n, 2) : 0.0;
|
||||
$creditedEach = 0.0;
|
||||
$creditedRecipients = 0;
|
||||
|
||||
$row['pending_submission'] = null;
|
||||
|
||||
@@ -73,15 +70,33 @@ if (!writeJsonFile('chores.json', $chores)) {
|
||||
|
||||
foreach ($people as $pi => $p) {
|
||||
$pid = (string) ($p['id'] ?? '');
|
||||
if ($pid === '' || !in_array($pid, $assignees, true)) {
|
||||
if ($pid === '') {
|
||||
continue;
|
||||
}
|
||||
if ($submittedBy !== '') {
|
||||
if ($pid !== $submittedBy) {
|
||||
continue;
|
||||
}
|
||||
$creditedEach = $value;
|
||||
} else {
|
||||
$assignees = $row['assignee_ids'] ?? [];
|
||||
if (!is_array($assignees) || !in_array($pid, $assignees, true)) {
|
||||
continue;
|
||||
}
|
||||
$n = count($assignees);
|
||||
$creditedEach = $n > 0 ? round($value / $n, 2) : 0.0;
|
||||
}
|
||||
$bal = $p['currency_balance'] ?? 0;
|
||||
$people[$pi]['currency_balance'] = (is_numeric($bal) ? (float) $bal : 0.0) + $share;
|
||||
$people[$pi]['currency_balance'] = (is_numeric($bal) ? (float) $bal : 0.0) + $creditedEach;
|
||||
$creditedRecipients++;
|
||||
}
|
||||
|
||||
if (!writeJsonFile('people.json', $people)) {
|
||||
sendJson(['success' => false, 'error' => 'Failed to save people balances'], 500);
|
||||
}
|
||||
|
||||
sendJson(['success' => true, 'credited_each' => $share]);
|
||||
sendJson([
|
||||
'success' => true,
|
||||
'credited_each' => $creditedEach,
|
||||
'credited_recipients' => $creditedRecipients,
|
||||
]);
|
||||
|
||||
Reference in New Issue
Block a user