bitlair/revbank
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

statiegeld_tokens: simplify void

Browse source 
- No more red messages
- Accept "yes" case insensitively
- Change entry description and amount so the voiding is logged, which is
  more code but less complex than passing an attribute to be used during
  checkout.
This commit is contained in:
Juerd Waalboer 2023-02-13 02:44:02 +01:00
parent ff4ffd16f8
commit 0e1aa77fe5
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/RevBank/Cart/Entry.pm
View file

@ -95,6 +95,10 @@ sub contras($self) {
return map +{ %$_ }, @{ $self->{contras} };
}
sub delete_contras($self) {
$self->{contras} = [];
}
my $HI = "\e[37;1m";
my $LO = "\e[2m";
my $END = "\e[0m";

16
plugins/statiegeld_tokens
View file

@ -212,9 +212,6 @@ sub hook_checkout_prepare($class, $cart, $username, $transaction_id, @) {
$entry->quantity($available);
$warnings_by_type{$type}++;
}
if ($entry->attribute('statiegeld_VOID_TOKENS')) {
$cart->delete($entry);
}
push @used, splice @{ $tokens_by_type->{$type} }, 0, $entry->quantity;
$tokens_changed++;
@ -275,25 +272,26 @@ sub command($self, $cart, $command, @) {
}
$found or return REJECT, "Add deposit returns first.";
return "\e[31;1mDeposit token destruction mode.\e[0m\n\n"
. "The tokens will be deleted irrevokably and you will NOT RECEIVE THE MONEY.\n"
return "The tokens will be deleted irrevokably and you will NOT RECEIVE THE MONEY.\n"
. "Type 'yes' if you are sure", \&void;
}
sub void :Tab(yes,no) ($self, $cart, $input, @) {
if ($input eq 'y') {
if (lc $input eq 'y') {
return REJECT, "y is not yes...";
}
if ($input ne 'yes') {
if (lc $input ne 'yes') {
print "Destruction cancelled.\n";
return ACCEPT;
}
for my $entry ($cart->entries('plugin')) {
next if $entry->attribute('plugin') ne 'statiegeld';
$entry->attribute('statiegeld_VOID_TOKENS', 1);
$entry->{description} = "Void: $entry->{description}";
$entry->amount(0);
$entry->delete_contras;
$entry->attribute(deduplicate => join("/", $self->id, $entry->attribute('addon_id')));
}
print "\e[31;1mDeposit token destruction mode activated.\e[0m\n";
return ACCEPT;
}