Index: /controller/wpsg_OrderController.class.php =================================================================== --- /controller/wpsg_OrderController.class.php (revision 6073) +++ /controller/wpsg_OrderController.class.php (revision 6081) @@ -61,5 +61,5 @@ /** - * Nimmt Ajax Anfragen innerhalb der Bestellverwaltung entgege + * Nimmt Ajax Anfragen innerhalb der Bestellverwaltung entgegen */ public function ajaxAction() @@ -104,4 +104,5 @@ parse_str($_REQUEST['form_data'], $form_data); + /* TODO alt $k_id = $this->db->fetchOne("SELECT `k_id` FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($_REQUEST['edit_id'])."' "); @@ -116,21 +117,87 @@ 'land' => wpsg_q($form_data['dialog_land']) ), " `id` = '".wpsg_q($k_id)."' "); - - if (wpsg_isSizedInt($form_data['dialog_shipping'])) - { - - $this->db->UpdateQuery(WPSG_TBL_ORDER, array( - 'shipping_firma' => wpsg_q($form_data['dialog_firma']), - 'shipping_title' => wpsg_q($form_data['dialog_title']), - 'shipping_vname' => wpsg_q($form_data['dialog_vname']), - 'shipping_name' => wpsg_q($form_data['dialog_name']), - 'shipping_strasse' => wpsg_q($form_data['dialog_strasse']), - 'shipping_plz' => wpsg_q($form_data['dialog_plz']), - 'shipping_ort' => wpsg_q($form_data['dialog_ort']), - 'shipping_land' => wpsg_q($form_data['dialog_land']) - ), " `id` = '".wpsg_q($_REQUEST['edit_id'])."' "); - - } - + */ + + /* + $a_id = $this->db->fetchOne("SELECT `adress_id` FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($_REQUEST['edit_id'])."' "); + + if ($a_id > 0) { + $this->db->UpdateQuery(WPSG_TBL_ADRESS, array( + 'firma' => wpsg_q($form_data['dialog_firma']), + 'title' => wpsg_q($form_data['dialog_title']), + 'vname' => wpsg_q($form_data['dialog_vname']), + 'name' => wpsg_q($form_data['dialog_name']), + 'strasse' => wpsg_q($form_data['dialog_strasse']), + 'plz' => wpsg_q($form_data['dialog_plz']), + 'ort' => wpsg_q($form_data['dialog_ort']), + 'land' => wpsg_q($form_data['dialog_land']) + ), " `id` = '".wpsg_q($a_id)."' "); + } + */ + + + if (wpsg_isSizedInt($form_data['dialog_all'])) + { + + // Alle Bestellungen des Kunden anpassen + $customer_id = $this->db->fetchOne("SELECT `k_id` FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($_REQUEST['edit_id'])."' "); + $arOrder = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_ORDER."` WHERE `k_id` = '".wpsg_q($customer_id)."' "); + + } + else + { + + $arOrder = array($_REQUEST['edit_id']); + + } + + $adress_data = array( + 'firma' => wpsg_q($form_data['dialog_firma']), + 'title' => wpsg_q($form_data['dialog_title']), + 'vname' => wpsg_q($form_data['dialog_vname']), + 'name' => wpsg_q($form_data['dialog_name']), + 'fax' => wpsg_q($form_data['dialog_fax']), + 'tel' => wpsg_q($form_data['dialog_tel']), + 'strasse' => wpsg_q($form_data['dialog_strasse']), + 'nr' => wpsg_q($form_data['dialog_nr']), + 'plz' => wpsg_q($form_data['dialog_plz']), + 'ort' => wpsg_q($form_data['dialog_ort']), + 'land' => wpsg_q($form_data['dialog_land']) + ); + + foreach ($arOrder as $order_id) + { + + // Daten in der Bestellung aktualisieren + /** @var wpsg_order $oOrder */ + $oOrder = wpsg_order::getInstance($order_id); + $oOrder->updateAdress($adress_data); + + // Daten im Kunden aktualisieren? + if (wpsg_isSizedInt($form_data['dialog_customer'])) + { + + $oCustomer = $oOrder->getCustomer(); + $oCustomer->updateAdress($adress_data); + } + + if (wpsg_isSizedInt($form_data['dialog_shipping'])) + { + $oOrder->updateShippingAdress($adress_data); + + /* TODO alt + $this->db->UpdateQuery(WPSG_TBL_ORDER, array( + 'shipping_firma' => wpsg_q($form_data['dialog_firma']), + 'shipping_title' => wpsg_q($form_data['dialog_title']), + 'shipping_vname' => wpsg_q($form_data['dialog_vname']), + 'shipping_name' => wpsg_q($form_data['dialog_name']), + 'shipping_strasse' => wpsg_q($form_data['dialog_strasse']), + 'shipping_plz' => wpsg_q($form_data['dialog_plz']), + 'shipping_ort' => wpsg_q($form_data['dialog_ort']), + 'shipping_land' => wpsg_q($form_data['dialog_land']) + ), " `id` = '".wpsg_q($_REQUEST['edit_id'])."' "); + */ + } + } die("1"); @@ -254,5 +321,5 @@ $this->shop->view['data'] = $this->db->fetchRow(" SELECT - O.*, K.*, + K.*, O.*, O.`id` AS id, O.`comment` AS `order_comment`, @@ -307,4 +374,21 @@ C.`id` = '".$this->shop->view['data']['shipping_land']."' "); + + $arAdr = $this->db->fetchRow(" + SELECT + `title`, + `name`, + `vname`, + `firma`, + `strasse`, + `plz`, + `ort`, + `land` + FROM + `".WPSG_TBL_ADRESS."` + WHERE + `id` = '".wpsg_q($this->shop->view['data']['adress_id'])."' + "); + $this->shop->view['data'] = array_merge($this->shop->view['data'], $arAdr); $this->shop->view['arSubAction'] = array( Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 6073) +++ /lib/wpsg_basket.class.php (revision 6081) @@ -703,5 +703,5 @@ 'vname' => wpsg_q(wpsg_getStr($this->arCheckout['vname'])), 'name' => wpsg_q(wpsg_getStr($this->arCheckout['name'])), - 'strasse' => wpsg_q(wpsg_getStr($this->arCheckout['street'])), + 'strasse' => wpsg_q(wpsg_getStr($this->arCheckout['strasse'])), 'nr' => wpsg_q(wpsg_getStr($this->arCheckout['nr'])), 'plz' => wpsg_q(wpsg_getStr($this->arCheckout['plz'])), @@ -1301,5 +1301,5 @@ // prÃŒft ob tatsÀchlich mind. ein Produkt im Warenkorb liegt - if (count($_SESSION['wpsg']['basket']) < 1 && !is_numeric($state)) + if (isset($_SESSION['wpsg']['basket']) && count($_SESSION['wpsg']['basket']) < 1 && !is_numeric($state)) { $this->shop->addFrontendError(__('Keine Produkte im Warenkorb.', 'wpsg')); Index: /model/wpsg_customer.class.php =================================================================== --- /model/wpsg_customer.class.php (revision 6073) +++ /model/wpsg_customer.class.php (revision 6081) @@ -8,4 +8,5 @@ private $adress_data; + public $data; /** @@ -26,4 +27,37 @@ } // public function load($id) + /** + * Aktuallisiert den Adressdatensatz + * @param Array $adress_data (Quoted!) + */ + public function updateAdress($adress_data) + { + + if (!wpsg_isSizedInt($this->data['adress_id'])) + { + + // Es kann sein, dass zu einem Kunden noch kein Adressdatensatz existiert, dann anlegen + $adress_data['cdate'] = 'NOW()'; + + $adress_id = $this->db->ImportQuery(WPSG_TBL_ADRESS, $adress_data); + + $this->db->UpdateQuery(WPSG_TBL_KU, array( + 'adress_id' => wpsg_q($adress_id) + ), " `id` = '".wpsg_q($this->id)."' "); + + $this->data['adress_id'] = $adress_id; + + } + else + { + + $this->db->UpdateQuery(WPSG_TBL_ADRESS, $adress_data, " `id` = '".wpsg_q($this->data['adress_id'])."' "); + + } + + $this->adress_data = $adress_data; + + } // public function updateAdress($adress_data) + /** * Gibt das Geschlecht des Kunden zurÃŒck Index: /model/wpsg_order.class.php =================================================================== --- /model/wpsg_order.class.php (revision 6073) +++ /model/wpsg_order.class.php (revision 6081) @@ -15,4 +15,8 @@ var $_arOrderProducts = null; + public $data = false; + public $adress_data = false; + public $shipping_adress_data = false; + /** * LÀdt die Daten der Bestellung @@ -23,12 +27,106 @@ parent::load($order_id); + @$this->data = &$this->shop->cache->loadOrder($order_id); + @$this->customer = &$this->shop->cache->loadCustomerObject($this->data['k_id']); + $this->bShippingAdress = $this->shop->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array($this->data['k_id'], $order_id)); + + if ($this->data['id'] != $order_id) $this->shop->throwErrorCode('100_1'); + + if (wpsg_isSizedInt($this->data['adress_id'])) $this->adress_data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ADRESS."` WHERE `id` = '".wpsg_q($this->data['adress_id'])."' "); + if (wpsg_isSizedInt($this->data['shipping_adress_id'])) $this->shipping_adress_data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ADRESS."` WHERE `id` = '".wpsg_q($this->data['shipping_adress_id'])."' "); + + /* @$this->data = &$this->shop->cache->loadOrder($order_id); @$this->customer = &$this->shop->cache->loadCustomerObject($this->data['k_id']); if ($this->data['id'] != $order_id) $this->shop->throwErrorCode('100_1'); - + */ + return true; } // public function load($order_id) + + /** + * Aktualisiert die Versandadresse + * @param $adress_data + */ + public function updateShippingAdress($adress_data) + { + + if (!wpsg_isSizedInt($this->data['shipping_adress_id'])) + { + + // Es kann sein, dass zu einer Bestellung noch kein Adressdatensatz existiert, dann anlegen + $adress_data['cdate'] = 'NOW()'; + + $adress_id = $this->db->ImportQuery(WPSG_TBL_ADRESS, $adress_data); + + $this->db->UpdateQuery(WPSG_TBL_ORDER, array( + 'shipping_adress_id' => wpsg_q($adress_id) + ), " `id` = '".wpsg_q($this->id)."' "); + + $this->data['shipping_adress_id'] = $adress_id; + + } + else + { + + $this->db->UpdateQuery(WPSG_TBL_ADRESS, $adress_data, " `id` = '".wpsg_q($this->data['shipping_adress_id'])."' "); + + } + + $this->shipping_adress_data = $adress_data; + + } // public function updateShippingAdress($adress_data) + + /** + * Aktuallisiert den Adressdatensatz + * @param Array $adress_data (Quoted!) + */ + public function updateAdress($adress_data) + { + + $insert = false; + + if (!wpsg_isSizedInt($this->data['adress_id'])) + { + + $insert = true; + + } + else + { + + $adress_db_exists = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_ADRESS."` WHERE `id` = '".wpsg_q($this->data['adress_id'])."' "); + + if ($adress_db_exists != $this->data['adress_id']) $insert = true; + + } + + if ($insert === true) + { + + // Es kann sein, dass zu einer Bestellung noch kein Adressdatensatz existiert, dann anlegen + $adress_data['cdate'] = 'NOW()'; + + $adress_id = $this->db->ImportQuery(WPSG_TBL_ADRESS, $adress_data); + + $this->db->UpdateQuery(WPSG_TBL_ORDER, array( + 'adress_id' => wpsg_q($adress_id) + ), " `id` = '".wpsg_q($this->id)."' "); + + $this->data['adress_id'] = $adress_id; + + } + else + { + + $this->db->UpdateQuery(WPSG_TBL_ADRESS, $adress_data, " `id` = '".wpsg_q($this->data['adress_id'])."' "); + + } + + $this->adress_data = $adress_data; + + } // public function updateAdress($adress_data) /** @@ -675,7 +773,17 @@ { - if ($this->hasShippingAdress()) return $this->shipping_adress_data['title']; - else return $this->getInvoiceTitle(); - + //if ($this->hasShippingAdress()) return $this->shipping_adress_data['title']; + //else return $this->getInvoiceTitle(); + if ($this->bShippingAdress === true) + { + + if (wpsg_isSizedString($this->shipping_adress_data['title'])) $title = $this->shipping_adress_data['title']; + else $title = $this->data['shipping_title']; + + } + else $title = $this->getInvoiceTitle(); + + if ($title <= 0) return ''; + else return $title; } Index: /mods/wpsg_mod_addressvalidation.class.php =================================================================== --- /mods/wpsg_mod_addressvalidation.class.php (revision 6073) +++ /mods/wpsg_mod_addressvalidation.class.php (revision 6081) @@ -91,5 +91,7 @@ $ort = $arCheckout['ort']; $plz = $arCheckout['plz']; - $nr = $arCheckout['nr']; + $nr = ''; + if (isset($arCheckout['nr'])) + $nr = $arCheckout['nr']; $land = $arCheckout['land']; Index: /mods/wpsg_mod_basic.class.php =================================================================== --- /mods/wpsg_mod_basic.class.php (revision 6073) +++ /mods/wpsg_mod_basic.class.php (revision 6081) @@ -557,5 +557,5 @@ * Wird vor dem löschen des Kunden aufgerufen */ - public function customer_delete_pre(&$customer_id) { } + public function customer_delete_pre(&$customer_id, $delete) { } /** Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 6073) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 6081) @@ -193,5 +193,5 @@ public function checkCheckout(&$state, &$error, &$arCheckout) { - + if (isset($_REQUEST['wpsg_mod_kundenverwaltung_login'])) { @@ -213,7 +213,10 @@ { - $customer = array_shift(wpsg_customer::find(array('email' => $arCheckout['email']))); - - if (is_object($customer) && wpsg_isSizedInt($customer->wp_user_id) && ($customer->wp_user_id != get_current_user_id() || !wpsg_isSizedInt(get_current_user_id()))) + $temp = wpsg_customer::find(array('email' => $arCheckout['email'])); + $customer = array_shift($temp); + + $curuser = get_current_user_id(); + $wp_user_id = wpsg_getInt($customer->wp_user_id); + if (is_object($customer) && wpsg_isSizedInt($wp_user_id) && ($wp_user_id != $curuser || !wpsg_isSizedInt($curuser))) { @@ -251,5 +254,5 @@ } - // Angabe in Feld1 aber undgleich Feld2 + // Angabe in Feld1 aber ungleich Feld2 if ($_REQUEST['wpsg']['mod_kundenverwaltung']['pwd1'] != $_REQUEST['wpsg']['mod_kundenverwaltung']['pwd2'] && $_REQUEST['wpsg']['mod_kundenverwaltung']['pwd1'] != '') { @@ -744,6 +747,31 @@ $kunde_data['email'] = strtolower($kunde_data['email']); - - $kunde_id = $this->db->ImportQuery(WPSG_TBL_KU, $kunde_data); + unset($kunde_data['payment']); + + // Kundendaten/Adressdaten trennen + $adata = Array(); + $adata['cdate'] = 'NOW()'; + $adata['title'] = $kunde_data['title']; + $adata['name'] = $kunde_data['name']; + $adata['vname'] = $kunde_data['vname']; + $adata['firma'] = $kunde_data['firma']; + $adata['fax'] = $kunde_data['fax']; + $adata['strasse'] = $kunde_data['strasse']; + $adata['nr'] = wpsg_getStr($kunde_data['nr']); + $adata['plz'] = $kunde_data['plz']; + $adata['ort'] = $kunde_data['ort']; + $adata['land'] = $kunde_data['land']; + $adata['tel'] = $kunde_data['tel']; + + $kdata = Array(); + $kdata['email'] = $kunde_data['email']; + $kdata['ustidnr'] = $kunde_data['ustidnr']; + $kdata['geb'] = $kunde_data['geb']; + $kdata['id'] = $kunde_data['id']; + $kdata['passwort_saltmd5'] = $kunde_data['passwort_saltmd5']; + $kdata['custom'] = $kunde_data['custom']; + + $kdata['adress_id'] = $this->db->ImportQuery(WPSG_TBL_ADRESS, $adata); + $kunde_id = $this->db->ImportQuery(WPSG_TBL_KU, $kdata); $knr = $this->shop->buildKNR($kunde_id); @@ -815,5 +843,7 @@ { - if (!wpsg_isSizedInt(get_current_user_id()) || get_current_user_id() != $oCustomer->wp_user_id) + $curuser = get_current_user_id(); + $wp_user_id = $oCustomer->wp_user_id; + if (!wpsg_isSizedInt($curuser) || $curuser != $wp_user_id) { @@ -857,5 +887,34 @@ $kunde_data = wpsg_q($kunde_data); - + unset($kunde_data['payment']); + + $adata['cdate'] = 'NOW()'; + $adata['title'] = $kunde_data['title']; unset($kunde_data['title']); + $adata['name'] = $kunde_data['name']; unset($kunde_data['name']); + $adata['vname'] = $kunde_data['vname']; unset($kunde_data['vname']); + $adata['firma'] = $kunde_data['firma']; unset($kunde_data['firma']); + $adata['fax'] = $kunde_data['fax']; unset($kunde_data['fax']); + $adata['strasse'] = $kunde_data['strasse']; unset($kunde_data['strasse']); + $adata['nr'] = wpsg_getStr($kunde_data['nr']); unset($kunde_data['nr']); + $adata['plz'] = $kunde_data['plz']; unset($kunde_data['plz']); + $adata['ort'] = $kunde_data['ort']; unset($kunde_data['ort']); + $adata['land'] = $kunde_data['land']; unset($kunde_data['land']); + $adata['tel'] = $kunde_data['tel']; unset($kunde_data['tel']); + + $a = $this->db->fetchRow(" + SELECT + `adress_id` + FROM + `".WPSG_TBL_KU."` + WHERE + `id` = '".wpsg_q($kunde_id)."' + "); + $kunde_data['adress_id'] = $a['adress_id']; + + if ($a['adress_id'] == 0) + $kunde_data['adress_id'] = $this->db->ImportQuery(WPSG_TBL_ADRESS, $adata); + else + $this->db->UpdateQuery(WPSG_TBL_ADRESS, $adata, "`id` = '".wpsg_q($a['adress_id'])."'"); + $this->db->UpdateQuery(WPSG_TBL_KU, $kunde_data, "`id` = '".wpsg_q($kunde_id)."'"); @@ -911,6 +970,7 @@ $kunde = $this->shop->cache->loadKunden($this->isLoggedIn()); - - $this->shop->view['data'] = $_SESSION['wpsg']['checkout']; + $kunde['geb'] = wpsg_fromDate($kunde['geb']); + + $this->shop->view['data'] = array_merge($_SESSION['wpsg']['checkout'], $kunde); $this->shop->view['error'] = $_SESSION['wpsg']['errorFields']; $this->shop->view['pflicht'] = $this->shop->loadPflichtFeldDaten(); @@ -1104,5 +1164,6 @@ $kunde_data = $this->shop->cache->loadKunden($customer_id); - if (get_current_user_id() == $kunde_data['wp_user_id'] && wpsg_isSizedInt(get_current_user_id())) + $curuser = get_current_user_id(); + if ($curuser == $kunde_data['wp_user_id'] && wpsg_isSizedInt($curuser)) { @@ -1166,5 +1227,5 @@ } // public function customer_created($kunde_id, $pwd) - public function customer_delete_pre(&$customer_id) + public function customer_delete_pre(&$customer_id, $delete) { @@ -1174,5 +1235,6 @@ $kunde_data = $this->shop->cache->loadKunden($customer_id); - if (wpsg_isSizedInt($kunde_data['wp_user_id'])) wp_delete_user($kunde_data['wp_user_id']); + if (wpsg_isSizedInt($kunde_data['wp_user_id']) && ($delete == 'delete')) + wp_delete_user($kunde_data['wp_user_id']); } @@ -1338,5 +1400,13 @@ { - $arData = $this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_KU)."` "); + // Export WPSG_TBL_KU und WPSG_TBL_ADRESS + //$arData = $this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_KU)."` "); + $arData = $this->db->fetchAssoc(" + SELECT + C.*, CA.*, C.`id` AS 'kid' + FROM + `".WPSG_TBL_KU."` AS C + LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = C.`adress_id`) + "); 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; } @@ -1346,5 +1416,5 @@ $fp = fopen($path.'/wpsg_customerexport.csv', 'w'); - fputcsv($fp, array_keys($arData[0]));; + fputcsv($fp, array_keys($arData[0]), ';'); foreach ($arData as $e) { @@ -1355,6 +1425,11 @@ foreach ($e as $k => $v) { $e[$k] = preg_replace('/\r|\n/', '', $v); } } - - fputcsv($fp, $e, ',', '"'); + foreach ($e as $k => $v) { + if (($k == 'budget') || ($k == 'wpsg_mod_statistics_long') || ($k == 'wpsg_mod_statistics_lat')) + $e[$k] = str_replace('.', ',', $e[$k]); + } + + //fputcsv($fp, $e, ',', '"'); + fputcsv($fp, $e, ';', '"'); } @@ -1377,5 +1452,5 @@ private function be_importAction() { - + // Import WPSG_TBL_KU und WPSG_TBL_ADRESS if (isset($_REQUEST['wpsg_import']) && file_exists($_FILES['wpsg_importfile']['tmp_name'])) { @@ -1389,5 +1464,5 @@ $i = 0; - while (($row = fgetcsv ($handle, 0, ",")) !== FALSE ) + while (($row = fgetcsv ($handle, 0, ";")) !== FALSE ) { @@ -1401,19 +1476,55 @@ } - if ($data['id'] <= 0) unset($data['id']); + //if ($data['id'] <= 0) unset($data['id']); + + // Daten splitten in Kunden und Adresse + // K: knr,paypal_payer_id,email,geb,ustidnr,custom,wpsg_mod_statistics_long,wpsg_mod_statistics_lat, + // adress_id,passwort_saltmd5,comment,wp_user_id,status,group_id,budget,kid + $kdata['id'] = $data['kid']; + $kdata['knr'] = wpsg_q($data['knr']); + $kdata['paypal_payer_id'] = wpsg_q($data['paypal_payer_id']); + $kdata['email'] = wpsg_q($data['email']); + $kdata['geb'] = wpsg_q($data['geb']); + $kdata['ustidnr'] = wpsg_q($data['ustidnr']); + $kdata['custom'] = wpsg_q($data['custom']); + $kdata['wpsg_mod_statistics_long'] = wpsg_q(str_replace(',', '.', $data['wpsg_mod_statistics_long'])); + $kdata['wpsg_mod_statistics_lat'] = wpsg_q(str_replace(',', '.', $data['wpsg_mod_statistics_lat'])); + $kdata['adress_id'] = wpsg_q($data['adress_id']); + $kdata['passwort_saltmd5'] = wpsg_q($data['passwort_saltmd5']); + $kdata['comment'] = wpsg_q($data['comment']); + $kdata['wp_user_id'] = wpsg_q($data['wp_user_id']); + $kdata['status'] = wpsg_q($data['status']); + $kdata['group_id'] = wpsg_q($data['group_id']); + $kdata['budget'] = wpsg_q(str_replace(',', '.', $data['budget'])); + + // A: id,title,name,vname,firma,fax,strasse,plz,ort,land,tel,cdate,nr + $adata['id'] = $data['id']; + $adata['title'] = $data['title']; + $adata['name'] = wpsg_q($data['name']); + $adata['vname'] = wpsg_q($data['vname']); + $adata['firma'] = wpsg_q($data['firma']); + $adata['fax'] = wpsg_q($data['fax']); + $adata['strasse'] = wpsg_q($data['strasse']); + $adata['plz'] = wpsg_q($data['plz']); + $adata['ort'] = wpsg_q($data['ort']); + $adata['land'] = $data['land']; + $adata['tel'] = wpsg_q($data['tel']); + $adata['cdate'] = 'NOW()'; + $adata['nr'] = wpsg_q($data['nr']); // Alte Sachen lösche ich vor dem Import mit der Übergebenen ID ! - $this->shop->callMods('customer_delete_pre', array(&$data['id'])); + $this->shop->callMods('customer_delete_pre', array(&$kdata['id'], 'no')); // Kunden löschen - $this->db->Query("DELETE FROM `".WPSG_TBL_KU."` WHERE `id` = '".wpsg_q($data['id'])."'"); - + $this->db->Query("DELETE FROM `".WPSG_TBL_KU."` WHERE `id` = '".wpsg_q($kdata['id'])."'"); + $this->db->Query("DELETE FROM `".WPSG_TBL_ADRESS."` WHERE `id` = '".wpsg_q($adata['id'])."'"); + $nImported ++; - $data_import = $data; - - $pNeu_id = $this->db->importQuery(WPSG_TBL_KU, $data_import, true); - + $k_id = $this->db->importQuery(WPSG_TBL_KU, wpsg_q($kdata), true); + if ($kdata['adress_id'] > 0) + $a_id = $this->db->importQuery(WPSG_TBL_ADRESS, wpsg_q($adata), true); + } else @@ -1461,4 +1572,16 @@ "); + if ($this->shop->view['data']['adress_id'] != 0) + $this->shop->view['data'] = array_merge($this->shop->view['data'], $this->db->fetchRow(" + SELECT + KA.* + FROM + `".WPSG_TBL_ADRESS."` AS KA + WHERE + KA.`id` = '".wpsg_q($this->shop->view['data']['adress_id'])."' + ")); + + $this->shop->view['data']['id']= wpsg_q($_REQUEST['edit_id']); + $this->shop->view['data']['custom'] = @unserialize($this->shop->view['data']['custom']); $this->shop->view['arLand'] = $this->db->fetchAssocField(" @@ -1539,6 +1662,18 @@ { - $this->shop->callMods('customer_delete_pre', array(&$_REQUEST['edit_id'])); - + $this->shop->callMods('customer_delete_pre', array(&$_REQUEST['edit_id'], 'delete')); + + $a = $this->db->fetchRow(" + SELECT + `adress_id` + FROM + `".WPSG_TBL_KU."` + WHERE + `id` = '".wpsg_q($_REQUEST['edit_id'])."' + "); + + if ($a['adress_id'] != 0) + $this->db->Query("DELETE FROM `".WPSG_TBL_ADRESS."` WHERE `id` = '".wpsg_q($a['adress_id'])."'"); + $this->db->Query("DELETE FROM `".WPSG_TBL_KU."` WHERE `id` = '".wpsg_q($_REQUEST['edit_id'])."'"); @@ -1557,21 +1692,25 @@ $data = array( 'knr' => wpsg_q($_REQUEST['knr']), - 'title' => wpsg_q($_REQUEST['title']), - 'name' => wpsg_q($_REQUEST['name']), - 'vname' => wpsg_q($_REQUEST['vname']), 'geb' => wpsg_toDate($_REQUEST['geb']), - 'email' => wpsg_q($_REQUEST['email']), - 'firma' => wpsg_q($_REQUEST['firma']), - 'tel' => wpsg_q($_REQUEST['tel']), - 'fax' => wpsg_q($_REQUEST['fax']), - 'strasse' => wpsg_q($_REQUEST['strasse']), - 'plz' => wpsg_q($_REQUEST['plz']), - 'ort' => wpsg_q($_REQUEST['ort']), + 'email' => strtolower(wpsg_q($_REQUEST['email'])), 'ustidnr' => wpsg_q($_REQUEST['ustidnr']), - 'land' => wpsg_q($_REQUEST['land']), 'comment' => wpsg_q($_REQUEST['comment']), 'status' => wpsg_q($_REQUEST['status']) ); - + $adata = array( + 'cdate' => 'NOW()', + 'title' => wpsg_q($_REQUEST['title']), + 'name' => wpsg_q($_REQUEST['name']), + 'vname' => wpsg_q($_REQUEST['vname']), + 'firma' => wpsg_q($_REQUEST['firma']), + 'fax' => wpsg_q($_REQUEST['fax']), + 'strasse' => wpsg_q($_REQUEST['strasse']), + 'nr' => wpsg_q(wpsg_getStr($_REQUEST['hnr'])), + 'plz' => wpsg_q($_REQUEST['plz']), + 'ort' => wpsg_q($_REQUEST['ort']), + 'land' => wpsg_q($_REQUEST['land']), + 'tel' => wpsg_q($_REQUEST['tel']) + ); + if ($this->shop->hasMod('wpsg_mod_customergroup')) { @@ -1600,5 +1739,5 @@ $this->shop->callMods('wpsg_mod_customer_save', array(&$data)); - if ($_REQUEST['edit_id'] > 0) + if (wpsg_getInt($_REQUEST['edit_id']) > 0) { @@ -1619,4 +1758,19 @@ } + + $a = $this->db->fetchRow(" + SELECT + `adress_id` + FROM + `".WPSG_TBL_KU."` + WHERE + `id` = '".wpsg_q($_REQUEST['edit_id'])."' + "); + + if ($a['adress_id'] == 0) + $data['adress_id'] = $this->db->ImportQuery(WPSG_TBL_ADRESS, $adata); + else + $this->db->UpdateQuery(WPSG_TBL_ADRESS, $adata, "`id` = '".wpsg_q($a['adress_id'])."'"); + $this->db->UpdateQuery(WPSG_TBL_KU, $data, "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); @@ -1625,7 +1779,26 @@ { - $_REQUEST['edit_id'] = $this->db->ImportQuery(WPSG_TBL_KU, $data); - - $this->shop->callMods('customer_created', array(&$_REQUEST['edit_id'], &$_REQUEST['password1'])); + $data['adress_id'] = $this->db->ImportQuery(WPSG_TBL_ADRESS, $adata); + $kunde_id = $this->db->ImportQuery(WPSG_TBL_KU, $data); + $_REQUEST['edit_id'] = $kunde_id; + + $knr = $this->shop->buildKNR($kunde_id); + + $this->shop->cache->clearKundenCache($kunde_id); + + $this->db->UpdateQuery(WPSG_TBL_KU, array( + 'knr' => wpsg_q($knr), + 'status' => get_option('wpsg_page_mod_kundenverwaltung_status') + ), "`id` = '".wpsg_q($kunde_id)."'"); + + if ((wpsg_getStr($_REQUEST['password1']) == '') || (wpsg_getStr($_REQUEST['password2']) == '') || + (wpsg_getStr($_REQUEST['email']) == '') || (wpsg_getStr($_REQUEST['password1']) != wpsg_getStr($_REQUEST['password2']))) + { + $this->shop->addBackendMessage(__('WP-User wurde nicht angelegt.', 'wpsg')); + } + else + { + $this->shop->callMods('customer_created', array(&$_REQUEST['edit_id'], &$_REQUEST['password1'])); + } } Index: /mods/wpsg_mod_shippingadress.class.php =================================================================== --- /mods/wpsg_mod_shippingadress.class.php (revision 6073) +++ /mods/wpsg_mod_shippingadress.class.php (revision 6081) @@ -48,5 +48,15 @@ parse_str($_REQUEST['form_data'], $form_data); - + + $a = $this->db->fetchRow(" + SELECT + `shipping_adress_id` + FROM + `".WPSG_TBL_ORDER."` + WHERE + `id` = '".wpsg_q($_REQUEST['edit_id'])."' + "); + + /* TODO alt $this->db->UpdateQuery(WPSG_TBL_ORDER, array( 'shipping_firma' => wpsg_q($form_data['dialog_shipping_firma']), @@ -59,4 +69,17 @@ 'shipping_land' => wpsg_q($form_data['dialog_shipping_land']) ), " `id` = '".wpsg_q($_REQUEST['edit_id'])."' "); + */ + if ($a['shipping_adress_id'] > 0) { + $this->db->UpdateQuery(WPSG_TBL_ADRESS, array( + 'firma' => wpsg_q($form_data['dialog_shipping_firma']), + 'title' => wpsg_q($form_data['dialog_shipping_title']), + 'vname' => wpsg_q($form_data['dialog_shipping_vname']), + 'name' => wpsg_q($form_data['dialog_shipping_name']), + 'strasse' => wpsg_q($form_data['dialog_shipping_strasse']), + 'plz' => wpsg_q($form_data['dialog_shipping_plz']), + 'ort' => wpsg_q($form_data['dialog_shipping_ort']), + 'land' => wpsg_q($form_data['dialog_shipping_land']) + ), " `id` = '".wpsg_q($a['shipping_adress_id'])."' "); + } die("1"); @@ -165,12 +188,13 @@ { - $this->shop->view['wpsg_mod_shippingadress'] = $order_data; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml'); + $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'); } else { - + /* TODO alt $this->shop->view['wpsg_mod_shippingadress'] = $this->db->fetchRow(" SELECT @@ -181,4 +205,5 @@ `shipping_plz` AS plz, `shipping_ort` AS ort, + `shipping_land` AS shipping_land, `shipping_land` AS land FROM @@ -187,9 +212,25 @@ `id` = '".wpsg_q($order_id)."' "); - } - - $this->shop->view['wpsg_mod_shippingadress']['oCountry'] = wpsg_country::getInstance($this->shop->view['wpsg_mod_shippingadress']['land']); - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml'); + */ + $this->shop->view['wpsg_mod_shippingadress'] = $this->db->fetchRow(" + SELECT + `title` AS shipping_title, + `name` AS shipping_name, + `vname` AS shipping_vname, + `firma` AS shipping_firma, + `strasse` AS shipping_strasse, + `plz` AS shipping_plz, + `ort` AS shipping_ort, + `land` AS shipping_land + FROM + `".WPSG_TBL_ADRESS."` + WHERE + `id` = '".wpsg_q($order_data['shipping_adress_id'])."' + "); + + $this->shop->view['wpsg_mod_shippingadress']['oCountry'] = wpsg_country::getInstance($this->shop->view['wpsg_mod_shippingadress']['shipping_land']); + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml'); + } + } // public function wpsg_order_view_customerdata(&$order_id) @@ -198,5 +239,5 @@ public function check_different_shippingadress($k_id, $o_id) { - + /* TODO alt $arrAdrKunde = $this->db->fetchRow("SELECT `name`, `vname`, `firma`, `strasse`, `plz`, `ort`, `land` @@ -233,4 +274,15 @@ return false; } + */ + + $arrAdr = $this->db->fetchRow("SELECT * + FROM + `".WPSG_TBL_ORDER."` + WHERE + `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; } // public function check_different_shippingadress() Index: /views/mods/mod_deliverynote/order_view_content.phtml =================================================================== --- /views/mods/mod_deliverynote/order_view_content.phtml (revision 6073) +++ /views/mods/mod_deliverynote/order_view_content.phtml (revision 6081) @@ -34,5 +34,5 @@ @@ -41,5 +41,5 @@ " /> Index: /views/mods/mod_kundenverwaltung/index.phtml =================================================================== --- /views/mods/mod_kundenverwaltung/index.phtml (revision 6073) +++ /views/mods/mod_kundenverwaltung/index.phtml (revision 6081) @@ -22,5 +22,5 @@