Skip to content

Fix /pay, output success/fail message as a reply (not a popup!) #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
castaway wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix /pay, output success/fail message as a reply (not a popup!) #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/AccessSystem/Schema/Result/Person.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,14 +601,14 @@ sub add_debit {
}
if($amount =~/\D/) {
return (0, 'Amount must be a positive integer of pence');
} elsif($self->balance_p < $amount) {
} elsif($self->balance_p + 500 < $amount) {
return (0, 'Not enough money for that transaction');
} else {
my $tr = $self->create_related('transactions', {
reason => $reason,
amount_p => -1*$amount,
});

return (1, 'Success', $self->balance_p);
}
}
Expand Down
12 changes: 8 additions & 4 deletions lib/AccessSystem/TelegramBot.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,13 +1004,17 @@ sub pay ($self, $text, $message, $args = undef) {
} elsif ($args->[1] eq 'cancel') {
## ended selections - cancel whole thing
delete $self->waiting_on_response->{$message->from->id};
return $message->answer('Canceled');
return $message->reply('Cancelled');
} elsif ($args->[1] eq 'pay') {
## ended selections create transaction
delete $self->waiting_on_response->{$message->from->id};
my ($status, $msg) = $member->add_debit($waiting->{total},
join(",",@{$waiting->{products}}));
return $message->answer($msg);
my ($status, $msg, $bal) = $member->add_debit(
$waiting->{total},
join(",",@{$waiting->{products}}));
if($bal < 0) {
$msg = 'Paid: Your balance is now negative, £5 is the maximum you can go below 0, please pay some in. Use /balance to check.';
}
return $message->reply($msg);
}
} else {
$self->waiting_on_response->{$message->from->id} = {
Expand Down