Index: /lib/install.php =================================================================== --- /lib/install.php (revision 6091) +++ /lib/install.php (revision 6094) @@ -83,5 +83,5 @@ /** - * Kundentabelle + * Kundentabelle ALT */ $sql = "CREATE TABLE ".WPSG_TBL_KU." ( @@ -94,5 +94,6 @@ custom TEXT NOT NULL, adress_id INT(11) NOT NULL COMMENT 'Link zu WPSG_TBL_ADRESS (Kundenadresse)', - KEY adress_id (adress_id), + deleted INT(11) NOT NULL COMMENT 'Markierung fÌr gelöschte Kunden', + KEY adress_id (adress_id), PRIMARY KEY (id) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;"; Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 6091) +++ /lib/wpsg_basket.class.php (revision 6094) @@ -592,5 +592,5 @@ // Berechnen $arBasket = $this->toArray(); - + // Keine Produkte nix speichern // Sonst wurden schon beim Betreten des leeren Warenkorb (Bots) leere Bestellungen erzeugt @@ -603,12 +603,13 @@ 'ustidnr' => wpsg_q(wpsg_getStr($this->arCheckout['ustidnr'])) ); - + $this->shop->callMods('basket_save_kunde', array(&$data, &$this->arCheckout)); $saved_order_db = array(); + $k_id = wpsg_getStr($this->arCheckout['id']); if (wpsg_isSizedInt($_SESSION['wpsg']['order_id'])) { - + $saved_order_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($_SESSION['wpsg']['order_id'])."' "); @@ -635,5 +636,5 @@ if (wpsg_isSizedInt($k_id) && $k_id != $_SESSION['wpsg']['checkout']['id']) { - + $k_id = $_SESSION['wpsg']['checkout']['id']; @@ -645,5 +646,5 @@ if (isset($this->arCheckout['custom']) && wpsg_isSizedArray($this->arCheckout)) $data['custom'] = $this->arCheckout['custom']; - + if (wpsg_isSizedInt($k_id)) { @@ -657,9 +658,9 @@ $data['custom'] = wpsg_array_merge($custom_old, (array)$this->arCheckout['custom']); - - } - - } - + + } + + } + $data['custom'] = serialize($data['custom']); @@ -685,10 +686,10 @@ } - + $k_id = $this->db->ImportQuery(WPSG_TBL_KU, $data); $knr = $this->shop->buildKNR($k_id); $update_customer_data['knr'] = wpsg_q($knr); - + $this->shop->callMods('customer_created', array(&$k_id, &$this->arCheckout['password'])); @@ -711,8 +712,21 @@ 'land' => wpsg_q(wpsg_getStr($this->arCheckout['land'])) ); - + $adress_data['cdate'] = 'NOW()'; + + $re_adress_id = 0; + if ($finish_order === true) { + + // Adresse als Rechnungsadresse anlegen + $re_adress_id = wpsg_q($this->db->ImportQuery(WPSG_TBL_ADRESS, $adress_data)); + + if (!wpsg_isSizedInt($customer_data['adress_id'])) + $update_customer_data['adress_id'] = $re_adress_id; + + } + + /* if (!wpsg_isSizedInt($customer_data['adress_id'])) { - + $adress_data['cdate'] = 'NOW()'; @@ -727,4 +741,5 @@ } + */ // Kundendaten ggf. aktualisieren @@ -733,5 +748,5 @@ $arBasket['checkout']['k_id'] = $k_id; $arBasket['checkout']['knr'] = $knr; - + // Produkte letztmalig ÌberprÌfen foreach ($arBasket['produkte'] as $p_id => $p) @@ -743,13 +758,13 @@ if (!$this->shop->callMod('wpsg_mod_stock', 'checkBestand', array($p['id'], $p['menge'])) && $this->shop->get_option('wpsg_mod_stock_allow') == '1') { - + $p['menge'] = $this->shop->callMod('wpsg_mod_stock', 'getBestand', array($p['id'])); - + } - - } - - } - + + } + + } + $data = array( 'cdate' => 'NOW()', @@ -779,5 +794,5 @@ 'wpsg_kleinunternehmer' => $this->shop->get_option('wpsg_kleinunternehmer'), 'wpsg_kleinunternehmer_text' => $this->shop->get_option('wpsg_kleinunternehmer_text') - ) + ) ); @@ -792,5 +807,5 @@ } - + /** Gutschein speichern */ if ($this->gs_id !== false && $this->gs_id > 0) @@ -803,5 +818,5 @@ $data['gs_id'] = wpsg_q($this->gs_id); $data['price_gs'] = wpsg_q($arBasket['sum']['gs']); - + } @@ -841,10 +856,11 @@ } - } + } $_REQUEST */ + $this->shop->callMods('basket_save_order', array(&$data, &$this->arCheckout, &$arBasket, $finish_order)); - if (($finish_order === true) && (wpsg_getStr($checkout['diff_shippingadress']) == '1')) - { //TODO Gesonderte Lieferadresse speichern + if (($finish_order === true) && (wpsg_getStr($this->arCheckout['diff_shippingadress']) == '1')) + { // Gesonderte Lieferadresse speichern $adata['cdate'] = 'NOW()'; @@ -860,14 +876,21 @@ $data['shipping_adress_id'] = wpsg_q($this->db->ImportQuery(WPSG_TBL_ADRESS, $adata)); - - } - $data['adress_id'] = $customer_data['adress_id']; + + // Daten fÌr BestellbestÀtigungsmail bereitstellen + $arBasket['checkout']['shipping_title'] = $data['shipping_title']; + $arBasket['checkout']['shipping_vname'] = $data['shipping_vname']; + $arBasket['checkout']['shipping_name'] = $data['shipping_name']; + $arBasket['checkout']['shipping_strasse'] = $data['shipping_strasse']; + $arBasket['checkout']['shipping_plz'] = $data['shipping_plz']; + $arBasket['checkout']['shipping_ort'] = $data['shipping_ort']; + $arBasket['checkout']['shipping_firma'] = $data['shipping_firma']; + $arBasket['checkout']['shipping_land'] = $data['shipping_land']; + + } + $data['adress_id'] = $re_adress_id; $data['custom_data']['basket']['oOrder'] = Array(); //unset($data['custom_data']['basket']['oOrder']['shop']); - $sw = wpsg_q(serialize($data['custom_data'])); - $sl = strlen($sw); - //echo "wpsg_q:
".$sw; $data['custom_data'] = wpsg_q(serialize($data['custom_data'])); @@ -891,7 +914,7 @@ 'onr' => wpsg_q($o_nr) ), "`id` = '".wpsg_q($o_id)."'"); - - } - + + } + $arBasket['checkout']['onr'] = $o_nr; $arBasket['checkout']['o_id'] = $o_id; @@ -907,7 +930,7 @@ if ($gs_db['multi'] != '1') { - + $this->db->UpdateQuery(WPSG_TBL_GUTSCHEIN, array('o_id' => $o_id), "`id` = '".wpsg_q($this->gs_id)."'"); - + } @@ -928,5 +951,5 @@ // Aufdröselung der Varianten damit in der DB die korrekt Produkt ID steht $produkt_id = $this->shop->getProduktID($p['id']); - + $data = array( 'o_id' => wpsg_q($o_id), @@ -984,5 +1007,5 @@ } - + if ($finish_order === true) { @@ -990,5 +1013,5 @@ $this->shop->callMods('basket_save_done', array(&$o_id, &$k_id, &$this)); $this->shop->callMods('basket_save_done_array', array(&$o_id, &$k_id, &$arBasket)); - + // Wenn CrefoPay aktiv, werden die Mails spÀter versendet if (!$this->shop->hasMod('wpsg_mod_crefopay')) $this->sendOrderSaveMails($o_id, $arBasket); @@ -1031,5 +1054,5 @@ return $o_id; - + } // public function save() @@ -1945,5 +1968,5 @@ $id = $this->arOrder['type_shipping']; - $tax_keys = $this->shop->arShipping[$id]['mwst_key']; + $tax_keys = wpsg_getStr($this->shop->arShipping[$id]['mwst_key']); $mb->setShippingKosten($arReturn, 'x', $prices, $tax_keys); $taxs = $arReturn['shipping']['mwst']; Index: /mods/wpsg_mod_deliverynote.class.php =================================================================== --- /mods/wpsg_mod_deliverynote.class.php (revision 6091) +++ /mods/wpsg_mod_deliverynote.class.php (revision 6094) @@ -214,5 +214,5 @@ { - // Vorschau einer Rechnung aus der Bestellverwaltung + // Vorschau eines Lieferscheines aus der Bestellverwaltung $this->writeDeliverynote( $_REQUEST['edit_id'], Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 6091) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 6094) @@ -79,5 +79,5 @@ $this->db->UpdateQuery(WPSG_TBL_KU, array( 'status' => '1' - ), '1'); + ), " `deleted` != '1' "); $this->shop->addBackendMessage(__('Alle Kunden wurden auf Aktiv gesetzt.', 'wpsg')); @@ -90,5 +90,5 @@ $this->db->UpdateQuery(WPSG_TBL_KU, array( 'status' => '0' - ), '1'); + ), " `deleted` != '1' "); $this->shop->addBackendMessage(__('Alle Kunden wurden auf Inaktiv gesetzt.', 'wpsg')); @@ -983,5 +983,5 @@ { - $this->shop->view['data']['custom'][$k] = $this->shop->view['custom_values'][$k]; + $this->shop->view['data']['custom'][$k] = wpsg_getStr($this->shop->view['custom_values'][$k]); } @@ -1403,4 +1403,5 @@ // Export WPSG_TBL_KU und WPSG_TBL_ADRESS //$arData = $this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_KU)."` "); + /* $arData = $this->db->fetchAssoc(" SELECT @@ -1410,4 +1411,27 @@ LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = C.`adress_id`) "); + */ + + $arData = $this->db->fetchAssoc(" + SELECT + C.*, C.`id` AS kid, + IF (CA.`id` > 0, CA.`title`, C.`title`) AS `title`, + IF (CA.`id` > 0, CA.`name`, C.`name`) AS `name`, + IF (CA.`id` > 0, CA.`vname`, C.`vname`) AS `vname`, + IF (CA.`id` > 0, CA.`firma`, C.`firma`) AS `firma`, + IF (CA.`id` > 0, CA.`fax`, C.`fax`) AS `fax`, + IF (CA.`id` > 0, CA.`strasse`, C.`strasse`) AS `strasse`, + IF (CA.`id` > 0, CA.`nr`, '') AS `nr`, + IF (CA.`id` > 0, CA.`plz`, C.`plz`) AS `plz`, + IF (CA.`id` > 0, CA.`ort`, C.`ort`) AS `ort`, + IF (CA.`id` > 0, CA.`land`, C.`land`) AS `land`, + IF (CA.`id` > 0, CA.`tel`, C.`tel`) AS `tel`, + CA.`id` + FROM + `".wpsg_q(WPSG_TBL_KU)."` AS C + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = C.`adress_id`) + WHERE + C.`deleted` != '1' + "); if (!wpsg_isSizedArray($arData)) { $this->addBackendError(__('Keine Daten zum Exportieren vorhanden.', 'wpsg')); $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer&action=index'); return; } @@ -1417,5 +1441,5 @@ $fp = fopen($path.'/wpsg_customerexport.csv', 'w'); - fputcsv($fp, array_keys($arData[0]), ';'); + fputcsv($fp, array_keys($arData[0]), ','); foreach ($arData as $e) { @@ -1431,6 +1455,6 @@ } - //fputcsv($fp, $e, ',', '"'); - fputcsv($fp, $e, ';', '"'); + fputcsv($fp, $e, ',', '"'); + //fputcsv($fp, $e, ';', '"'); } @@ -1465,5 +1489,5 @@ $i = 0; - while (($row = fgetcsv ($handle, 0, ";")) !== FALSE ) + while (($row = fgetcsv ($handle, 0, ",")) !== FALSE ) { @@ -1722,4 +1746,6 @@ $data['custom'] = @serialize($_REQUEST['custom']); + + if (isset($_REQUEST['deleted'])) $data['deleted'] = $_REQUEST['deleted']; if ($_REQUEST['password1'] == $_REQUEST['password2'] && trim($_REQUEST['password1']) != '') @@ -1817,5 +1843,5 @@ private function be_indexAction() { - + $nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage'); if ($nPerPage <= 0) $nPerPage = 10; @@ -1860,5 +1886,183 @@ $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml'); - + + + /* + // NEU von Shop V3 $strQuery ist unvollstÀndig + $strQueryWHERE = ""; + + if (isset($_REQUEST['s']) && $_REQUEST['s'] != '') + { + + $strQueryWHERE .= " + AND ( + IF (CA.`id` > 0, CA.`name`, K.`name`) LIKE '%".wpsg_q($_REQUEST['s'])."%' OR + IF (CA.`id` > 0, CA.`vname`, K.`vname`) LIKE '%".wpsg_q($_REQUEST['s'])."%' OR + K.`email` LIKE '%".wpsg_q($_REQUEST['s'])."%' OR + K.`id` = '".wpsg_q($_REQUEST['s'])."' OR + K.`knr` LIKE '%".wpsg_q($_REQUEST['s'])."%' + ) + "; + + } + + if ($this->shop->hasMod('wpsg_mod_customergroup')) + { + + if (isset($_REQUEST['customergroup']) && $_REQUEST['customergroup'] > 0) + { + + $strQueryWHERE .= " AND `group_id` = '".wpsg_q($_REQUEST['customergroup'])."' "; + + } + else if (isset($_REQUEST['customergroup']) && $_REQUEST['customergroup'] === '0') + { + + $strQueryWHERE .= " AND (`group_id` = 0 OR `group_id` IS NULL) "; + + } + + } + + // Damit "Geisterkunden" aus unvollstÀndigen Bestellungen nicht erscheinen + //$strQueryWHERE .= " AND K.`email` != '' "; + + $nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage'); + if ($nPerPage <= 0) $nPerPage = 10; + + if (isset($_REQUEST['seite'])) $seite = $_REQUEST['seite']; else $seite = 1; + + $this->shop->view['count'] = $this->db->fetchOne(" + SELECT + COUNT(*) + FROM + ( + SELECT + K.`id`, + (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count, + (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete + FROM + `".WPSG_TBL_KU."` AS K + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = K.`adress_id`) + WHERE + ( + IF (CA.`id` > 0, CA.`vname`, K.`vname`) != '' OR + IF (CA.`id` > 0, CA.`name`, K.`name`) != '' OR + K.`email` != '' + ) + AND K.`deleted` != '1' + ".$strQueryWHERE." + ) AS OUTER_TABLE + "); + + $this->shop->view['seite'] = $seite; + $this->shop->view['pages'] = ceil($this->shop->view['count'] / $nPerPage); + if ($this->shop->view['seite'] <= 0 || $this->shop->view['seite'] > $this->shop->view['pages']) $this->shop->view['seite'] = 1; + + if (isset($_REQUEST['filter'])) + $this->shop->view['filter'] = $_REQUEST['filter']; + else + $this->shop->view['filter'] = array(); + + $strQueryORDER = ''; + + if (!isset($this->shop->view['filter']['order'])) + { + + $this->shop->view['filter']['order'] = 'nr'; + + } + + switch ($this->shop->view['filter']['order']) + { + + case 'name': $strQueryORDER .= "`order_name`"; break; + case 'adress': $strQueryORDER = "`order_adress`"; break; + case 'status': $strQueryORDER = "`order_count`"; break; + default: $strQueryORDER = " `order_nr` "; break; + + } + + if (!isset($this->shop->view['filter']['ascdesc'])) + { + + $this->shop->view['filter']['ascdesc'] = 'DESC'; + + } + + if (wpsg_isSizedString($this->shop->get_option('wpsg_order_knr'), '1')) $strQueryORDERNR = " `knr` AS `order_nr` "; + else $strQueryORDERNR = " CAST(`knr` AS UNSIGNED) AS `order_nr` "; + + // Das HAVING ist so "kompliziert" weil ich erreichen wollte das Kunden die gÀnzlich keine Bestellungen haben dennoch angezeigt werden + // Kunden die aber nur unvollstÀndige Bestellungen haben aber nicht + $strQuery = " + SELECT + K.*, + IF (CA.`id` > 0, CA.`title`, K.`title`) AS `title`, + IF (CA.`id` > 0, CA.`name`, K.`name`) AS `name`, + IF (CA.`id` > 0, CA.`vname`, K.`vname`) AS `vname`, + IF (CA.`id` > 0, CA.`firma`, K.`firma`) AS `firma`, + IF (CA.`id` > 0, CA.`fax`, K.`fax`) AS `fax`, + IF (CA.`id` > 0, CA.`strasse`, K.`strasse`) AS `strasse`, + IF (CA.`id` > 0, CA.`nr`, '') AS `nr`, + IF (CA.`id` > 0, CA.`plz`, K.`plz`) AS `plz`, + IF (CA.`id` > 0, CA.`ort`, K.`ort`) AS `ort`, + IF (CA.`id` > 0, CA.`land`, K.`land`) AS `land`, + IF (CA.`id` > 0, CA.`tel`, K.`tel`) AS `tel`, + IF (CA.`id` > 0, CAL.`kuerzel`, L.`kuerzel`) AS land_kuerzel, + IF (CA.`id` > 0, CONCAT(CA.`firma`, ' ', CA.`strasse`, ' ', CA.`plz`, ' ', CA.`ort`), CONCAT(K.`firma`, ' ', K.`strasse`, ' ', K.`plz`, ' ', K.`ort`)) AS `order_adress`, + IF (CA.`id` > 0, CONCAT(CA.`vname`, ' ', CA.`name`), CONCAT(K.`vname`, ' ', K.`name`)) AS `order_name`, + ".$strQueryORDERNR.", + (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count, + (SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete, + (SELECT SUM(`price_gesamt`) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` IN (100, 110)) as order_umsatz + FROM + `".WPSG_TBL_KU."` AS K + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = K.`adress_id`) + LEFT JOIN `".WPSG_TBL_LAND."` AS CAL ON (CAL.`id` = CA.`land`) + LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (K.`land` = L.`id`) + WHERE + ( + IF (CA.`id` > 0, CA.`vname`, K.`vname`) != '' OR + IF (CA.`id` > 0, CA.`name`, K.`name`) != '' OR + K.`email` != '' + ) + AND K.`deleted` != '1' + ".$strQueryWHERE." + ORDER BY + ".$strQueryORDER." ".wpsg_q($this->shop->view['filter']['ascdesc']).", K.`id` DESC + LIMIT + ".(($this->shop->view['seite'] - 1) * $nPerPage).", ".$nPerPage." + "; + + $this->shop->view['data'] = $this->db->fetchAssoc($strQuery); + + // Kundengruppen laden + if ($this->shop->hasMod('wpsg_mod_customergroup')) + { + + $this->shop->view['arCustomergroup'] = $this->db->fetchAssocField(" + SELECT + KG.`id`, CONCAT(KG.`name`, ' (ID:', KG.`id`, ')') AS `name` + FROM + `".WPSG_TBL_KG."` AS KG + ORDER BY + KG.`name` ASC + ", "id", "name"); + + } + + foreach ($this->shop->view['data'] as $k => $customer_db) + { + + $this->shop->view['data'][$k]['oCustomer'] = new wpsg_customer(); + $this->shop->view['data'][$k]['oCustomer']->load($customer_db['id']); + $this->shop->view['data'][$k]['order_umsatz'] = $this->shop->view['data'][$k]['oCustomer']->getOrderAmount(array(100, 110)); + + } + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml'); + */ + } // private function be_indexAction() @@ -1894,15 +2098,54 @@ $kunde = $this->db->fetchRow(" SELECT - K.`firma`, K.`title`, K.`vname`, K.`name`, K.`geb`, - K.`fax`, K.`tel`, K.`strasse`, K.`ort`, K.`plz`, K.`land`, - K.`ustidnr`, K.`email`, K.`id`, K.`wp_user_id` + C.`id`, + IF (CA.`id` > 0, CA.`title`, C.`title`) AS `title`, + IF (CA.`id` > 0, CA.`name`, C.`name`) AS `name`, + IF (CA.`id` > 0, CA.`vname`, C.`vname`) AS `vname`, + IF (CA.`id` > 0, CA.`firma`, C.`firma`) AS `firma`, + IF (CA.`id` > 0, CA.`fax`, C.`fax`) AS `fax`, + IF (CA.`id` > 0, CA.`strasse`, C.`strasse`) AS `strasse`, + IF (CA.`id` > 0, CA.`nr`, '') AS `nr`, + IF (CA.`id` > 0, CA.`plz`, C.`plz`) AS `plz`, + IF (CA.`id` > 0, CA.`ort`, C.`ort`) AS `ort`, + IF (CA.`id` > 0, CA.`land`, C.`land`) AS `land`, + IF (CA.`id` > 0, CA.`tel`, C.`tel`) AS `tel`, + C.`geb`, C.`ustidnr`, C.`email`, C.`id`, C.`wp_user_id` FROM - `".WPSG_TBL_KU."` AS K + `".WPSG_TBL_KU."` AS C + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = C.`adress_id`) WHERE - K.`id` = '".wpsg_q($kunde_id)."' + C.`id` = '".wpsg_q($kunde_id)."' AND + C.`deleted` != '1' "); + + if ($kunde['id'] != $kunde_id) return; if (!is_array($_SESSION['wpsg']['checkout'])) $_SESSION['wpsg']['checkout'] = array(); - + + if (wpsg_isSizedInt($_SESSION['wpsg']['order_id'])) + { + + $temp_k_id = $this->db->fetchOne("SELECT `k_id` FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($_SESSION['wpsg']['order_id'])."' "); + + if (wpsg_isSizedInt($temp_k_id) && $temp_k_id != $kunde_id) + { + + // TemporÀren Kunden löschen + // Zur Sicherheit check ich mal ob es Bestellungen mit ihm gibt. + $count_order = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` WHERE `k_id` = '".wpsg_q($temp_k_id)."' AND `id` != '".wpsg_q($_SESSION['wpsg']['order_id'])."' "); + + if ($count_order > 0) $this->shop->throwErrorCode('3100_1'); + else + { + + $oCustomer = wpsg_customer::getInstance($temp_k_id); + $oCustomer->delete(); + + } + + } + + } + $_SESSION['wpsg']['checkout'] = wpsg_array_merge($_SESSION['wpsg']['checkout'], wpsg_xss(array( 'id' => $kunde['id'], @@ -1917,4 +2160,5 @@ 'tel' => $kunde['tel'], 'strasse' => $kunde['strasse'], + 'nr' => $kunde['nr'], 'plz' => $kunde['plz'], 'ort' => $kunde['ort'], Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 6091) +++ /mods/wpsg_mod_productvariants.class.php (revision 6094) @@ -285,6 +285,590 @@ } // public function getProductKeyFromRequest($product_id, $form_data) + public function produkt_ajax() + { + + //error_reporting(E_ALL); + + if (isset($_REQUEST['cmd']) && $_REQUEST['cmd'] == 'wpsg_vp_add') + { + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + $data = array( + "name" => $_REQUEST['name'], + "typ" => $_REQUEST['typ'], + "aktiv" => "1" + ); + + if ($_REQUEST['typ'] == "checkbox") + { + $data['preis'] = "0"; + } + else + { + $data['vari'] = array(); + } + + $vp_data[] = $data; + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + + $this->shop->view['message'] = array(0, __("Variante erfolgreich angelegt.", "wpsg")); + + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == 'wpsg_var_reorder') + { + + parse_str($_REQUEST['wpsg_reorder'], $wpsg_reorder); + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + $vp_data_neu = array(); + + foreach ($wpsg_reorder['variante'] as $order) + { + + if (array_key_exists($order, $vp_data)) + { + + $vp_data_neu[] = $vp_data[$order]; + unset($vp_data[$order]); + + } + else + { + + $this->shop->throwErrorCode('98_1'); + + } + + } + + if (wpsg_isSizedArray($vp_data)) + { + + $this->shop->throwErrorCode('98_2'); + + } + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data_neu); + + $this->shop->view['message'] = array(0, __('Variantenreihenfolge gespeichert.', 'wpsg')); + + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == 'wpsg_vari_reorder') + { + + parse_str($_REQUEST['wpsg_reorder'], $wpsg_reorder); + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + foreach ($wpsg_reorder as $var_key => $order) + { + + $var_id = preg_replace('/^variorder\_/', '', $var_key); + + wpsg_array_reorder($vp_data[$var_id]['vari'], $order); + + if (wpsg_isSizedArray($vp_data[$var_id]['lang'])) + { + + foreach ($vp_data[$var_id]['lang'] as $lang_key => $lang_vari) + { + + wpsg_array_reorder($vp_data[$var_id]['lang'][$lang_key]['vari'], $order); + + } + + } + + } + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + + $this->shop->view['message'] = array(0, __("Variationenreihenfolge gespeichert.", "wpsg")); + + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == 'wpsg_vp_refreh') + { + + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == "wpsg_vp_del") + { + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + unset($vp_data[$_REQUEST['var_id']]); + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + + $this->shop->view['message'] = array(0, __("Variante wurde erfolgreich gelöscht.", "wpsg")); + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == "wpsg_vp_deaktiv") + { + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + if ($_REQUEST['status'] == "1") + { + + $vp_data[$_REQUEST['var_id']]['aktiv'] = 1; + $this->shop->view['message'] = array(0, __("Variante wurde erfolgreich aktiviert.", "wpsg")); + + } + else + { + + $vp_data[$_REQUEST['var_id']]['aktiv'] = 0; + $this->shop->view['message'] = array(0, __("Variante wurde erfolgreich deaktiviert.", "wpsg")); + + } + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == "wpsg_vp_addVariation") + { + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + $vp_data[$_REQUEST['var_id']]['vari'][] = array( + "name" => $_REQUEST['vari_name'], + "preis" => wpsg_tf($_REQUEST['vari_preis']), + "aktiv" => "1" + ); + + $this->shop->view['message'] = array(0, __("Variation wurde erfolgreich angelegt.", "wpsg")); + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == "wpsg_vp_vari_del") + { + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + unset($vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]); + + if (wpsg_isSizedArray($vp_data[$_REQUEST['var_id']]['lang'])) + { + + foreach ($vp_data[$_REQUEST['var_id']]['lang'] as $lang_key => $lang_vari) + { + + unset($vp_data[$_REQUEST['var_id']]['lang'][$lang_key]['vari'][$_REQUEST['vari_id']]); + + } + + } + + $this->shop->view['message'] = array(0, __("Variation wurde erfolgreich gelöscht.", "wpsg")); + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == "wpsg_vp_vari_deaktiv") + { + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + if ($_REQUEST['status'] == "1") + { + + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['aktiv'] = 1; + $this->shop->view['message'] = array(0, __("Variation wurde erfolgreich aktiviert.", "wpsg")); + + } + else + { + + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['aktiv'] = 0; + $this->shop->view['message'] = array(0, __("Variation wurde erfolgreich deaktiviert.", "wpsg")); + + } + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + die($this->drawVarianten($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == 'wpsg_var_setImageOrder') + { + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + if ($_REQUEST['vari_id'] == -1) + { + + $vp_data[$_REQUEST['var_id']]['picOrder'] = $_REQUEST['wpsg_reorder']; + + } + else + { + + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['picOrder'] = $_REQUEST['wpsg_reorder']; + + } + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + + die("1"); + + } + else if ($_REQUEST['cmd'] == 'wpsg_vp_vari_setPic') + { + //die('wpsg_vp_vari_setPic'); + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + + if ($_REQUEST['vari_id'] >= 0) + { + + $arPic = explode(",", $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['pic']); + + if (in_array($_REQUEST['pic'], $arPic)) + { + unset($arPic[array_search($_REQUEST['pic'], $arPic)]); + } + else + { + $arPic[] = $_REQUEST['pic']; + } + + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['pic'] = implode(",", $arPic); + + } + else + { + + $arPic = explode(",", $vp_data[$_REQUEST['var_id']]['pic']); + + if (in_array($_REQUEST['pic'], $arPic)) + { + unset($arPic[array_search($_REQUEST['pic'], $arPic)]); + } + else + { + $arPic[] = $_REQUEST['pic']; + } + + $vp_data[$_REQUEST['var_id']]['pic'] = implode(",", $arPic); + + } + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + + die("1"); + + } + else if ($_REQUEST['cmd'] == 'wpsg_vp_vari_inlineEdit') + { + + + $vp_data = $this->loadVarianten($_REQUEST['edit_id']); + $product_data = $this->shop->cache->loadProduct($_REQUEST['edit_id']); + + if ($_REQUEST['typ'] == "vari_name") + { + + if (wpsg_isSizedString($_REQUEST['wpsg_lang'])) + { + $vp_data[$_REQUEST['var_id']]['lang'][$_REQUEST['wpsg_lang']]['vari'][$_REQUEST['vari_id']]['name'] = wpsg_q($_REQUEST['value']); + } + else + { + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['name'] = wpsg_q($_REQUEST['value']); + } + + } + else if ($_REQUEST['typ'] == "vari_artnr") + { + + if (wpsg_isSizedString($_REQUEST['wpsg_lang'])) + { + $vp_data[$_REQUEST['var_id']]['lang'][$_REQUEST['wpsg_lang']]['vari'][$_REQUEST['vari_id']]['artnr'] = wpsg_q($_REQUEST['value']); + } + else + { + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['artnr'] = wpsg_q($_REQUEST['value']); + } + + } + else if ($_REQUEST['typ'] == "vari_preis") + { + + $_REQUEST['value'] = wpsg_tf($_REQUEST['value']); + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['preis'] = $_REQUEST['value']; + $_REQUEST['value'] = wpsg_ff($_REQUEST['value'], $this->shop->get_option('wpsg_currency')); + + } + else if ($_REQUEST['typ'] == "vari_fmenge") + { + + $arFeinheiten = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit')); + + $_REQUEST['value'] = wpsg_ff(wpsg_tf($_REQUEST['value']), $arFeinheiten[$product_data['feinheit']]); + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['fmenge'] = wpsg_tf($_REQUEST['value']); + + } + else if ($_REQUEST['typ'] == "vari_weight") + { + + $_REQUEST['value'] = wpsg_tf($_REQUEST['value']); + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['weight'] = $_REQUEST['value']; + + } + else if ($_REQUEST['typ'] == "vari_stock") + { + + $_REQUEST['value'] = intval($_REQUEST['value']); + $vp_data[$_REQUEST['var_id']]['vari'][$_REQUEST['vari_id']]['stock'] = $_REQUEST['value']; + + } + else if ($_REQUEST['typ'] == "var_name") + { + + if (wpsg_isSizedString($_REQUEST['wpsg_lang'])) + { + $vp_data[$_REQUEST['var_id']]['lang'][$_REQUEST['wpsg_lang']]['name'] = $_REQUEST['value']; + } + else + { + $vp_data[$_REQUEST['var_id']]['name'] = $_REQUEST['value']; + } + + } + else if ($_REQUEST['typ'] == "var_preis") + { + + $_REQUEST['value'] = wpsg_tf($_REQUEST['value']); + $vp_data[$_REQUEST['var_id']]['preis'] = $_REQUEST['value']; + $_REQUEST['value'] = wpsg_ff($_REQUEST['value'], $this->shop->get_option('wpsg_currency')); + + } + else if ($_REQUEST['typ'] == "var_weight") + { + + $_REQUEST['value'] = wpsg_tf($_REQUEST['value']); + $vp_data[$_REQUEST['var_id']]['weight'] = $_REQUEST['value']; + + } + else if ($_REQUEST['typ'] == "var_fmenge") + { + + $arFeinheiten = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit')); + + $_REQUEST['value'] = wpsg_ff(wpsg_tf($_REQUEST['value']), $arFeinheiten[$product_data['feinheit']]); + $vp_data[$_REQUEST['var_id']]['fmenge'] = wpsg_tf($_REQUEST['value']); + + } + else if ($_REQUEST['typ'] == "var_artnr") + { + + if (wpsg_isSizedString($_REQUEST['wpsg_lang'])) + { + $vp_data[$_REQUEST['var_id']]['lang'][$_REQUEST['wpsg_lang']]['artnr'] = wpsg_q($_REQUEST['value']); + } + else + { + $vp_data[$_REQUEST['var_id']]['artnr'] = wpsg_q($_REQUEST['value']); + } + + } + else if ($_REQUEST['typ'] == "var_stock") + { + + $_REQUEST['value'] = intval($_REQUEST['value']); + $vp_data[$_REQUEST['var_id']]['stock'] = $_REQUEST['value']; + + } + + $this->saveVarianten($_REQUEST['edit_id'], $vp_data); + + die(strval($_REQUEST['value'])); + + } + + } // public function produkt_ajax() + /* Modulfunktionen */ + /** + * Speichert die Varianten + */ + public function saveVarianten($produkt_id, $vp_data) + { + + $vp_data = $this->clearArrayForSerialization($vp_data); + + $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, array( + "mod_varianten" => wpsg_q(serialize($vp_data)) + ), "`id` = '".wpsg_q($produkt_id)."'"); + + } // public function saveVarianten($produkt_id, $vp_data) + + /** + * LÀdt die Varianteninformationen aus dem serialisierten Array + * @param $noTrans Wird diese Variable auf true gesetzt, so wird die Übersetzung nicht geladen (Wie Backend) Wichtig wenn die Varianten wieder gespeichert werden sollen! + */ + public function loadVarianten($produkt_id, $noTrans = false, $noCache = false) + { + + if (is_admin()) $noCache = true; + + if (!$noCache && array_key_exists($produkt_id.$noTrans, $this->cache_variData)) return $this->cache_variData[$produkt_id.$noTrans]; + + // Übersetzung verarbeiten + if (is_admin() || $noTrans === true) + { + + $vp_data = @unserialize($this->db->fetchOne("SELECT `mod_varianten` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_id)."'")); + if (!is_array($vp_data)) $vp_data = array(); + + } + else + { + + // Im Frontend geht es nach der Sprache auf der der Shop aktuell lÀuft + if ($this->shop->isOtherLang()) + { + + $parent_lang_id = $this->db->fetchOne("SELECT `lang_parent` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_id)."'"); + if (!wpsg_isSizedInt($parent_lang_id)) $parent_lang_id = $produkt_id; + + $vp_data = @unserialize($this->db->fetchOne("SELECT `mod_varianten` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($parent_lang_id)."'")); + if (!is_array($vp_data)) $vp_data = array(); + + foreach ($vp_data as $k => $v) + { + + // Den Namen der Variante auf die aktuelle Sprache stellen + if (wpsg_isSizedString($vp_data[$k]['lang'][$this->shop->getCurrentLanguage()]['name'])) $vp_data[$k]['name'] = $vp_data[$k]['lang'][$this->shop->getCurrentLanguage()]['name']; + + if (wpsg_isSizedArray($vp_data[$k]['vari'])) + { + + foreach ($vp_data[$k]['vari'] as $k2 => $vari) + { + + // Den Namen der Variation auf die aktuelle Sprache korrigieren + if (wpsg_isSizedString($vp_data[$k]['lang'][$this->shop->getCurrentLanguage()]['vari'][$k2]['name'])) $vp_data[$k]['vari'][$k2]['name'] = $vp_data[$k]['lang'][$this->shop->getCurrentLanguage()]['vari'][$k2]['name']; + + } + + } + + } + + } + else + { + + $vp_data = @unserialize($this->db->fetchOne("SELECT `mod_varianten` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_id)."'")); + if (!is_array($vp_data)) $vp_data = array(); + + } + + } + + $this->cache_variData[$produkt_id.$noTrans] = $vp_data; + + return $vp_data; + + } // public function loadVarianten($produkt_id) + + private function clearArrayForSerialization($ar) + { + + foreach ((array)$ar as $k => $v) + { + + if (wpsg_isSizedArray($v)) + { + + $ar[$k] = $this->clearArrayForSerialization($v); + + } + else + { + + $ar[$k] = preg_replace('/\'|\`|\ÂŽ|\"/', '', $v); + + } + + } + + return $ar; + + } // private function clearArrayForSerialization($ar) + + /** + * Gibt die Bilder als Array fÃŒr die Variation zurÃŒck + * Beachtet die Reihenfolge die im Backend ÃŒber Drag&Drop definiert ist + * @param int $var_id Key der Variante + * @param int $vari_id Key der Variation + */ + public function getVariImages($product_id, $var_id, $vari_id) + { + + $vp_data = $this->loadVarianten($product_id); + + $arProductBilder = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_id)); + + $arReturn = array(); + + // Bilder in Reihenfolge + //if ($vp_data[$var_id]['typ'] == 'checkbox' && wpsg_isSizedArray($vp_data[$var_id]['picOrder'])) $arReturn = $vp_data[$var_id]['picOrder']; + //else if (wpsg_isSizedArray($vp_data[$var_id]['vari'][$vari_id]['picOrder'])) $arReturn = $vp_data[$var_id]['vari'][$vari_id]['picOrder']; + + // PrÃŒfen ob die Bilder noch in Produktbilder Array drin sind + foreach ($arReturn as $k => $v) + { + + if (!in_array($v, $arProductBilder)) unset($arReturn[$k]); + else unset($arProductBilder[array_search($v, $arProductBilder)]); + + } + + // Bilder aus dem ProduktArray noch hinzufÃŒgen, die eventuell nicht im sortierten Array enthalten sind + foreach ($arProductBilder as $k => $v) + { + + $arReturn[] = $v; + + } + + $arImageSelect = array(); + + // Sind die Bilder in der Variante ausgewÀhlt? + if (!is_admin()) + { + + if ($vp_data[$var_id]['typ'] == 'checkbox' && wpsg_isSizedString($vp_data[$var_id]['pic'])) $arImageSelect = explode(',', $vp_data[$var_id]['pic']); + else if (wpsg_isSizedString($vp_data[$var_id]['vari'][$vari_id]['pic'])) $arImageSelect = explode(',', $vp_data[$var_id]['vari'][$vari_id]['pic']); + + foreach ($arReturn as $k => $v) + { + + if (!in_array($v, $arImageSelect)) unset($arReturn[$k]); + + } + + } + + return $arReturn; + + } // public function getVariImages($product_id, $var_id, $vari_id) + /** * PrÃŒft ob das Produkt ein Variantenprodukt ist oder nicht Index: /mods/wpsg_mod_produktbilder.class.php =================================================================== --- /mods/wpsg_mod_produktbilder.class.php (revision 6091) +++ /mods/wpsg_mod_produktbilder.class.php (revision 6094) @@ -201,5 +201,5 @@ } - else if ($_REQUEST['cmd'] == 'upload2') + else if ($_REQUEST['cmd'] == 'upload_mt') { // Mediathek @@ -229,11 +229,16 @@ // Tests - $p1 = wp_get_attachment_url($attachment_id); - $p2 = get_attached_file( $attachment_id ); // Full path - $p3 = get_attachment_link( $attachment_id ); - $p4 = get_the_title( $attachment_id ); - $p5 = get_post_type($attachment_id); - $p6 = get_post($attachment_id); - $p7 = wp_get_attachment_image_src($attachment_id, 'thumbnail'); // Array mit Full-Path, Width, Height + $p1 = wp_get_attachment_url($attachment_id); // http://shop4.home/wp-content/uploads/2017/03/hdrechteckig.png + $p2 = get_attached_file( $attachment_id ); // C:\xampp\htdocs\wp2/wp-content/uploads/2017/03/hdrechteckig.png + $p3 = get_attachment_link( $attachment_id ); // http://shop4.home/hdrechteckig/ + $p4 = get_the_title( $attachment_id ); // hdrechteckig + $p5 = get_post_type($attachment_id); // attachment + $p6 = get_post($attachment_id); // WP_Post + $p7 = wp_get_attachment_image_src($attachment_id, 'thumbnail'); // Array mit Full-URL, Width, Height + + add_image_size('s_40_40', 40, 40); + $ht = wp_get_attachment_image( $attachment_id, Array(40, 40)); + $p8 = wp_get_attachment_image_src($attachment_id, Array(40, 40)); + $p80 = $p8[0]; //$rw = add_post_meta( $attachment_id, 'wpsg_produkt_id', '6' ); @@ -262,13 +267,15 @@ } - else if ($_REQUEST['cmd'] == 'remove2') + else if ($_REQUEST['cmd'] == 'removemt') { //unlink($this->getPicPath($_REQUEST['edit_id']).'/'.$_REQUEST['file']); - if ($_REQUEST['delmt'] == true) // Auch in der Mediathek löschen + if ($_REQUEST['delmt'] === 'true') { // Auch in der Mediathek löschen wp_delete_post( $_REQUEST['pid'], true ); - - if ($_REQUEST['del'] == true) // Zuordnung löschen + } + + if ($_REQUEST['del'] === 'true') { // Zuordnung löschen delete_post_meta( $_REQUEST['pid'], 'wpsg_produkt_id', $_REQUEST['edit_id'] ); + } $this->shop->view['data']['id'] = $_REQUEST['edit_id']; @@ -276,5 +283,5 @@ if ($this->shop->hasMod('wpsg_mod_produktartikel')) $this->shop->callMod('wpsg_mod_produktartikel', 'updatePostThumbnail', array($_REQUEST['edit_id'])); - die($this->getProduktBilderListe2($_REQUEST['edit_id'])); + die($this->getProduktBilderListe_MT($_REQUEST['edit_id'])); } @@ -286,13 +293,13 @@ $this->shop->view['data']['id'] = $_REQUEST['edit_id']; - die($this->getProduktBilderListe2($_REQUEST['edit_id'])); - - } - else if ($_REQUEST['cmd'] == 'produktbilder_liste2') + die($this->getProduktBilderListe_MT($_REQUEST['edit_id'])); + + } + else if ($_REQUEST['cmd'] == 'produktbilder_liste_MT') { $this->shop->view['data']['id'] = $_REQUEST['edit_id']; //$content = $this->getProduktBilderListe($_REQUEST['edit_id']); - die($this->getProduktBilderListe2($_REQUEST['edit_id'])); + die($this->getProduktBilderListe_MT($_REQUEST['edit_id'])); } @@ -362,5 +369,5 @@ $this->shop->view['ProduktList'] = $this->getProduktBilderListe($product_data['id']); - $this->shop->view['ProduktList2'] = $this->getProduktBilderListe2($product_data['id']); + $this->shop->view['ProduktList_MT'] = $this->getProduktBilderListe_MT($product_data['id']); } @@ -439,5 +446,5 @@ * Zeichnet die Liste mit den Produktbildern */ - public function getProduktBilderListe2($produkt_id) + public function getProduktBilderListe_MT($produkt_id, $size = 'thumbnail') { global $wpdb; @@ -453,19 +460,19 @@ $p1 = wp_get_attachment_url($val['ID']); $arrf = pathinfo($p1); - $this->shop->view['ProduktBilder2'][$i]['fname'] = $arrf['basename']; + $this->shop->view['ProduktBilder_MT'][$i]['fname'] = $arrf['basename']; $guid = $arrf['dirname'].'/'.$arrf['filename'].'-150x150.'.$arrf['extension']; */ - $p = wp_get_attachment_image_src($val['post_id'], 'thumbnail'); // Array mit Full-Path, Width, Height + $p = wp_get_attachment_image_src($val['post_id'], $size); // Array mit Full-Path, Width, Height $guid = $p[0]; $arrf = pathinfo($guid); - $this->shop->view['ProduktBilder2'][$i]['pid'] = $val['post_id']; - $this->shop->view['ProduktBilder2'][$i]['fname'] = $arrf['basename']; - $this->shop->view['ProduktBilder2'][$i]['guid'] = $guid; + $this->shop->view['ProduktBilder_MT'][$i]['pid'] = $val['post_id']; + $this->shop->view['ProduktBilder_MT'][$i]['fname'] = $arrf['basename']; + $this->shop->view['ProduktBilder_MT'][$i]['guid'] = $guid; $i++; } - return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktbilder/produkt_edit_list2.phtml', false); - - } // public function getProduktBilderListe2($produkt_id) + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktbilder/produkt_edit_list_MT.phtml', false); + + } // public function getProduktBilderListe_MT($produkt_id) /** @@ -547,4 +554,41 @@ } // public function getProduktBilder($produkt_id) + + /** + * Gibt ein Array mit den Produktbildern zurÃŒck + */ + public function getProduktBilder_MT($produkt_id) + { + + $arFiles = array(); + + global $wpdb; + $data = $this->db->fetchAssoc("SELECT * FROM `".$wpdb->prefix."postmeta` WHERE `meta_key`='".wpsg_q('wpsg_produkt_id')."' AND `meta_value`='".wpsg_q($produkt_id)."' "); + + $i = 0; + foreach ($data as $key => $val) { + $p = wp_get_attachment_image_src($val['post_id'], 'full'); // Array mit Full-Path, Width, Height + $guid = $p[0]; + $arrf = pathinfo($guid); + //$this->shop->view['ProduktBilder_MT'][$i]['pid'] = $val['post_id']; + //$this->shop->view['ProduktBilder_MT'][$i]['fname'] = $arrf['basename']; + //$this->shop->view['ProduktBilder_MT'][$i]['guid'] = $guid; + $arFiles[$i]['guid'] = $guid; + $arFiles[$i]['post_id'] = $val['post_id']; + $arFiles[$i]['basename'] = $arrf['basename']; + + $i++; + } + /* + wpsg_asort($arFiles); + + $arReturn = array(); + foreach ($arFiles as $k => $v) $arReturn[] = $v; + + return $arReturn; + */ + return $arFiles; + + } // public function getProduktBilder_MT($produkt_id) /* Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 6091) +++ /mods/wpsg_mod_rechnungen.class.php (revision 6094) @@ -386,12 +386,5 @@ if (trim($this->shop->view['order']['language']) != '') $this->shop->setTempLocale($this->shop->view['order']['language']); - $this->shop->view['kunde'] = $this->db->fetchRow(" - SELECT - K.* - FROM - `".WPSG_TBL_KU."` AS K - WHERE - K.`id` = '".wpsg_q($this->shop->view['order']['k_id'])."' - "); + $this->getAdresse($this->shop->view['order']['k_id']); $email = $this->shop->view['kunde']['email']; @@ -574,4 +567,42 @@ } // public function order_ajax() + + private function getAdresse($kid) + { + /* + $this->shop->view['kunde'] = $this->db->fetchRow(" + SELECT + K.* + FROM + `".WPSG_TBL_KU."` AS K + WHERE + K.`id` = '".wpsg_q($kid)."' + "); + */ + + $this->shop->view['kunde'] = $this->db->fetchRow(" + SELECT + C.`id`, + IF (CA.`id` > 0, CA.`title`, C.`title`) AS `title`, + IF (CA.`id` > 0, CA.`name`, C.`name`) AS `name`, + IF (CA.`id` > 0, CA.`vname`, C.`vname`) AS `vname`, + IF (CA.`id` > 0, CA.`firma`, C.`firma`) AS `firma`, + IF (CA.`id` > 0, CA.`fax`, C.`fax`) AS `fax`, + IF (CA.`id` > 0, CA.`strasse`, C.`strasse`) AS `strasse`, + IF (CA.`id` > 0, CA.`nr`, '') AS `nr`, + IF (CA.`id` > 0, CA.`plz`, C.`plz`) AS `plz`, + IF (CA.`id` > 0, CA.`ort`, C.`ort`) AS `ort`, + IF (CA.`id` > 0, CA.`land`, C.`land`) AS `land`, + IF (CA.`id` > 0, CA.`tel`, C.`tel`) AS `tel`, + C.`geb`, C.`ustidnr`, C.`email`, C.`id`, C.`knr`, C.`wp_user_id` + FROM + `".WPSG_TBL_KU."` AS C + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = C.`adress_id`) + WHERE + C.`id` = '".wpsg_q($kid)."' AND + C.`deleted` != '1' + "); + + } public function admin_emailconf_save() @@ -629,12 +660,5 @@ if (trim($this->shop->view['data']['language']) != '') $this->shop->setTempLocale($this->shop->view['data']['language']); - $this->shop->view['kunde'] = $this->db->fetchRow(" - SELECT - K.* - FROM - `".WPSG_TBL_KU."` AS K - WHERE - K.`id` = '".wpsg_q($this->shop->view['data']['k_id'])."' - "); + $this->getAdresse($this->shop->view['data']['k_id']); $custom_data = @unserialize($this->shop->view['data']['custom_data']); @@ -846,12 +870,5 @@ if (trim($this->shop->view['data']['language']) != '') $this->shop->setTempLocale($this->shop->view['data']['language']); - $this->shop->view['kunde'] = $this->db->fetchRow(" - SELECT - K.* - FROM - `".WPSG_TBL_KU."` AS K - WHERE - K.`id` = '".wpsg_q($this->shop->view['data']['k_id'])."' - "); + $this->getAdresse($this->shop->view['data']['k_id']); $custom_data = @unserialize($this->shop->view['data']['custom_data']); Index: /mods/wpsg_mod_shippingadress.class.php =================================================================== --- /mods/wpsg_mod_shippingadress.class.php (revision 6091) +++ /mods/wpsg_mod_shippingadress.class.php (revision 6094) @@ -13,5 +13,5 @@ /** - * Costructor + * Constructor */ public function __construct() @@ -185,10 +185,9 @@ $order_data = $this->shop->cache->loadOrder($order_id); - if ($this->check_different_shippingadress($order_data['k_id'], $order_id) === true) + if ($this->check_different_shippingadress($order_data['k_id'], $order_id) === false) { $this->shop->view['wpsg_mod_shippingadress'] = Array(); //$this->shop->view['wpsg_mod_shippingadress'] = $order_data; - //$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml'); @@ -282,7 +281,7 @@ `id` = '".wpsg_q($o_id)."'"); - if ($arrAdr['shipping_adress_id'] == 0) return true; - if ($arrAdr['shipping_adress_id'] != $arrAdr['adress_id']) return false; - return true; + if ($arrAdr['shipping_adress_id'] == 0) return false; + if ($arrAdr['shipping_adress_id'] != $arrAdr['adress_id']) return true; + return false; } // public function check_different_shippingadress() Index: /system/intern/mods/wpsg_mod_varianten.class.php =================================================================== --- /system/intern/mods/wpsg_mod_varianten.class.php (revision 6091) +++ /system/intern/mods/wpsg_mod_varianten.class.php (revision 6094) @@ -1050,8 +1050,8 @@ public function getVariImages($product_id, $var_id, $vari_id) { - + die('getVariImages'); $vp_data = $this->loadVarianten($product_id); - $arProductBilder = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($product_id)); + $arProductBilder = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder2', array($product_id)); $arReturn = array(); Index: /views/mods/mod_kundenverwaltung/index.phtml =================================================================== --- /views/mods/mod_kundenverwaltung/index.phtml (revision 6091) +++ /views/mods/mod_kundenverwaltung/index.phtml (revision 6094) @@ -17,5 +17,5 @@ @@ -29,5 +29,5 @@ -
+
Index: /views/mods/mod_productvariants/admin_edit.phtml =================================================================== --- /views/mods/mod_productvariants/admin_edit.phtml (revision 6091) +++ /views/mods/mod_productvariants/admin_edit.phtml (revision 6094) @@ -133,4 +133,22 @@ TODO: Bilder + callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['product_id'])); + $k = $this->view['variant']['id']; + $kv = $vari['id']; + $temp = $this->callMod('wpsg_mod_productvariants', 'getVariImages', array($this->view['product_id'], $k, $kv)); + ?> + + view['variant']['id'] $vari $var $kv $_REQUEST['pic'] + $file = $b['basename']; + $href = wp_get_attachment_image_src($b['post_id'], Array(25, 25)); + ?> + pic" id="" + onclick="return wpsg_vp_vari_setPic(this, , , '', );" href=""> + + + + + @@ -143,4 +161,77 @@ - - - - - - -

