' AS `open`, CONCAT('') AS `auswahl`";
+
+// $moreinfo = true; // Allow drop down details
+// $moreinfoaction = "lieferschein"; // specify suffix for minidetail-URL to allow different minidetails
+// $menucol = 11; // Set id col for moredata/menu
+
+ $menu = "| " . " |
"); +// echo($values."
"); +// echo($update."
"); + + $sql = "INSERT INTO lieferbedingungen (".$columns.") VALUES (".$values.") ON DUPLICATE KEY UPDATE ".$update; + +// echo($sql); + + $this->app->DB->Update($sql); + + if ($id == 'NULL') { + $msg = $this->app->erp->base64_url_encode("
Das Element wurde erfolgreich angelegt.
");
+ header("Location: index.php?module=lieferbedingungen&action=list&msg=$msg");
+ } else {
+ $this->app->Tpl->addMessage('success', 'Die Einstellungen wurden erfolgreich übernommen.');
+ }
+ }
+
+
+ // Load values again from database
+ if ($id != 'NULL') {
+
+ $dropnbox = "'' AS `open`, CONCAT('') AS `auswahl`";
+ $result = $this->app->DB->SelectArr("SELECT SQL_CALC_FOUND_ROWS l.id, $dropnbox, l.lieferbedingungen, l.kennzeichen, l.id FROM lieferbedingungen l"." WHERE id=$id");
+
+ foreach ($result[0] as $key => $value) {
+ $this->app->Tpl->Set(strtoupper($key), $value);
+ }
+
+ if (!empty($result)) {
+ $lieferbedingungen_from_db = $result[0];
+ } else {
+ return;
+ }
+ }
+
+ /*
+ * Add displayed items later
+ *
+
+ $this->app->Tpl->Add('KURZUEBERSCHRIFT2', $email);
+ $this->app->Tpl->Add('EMAIL', $email);
+ $this->app->Tpl->Add('ANGEZEIGTERNAME', $angezeigtername);
+
+ $this->app->YUI->AutoComplete("artikel", "artikelnummer");
+ $this->app->Tpl->Set('PROJEKT',$this->app->erp->ReplaceProjekt(false,$lieferbedingungen_from_db['projekt'],false));
+ $this->app->Tpl->Set('PRIO', $lieferbedingungen_from_db['prio']==1?"checked":"");
+
+ */
+
+ $this->app->Tpl->Parse('PAGE', "lieferbedingungen_edit.tpl");
+ }
+
+ /**
+ * Get all paramters from html form and save into $input
+ */
+ public function GetInput(): array {
+ $input = array();
+ //$input['EMAIL'] = $this->app->Secure->GetPOST('email');
+
+ $input['lieferbedingungen'] = $this->app->Secure->GetPOST('lieferbedingungen');
+ $input['kennzeichen'] = $this->app->Secure->GetPOST('kennzeichen');
+
+
+ return $input;
+ }
+ }
diff --git a/www/pages/onlineshops.php b/www/pages/onlineshops.php
index a1eea6e4..9cfda337 100644
--- a/www/pages/onlineshops.php
+++ b/www/pages/onlineshops.php
@@ -4739,7 +4739,7 @@ INNER JOIN shopexport s ON
}
$this->arrayToXmlHelper($subNode, $value, $nameSpaces,$subNodeName);
}
- } else {
+ } else if (gettype($value) == 'string') {
$subNode = $xmlObj->addChild((string)$subNodeName, htmlspecialchars($value, ENT_QUOTES), $nameSpace);
if(!empty($attributes)) {
foreach($attributes as $attribute) {
diff --git a/www/pages/shopimport.php b/www/pages/shopimport.php
index 0a1112d1..e093318d 100644
--- a/www/pages/shopimport.php
+++ b/www/pages/shopimport.php
@@ -1881,10 +1881,10 @@ class Shopimport
{
if($warenkorb['email']!=='amazon_import_bounce@nfxmedia.de')
{
- $checkidemail = $this->app->DB->Select("SELECT kundennummer FROM adresse WHERE email='".$warenkorb['email']."' and email <> '' $adresseprojekt AND geloescht!=1 AND kundennummer <> '' LIMIT 1");
+ $checkidemail = $this->app->DB->Select("SELECT kundennummer FROM adresse WHERE email='".$this->app->DB->real_escape_string($warenkorb['email'])."' and email <> '' $adresseprojekt AND geloescht!=1 AND kundennummer <> '' LIMIT 1");
}
if((String)$checkidemail === ''){
- $checkidemail = $this->app->DB->Select("SELECT kundennummer FROM adresse WHERE name LIKE '" . $warenkorb['name'] . "' AND ort LIKE '" . $warenkorb['ort'] . "' AND geloescht!=1 $adresseprojekt AND kundennummer <> '' LIMIT 1");
+ $checkidemail = $this->app->DB->Select("SELECT kundennummer FROM adresse WHERE name LIKE '" . $this->app->DB->real_escape_string($warenkorb['name']) . "' AND ort LIKE '" . $this->app->DB->real_escape_string($warenkorb['ort']) . "' AND geloescht!=1 $adresseprojekt AND kundennummer <> '' LIMIT 1");
}
}else{
$checkidemail = $this->app->DB->Select("SELECT kundennummer FROM adresse WHERE name='".$this->app->DB->real_escape_string($warenkorb['name'])."' AND strasse='".$this->app->DB->real_escape_string($warenkorb['strasse'])."' AND plz='".$this->app->DB->real_escape_string($warenkorb['plz'])."' AND ort='".$this->app->DB->real_escape_string($warenkorb['ort'])."' $adresseprojekt AND geloescht!=1 AND kundennummer <> '' LIMIT 1");
diff --git a/www/pages/versandpakete.php b/www/pages/versandpakete.php
index 791fedf0..e29bf326 100644
--- a/www/pages/versandpakete.php
+++ b/www/pages/versandpakete.php
@@ -642,11 +642,13 @@ class Versandpakete {
// Write to database
// Add checks here
- $sql = "SELECT status FROM versandpakete WHERE id = ".$id;
- $input['status'] = $this->app->DB->SelectArr($sql)[0]['status']; // Status is not changeable
+ $sql = "SELECT * FROM versandpakete WHERE id = ".$id;
+ $paket_db = $this->app->DB->SelectRow($sql);
+ $input['status'] = $paket_db['status']; // Status is not changeable
if ($input['status'] != 'neu') {
$input = Array('bemerkung' => $input['bemerkung']);
}
+
if (!empty($paket_db['tracking'])) { // Tracking is not changeable
unset($input['tracking']);
unset($input['tracking_link']);
diff --git a/www/widgets/_gen/widget.gen.adresse.php b/www/widgets/_gen/widget.gen.adresse.php
index f058afec..8e9da36c 100644
--- a/www/widgets/_gen/widget.gen.adresse.php
+++ b/www/widgets/_gen/widget.gen.adresse.php
@@ -667,6 +667,13 @@ class WidgetGenadresse
$field = new HTMLInput("kennung","text","","30","","","","","","","","0","","");
$this->form->NewField($field);
+ $field = new HTMLCheckbox("etikettautodruck","","","1","0","0");
+ $this->form->NewField($field);
+
+ $field = new HTMLInput("etikett","text","","30","","","","","","","","0","","");
+ $this->form->NewField($field);
+
+
}
}
diff --git a/www/widgets/templates/_gen/adresse.tpl b/www/widgets/templates/_gen/adresse.tpl
index 538843aa..87238e64 100644
--- a/www/widgets/templates/_gen/adresse.tpl
+++ b/www/widgets/templates/_gen/adresse.tpl
@@ -771,6 +771,27 @@ function abweichend(cmd) {
+
+
+
+
+
+
+
+
+
diff --git a/www/widgets/widget.adresse.php b/www/widgets/widget.adresse.php
index b65ab7c1..fa00fbfe 100644
--- a/www/widgets/widget.adresse.php
+++ b/www/widgets/widget.adresse.php
@@ -438,6 +438,11 @@ class WidgetAdresse extends WidgetGenAdresse
$this->app->Tpl->Set('NACHBUNDESSTAAT','-->');
}
+ $etikettenart = $this->app->erp->GetEtiketten();
+ $field = new HTMLSelect("etikett",0);
+ $field->AddOptionsAsocSimpleArray($etikettenart);
+ $this->form->NewField($field);
+
}
function ReplaceDecimal($db,$value,$fromform)
diff --git a/www/widgets/widget.projekt.php b/www/widgets/widget.projekt.php
index 8488f348..9732dcde 100644
--- a/www/widgets/widget.projekt.php
+++ b/www/widgets/widget.projekt.php
@@ -152,7 +152,6 @@ class WidgetProjekt extends WidgetGenProjekt
$field->AddOptionsAsocSimpleArray($drucker);
$this->form->NewField($field);
-
$drucker = $this->app->erp->GetDrucker();
$field = new HTMLSelect("kasse_drucker",0);
$field->AddOptionsAsocSimpleArray($drucker);