- | SOFTWARE |
+ 110.600.000 |
' . htmlspecialchars($item['name']);
if ($item['serial_number'] !== 'N/A') {
@@ -308,7 +308,7 @@ $pdf .= '
€ ' . number_format($tax_amount, 2) . '
';
} else {
- $vat_label = 'VAT';
+ $vat_label = htmlspecialchars($lbl_tax) . ' (0%)';
if (!empty($vat_note)) {
$vat_label .= ' (' . htmlspecialchars($vat_note) . ')';
}
diff --git a/assets/softwaretool.js b/assets/softwaretool.js
index 3ce7edc..9de0054 100644
--- a/assets/softwaretool.js
+++ b/assets/softwaretool.js
@@ -1482,6 +1482,48 @@ function showPaymentModal(option) {
modal.appendChild(modalContent);
document.body.appendChild(modal);
+ // VAT number validation state
+ let vatValidationInProgress = false;
+ let vatValidationResult = null;
+
+ // Function to check VAT number against VIES database (via server-side proxy)
+ async function checkVATNumber(countryCode, vatNumber) {
+ if (!countryCode || !vatNumber) {
+ return null;
+ }
+
+ // Use server-side proxy to avoid CORS issues
+ const serviceToken = document.getElementById("servicetoken")?.innerHTML || '';
+ const url = link + '/v2/vat_check';
+
+ try {
+ const response = await fetch(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ 'Authorization': 'Bearer ' + serviceToken
+ },
+ body: JSON.stringify({
+ countryCode: countryCode,
+ vatNumber: vatNumber
+ })
+ });
+
+ if (!response.ok) {
+ console.warn('VAT check HTTP error:', response.status);
+ return null;
+ }
+
+ const data = await response.json();
+ console.log('VIES response:', data);
+ return data;
+ } catch (error) {
+ console.error('Error checking VAT:', error);
+ return null;
+ }
+ }
+
// Function to calculate and update tax
function updateTaxDisplay() {
const selectedCountry = document.getElementById("paymentCountry").value;
@@ -1500,12 +1542,12 @@ function showPaymentModal(option) {
// Netherlands: always take the tax percentage
taxRate = countryTaxRate;
} else if (isEU) {
- if (vatNumber) {
- // EU with VAT number: 0% VAT, reverse charge
+ if (vatNumber && vatValidationResult && vatValidationResult.valid === true) {
+ // EU with VALID VAT number: 0% VAT, reverse charge
taxRate = 0;
vatNote = 'Reverse charge VAT';
} else {
- // EU without VAT number: use country VAT
+ // EU without VAT number or invalid VAT: use country VAT
taxRate = countryTaxRate;
vatNote = 'Local VAT';
}
@@ -1564,9 +1606,112 @@ function showPaymentModal(option) {
}
}
+ // Debounce timer for VAT validation
+ let vatValidationTimeout = null;
+
+ // Function to validate VAT number with visual feedback
+ async function validateVATNumber() {
+ const selectedCountry = document.getElementById("paymentCountry").value;
+ const vatNumber = document.getElementById("paymentVatNumber").value.trim();
+ const vatInput = document.getElementById("paymentVatNumber");
+
+ // Reset validation state
+ vatValidationResult = null;
+ vatInput.style.borderColor = '';
+
+ // Remove any existing validation message
+ const existingMessage = document.getElementById('vatValidationMessage');
+ if (existingMessage) {
+ existingMessage.remove();
+ }
+
+ if (!vatNumber) {
+ updateTaxDisplay();
+ return;
+ }
+
+ if (!selectedCountry || typeof COUNTRIES === 'undefined' || !COUNTRIES) {
+ updateTaxDisplay();
+ return;
+ }
+
+ const countryData = Object.values(COUNTRIES).find(c => c.country === selectedCountry);
+ if (!countryData || countryData.eu !== 1 || !countryData.country_code) {
+ updateTaxDisplay();
+ return;
+ }
+
+ // For Netherlands, don't validate VAT (always apply VAT)
+ if (selectedCountry === 'Netherlands') {
+ updateTaxDisplay();
+ return;
+ }
+
+ // Show validating state
+ vatInput.style.borderColor = '#ffc107';
+ vatValidationInProgress = true;
+
+ const validationMsg = document.createElement('div');
+ validationMsg.id = 'vatValidationMessage';
+ validationMsg.style.cssText = 'margin-top: 5px; font-size: 12px; color: #ffc107;';
+ validationMsg.innerHTML = ' Validating VAT number...';
+ vatInput.parentNode.appendChild(validationMsg);
+
+ // Call VIES API
+ const result = await checkVATNumber(countryData.country_code, vatNumber);
+ vatValidationInProgress = false;
+
+ if (result && result.valid === true) {
+ // VAT number is valid
+ vatValidationResult = result;
+ vatInput.style.borderColor = '#28a745';
+ validationMsg.style.color = '#28a745';
+ validationMsg.innerHTML = ' Valid VAT number';
+
+ // Format VAT number as CountryCode + VatNumber (e.g., DE115235681)
+ const formattedVAT = result.countryCode + result.vatNumber;
+ if (vatInput.value !== formattedVAT) {
+ vatInput.value = formattedVAT;
+ }
+ } else {
+ // VAT number is invalid or check failed
+ vatValidationResult = null;
+ vatInput.style.borderColor = '#dc3545';
+ validationMsg.style.color = '#dc3545';
+ validationMsg.innerHTML = ' Invalid VAT number or validation failed';
+ }
+
+ // Update tax display with new validation result
+ updateTaxDisplay();
+ }
+
// Add event listeners to country select and VAT number to update tax
- document.getElementById("paymentCountry").addEventListener('change', updateTaxDisplay);
- document.getElementById("paymentVatNumber").addEventListener('input', updateTaxDisplay);
+ document.getElementById("paymentCountry").addEventListener('change', () => {
+ vatValidationResult = null;
+ const vatInput = document.getElementById("paymentVatNumber");
+ vatInput.style.borderColor = '';
+ const existingMessage = document.getElementById('vatValidationMessage');
+ if (existingMessage) {
+ existingMessage.remove();
+ }
+ updateTaxDisplay();
+
+ // Validate VAT if already entered
+ if (vatInput.value.trim()) {
+ if (vatValidationTimeout) {
+ clearTimeout(vatValidationTimeout);
+ }
+ vatValidationTimeout = setTimeout(validateVATNumber, 500);
+ }
+ });
+
+ document.getElementById("paymentVatNumber").addEventListener('input', () => {
+ // Debounce VAT validation
+ if (vatValidationTimeout) {
+ clearTimeout(vatValidationTimeout);
+ }
+ vatValidationTimeout = setTimeout(validateVATNumber, 1000);
+ });
// Close modal on cancel
document.getElementById("cancelPayment").onclick = () => {
diff --git a/settings.php b/settings.php
index 1841d9a..fa4fd0c 100644
--- a/settings.php
+++ b/settings.php
@@ -4,8 +4,9 @@ defined(page_security_key) or exit;
//=============================
// Configuration file
//=============================
-$domain = getDomainName($_SERVER['SERVER_NAME']);
-$file = ((file_exists(dirname(__FILE__).'/custom/'.$domain.'/settings/'.$domain.'_config.php')) ? dirname(__FILE__).'/custom/'.$domain.'/settings/'.$domain.'_config.php' : dirname(__FILE__).'/settings/config.php');
+
+$env = getenv('APP_ENV') ?: 'development';
+$file = ((file_exists(dirname(__FILE__).'/custom/'.$env.'/settings/'.$env.'_config.php')) ? dirname(__FILE__).'/custom/'.$env.'/settings/'.$env.'_config.php' : dirname(__FILE__).'/settings/'.$env.'_config.php');
//Check if allowed
if (isAllowed('settings',$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){
diff --git a/settings/.DS_Store b/settings/.DS_Store
index 19d91adf55d8e41e393382dd5780d95691436e72..e6fa5e3f5f7791f6bba5652e061bfb575894d348 100644
GIT binary patch
delta 56
zcmZoMXfc@JFUrNhz`)4BAi%(o%8<*D#*oQS#E`pLkYhPBD@aOc@&Ojv%`;i@m?t*m
KY-Z>9%MSoO;|&i0
delta 119
zcmZoMXfc@JFUrHfz`)4BAi%(o$&k*V$56nK!BDVSkYhQsAV`XfA( ['country' => 'Austria', 'taxes' => 20.00,'eu' => 1],
- 2 => ['country' => 'Belgium', 'taxes' => 21.00,'eu' => 1],
- 3 => ['country' => 'Bulgaria', 'taxes' => 20.00,'eu' => 1],
- 4 => ['country' => 'Croatia', 'taxes' => 25.00,'eu' => 1],
- 5 => ['country' => 'Cyprus', 'taxes' => 19.00,'eu' => 1],
- 6 => ['country' => 'Czech Republic', 'taxes' => 21.00,'eu' => 1],
- 7 => ['country' => 'Denmark', 'taxes' => 25.00,'eu' => 1],
- 8 => ['country' => 'Estonia', 'taxes' => 24.00,'eu' => 1],
- 9 => ['country' => 'Finland', 'taxes' => 25.50,'eu' => 1],
- 10 => ['country' => 'France', 'taxes' => 20.00,'eu' => 1],
- 11 => ['country' => 'Germany', 'taxes' => 19.00,'eu' => 1],
- 12 => ['country' => 'Greece', 'taxes' => 24.00,'eu' => 1],
- 13 => ['country' => 'Hungary', 'taxes' => 27.00,'eu' => 1],
- 14 => ['country' => 'Ireland', 'taxes' => 23.00,'eu' => 1],
- 15 => ['country' => 'Italy', 'taxes' => 22.00,'eu' => 1],
- 16 => ['country' => 'Latvia', 'taxes' => 21.00,'eu' => 1],
- 17 => ['country' => 'Lithuania', 'taxes' => 21.00,'eu' => 1],
- 18 => ['country' => 'Luxembourg', 'taxes' => 16.00,'eu' => 1],
- 19 => ['country' => 'Malta', 'taxes' => 18.00,'eu' => 1],
- 20 => ['country' => 'Netherlands', 'taxes' => 21.00,'eu' => 1],
- 21 => ['country' => 'Poland', 'taxes' => 23.00,'eu' => 1],
- 22 => ['country' => 'Portugal', 'taxes' => 23.00,'eu' => 1],
- 23 => ['country' => 'Romania', 'taxes' => 19.00,'eu' => 1],
- 24 => ['country' => 'Slovakia', 'taxes' => 23.00,'eu' => 1],
- 25 => ['country' => 'Slovenia', 'taxes' => 22.00,'eu' => 1],
- 26 => ['country' => 'Spain', 'taxes' => 21.00,'eu' => 1],
- 27 => ['country' => 'Sweden', 'taxes' => 25.00,'eu' => 1],
- 28 => ['country' => 'United Kingdom', 'taxes' => 0.00,'eu' => 0],
- 29 => ['country' => 'Switzerland', 'taxes' => 0.00,'eu' => 0],
- 30 => ['country' => 'Norway', 'taxes' => 0.00,'eu' => 0],
- 31 => ['country' => 'Iceland', 'taxes' => 0.00,'eu' => 0],
- 32 => ['country' => 'Albania', 'taxes' => 0.00,'eu' => 0],
- 33 => ['country' => 'Serbia', 'taxes' => 0.00,'eu' => 0],
- 34 => ['country' => 'North Macedonia', 'taxes' => 0.00,'eu' => 0],
- 35 => ['country' => 'Bosnia and Herzegovina', 'taxes' => 0.00,'eu' => 0],
- 36 => ['country' => 'Montenegro', 'taxes' => 0.00,'eu' => 0],
- 37 => ['country' => 'Moldova', 'taxes' => 0.00,'eu' => 0],
- 38 => ['country' => 'Ukraine', 'taxes' => 0.00,'eu' => 0],
- 39 => ['country' => 'Belarus', 'taxes' => 0.00,'eu' => 0],
- 40 => ['country' => 'Turkey', 'taxes' => 0.00,'eu' => 0],
- 41 => ['country' => 'Andorra', 'taxes' => 0.00,'eu' => 0],
- 42 => ['country' => 'Australia', 'taxes' => 0.00,'eu' => 0],
- 43 => ['country' => 'New Zealand', 'taxes' => 0.00,'eu' => 0],
- 44 => ['country' => 'Japan', 'taxes' => 0.00,'eu' => 0],
- 45 => ['country' => 'China', 'taxes' => 0.00,'eu' => 0],
- 46 => ['country' => 'India', 'taxes' => 0.00,'eu' => 0],
- 47 => ['country' => 'South Korea', 'taxes' => 0.00,'eu' => 0],
- 48 => ['country' => 'Singapore', 'taxes' => 0.00,'eu' => 0],
- 49 => ['country' => 'Indonesia', 'taxes' => 0.00,'eu' => 0],
- 50 => ['country' => 'Thailand', 'taxes' => 0.00,'eu' => 0],
- 51 => ['country' => 'Vietnam', 'taxes' => 0.00,'eu' => 0],
- 52 => ['country' => 'Philippines', 'taxes' => 0.00,'eu' => 0],
- 53 => ['country' => 'Malaysia', 'taxes' => 0.00,'eu' => 0],
- 54 => ['country' => 'Taiwan', 'taxes' => 0.00,'eu' => 0],
- 55 => ['country' => 'Pakistan', 'taxes' => 0.00,'eu' => 0],
- 56 => ['country' => 'Bangladesh', 'taxes' => 0.00,'eu' => 0],
- 57 => ['country' => 'Sri Lanka', 'taxes' => 0.00,'eu' => 0],
- 58 => ['country' => 'Nepal', 'taxes' => 0.00,'eu' => 0],
- 59 => ['country' => 'Cambodia', 'taxes' => 0.00,'eu' => 0],
- 60 => ['country' => 'Myanmar', 'taxes' => 0.00,'eu' => 0],
- 61 => ['country' => 'Laos', 'taxes' => 0.00,'eu' => 0],
- 62 => ['country' => 'Mongolia', 'taxes' => 0.00,'eu' => 0],
- 63 => ['country' => 'Kazakhstan', 'taxes' => 0.00,'eu' => 0],
- 64 => ['country' => 'Uzbekistan', 'taxes' => 0.00,'eu' => 0],
- 65 => ['country' => 'Armenia', 'taxes' => 0.00,'eu' => 0],
- 66 => ['country' => 'Georgia', 'taxes' => 0.00,'eu' => 0],
- 67 => ['country' => 'Azerbaijan', 'taxes' => 0.00,'eu' => 0],
- 68 => ['country' => 'Fiji', 'taxes' => 0.00,'eu' => 0],
- 69 => ['country' => 'Papua New Guinea', 'taxes' => 0.00,'eu' => 0],
- 70 => ['country' => 'Samoa', 'taxes' => 0.00,'eu' => 0],
- 71 => ['country' => 'Tonga', 'taxes' => 0.00,'eu' => 0],
- 72 => ['country' => 'Vanuatu', 'taxes' => 0.00,'eu' => 0],
- 73 => ['country' => 'Bhutan', 'taxes' => 0.00,'eu' => 0],
- 74 => ['country' => 'Saudi Arabia', 'taxes' => 0.00,'eu' => 0],
- 75 => ['country' => 'United Arab Emirates', 'taxes' => 0.00,'eu' => 0],
- 76 => ['country' => 'Bahrain', 'taxes' => 0.00,'eu' => 0],
- 77 => ['country' => 'Kuwait', 'taxes' => 0.00,'eu' => 0],
- 78 => ['country' => 'Oman', 'taxes' => 0.00,'eu' => 0],
- 79 => ['country' => 'Qatar', 'taxes' => 0.00,'eu' => 0],
- 80 => ['country' => 'Israel', 'taxes' => 0.00,'eu' => 0],
- 81 => ['country' => 'Jordan', 'taxes' => 0.00,'eu' => 0],
- 82 => ['country' => 'Lebanon', 'taxes' => 0.00,'eu' => 0],
- 83 => ['country' => 'Egypt', 'taxes' => 0.00,'eu' => 0],
- 85 => ['country' => 'South Africa', 'taxes' => 0.00,'eu' => 0],
- 86 => ['country' => 'Nigeria', 'taxes' => 0.00,'eu' => 0],
- 87 => ['country' => 'Kenya', 'taxes' => 0.00,'eu' => 0],
- 88 => ['country' => 'Ghana', 'taxes' => 0.00,'eu' => 0],
- 89 => ['country' => 'Morocco', 'taxes' => 0.00,'eu' => 0],
- 90 => ['country' => 'Tunisia', 'taxes' => 0.00,'eu' => 0],
- 91 => ['country' => 'Algeria', 'taxes' => 0.00,'eu' => 0],
- 92 => ['country' => 'Egypt', 'taxes' => 0.00,'eu' => 0],
- 93 => ['country' => 'Ethiopia', 'taxes' => 0.00,'eu' => 0],
- 94 => ['country' => 'Tanzania', 'taxes' => 0.00,'eu' => 0],
- 95 => ['country' => 'Uganda', 'taxes' => 0.00,'eu' => 0],
- 96 => ['country' => 'Zimbabwe', 'taxes' => 0.00,'eu' => 0],
- 97 => ['country' => 'Zambia', 'taxes' => 0.00,'eu' => 0],
- 98 => ['country' => 'Botswana', 'taxes' => 0.00,'eu' => 0],
- 99 => ['country' => 'Mauritius', 'taxes' => 0.00,'eu' => 0],
- 100 => ['country' => 'Namibia', 'taxes' => 0.00,'eu' => 0],
- 101 => ['country' => 'Rwanda', 'taxes' => 0.00,'eu' => 0],
- 102 => ['country' => 'Senegal', 'taxes' => 0.00,'eu' => 0],
- 103 => ['country' => 'Ivory Coast', 'taxes' => 0.00,'eu' => 0],
- 104 => ['country' => 'Cameroon', 'taxes' => 0.00,'eu' => 0],
- 105 => ['country' => 'Angola', 'taxes' => 0.00,'eu' => 0],
- 106 => ['country' => 'Mozambique', 'taxes' => 0.00,'eu' => 0],
- 107 => ['country' => 'Madagascar', 'taxes' => 0.00,'eu' => 0],
- 108 => ['country' => 'Mali', 'taxes' => 0.00,'eu' => 0],
- 109 => ['country' => 'Burkina Faso', 'taxes' => 0.00,'eu' => 0],
- 110 => ['country' => 'Niger', 'taxes' => 0.00,'eu' => 0],
- 111 => ['country' => 'Benin', 'taxes' => 0.00,'eu' => 0],
- 112 => ['country' => 'Togo', 'taxes' => 0.00,'eu' => 0],
- 113 => ['country' => 'Guinea', 'taxes' => 0.00,'eu' => 0],
- 114 => ['country' => 'Malawi', 'taxes' => 0.00,'eu' => 0],
- 115 => ['country' => 'Gabon', 'taxes' => 0.00,'eu' => 0],
- 116 => ['country' => 'Mauritania', 'taxes' => 0.00,'eu' => 0],
- 117 => ['country' => 'Lesotho', 'taxes' => 0.00,'eu' => 0],
- 118 => ['country' => 'Eswatini', 'taxes' => 0.00,'eu' => 0],
- 119 => ['country' => 'Liberia', 'taxes' => 0.00,'eu' => 0],
- 120 => ['country' => 'Canada', 'taxes' => 0.00,'eu' => 0],
- 121 => ['country' => 'United States', 'taxes' => 0.00,'eu' => 0],
- 122 => ['country' => 'Mexico', 'taxes' => 0.00,'eu' => 0],
- 123 => ['country' => 'Argentina', 'taxes' => 0.00,'eu' => 0],
- 124 => ['country' => 'Brazil', 'taxes' => 0.00,'eu' => 0],
- 125 => ['country' => 'Chile', 'taxes' => 0.00,'eu' => 0],
- 126 => ['country' => 'Colombia', 'taxes' => 0.00,'eu' => 0],
- 127 => ['country' => 'Peru', 'taxes' => 0.00,'eu' => 0],
- 128 => ['country' => 'Ecuador', 'taxes' => 0.00,'eu' => 0],
- 129 => ['country' => 'Uruguay', 'taxes' => 0.00,'eu' => 0],
- 130 => ['country' => 'Paraguay', 'taxes' => 0.00,'eu' => 0],
- 131 => ['country' => 'Bolivia', 'taxes' => 0.00,'eu' => 0],
- 132 => ['country' => 'Venezuela', 'taxes' => 0.00,'eu' => 0],
- 133 => ['country' => 'Costa Rica', 'taxes' => 0.00,'eu' => 0],
- 134 => ['country' => 'Panama', 'taxes' => 0.00,'eu' => 0],
- 135 => ['country' => 'Guatemala', 'taxes' => 0.00,'eu' => 0],
- 136 => ['country' => 'Honduras', 'taxes' => 0.00,'eu' => 0],
- 137 => ['country' => 'El Salvador', 'taxes' => 0.00,'eu' => 0],
- 138 => ['country' => 'Nicaragua', 'taxes' => 0.00,'eu' => 0],
- 139 => ['country' => 'Dominican Republic', 'taxes' => 0.00,'eu' => 0],
- 140 => ['country' => 'Jamaica', 'taxes' => 0.00,'eu' => 0],
- 141 => ['country' => 'Trinidad and Tobago', 'taxes' => 0.00,'eu' => 0],
- 142 => ['country' => 'Barbados', 'taxes' => 0.00,'eu' => 0],
- 143 => ['country' => 'Bahamas', 'taxes' => 0.00,'eu' => 0],
+ 1 => ['country' => 'Austria', 'taxes' => 20.00,'eu' => 1, 'country_code' => 'AT'],
+ 2 => ['country' => 'Belgium', 'taxes' => 21.00,'eu' => 1, 'country_code' => 'BE'],
+ 3 => ['country' => 'Bulgaria', 'taxes' => 20.00,'eu' => 1, 'country_code' => 'BG'],
+ 4 => ['country' => 'Croatia', 'taxes' => 25.00,'eu' => 1, 'country_code' => 'HR'],
+ 5 => ['country' => 'Cyprus', 'taxes' => 19.00,'eu' => 1, 'country_code' => 'CY'],
+ 6 => ['country' => 'Czech Republic', 'taxes' => 21.00,'eu' => 1, 'country_code' => 'CZ'],
+ 7 => ['country' => 'Denmark', 'taxes' => 25.00,'eu' => 1, 'country_code' => 'DK'],
+ 8 => ['country' => 'Estonia', 'taxes' => 24.00,'eu' => 1, 'country_code' => 'EE'],
+ 9 => ['country' => 'Finland', 'taxes' => 25.50,'eu' => 1, 'country_code' => 'FI'],
+ 10 => ['country' => 'France', 'taxes' => 20.00,'eu' => 1, 'country_code' => 'FR'],
+ 11 => ['country' => 'Germany', 'taxes' => 19.00,'eu' => 1, 'country_code' => 'DE'],
+ 12 => ['country' => 'Greece', 'taxes' => 24.00,'eu' => 1, 'country_code' => 'GR'],
+ 13 => ['country' => 'Hungary', 'taxes' => 27.00,'eu' => 1, 'country_code' => 'HU'],
+ 14 => ['country' => 'Ireland', 'taxes' => 23.00,'eu' => 1, 'country_code' => 'IE'],
+ 15 => ['country' => 'Italy', 'taxes' => 22.00,'eu' => 1, 'country_code' => 'IT'],
+ 16 => ['country' => 'Latvia', 'taxes' => 21.00,'eu' => 1, 'country_code' => 'LV'],
+ 17 => ['country' => 'Lithuania', 'taxes' => 21.00,'eu' => 1, 'country_code' => 'LT'],
+ 18 => ['country' => 'Luxembourg', 'taxes' => 16.00,'eu' => 1, 'country_code' => 'LU'],
+ 19 => ['country' => 'Malta', 'taxes' => 18.00,'eu' => 1, 'country_code' => 'MT'],
+ 20 => ['country' => 'Netherlands', 'taxes' => 21.00,'eu' => 1, 'country_code' => 'NL'],
+ 21 => ['country' => 'Poland', 'taxes' => 23.00,'eu' => 1, 'country_code' => 'PL'],
+ 22 => ['country' => 'Portugal', 'taxes' => 23.00,'eu' => 1, 'country_code' => 'PT'],
+ 23 => ['country' => 'Romania', 'taxes' => 19.00,'eu' => 1, 'country_code' => 'RO'],
+ 24 => ['country' => 'Slovakia', 'taxes' => 23.00,'eu' => 1, 'country_code' => 'SK'],
+ 25 => ['country' => 'Slovenia', 'taxes' => 22.00,'eu' => 1, 'country_code' => 'SI'],
+ 26 => ['country' => 'Spain', 'taxes' => 21.00,'eu' => 1, 'country_code' => 'ES'],
+ 27 => ['country' => 'Sweden', 'taxes' => 25.00,'eu' => 1, 'country_code' => 'SE'],
+ 28 => ['country' => 'United Kingdom', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 29 => ['country' => 'Switzerland', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 30 => ['country' => 'Norway', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 31 => ['country' => 'Iceland', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 32 => ['country' => 'Albania', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 33 => ['country' => 'Serbia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 34 => ['country' => 'North Macedonia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 35 => ['country' => 'Bosnia and Herzegovina', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 36 => ['country' => 'Montenegro', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 37 => ['country' => 'Moldova', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 38 => ['country' => 'Ukraine', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 39 => ['country' => 'Belarus', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 40 => ['country' => 'Turkey', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 41 => ['country' => 'Andorra', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 42 => ['country' => 'Australia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 43 => ['country' => 'New Zealand', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 44 => ['country' => 'Japan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 45 => ['country' => 'China', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 46 => ['country' => 'India', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 47 => ['country' => 'South Korea', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 48 => ['country' => 'Singapore', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 49 => ['country' => 'Indonesia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 50 => ['country' => 'Thailand', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 51 => ['country' => 'Vietnam', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 52 => ['country' => 'Philippines', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 53 => ['country' => 'Malaysia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 54 => ['country' => 'Taiwan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 55 => ['country' => 'Pakistan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 56 => ['country' => 'Bangladesh', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 57 => ['country' => 'Sri Lanka', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 58 => ['country' => 'Nepal', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 59 => ['country' => 'Cambodia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 60 => ['country' => 'Myanmar', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 61 => ['country' => 'Laos', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 62 => ['country' => 'Mongolia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 63 => ['country' => 'Kazakhstan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 64 => ['country' => 'Uzbekistan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 65 => ['country' => 'Armenia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 66 => ['country' => 'Georgia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 67 => ['country' => 'Azerbaijan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 68 => ['country' => 'Fiji', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 69 => ['country' => 'Papua New Guinea', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 70 => ['country' => 'Samoa', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 71 => ['country' => 'Tonga', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 72 => ['country' => 'Vanuatu', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 73 => ['country' => 'Bhutan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 74 => ['country' => 'Saudi Arabia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 75 => ['country' => 'United Arab Emirates', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 76 => ['country' => 'Bahrain', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 77 => ['country' => 'Kuwait', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 78 => ['country' => 'Oman', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 79 => ['country' => 'Qatar', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 80 => ['country' => 'Israel', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 81 => ['country' => 'Jordan', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 82 => ['country' => 'Lebanon', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 83 => ['country' => 'Egypt', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 85 => ['country' => 'South Africa', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 86 => ['country' => 'Nigeria', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 87 => ['country' => 'Kenya', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 88 => ['country' => 'Ghana', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 89 => ['country' => 'Morocco', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 90 => ['country' => 'Tunisia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 91 => ['country' => 'Algeria', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 92 => ['country' => 'Egypt', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 93 => ['country' => 'Ethiopia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 94 => ['country' => 'Tanzania', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 95 => ['country' => 'Uganda', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 96 => ['country' => 'Zimbabwe', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 97 => ['country' => 'Zambia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 98 => ['country' => 'Botswana', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 99 => ['country' => 'Mauritius', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 100 => ['country' => 'Namibia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 101 => ['country' => 'Rwanda', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 102 => ['country' => 'Senegal', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 103 => ['country' => 'Ivory Coast', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 104 => ['country' => 'Cameroon', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 105 => ['country' => 'Angola', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 106 => ['country' => 'Mozambique', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 107 => ['country' => 'Madagascar', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 108 => ['country' => 'Mali', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 109 => ['country' => 'Burkina Faso', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 110 => ['country' => 'Niger', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 111 => ['country' => 'Benin', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 112 => ['country' => 'Togo', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 113 => ['country' => 'Guinea', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 114 => ['country' => 'Malawi', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 115 => ['country' => 'Gabon', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 116 => ['country' => 'Mauritania', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 117 => ['country' => 'Lesotho', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 118 => ['country' => 'Eswatini', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 119 => ['country' => 'Liberia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 120 => ['country' => 'Canada', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 121 => ['country' => 'United States', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 122 => ['country' => 'Mexico', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 123 => ['country' => 'Argentina', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 124 => ['country' => 'Brazil', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 125 => ['country' => 'Chile', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 126 => ['country' => 'Colombia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 127 => ['country' => 'Peru', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 128 => ['country' => 'Ecuador', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 129 => ['country' => 'Uruguay', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 130 => ['country' => 'Paraguay', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 131 => ['country' => 'Bolivia', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 132 => ['country' => 'Venezuela', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 133 => ['country' => 'Costa Rica', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 134 => ['country' => 'Panama', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 135 => ['country' => 'Guatemala', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 136 => ['country' => 'Honduras', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 137 => ['country' => 'El Salvador', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 138 => ['country' => 'Nicaragua', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 139 => ['country' => 'Dominican Republic', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 140 => ['country' => 'Jamaica', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 141 => ['country' => 'Trinidad and Tobago', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 142 => ['country' => 'Barbados', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
+ 143 => ['country' => 'Bahamas', 'taxes' => 0.00,'eu' => 0, 'country_code' => ''],
];
diff --git a/webhook_mollie.php b/webhook_mollie.php
index d02a021..88c3de5 100644
--- a/webhook_mollie.php
+++ b/webhook_mollie.php
@@ -262,17 +262,18 @@ try {
$dompdf->render();
$subject = 'Software Upgrade - Invoice: '.$order_id;
$attachment = $dompdf->output();
+ $attachment_name = $subject.'.pdf';
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
//Send email via PHPMailer
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
// The send_mail function will exit on error and debuglog the error
- $mail_result = send_mail($customer_email, $subject, $message, $attachment, $subject);
+ $mail_result = send_mail($customer_email, $subject, $message, $attachment, $attachment_name);
// Send to bookkeeping if configured
if(invoice_bookkeeping){
debuglog("WEBHOOK: Sending to bookkeeping: " . email_bookkeeping);
- send_mail(email_bookkeeping, $subject, $message, $attachment, $subject);
+ send_mail(email_bookkeeping, $subject, $message, $attachment, $attachment_name);
}
} else {
debuglog("WEBHOOK: No invoice data found for invoice_id: $invoice_id");
diff --git a/webhook_paypal.php b/webhook_paypal.php
index 3df5306..5636f25 100644
--- a/webhook_paypal.php
+++ b/webhook_paypal.php
@@ -306,16 +306,17 @@ try {
$dompdf->render();
$subject = 'Software Upgrade - Invoice: '.$order_id;
$attachment = $dompdf->output();
+ $attachment_name = $subject.'.pdf';
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
//Send email via PHPMailer
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
- $mail_result = send_mail($customer_email, $subject, $message, $attachment, $subject);
+ $mail_result = send_mail($customer_email, $subject, $message, $attachment, $attachment_name);
// Send to bookkeeping if configured
if(invoice_bookkeeping){
debuglog("PAYPAL WEBHOOK: Sending to bookkeeping: " . email_bookkeeping);
- send_mail(email_bookkeeping, $subject, $message, $attachment, $subject);
+ send_mail(email_bookkeeping, $subject, $message, $attachment, $attachment_name);
}
} else {
debuglog("PAYPAL WEBHOOK: No invoice data found for invoice_id: $invoice_id");
|