Skip to content

Fix VAT ID handling for Shopware 6 orders #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exciler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix VAT ID handling for Shopware 6 orders #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions www/pages/shopimport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,18 +826,41 @@ public function KundeAnlegenUpdate($shopimportid, $shopextid, $warenkorb, bool $
}
}
// abweichende lieferadresse gleich angelegen?
$lieferUstidEsc = $this->app->DB->real_escape_string((string)($warenkorb['lieferadresse_ustid'] ?? ''));
if (strlen($warenkorb['lieferadresse_ansprechpartner']) > 3) {
$this->app->DB->Insert("INSERT INTO lieferadressen (typ,name,abteilung,unterabteilung,land,strasse,ort,plz,adresszusatz,adresse) VALUES
('','{$warenkorb['lieferadresse_ansprechpartner']}',
'{$warenkorb['lieferadresse_abteilung']}','{$warenkorb['lieferadresse_unterabteilung']}','{$warenkorb['lieferadresse_land']}',
'{$warenkorb['lieferadresse_strasse']}','{$warenkorb['lieferadresse_ort']}','{$warenkorb['lieferadresse_plz']}','{$warenkorb['lieferadresse_adresszusatz']}','$adresse')");
$matchName = $this->app->DB->real_escape_string($warenkorb['lieferadresse_ansprechpartner']);
$matchStrasse = $this->app->DB->real_escape_string($warenkorb['lieferadresse_strasse']);
$matchPlz = $this->app->DB->real_escape_string($warenkorb['lieferadresse_plz']);
$matchOrt = $this->app->DB->real_escape_string($warenkorb['lieferadresse_ort']);
$existingId = $this->app->DB->Select("SELECT id FROM lieferadressen
WHERE adresse='$adresse' AND name='$matchName' AND strasse='$matchStrasse'
AND plz='$matchPlz' AND ort='$matchOrt' LIMIT 1");
if (!empty($existingId)) {
$this->app->DB->Update("UPDATE lieferadressen SET ustid='$lieferUstidEsc' WHERE id='$existingId' LIMIT 1");
} else {
$this->app->DB->Insert("INSERT INTO lieferadressen (typ,name,abteilung,unterabteilung,land,strasse,ort,plz,adresszusatz,adresse,ustid) VALUES
('','{$warenkorb['lieferadresse_ansprechpartner']}',
'{$warenkorb['lieferadresse_abteilung']}','{$warenkorb['lieferadresse_unterabteilung']}','{$warenkorb['lieferadresse_land']}',
'{$warenkorb['lieferadresse_strasse']}','{$warenkorb['lieferadresse_ort']}','{$warenkorb['lieferadresse_plz']}','{$warenkorb['lieferadresse_adresszusatz']}','$adresse','$lieferUstidEsc')");
}
}

if (strlen($warenkorb['lieferadresse_name']) > 3 && $warenkorb['lieferadresse_ansprechpartner'] == '') {
$this->app->DB->Insert("INSERT INTO lieferadressen (typ,name,abteilung,unterabteilung,land,strasse,ort,plz,adresszusatz,adresse) VALUES
('','{$warenkorb['lieferadresse_name']}',
'{$warenkorb['lieferadresse_abteilung']}','{$warenkorb['lieferadresse_unterabteilung']}','{$warenkorb['lieferadresse_land']}',
'{$warenkorb['lieferadresse_strasse']}','{$warenkorb['lieferadresse_ort']}','{$warenkorb['lieferadresse_plz']}','{$warenkorb['lieferadresse_adresszusatz']}','$adresse')");
$matchName = $this->app->DB->real_escape_string($warenkorb['lieferadresse_name']);
$matchStrasse = $this->app->DB->real_escape_string($warenkorb['lieferadresse_strasse']);
$matchPlz = $this->app->DB->real_escape_string($warenkorb['lieferadresse_plz']);
$matchOrt = $this->app->DB->real_escape_string($warenkorb['lieferadresse_ort']);
$existingId = $this->app->DB->Select("SELECT id FROM lieferadressen
WHERE adresse='$adresse' AND name='$matchName' AND strasse='$matchStrasse'
AND plz='$matchPlz' AND ort='$matchOrt' LIMIT 1");
if (!empty($existingId)) {
$this->app->DB->Update("UPDATE lieferadressen SET ustid='$lieferUstidEsc' WHERE id='$existingId' LIMIT 1");
} else {
$this->app->DB->Insert("INSERT INTO lieferadressen (typ,name,abteilung,unterabteilung,land,strasse,ort,plz,adresszusatz,adresse,ustid) VALUES
('','{$warenkorb['lieferadresse_name']}',
'{$warenkorb['lieferadresse_abteilung']}','{$warenkorb['lieferadresse_unterabteilung']}','{$warenkorb['lieferadresse_land']}',
'{$warenkorb['lieferadresse_strasse']}','{$warenkorb['lieferadresse_ort']}','{$warenkorb['lieferadresse_plz']}','{$warenkorb['lieferadresse_adresszusatz']}','$adresse','$lieferUstidEsc')");
}
}
}

Expand Down
26 changes: 20 additions & 6 deletions www/pages/shopimporter_shopware6.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3422,6 +3422,20 @@ public function ImportGetAuftrag()
$order['customer'] = $customer;
$cart['email'] = $customer['data']['0']['attributes']['email'];

$customerVatId = '';
$customerAttrs = $customer['data'][0]['attributes'] ?? [];
if (!empty($customerAttrs['vatIds']) && is_array($customerAttrs['vatIds'])) {
foreach ($customerAttrs['vatIds'] as $vatIdCandidate) {
if (is_string($vatIdCandidate) && trim($vatIdCandidate) !== '') {
$customerVatId = trim($vatIdCandidate);
break;
}
}
}
if ($customerVatId === '' && !empty($customerAttrs['vatId'])) {
$customerVatId = trim((string)$customerAttrs['vatId']);
}

$addresses = $this->shopwareRequest(
'GET',
'order/' . $order['id'] . '/addresses?associations[salutation][]&associations[country][]',
Expand All @@ -3432,9 +3446,9 @@ public function ImportGetAuftrag()
$billingSalutationId = '';
foreach ($addresses['data'] as $address) {
if ($address['id'] === $order['attributes']['billingAddressId']) {
if (!empty($address['attributes']['vatId'])) {
$cart['ustid'] = $address['attributes']['vatId'];
}
$cart['ustid'] = !empty($address['attributes']['vatId'])
? $address['attributes']['vatId']
: $customerVatId;
$cart['name'] = $address['attributes']['firstName'] . ' ' . $address['attributes']['lastName'];
if (!empty($address['attributes']['company'])) {
$cart['ansprechpartner'] = $cart['name'];
Expand All @@ -3454,9 +3468,9 @@ public function ImportGetAuftrag()
}
if ($address['id'] !== $order['attributes']['billingAddressId']) {
$cart['abweichendelieferadresse'] = 1;
if (!empty($address['attributes']['vatId'])) {
$cart['lieferadresse_ustid'] = $address['attributes']['vatId'];
}
$cart['lieferadresse_ustid'] = !empty($address['attributes']['vatId'])
? $address['attributes']['vatId']
: $customerVatId;
$cart['lieferadresse_name'] = $address['attributes']['firstName'] . ' ' . $address['attributes']['lastName'];
if (!empty($address['attributes']['company'])) {
$cart['lieferadresse_ansprechpartner'] = $cart['lieferadresse_name'];
Expand Down