diff --git a/api/v2/authorization.php b/api/v2/authorization.php
index aff98dd..63289ef 100644
--- a/api/v2/authorization.php
+++ b/api/v2/authorization.php
@@ -72,8 +72,8 @@ if ($stmt->rowCount() == 1) {
$user_data['refreshkey'] = bin2hex(random_bytes(25));
$sql_refreshkey = 'UPDATE users SET refreshkey = ? WHERE id = ?';
- $stmt_service = $pdo->prepare($sql_refreshkey);
- $stmt_service->execute([$user_data['refreshkey'], $user_data['id']]);
+ $stmt_refreshkey = $pdo->prepare($sql_refreshkey);
+ $stmt_refreshkey->execute([$user_data['refreshkey'], $user_data['id']]);
$token = createCommunicationToken($user_data['userkey']);
diff --git a/api/v2/get/products_software_versions.php b/api/v2/get/products_software_versions.php
index fcaa325..b598d79 100644
--- a/api/v2/get/products_software_versions.php
+++ b/api/v2/get/products_software_versions.php
@@ -26,7 +26,7 @@ if(isset($get_content) && $get_content!=''){
foreach ($requests as $y){
$v = explode("=", $y);
//INCLUDE VARIABLES IN ARRAY
- $criterias[$v[0]] = $v[1];
+ $criterias[$v[0]] = $v[1] ?? '';
if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='totals' || $v[0] =='list' || $v[0] =='history'|| $v[0] =='success_msg'){
//do nothing
diff --git a/api/v2/get/token_refresh.php b/api/v2/get/token_refresh.php
index 4bb278d..4ca7969 100644
--- a/api/v2/get/token_refresh.php
+++ b/api/v2/get/token_refresh.php
@@ -65,8 +65,8 @@ if ($stmt->rowCount() == 1) {
//Refresh REFRESHKEY
$user_data['refreshkey'] = bin2hex(random_bytes(25));
$sql_refreshkey = 'UPDATE users SET refreshkey = ? WHERE id = ?';
- $stmt_service = $pdo->prepare($sql_refreshkey);
- $stmt_service->execute([$user_data['refreshkey'], $user_data['id']]);
+ $stmt_refreshkey = $pdo->prepare($sql_refreshkey);
+ $stmt_refreshkey->execute([$user_data['refreshkey'], $user_data['id']]);
$token = createCommunicationToken($user_data['userkey']);
diff --git a/assets/database/STEP 2.sql b/assets/database/STEP 2.sql
index c72ceee..99758e6 100644
--- a/assets/database/STEP 2.sql
+++ b/assets/database/STEP 2.sql
@@ -4,6 +4,8 @@ TRUNCATE TABLE `role_access_permissions`;
TRUNCATE TABLE `user_roles`;
TRUNCATE TABLE `access_elements`;
+ALTER TABLE taxes ADD COLUMN eu TINYINT(1) DEFAULT 0;
+
INSERT INTO access_elements (access_name,access_path,description,is_active,created,createdby,updated,updatedby,access_group) VALUES
('Access Element','access_element','Auto-scanned: access_element',1,'2026-01-18 18:49:49','0','2026-01-18 18:49:49',NULL,'Views'),
('Access Element Manage','access_element_manage','Auto-scanned: access_element_manage',1,'2026-01-18 18:49:49','0','2026-01-18 18:49:49',NULL,'Views'),
@@ -921,5 +923,14 @@ WHERE warranty_date IS NOT NULL;
alter table users add refreshkey varchar(255);
+UPDATE taxes SET eu = 1 WHERE country IN (
+ 'Austria', 'Belgium', 'Bulgaria', 'Croatia', 'Cyprus', 'Czech Republic',
+ 'Denmark', 'Estonia', 'Finland', 'France', 'Germany', 'Greece',
+ 'Hungary', 'Ireland', 'Italy', 'Latvia', 'Lithuania', 'Luxembourg',
+ 'Malta', 'Netherlands', 'Poland', 'Portugal', 'Romania', 'Slovakia',
+ 'Slovenia', 'Spain', 'Sweden'
+);
+
+UPDATE taxes SET rate = 0.00 WHERE eu = 0 OR eu IS NULL;
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/assets/functions.php b/assets/functions.php
index 340069c..4bbdee1 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -5627,12 +5627,12 @@ function generateSoftwareInvoice($invoice_data, $order_id, $language = 'US') {
// Extract customer data
$customer = $invoice_data['customer'] ?? [];
$customer_email = $customer['email'] ?? $invoice_data['payer_email'] ?? '';
- $customer_name = trim(($customer['first_name'] ?? '') . ' ' . ($customer['last_name'] ?? ''));
- $customer_address = $customer['address_street'] ?? '';
- $customer_city = $customer['address_city'] ?? '';
- $customer_state = $customer['address_state'] ?? '';
- $customer_zip = $customer['address_zip'] ?? '';
- $customer_country = $customer['address_country'] ?? '';
+ $customer_name = $customer['name'] ?? trim(($customer['first_name'] ?? '') . ' ' . ($customer['last_name'] ?? ''));
+ $customer_address = $customer['street'] ?? $customer['address_street'] ?? '';
+ $customer_city = $customer['city'] ?? $customer['address_city'] ?? '';
+ $customer_state = $customer['state'] ?? $customer['address_state'] ?? '';
+ $customer_zip = $customer['zip'] ?? $customer['address_zip'] ?? '';
+ $customer_country = $customer['country'] ?? $customer['address_country'] ?? '';
// Extract transaction data
$pricing = $invoice_data['pricing'] ?? [];
@@ -5744,6 +5744,54 @@ function generateSoftwareInvoice($invoice_data, $order_id, $language = 'US') {
}
}
+ // Calculate VAT note based on country and VAT number
+ $vat_note = '';
+ $customer_vat_number = $customer['vat_number'] ?? '';
+
+ // Load countries array
+ include dirname(__FILE__,2).'/settings/countries.php';
+
+ debuglog("Customer Country: " . ($customer_country ?? 'NULL'));
+ debuglog("Customer VAT: " . ($customer_vat_number ?? 'NULL'));
+
+ if (!empty($customer_country) && isset($countries)) {
+ // Find country data
+ $country_data = null;
+ foreach ($countries as $country_info) {
+ if ($country_info['country'] === $customer_country) {
+ $country_data = $country_info;
+ break;
+ }
+ }
+
+ if ($country_data) {
+ $is_eu = $country_data['eu'] === 1;
+ $is_netherlands = $customer_country === 'Netherlands';
+
+ if ($is_netherlands) {
+ // Netherlands: no special note needed
+ $vat_note = '';
+ } elseif ($is_eu) {
+ if (!empty($customer_vat_number)) {
+ // EU with VAT number: reverse charge
+ $vat_note = 'Reverse charge VAT';
+ } else {
+ // EU without VAT number: local VAT
+ $vat_note = 'Local VAT';
+ }
+ } else {
+ // Non-EU: out of scope
+ $vat_note = 'Out of scope of EU VAT. Buyer is responsible for local taxes and duties';
+ }
+
+ debuglog("VAT Note set to: " . ($vat_note ?: 'EMPTY'));
+ } else {
+ debuglog("Country NOT found in array: " . $customer_country);
+ }
+ } else {
+ debuglog("Empty customer_country or countries not loaded");
+ }
+
// Build HTML for PDF and EMAIL
include dirname(__FILE__,2).'/assets/mail/email_template_invoice.php';
include dirname(__FILE__,2).'/assets/mail/pdf_template_invoice.php';
@@ -5816,7 +5864,8 @@ function generateCountriesFile($token){
foreach($taxes as $tax){
$countries[$tax['id']] = [
'country' => $tax['country'] ?? '',
- 'taxes' => $tax['rate'] ?? 0
+ 'taxes' => $tax['rate'] ?? 0,
+ 'eu' => $tax['eu'] ?? 0
];
}
@@ -5826,7 +5875,7 @@ function generateCountriesFile($token){
$fileContent .= "// Generated on: " . date('Y-m-d H:i:s') . "\n\n";
$fileContent .= "\$countries = [\n";
foreach($countries as $id => $data){
- $fileContent .= " " . $id . " => ['country' => '" . addslashes($data['country']) . "', 'taxes' => " . $data['taxes'] . "],\n";
+ $fileContent .= " " . $id . " => ['country' => '" . addslashes($data['country']) . "', 'taxes' => " . $data['taxes'] . ",'eu' => " . $data['eu'] . "],\n";
}
$fileContent .= "];\n";
diff --git a/assets/mail/email_template_invoice.php b/assets/mail/email_template_invoice.php
index 8e936c9..52e8bd9 100644
--- a/assets/mail/email_template_invoice.php
+++ b/assets/mail/email_template_invoice.php
@@ -122,14 +122,24 @@ $message .= '
';
if ($tax_amount > 0) {
+ $tax_percentage = ($subtotal > 0) ? round(($tax_amount / $subtotal) * 100, 2) : 0;
+ $vat_label = htmlspecialchars($lbl_tax) . ' (' . $tax_percentage . '%)';
+ if (!empty($vat_note)) {
+ $vat_label .= ' (' . htmlspecialchars($vat_note) . ')';
+ }
$message .= '
- | ' . htmlspecialchars($lbl_tax) . ' |
+ ' . $vat_label . ' |
€ ' . number_format($tax_amount, 2) . ' |
';
} else {
+ $vat_label = 'VAT';
+ if (!empty($vat_note)) {
+ $vat_label .= ' (' . htmlspecialchars($vat_note) . ')';
+ }
+ $vat_amount_display = !empty($vat_note) ? '€ 0.00' : 'included';
$message .= '
- | VAT |
- included |
+ ' . $vat_label . ' |
+ ' . $vat_amount_display . ' |
';
}
diff --git a/assets/mail/pdf_template_invoice.php b/assets/mail/pdf_template_invoice.php
index cf99e04..f2bee57 100644
--- a/assets/mail/pdf_template_invoice.php
+++ b/assets/mail/pdf_template_invoice.php
@@ -299,14 +299,23 @@ $pdf .= '
if ($tax_amount > 0) {
$tax_percentage = ($subtotal > 0) ? round(($tax_amount / $subtotal) * 100, 2) : 0;
+ $vat_label = htmlspecialchars($lbl_tax) . ' (' . $tax_percentage . '%)';
+ if (!empty($vat_note)) {
+ $vat_label .= ' (' . htmlspecialchars($vat_note) . ')';
+ }
$pdf .= '
-
' . htmlspecialchars($lbl_tax) . ' (' . $tax_percentage . '%)
+
' . $vat_label . '
€ ' . number_format($tax_amount, 2) . '
-
VAT
-
included
+
' . $vat_label . '
+
' . $vat_amount_display . '