/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 64ba4cbb

Von Cem Aydin vor etwa 2 Jahren hinzugefügt

ID 64ba4cbb6e30476f4f442d09bf4d0b1d3e121bab
Vorgänger 744958b4
Nachfolger db101cc6

Swiss QR-Bill: QrBillFunctions.pm Fehlerrückgabe angepasst

       $qr_account = first { $_->use_for_qrbill } @{ $bank_accounts };
       if (!$qr_account) {
         $::form->error($::locale->text('No bank account flagged for QRBill usage was found.'));
         return undef, $::locale->text('No bank account flagged for QRBill usage was found.');
+      }
       $main::lxdebug->leave_sub();
       return $qr_account;
       return $qr_account, undef;
+    }
     sub assemble_ref_number {
-...
       #     input: 6 digits, only numbers
       #     output: 6 digits, only numbers
       if (!($bank_id =~ /^\d*$/) || length($bank_id) != 6) {
         $::form->error($::locale->text('Bank account id number invalid. Must be 6 digits.'));
         return undef, $::locale->text('Bank account id number invalid. Must be 6 digits.');
+      }
       # - customer_number
-...
       #     output: prefix removed, 6 digits, filled with leading zeros
       $customer_number = remove_letters_prefix($customer_number);
       if (!check_digits_and_max_length($customer_number, 6)) {
         $::form->error($::locale->text('Customer number invalid. Must be less then or equal to 6 digits after prefix.'));
         return undef, $::locale->text('Customer number invalid. Must be less then or equal to 6 digits after non-digits removed.');
+      }
       # fill with zeros
       $customer_number = sprintf "%06d", $customer_number;
-...
       #     output: prefix removed, 7 digits, filled with leading zeros
       $order_number = remove_letters_prefix($order_number);
       if (!check_digits_and_max_length($order_number, 7)) {
         $::form->error($::locale->text('Order number invalid. Must be less then or equal to 7 digits after prefix.'));
         return undef, $::locale->text('Order number invalid. Must be less then or equal to 7 digits after prefix.');
+      }
       # fill with zeros
       $order_number = sprintf "%07d", $order_number;
-...
       #     output: prefix removed, 7 digits, filled with leading zeros
       $invoice_number = remove_letters_prefix($invoice_number);
       if (!check_digits_and_max_length($invoice_number, 7)) {
         $::form->error($::locale->text('Invoice number invalid. Must be less then or equal to 7 digits after prefix.'));
         return undef, $::locale->text('Invoice number invalid. Must be less then or equal to 7 digits after prefix.');
+      }
       # fill with zeros
       $invoice_number = sprintf "%07d", $invoice_number;
-...
       my $ref_number_cpl = $ref_number . calculate_check_digit($ref_number);
       $main::lxdebug->leave_sub();
       return $ref_number_cpl;
       return $ref_number_cpl, undef;
+    }
     sub get_ref_number_formatted {
-...
       $main::lxdebug->enter_sub();
       unless ($_[0] =~ /^\d+\.\d{2}$/) {
         $::form->error($::locale->text('Amount has wrong format.'));
         return undef;
+      }
       local $_ = shift;
-...
         get_ref_number_formatted get_iban_formatted get_amount_formatted);
       # get qr-account data
       my $qr_account = get_qrbill_account();
       my ($qr_account, $error) = get_qrbill_account();
       my $ref_number = assemble_ref_number(
       my ($ref_number, $error) = assemble_ref_number(
         $qr_account->{'bank_account_id'},
         $form->{'customernumber'},
         $form->{'ordnumber'},
-...
       $form->{'iban_formatted'} = get_iban_formatted($qr_account->{'iban'});
       # format amount for template
       $form->{'amount_formatted'} = get_amount_formatted(
         sprintf(
           "%.2f",
           $form->parse_amount(\%::myconfig, $form->{'total'})
+        )
       );
       my $amount = sprintf("%.2f", $form->parse_amount(\%::myconfig, $form->{'total'}));
       my $amount_formatted = get_amount_formatted($amount);
     =head1 DESCRIPTION
-...
     =item C<get_qrbill_account>
     Return the bank account flagged for the QR bill.
     Return the bank account flagged for the QR bill. And a string containing an
     error message as second return value or undef if no error occurred.
     =item C<assemble_ref_number>
     Assembles and returns the Swiss reference number. 27 digits, formed
     from the parameters plus one check digit.
     from the parameters plus one check digit. And a string containing an error
     message as second return value or undef if no error occurred.
     Prefixes will be removed and numbers filled up with leading zeros.
-...
     =item C<get_amount_formatted>
     Given an amount, return it in format: 'X XXX.XX'
     Or undef if an error occurred.
     =back
     =head1 ERROR HANDLING
     Currently errors are thrown via form e.g.:
     The functions C<get_qrbill_account> and C<assemble_ref_number> return
     undef when an error occurs and a string containing an error message as
     second return value.
     The function C<get_amount_formatted> returns undef if an error occurred.
       $::form->error($::locale->text('Bank account id number invalid. Must be 6 digits.'));
     The other functions always return a result.
     =head1 AUTHOR

       # assemble data for QR-Code
       # get qr-account data
       my $qr_account = get_qrbill_account();
       my ($qr_account, $error) = get_qrbill_account();
       if (!$qr_account) {
         $::form->error($error);
+      }
       my %biller_information = (
         'iban' => $qr_account->{'iban'}
-...
         'countrycode' => $biller_countrycode,
       );
       my $amount;
       my ($amount, $amount_formatted);
       if ($form->{'qrbill_without_amount'}) {
         $amount = '';
         $amount_formatted = '';
       } else {
         $amount = sprintf("%.2f", $form->parse_amount(\%::myconfig, $form->{'total'}));
         # format amount for template
         $amount_formatted = get_amount_formatted($amount);
         if (!$amount_formatted) {
           $::form->error($::locale->text('Amount has wrong format.'));
+        }
+      }
       my %payment_information = (
-...
       my %ref_nr_data;
       if ($::instance_conf->get_create_qrbill_invoices == 1) {
         # generate ref.-no. with check digit
         my $ref_number = assemble_ref_number(
         my ($ref_number, $error) = assemble_ref_number(
           $qr_account->{'bank_account_id'},
           $form->{'customernumber'},
           $form->{'ordnumber'},
           $form->{'invnumber'},
         );
         if (!$ref_number) {
           $::form->error($error);
+        }
         %ref_nr_data = (
           'type' => 'QRR',
           'ref_number' => $ref_number,
-...
       $form->{'biller_information'} = \%biller_information;
       $form->{'biller_data'} = \%biller_data;
       $form->{'iban_formatted'} = get_iban_formatted($qr_account->{'iban'});
       # format amount for template
       $form->{'amount_formatted'} = get_amount_formatted(
         sprintf(
           "%.2f",
           $form->parse_amount(\%::myconfig, $form->{'total'})
+        )
       );
       $form->{'amount_formatted'} = $amount_formatted;
       # set outfile
       my $outfile = $form->{"tmpdir"} . '/' . 'qr-code.png';

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 64ba4cbb

Von Cem Aydin vor etwa 2 Jahren hinzugefügt