Revision 5a57280a
Von Cem Aydin vor etwa 1 Jahr hinzugefügt
| SL/IS.pm | ||
|---|---|---|
| 636 | 636 |
my $biller_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code($biller_country); |
| 637 | 637 |
$form->{qrbill_biller_countrycode} = $biller_countrycode;
|
| 638 | 638 |
|
| 639 |
my $customer_country = $form->{'country'} || 'CH';
|
|
| 639 |
my $customer_country = $form->{billing_address_id} ?
|
|
| 640 |
$form->{billing_address_country} || 'CH' :
|
|
| 641 |
$form->{country} || 'CH';
|
|
| 640 | 642 |
my $customer_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code($customer_country); |
| 641 | 643 |
$form->{qrbill_customer_countrycode} = $customer_countrycode;
|
| 642 | 644 |
|
| SL/Template/OpenDocument.pm | ||
|---|---|---|
| 521 | 521 |
if (!$form->{qrbill_customer_countrycode}) {
|
| 522 | 522 |
$::form->error($::locale->text('Error mapping customer countrycode.'));
|
| 523 | 523 |
} |
| 524 |
|
|
| 524 | 525 |
my %invoice_recipient_data = ( |
| 525 | 526 |
'address_type' => 'K', |
| 526 |
'name' => $form->{'name'},
|
|
| 527 |
'address_row1' => $form->{'street'},
|
|
| 528 |
'address_row2' => $form->{'zipcode'} . ' ' . $form->{'city'},
|
|
| 527 |
'name' => $form->{billing_address_id} ?
|
|
| 528 |
$form->{'billing_address_name'} :
|
|
| 529 |
$form->{'name'},
|
|
| 530 |
'address_row1' => $form->{billing_address_id} ?
|
|
| 531 |
$form->{'billing_address_street'} :
|
|
| 532 |
$form->{'street'},
|
|
| 533 |
'address_row2' => $form->{billing_address_id} ?
|
|
| 534 |
$form->{'billing_address_zipcode'} . ' ' . $form->{'billing_address_city'} :
|
|
| 535 |
$form->{'zipcode'} . ' ' . $form->{'city'},
|
|
| 529 | 536 |
'countrycode' => $form->{qrbill_customer_countrycode},
|
| 530 | 537 |
); |
| 531 | 538 |
|
Auch abrufbar als: Unified diff
Schweizer QR-Rechnung: Zusätzliche Rechnungsadressen in QR-Code Ausgabe eingebaut