- - -

- - view['data']['id'])) { ?> -
-
- - - - - -
-
view['ProduktList2']; ?>
- - - - - + + + + + + + +

+ + +

+ + view['data']['id'])) { ?> +
+
+ + + +
Index: /views/mods/mod_produktbilder/produkt_edit_list_MT.phtml =================================================================== --- /views/mods/mod_produktbilder/produkt_edit_list_MT.phtml (revision 6094) +++ /views/mods/mod_produktbilder/produkt_edit_list_MT.phtml (revision 6094) @@ -0,0 +1,27 @@ + + + view['ProduktBilder_MT']) && (sizeof($this->view['ProduktBilder_MT']) > 0)) { ?> + + view['ProduktBilder_MT'] as $b) { ?> + +
+ + + <?php echo wpsg_hspc($b['fname']); ?> + + + +
+ + +
+ + +

+ Index: /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml =================================================================== --- /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml (revision 6091) +++ /views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml (revision 6094) @@ -69,5 +69,5 @@ if (wpsg_isSizedString($this->view['wpsg_mod_shippingadress']['shipping_title']) && $this->view['wpsg_mod_shippingadress']['shipping_title'] != '-1') - echo $this->view['arTitles'][$this->view['wpsg_mod_shippingadress']['shipping_title']]; + echo $this->view['wpsg_mod_shippingadress']['shipping_title']; ?> view['wpsg_mod_shippingadress']['shipping_vname']); ?> view['wpsg_mod_shippingadress']['shipping_name']); ?>
Index: /views/order/view_customerdata.phtml =================================================================== --- /views/order/view_customerdata.phtml (revision 6091) +++ /views/order/view_customerdata.phtml (revision 6094) @@ -58,5 +58,5 @@ view['data']['firma']); ?>
- view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['arTitles'][$this->view['data']['title']]).' ':''); ?>view['data']['vname']); ?> view['data']['name']); ?>
+ view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['data']['title']).' ':''); ?>view['data']['vname']); ?> view['data']['name']); ?>
view['data']['strasse']); ?>
view['data']['plz']); ?> view['data']['ort']); ?> view['country']['kuerzel']); ?>
Index: /views/produkttemplates/standard_mt.phtml =================================================================== --- /views/produkttemplates/standard_mt.phtml (revision 6094) +++ /views/produkttemplates/standard_mt.phtml (revision 6094) @@ -0,0 +1,341 @@ +view['data']); + + // Damit keine Zubehörprodukte ausgegeben werden + //$this->noReleatedProducts = true; + + //wpsg_debug($_SESSION); + +if (!function_exists('is_plugin_active')) + require_once(ABSPATH.'/wp-admin/includes/plugin.php'); +?> +
+ +
+ + + + callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+ +
+
+ + hasMod('wpsg_mod_produktbilder')) { ?> +
+ get_option('wpsg_mod_produktbilder_width'); + $pbh = $this->get_option('wpsg_mod_produktbilder_height'); + $pbm = $this->get_option('wpsg_mod_produktbilder_mode'); + $pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder2', array($this->view['data']['id'])); + ?> + + + view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?> +
+ + + +
+ + + + + +
+
+ + +
+
+ +
+ +
+

getProductName($this->view['data']['id']); ?>

+ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> +
+
+ get_option('wpsg_showArticelnumber') == '1') { ?> +
+ : view['data']['anr']); ?>
+ get_option('wpsg_mod_produktartikel_ean'))) {?> + :view['data']['ean']); ?>
+ + get_option('wpsg_mod_produktartikel_gtin'))) {?> + :view['data']['gtin']); ?>
+
+ + + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + +
+ + + + view['data']['preis'], $this->get_option('wpsg_currency')); ?> + view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> + + hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> +
+ : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> +
+ +
+ + get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> + +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ + + +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + +
+ + + + + getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> + + + + + +
+

+ view['data']['shortdesc']; ?> +
+ +
+ + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> +
+ + +
+ + + + + hasMod('wpsg_mod_fuellmenge')) { ?> + +
+ + '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], + ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', + wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) + ); ?> +
+ + + +
+ +
+ + hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> + + + callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> + + get_option('wpsg_mod_deliverytime_storetext')); ?> + get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> +   + +
+ + +
+ + + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> + +
+ + callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + +
+ +
+
+ + + + + + + + hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> +
+ + view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> +
+ + + + +
+ callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?> +
+ +
+ +
+ +
+
+ callMods('productForSale', array($this->view['data']['product_key'])) || ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id'])))) { ?> +
+ + + + view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> + /> + + get_option('wpsg_afterinsert'), array('2', '3'))) { ?> + + + +
+ +
+ +
+ + +
+ callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + callMods('productForSale', array($this->view['data']['product_key']))) { ?> + + + + + + +
+
+ +
+ + hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> + + + +
+ +
+ +
+ + +
+ + view['data']['longdescription'])) > 0) { ?> +
+
+
+

+ view['data']['longdescription']; ?> +
+
+
+ + +
+
+

+
+
+ +
+
+

+
+
+ + +
+ +
+ + +
+ + + +
+ + callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+ +