Index: /mods/wpsg_mod_export.class.php =================================================================== --- /mods/wpsg_mod_export.class.php (revision 6144) +++ /mods/wpsg_mod_export.class.php (revision 6145) @@ -942,5 +942,5 @@ } // public function loadProfil($profil_id) - + private function loadFields() { @@ -968,13 +968,31 @@ 'order_useragent' => __('UserAgent', 'wpsg'), 'order_ip' => __('IP Adresse', 'wpsg'), + + 'order_invoice_title' => __('Rechnungsadresse Anrede', 'wpsg'), + 'order_invoice_firma' => __('Rechnungsadresse Firma', 'wpsg'), + 'order_invoice_vorname' => __('Rechnunsadresse Vorname', 'wpsg'), + 'order_invoice_name' => __('Rechnungsadresse Name', 'wpsg'), + 'order_invoice_strasse' => __('Rechnungsadresse Straße (mit Hausnummer)', 'wpsg'), + 'order_invoice_strasse_strasse' => __('Rechnungsadresse Straße (ohne Hausnummer)', 'wpsg'), + 'order_invoice_strasse_nr' => __('Rechnungsadresse Hausnummer', 'wpsg'), + 'order_invoice_plz' => __('Rechnungsadresse PLZ', 'wpsg'), + 'order_invoice_ort' => __('Rechnungsadresse Ort', 'wpsg'), + 'order_invoice_land' => __('Rechnungsadresse Land (Name)', 'wpsg'), + 'order_invoice_land_krzl' => __('Rechnungsadresse Land (KÃŒrzel)', 'wpsg'), + 'order_invoice_tel' => __('Rechnungsadresse Telefon', 'wpsg'), + 'order_invoice_fax' => __('Rechnungsadresse Fax', 'wpsg'), + + 'order_title' => __('Lieferadresse Anrede', 'wpsg'), + 'order_firma' => __('Lieferadresse Firma', 'wpsg'), 'order_vorname' => __('Lieferadresse Vorname', 'wpsg'), - 'order_name' => __('Lieferadresse Name', 'wpsg'), - 'order_firma' => __('Lieferadresse Firma', 'wpsg'), - 'order_strasse' => __('Lieferadresse Straße', 'wpsg'), + 'order_name' => __('Lieferadresse Name', 'wpsg'), + 'order_strasse' => __('Lieferadresse Straße (mit Hausnummer)', 'wpsg'), + 'order_strasse_strasse' => __('Lieferadresse Straße (ohne Hausnummer)', 'wpsg'), + 'order_strasse_nr' => __('Lieferadresse Hausnummer', 'wpsg'), 'order_plz' => __('Lieferadresse PLZ', 'wpsg'), 'order_ort' => __('Lieferadresse Ort', 'wpsg'), 'order_land' => __('Lieferadresse Land (Name)', 'wpsg'), 'order_land_krzl' => __('Lieferadresse Land (KÃŒrzel)', 'wpsg'), - //'order_hausnr' => __('Lieferadresse Hausnummer', 'wpsg'), + 'order_payment_method' => __('Name der Zahlart', 'wpsg'), 'order_shipping_method' => __('Name der Versandart', 'wpsg'), @@ -1020,10 +1038,11 @@ 'kunde_id' => __('KundenID', 'wpsg'), 'kunde_nr' => __('Kundennummer', 'wpsg'), - 'kunde_title' => __('Titel/Anrede', 'wpsg'), + 'kunde_title' => __('Anrede', 'wpsg'), 'kunde_firma' => __('Firma', 'wpsg'), 'kunde_vorname' => __('Vorname', 'wpsg'), 'kunde_name' => __('Name', 'wpsg'), - 'kunde_strasse' => __('Straße', 'wpsg'), - //'kunde_hausnr' => __('Hausnummer', 'wpsg'), + 'kunde_strasse' => __('Straße (mit Hausnummer)', 'wpsg'), + 'kunde_strasse_strasse' => __('Straße (ohne Hausnummer)', 'wpsg'), + 'kunde_strasse_nr' => __('Hausnummer', 'wpsg'), 'kunde_ort' => __('Ort', 'wpsg'), 'kunde_plz' => __('PLZ', 'wpsg'), @@ -1181,5 +1200,5 @@ { - $field_value = $f['value_key']; + $field_value = $f['value']; $cache_key = $o_id.'_'.$p_id.'_'.$product_index.'_'.$productkey.'_'.$order_product_id; @@ -1191,6 +1210,6 @@ $order = $this->arCache[$cache_key]['order']; $produkt = $this->arCache[$cache_key]['produkt']; - $kunde = $this->arCache[$cache_key]['kunde']; - + $kunde = $this->arCache[$cache_key]['kunde']; + } else @@ -1201,5 +1220,5 @@ O.* FROM - `".WPSG_TBL_ORDER."` AS O + `".WPSG_TBL_ORDER."` AS O WHERE O.`id` = '".wpsg_q($o_id)."' @@ -1209,13 +1228,11 @@ $order['menge'] = $this->db->fetchOne("SELECT SUM(OP.`menge`) FROM `".WPSG_TBL_ORDERPRODUCT."` AS OP WHERE OP.`o_id` = '".wpsg_q($order['id'])."'"); - $order['oOrder'] = wpsg_order::getInstance($order['id']); - // Anzahl an Produkten in der Bestellung (MengenunabhÀngig) $order['count'] = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($order['id'])."'"); - - $order['payment_method'] = $order['oOrder']->getPaymentLabel(); - $order['shipping_method'] = $order['oOrder']->getShippingLabel(); - - $order['custom_data'] = @unserialize($order['custom_data']); + + $order['payment_method'] = $this->shop->arPayment[$order['type_payment']]['name']; + $order['shipping_method'] = $this->shop->arShipping[$order['type_shipping']]['name']; + + $order['custom_data'] = unserialize($order['custom_data']); if ($this->shop->hasMod('wpsg_mod_rechnungen')) @@ -1393,5 +1410,11 @@ } - + + // Objekte laden + + /** @var wpsg_order $oOrder */ + $oOrder = wpsg_order::getInstance($order['id']); + $oCustomer = $oOrder->getCustomer(); + switch ($field_value) { @@ -1418,5 +1441,12 @@ case 'order_price': - $return = wpsg_ff($order['custom_data']['basket']['sum']['preis_gesamt_brutto']); + if (!is_array($order['custom_data']['basket'])) + { + $return = wpsg_ff($order['price_gesamt']); + } + else + { + $return = wpsg_ff($order['custom_data']['basket']['sum']['preis_gesamt_brutto'], $this->shop->get_option('wpsg_currency')); + } break; @@ -1424,5 +1454,5 @@ case 'order_price_netto': - $return = wpsg_ff($order['custom_data']['basket']['sum']['preis_gesamt_netto']); + $return = wpsg_ff($order['custom_data']['basket']['sum']['preis_gesamt_netto'], $this->shop->get_option('wpsg_currency')); break; @@ -1431,14 +1461,33 @@ case 'order_payment': $return = number_format($order['price_payment'], 2, ',', '.'); break; case 'order_useragent': $return = $order['useragent']; break; - case 'order_ip': $return = $order['ip']; break; - case 'order_vorname': $return = $order['shipping_vname']; break; - case 'order_name': $return = $order['shipping_name']; break; - case 'order_strasse': $return = $order['shipping_strasse']; break; - case 'order_plz': $return = $order['shipping_plz']; break; - case 'order_ort': $return = $order['shipping_ort']; break; - case 'order_land': $return = $order['land']; break; - case 'order_land_krzl': $return = $order['land_krzl']; break; - case 'order_hausnr': $return = $order['shipping_hausnr']; break; - case 'order_payment_method': $return = $order['payment_method']; break; + case 'order_ip': $return = $order['ip']; break; + + case 'order_invoice_title': $return = $oOrder->getInvoiceTitle(); break; + case 'order_invoice_firma': $return = $oOrder->getInvoiceCompany(); break; + case 'order_invoice_vorname': $return = $oOrder->getInvoiceFirstName(); break; + case 'order_invoice_name': $return = $oOrder->getInvoiceName(); break; + case 'order_invoice_strasse': $return = $oOrder->getInvoiceStreet(); break; + case 'order_invoice_strasse_strasse': $return = $oOrder->getInvoiceStreetClear(); break; + case 'order_invoice_strasse_nr': $return = $oOrder->getInvoiceStreetNr(); break; + case 'order_invoice_plz': $return = $oOrder->getInvoiceZip(); break; + case 'order_invoice_ort': $return = $oOrder->getInvoiceCity(); break; + case 'order_invoice_land': $return = $oOrder->getInvoiceCountryName(); break; + case 'order_invoice_land_krzl': $return = $oOrder->getInvoiceCountryKuerzel(); break; + case 'order_invoice_tel': $return = $oOrder->getInvoicePhone(); break; + case 'order_invoice_fax': $return = $oOrder->getInvoiceFax(); break; + + case 'order_title': $return = $oOrder->getShippingTitle(); break; + case 'order_firma': $return = $oOrder->getShippingCompany(); break; + case 'order_vorname': $return = $oOrder->getShippingFirstName(); break; + case 'order_name': $return = $oOrder->getShippingName(); break; + case 'order_strasse': $return = $oOrder->getShippingStreet(); break; + case 'order_strasse_strasse': $return = $oOrder->getShippingStreetClear(); break; + case 'order_strasse_nr': $return = $oOrder->getShippingStreetNr(); break; + case 'order_plz': $return = $oOrder->getShippingZip(); break; + case 'order_ort': $return = $oOrder->getShippingCity(); break; + case 'order_land': $return = $oOrder->getShippingCountryName(); break; + case 'order_land_krzl': $return = $oOrder->getShippingCountryKuerzel(); break; + + case 'order_payment_method': $return = $order['payment_method']; break; case 'order_shipping_method': $return = $order['shipping_method']; break; case 'order_count': $return = $order['count']; break; @@ -1525,17 +1574,20 @@ case 'kunde_id': $return = $kunde['id']; break; case 'kunde_nr': $return = $kunde['knr']; break; - case 'kunde_title': $return = $kunde['title']; break; - case 'kunde_vorname': $return = $kunde['vname']; break; - case 'kunde_firma': $return = $kunde['firma']; break; - case 'kunde_name': $return = $kunde['name']; break; - case 'kunde_strasse': $return = $kunde['strasse']; break; - case 'kunde_hausnr': $return = $kunde['hausnr']; break; - case 'kunde_ort': $return = $kunde['ort']; break; - case 'kunde_plz': $return = $kunde['plz']; break; - case 'kunde_land': $return = $kunde['land']; break; - case 'kunde_land_krzl': $return = $kunde['land_krzl']; break; - case 'kunde_tel': $return = $kunde['tel']; break; - case 'kunde_fax': $return = $kunde['fax']; break; - case 'kunde_email': $return = $kunde['email']; break; + + case 'kunde_title': $return = $oCustomer->getTitle(); break; + case 'kunde_firma': $return = $oCustomer->getCompany(); break; + case 'kunde_vorname': $return = $oCustomer->getFirstname(); break; + case 'kunde_name': $return = $oCustomer->getName(); break; + case 'kunde_strasse': $return = $oCustomer->getStreet(); break; + case 'kunde_strasse_strasse': $return = $oCustomer->getStreetClear(); break; + case 'kunde_strasse_nr': $return = $oCustomer->getStreetNr(); break; + case 'kunde_ort': $return = $oCustomer->getCity(); break; + case 'kunde_plz': $return = $oCustomer->getZip(); break; + case 'kunde_land': $return = $oCustomer->getCountryName(); break; + case 'kunde_land_krzl': $return = $oCustomer->getCountryKuerzel(); break; + case 'kunde_tel': $return = $oCustomer->getPhone(); break; + case 'kunde_fax': $return = $oCustomer->getFax(); break; + + case 'kunde_email': $return = $kunde['email']; break; case 'kunde_ustid': $return = $kunde['ustidnr']; break; case 'kunde_geb': @@ -1627,4 +1679,6 @@ $f['size'] = 111255; + if (wpsg_isSizedInt($f['trim'])) $return = preg_replace('/\040/', '', $return); + if (isset($f['format']) && $f['format'] > 0 && $return != '--') {