Index: /controller/wpsg_OrderController.class.php =================================================================== --- /controller/wpsg_OrderController.class.php (revision 8068) +++ /controller/wpsg_OrderController.class.php (revision 8069) @@ -1681,4 +1681,5 @@ } else if ($_REQUEST['wpsg_action'] == 'writeMultiRechnung') { + $bPreview = $_REQUEST['preview'] === '1'; $nWriteRechnung = 0; @@ -1693,8 +1694,8 @@ // Fußtext - if ($this->shop->get_option('wpsg_rechnungen_foottext_standard') !== false) - { + if ($this->shop->get_option('wpsg_rechnungen_foottext_standard') !== false) { $wpsg_rechnungen_footer = $this->get_option("wpsg_rechnungen_footer"); + if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_Multirechnung_footer")); if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array(); @@ -1702,7 +1703,5 @@ $_REQUEST['wpsg_Multirechnung_fusstext'] = wpsg_getStr($wpsg_rechnungen_footer[$this->shop->get_option('wpsg_rechnungen_foottext_standard')][1]); - } - else - { + } else { $_REQUEST['wpsg_Multirechnung_fusstext'] = ''; @@ -1714,6 +1713,5 @@ // Rechnung fÃŒr mehrere Bestellungen schreiben - foreach ($arIDs as $k) - { + foreach ($arIDs as $k) { $bRechnungExists = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_RECHNUNGEN."` WHERE `rnr` != '' AND `o_id` = '".wpsg_q($k)."' AND `storno` = '0000-00-00 00:00:00'"); @@ -1722,35 +1720,29 @@ $_REQUEST['wpsg_Multirechnung_email'] = $this->db->fetchOne("SELECT K.`email` FROM `".WPSG_TBL_ORDER."` AS O LEFT JOIN `".WPSG_TBL_KU."` AS K ON (O.`k_id` = K.`id`) WHERE O.`id` = '".wpsg_q($k)."'"); - if ($bRechnungExists <= 0) - { + if ($bRechnungExists <= 0) { - try - { + try { $nWriteRechnung ++; + } catch (Exception $e) { + + die($e->getMessage()); + } - catch (Exception $e) - { - - die($e->getMessage()); - - } } } - - if ($nWriteRechnung <= 0) - { - - $this->addBackendError(__('FÃŒr die gewÀhlten Bestellungen konnten keine Sammelrechnungen geschrieben werden, bestehende Rechnungen mÃŒssen erst storniert werden.', 'wpsg')); - - } - else - { - - $this->shop->callMod('wpsg_mod_rechnungen', 'writeMultiRechnung', [$arIDs, false, false]); - $this->addBackendMessage('nohspc_'.wpsg_translate(__('Sammelechnung geschrieben', 'wpsg'))); + + if ($nWriteRechnung <= 0) { + + if (!$bPreview) $this->addBackendError(__('FÃŒr die gewÀhlten Bestellungen konnten keine Sammelrechnungen geschrieben werden, bestehende Rechnungen mÃŒssen erst storniert werden.', 'wpsg')); + + } else { + + $this->shop->callMod('wpsg_mod_rechnungen', 'writeMultiRechnung', [$arIDs, $bPreview]); + + if (!$bPreview) $this->addBackendMessage('nohspc_'.wpsg_translate(__('#1# Rechnungen als Sammelechnung geschrieben', 'wpsg'), $nWriteRechnung)); } Index: /lib/wpsg_calculation.class.php =================================================================== --- /lib/wpsg_calculation.class.php (revision 8068) +++ /lib/wpsg_calculation.class.php (revision 8069) @@ -1800,5 +1800,5 @@ $this->arCalculation['tax'][$tax_key] = [ 'key' => $tax_key, - 'tax_value' => (($tax_key !== '0')?$this->arCountry[$arTaxKey[1]][$tax_key]:0), + 'tax_value' => (($tax_key !== '0' && isset($this->arCountry[$arTaxKey[1]][$tax_key]))?$this->arCountry[$arTaxKey[1]][$tax_key]:0), 'netto' => 0, 'brutto' => 0 Index: /model/wpsg_order.class.php =================================================================== --- /model/wpsg_order.class.php (revision 8068) +++ /model/wpsg_order.class.php (revision 8069) @@ -808,6 +808,5 @@ * @return string Name des EmpfÀngers */ - public function getShippingName() - { + public function getShippingName() { if ($this->hasShippingAdress()) return $this->shipping_adress_data['name']; Index: /model/wpsg_order_product.class.php =================================================================== --- /model/wpsg_order_product.class.php (revision 8068) +++ /model/wpsg_order_product.class.php (revision 8069) @@ -105,5 +105,5 @@ } - + public function getProductName() { Index: /mods/wpsg_mod_export.class.php =================================================================== --- /mods/wpsg_mod_export.class.php (revision 8068) +++ /mods/wpsg_mod_export.class.php (revision 8069) @@ -229,5 +229,5 @@ } - + if (sizeof($arFiles) > 1) { Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 8068) +++ /mods/wpsg_mod_rechnungen.class.php (revision 8069) @@ -53,6 +53,5 @@ } // public function __construct() - public function install() - { + public function install() { require_once(WPSG_PATH_WP.'/wp-admin/includes/upgrade.php'); @@ -64,4 +63,5 @@ id int(25) NOT NULL AUTO_INCREMENT, o_id int(25) NOT NULL , + o_ids TEXT NOT NULL , datum DATETIME NOT NULL , storno DATETIME NOT NULL, @@ -111,7 +111,6 @@ } // public function template_redirect() - - public function be_ajax() - { + + public function be_ajax() { if ($_REQUEST['do'] == 'reset') @@ -1634,12 +1633,13 @@ /////////////// - public function writeMultiRechnung($order_ids, $preview, $bOutput = true) { - + public function writeMultiRechnung($order_ids, $preview) { + + $preview = true; + $this->shop->view['multi_data']['oids'] = $order_ids; // Select first order for Multiinvoice header and footer $order_id = array_values($order_ids)[0]; - - $this->shop->view['output'] = $bOutput; + $this->shop->view['data'] = $this->db->fetchRow(" SELECT @@ -1656,11 +1656,4 @@ // GET Kundenadresse $this->getAdresse($this->shop->view['data']['k_id']); - - $oOrder = wpsg_order::getInstance($order_id); - - $custom_data = @unserialize($this->shop->view['data']['custom_data']); - - $this->shop->view['kunde']['land'] = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($this->shop->view['kunde']['land'])."'"); - $this->shop->view['data']['shipping_land'] = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q(wpsg_getStr($this->shop->view['data']['shipping_land']))."'"); // GET Rechnungsdatum @@ -1676,160 +1669,64 @@ } - // GET Shipping Adress - if ($this->shop->hasMod('wpsg_mod_shippingadress') && $this->shop->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array('k_id' => @$this->shop->view['data']['k_id'], 'order_id' => @$this->shop->view['data']['id']))) { - - $temp = $this->db->fetchRow(" - SELECT - * - FROM - `".WPSG_TBL_ADRESS."` AS A - WHERE - A.`id` = '".wpsg_q($this->shop->view['data']['shipping_adress_id'])."' - "); - - $this->shop->view['data']['shipping_firma'] = $temp['firma']; - $this->shop->view['data']['shipping_vname'] = $temp['vname']; - $this->shop->view['data']['shipping_name'] = $temp['name']; - $this->shop->view['data']['shipping_strasse'] = $temp['strasse']; - $this->shop->view['data']['shipping_nr'] = $temp['nr']; - $this->shop->view['data']['shipping_plz'] = $temp['plz']; - $this->shop->view['data']['shipping_ort'] = $temp['ort']; - - $t = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($temp['land'])."'"); - - $this->shop->view['data']['shipping_land'] = array(); - $this->shop->view['data']['shipping_land']['name'] = $t['kuerzel']; - - } - // GET Fußtext $this->shop->view['fussText'] = $this->shop->replaceUniversalPlatzhalter(wpsg_sinput("text_field", @$_REQUEST['wpsg_Multirechnung_fusstext']), $order_id); - $price_sum_brutto = 0; - $price_sum_netto = 0; - - $payment_sum_brutto = 0; - $payment_sum_netto = 0; - - $shipping_sum_brutto = 0; - $shipping_sum_netto = 0; - + $arCalculationSum = [ + 'tax' => [], + 'sum' => [ + 'netto' => 0, + 'brutto' => 0, + 'topay_netto' => 0, + 'topay_brutto' => 0, + 'tax' => 0 + ] + ]; + // DATA FOREACH ORDER IN INVOICE - foreach ( $order_ids as $o_id ) { - - $this->shop->view['data'] = $this->db->fetchRow(" - SELECT - O.* - FROM - `".WPSG_TBL_ORDER."` AS O - WHERE - O.`id` = '".wpsg_q($o_id)."' - "); + foreach ($order_ids as $o_id) { // GET ORDER $oOrder = wpsg_order::getInstance($o_id); - // GET ORDERPRODUCTS - $arOrderProducts = $oOrder->getOrderProducts(); - - // GET Zahlungsart - $this->shop->view['payment'] = $this->shop->getPaymentName(@$this->shop->view['data']['type_payment'], $o_id); - // NEW CALCULATION $oCalculation = new \wpsg\wpsg_calculation(); - - // GET Versandland - $oDefaultCountry = $oOrder->getInvoiceCountry(); - - // GET SteuersÀtze von Versandland - $oCalculation->addCountry($oDefaultCountry->id, $oDefaultCountry->mwst, $oDefaultCountry->mwst_a,$oDefaultCountry->mwst_b, $oDefaultCountry->mwst_c, $oDefaultCountry->mwst_d, true); - - if (($_REQUEST['wpsg_Multirechnung_shippay']??'0') === '1') { - - $oCalculation->addShipping( - $oOrder->__get('shipping_set'), - $oOrder->__get('shipping_bruttonetto'), - $oOrder->__get('shipping_tax_key'), - $oOrder->__get('shipping_key') - ); - - $oCalculation->addPayment( - $oOrder->__get('payment_set'), - $oOrder->__get('payment_bruttonetto'), - $oOrder->__get('payment_tax_key'), - $oOrder->__get('payment_key') - ); - - } - - $arProduct = []; - $tax_view = WPSG_BRUTTO; - - // GET Produkte aus einzelner Bestellung - foreach ($arOrderProducts as $oOrderProduct) { - - // wpsg_debug($oOrderProduct); - - $oCalculation->addProduct( - $oOrderProduct->getPrice($tax_view), - $tax_view, - $oOrderProduct->getProduct()->__get('mwst_key'), - $oOrderProduct->getCount(), - $oOrderProduct->getProductKey() - ); - - $p = [ - 'oOrderProduct' => $oOrderProduct, - 'id' => $oOrderProduct->getProductKey(), - 'product_index' => $oOrderProduct->getProductIndex(), - 'productkey' => $oOrderProduct->getProductKey(), - 'menge' => $oOrderProduct->getCount(), - 'price' => $oOrderProduct->getPrice($tax_view), - 'anr' => $oOrderProduct->getProduct()->getNr(), - 'mwst_value' => 0, - 'preis_netto' => $oOrderProduct->getPrice(WPSG_NETTO), - 'preis_brutto' => $oOrderProduct->getPrice(WPSG_BRUTTO), - 'name' => $oOrderProduct->getProduct()->getProductName(false), - 'detailname' => $oOrderProduct->getProduct()->getProductName(true), - 'beschreibung' => $oOrderProduct->getDescription() - ]; - - // Übersetzung - if ($this->shop->isOtherLang()) { - - $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($oOrderProduct->getProduct()->getId())."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); - - if ($produkt_trans['id'] > 0) { - - $p['name'] = $produkt_trans['name']; - $p['beschreibung'] = $produkt_trans['beschreibung']; - $p['detailname'] = $produkt_trans['detailname']; - - } - + $oCalculation->fromDB($o_id); + + $arCalculation = $oCalculation->getCalculationArray(); + + $this->shop->view['multi_data']['order_data'][$o_id] = [ + 'oCalculation' => $oCalculation, + 'arCalculation' => $arCalculation, + 'oOrder' => $oOrder + ]; + + foreach ($arCalculation['tax'] as $k => $v) { + + if (!isset($arCalculationSum['tax'][$k])) $arCalculationSum['tax'][$k] = $v; + else { + + $arCalculationSum['tax'][$k]['netto'] += $v['netto']; + $arCalculationSum['tax'][$k]['brutto'] += $v['brutto']; + $arCalculationSum['tax'][$k]['sum'] += $v['sum']; + } - - $arProduct[] = $p; - - } - - $this->shop->view['basket'] = [ - 'data' => $this->shop->view['data'], - 'arCalculation' => $oCalculation->getCalculationArray(), - 'produkte' => $arProduct, - ]; - - $this->shop->view['multi_data']['orders'][] = $this->shop->view['basket']; - - // Abfrage ob Versandkosten mit einberechnen - if (($_REQUEST['wpsg_Multirechnung_shippay']??'0') === '1') { - - // Versankosten setzen - $this->shop->view['basket']['sum']['preis_shipping'] = $oCalculation->getShippingSum(WPSG_BRUTTO); - - } - - } - + + if ($k !== 0) { + + $arCalculationSum['sum']['tax'] += $v['sum']; + + } + + } + + $arCalculationSum['sum']['netto'] += $arCalculation['sum']['netto']; + $arCalculationSum['sum']['brutto'] += $arCalculation['sum']['brutto']; + $arCalculationSum['sum']['topay_netto'] += $arCalculation['sum']['topay_netto']; + $arCalculationSum['sum']['topay_brutto'] += $arCalculation['sum']['topay_brutto']; + + } + + $this->shop->view['arCalculationSum'] = $arCalculationSum; + // Rechnungsnummer bilden $rnr_format = $this->shop->get_option("wpsg_rechnungen_format"); @@ -1847,10 +1744,10 @@ $rnr = $this->shop->replaceUniversalPlatzhalter($rnr, $order_id); - $oInvoice = null; - + if ($preview) { $this->shop->view['preview'] = true; $this->shop->view['rnr'] = $rnr.' - '.__('Vorschau', 'wpsg'); + $r_id = "Vorschau"; @@ -1873,20 +1770,12 @@ array( "rnr" => $rnr, - "o_id" => $order_id, + "o_ids" => implode(',', $order_ids), "datum" => "NOW()" ) ); - $oInvoice = \wpsg\wpsg_invoice::getInstance($r_id); - - $oInvoice->setMeta('basket_data', json_encode($this->shop->view['basket'])); - $oInvoice->setMeta('version', '2'); - - if (($_REQUEST['wpsg_Multirechnung_shippay']??'0') === '1') { - - $oInvoice->setMeta('include_shipping', '1'); - - } - + $oInvoice = \wpsg\wpsg_invoice::getInstance($r_id); + $oInvoice->setMeta('version', '3'); + } @@ -1895,28 +1784,9 @@ $this->shop->view['oOrder'] = $this->shop->cache->loadOrderObject($order_id); - $this->shop->view['storno'] = false; - $this->shop->view['invoice'] = true; - + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_rechnungen/multi_invoice_pdf.phtml'); - + if (!$preview) { - - foreach ($this->shop->view['basket']['produkte'] as $p) { - - /** @var wpsg_order_product $oOrderProduct */ - $oOrderProduct = $p['oOrderProduct']; - - $invoice_data = json_decode($oOrderProduct->getMeta('wpsg_mod_rechnungen_data', false, 'null'), true); - if (!is_array($invoice_data)) $invoice_data = []; - - $invoice_data[] = [ - 'amount' => $p['menge'], - 'invoice_id' => $r_id - ]; - - $oOrderProduct->setMeta('wpsg_mod_rechnungen_data', json_encode($invoice_data)); - - } - + if (@$_REQUEST['wpsg_Multirechnung_sendmail'] == "1") { @@ -1961,12 +1831,17 @@ $this->shop->restoreTempLocale(); - - // In Log eintragen - $this->db->importQuery(WPSG_TBL_OL, array( - "cdate" => "NOW()", - "o_id" => wpsg_q($this->shop->view['data']['id']), - "title" => wpsg_q(wpsg_translate(__('Rechnungsmail an #1#', 'wpsg'), $empfaenger)), - "mailtext" => wpsg_q($mail_text) - )); + + // Log in jede Bestellung eintragen + foreach ($order_ids as $order_id) { + + // In Log eintragen + $this->db->importQuery(WPSG_TBL_OL, array( + "cdate" => "NOW()", + "o_id" => wpsg_q($order_id), + "title" => wpsg_q(wpsg_translate(__('Rechnungsmail an #1#', 'wpsg'), $empfaenger)), + "mailtext" => wpsg_q($mail_text) + )); + + } } @@ -2618,5 +2493,27 @@ } - + + } else if ($order_id === 'multi') { + + $ym = date('Y/m/'); + + if ($this->shop->isMultiBlog()) { + + $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_rechnungen/'.$ym; + + $url_content = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_rechnungen/'.$ym; + + if ($url) $strReturn = $url_content.'/'.$order_id.'/'; + else $strReturn = $path.'/'.$order_id.'/'; + + } else { + + $path = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_rechnungen/'.$ym; + + if ($url) $strReturn = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_rechnungen/'.$ym.$order_id.'/'; + else $strReturn = $path.$order_id.'/'; + + } + } else { Index: /views/mods/mod_rechnungen/multi_invoice_pdf.phtml =================================================================== --- /views/mods/mod_rechnungen/multi_invoice_pdf.phtml (revision 8068) +++ /views/mods/mod_rechnungen/multi_invoice_pdf.phtml (revision 8069) @@ -10,6 +10,6 @@ require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php'; - global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top, $rhead_left, $rhead_top, $sum_multi_offset; - + global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top, $rhead_left, $rhead_top, $sum_multi_offset, $pdf; + // Positionierung der Absenderadresszeile $absender_left = 25; @@ -42,17 +42,7 @@ else $taxdisplay = 'brutto'; - // Damit die Steuer bei der Kleinunternehmerregelung nicht angezeigt wird leer ich den Array sicherheitshalber - if ($this->get_option('wpsg_kleinunternehmer') == '1') - { - - unset($this->view['basket']['mwst']); - - } - - if (!function_exists('AddRechnungPage')) - { - - function AddRechnungPage($shop, $pdf) - { + if (!function_exists('AddRechnungPage')) { + + function AddRechnungPage($shop, $pdf) { global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top, $offset, $sum_multi_offset; @@ -149,6 +139,5 @@ // InnerEu Hinweistext - if ($shop->view['oOrder']->isInnerEu()) - { + if ($shop->view['oOrder']->isInnerEu()) { $pdf->SetFont('Arial', '', 9); @@ -185,7 +174,19 @@ $pdf = new wpsg_fpdf(); - $pdf->SetAutoPageBreak(true, 5); + //$pdf->SetAutoPageBreak(true, 5); AddRechnungPage($this, $pdf); + $checkPageBreak = function($shop, $offset, $lines) use ($pdf, $prod_top) { + + if ($prod_top + $offset + ($lines * 5) > 290) { + + AddRechnungPage($this, $pdf); + + return 0; + + } else return $offset; + + }; + $rhead_count = 1; $sum_multi_offset = 0; @@ -200,30 +201,29 @@ $sum_payment_brutto = 0; $sum_payment_netto = 0; - - foreach ($orders as $oSum) { - - // Produktgesamtsumme - foreach ($oSum['arCalculation']['product'] as $p) { - $sum_productsum_brutto += $p['brutto']; - $sum_productsum_netto += $p['netto']; - } - - // Zahlungssumme gesamt - $sum_topay_brutto += $oSum['arCalculation']['sum']['topay_brutto']; - $sum_topay_netto += $oSum['arCalculation']['sum']['topay_netto']; - - // Gesamtzahlungskosten - $sum_payment_brutto += $oSum['arCalculation']['sum']['payment_brutto']; - $sum_payment_netto += $oSum['arCalculation']['sum']['payment_netto']; - - // Gesamtversandkosten - $sum_shipping_brutto += $oSum['arCalculation']['sum']['shipping_brutto']; - $sum_shipping_netto += $oSum['arCalculation']['sum']['shipping_netto']; - - } - + + // moMwSt + $bNoTax = false; + + $bTaxCol = false; + if ($this->get_option('wpsg_showMwstAlways') === '1') $bTaxCol = true; + else { + + foreach ($this->view['multi_data']['order_data'] as $order_data) { + + if (sizeof($order_data['arCalculation']['tax']) > 1) { $bTaxCol = true; break; } + + } + + } + // FOREACH ORDER START - foreach ($orders as $oOrder) { - + foreach ($this->view['multi_data']['order_data'] as $order_data) { + + /** @var wpsg_order $oOrder */ + $oOrder = $order_data['oOrder']; + + /** @var \wpsg\wpsg_calculation $arCalculation */ + $arCalculation = $order_data['arCalculation']; + // Sammelrechnung ZÀhler $pdf->SetFont('Arial', 'B', 12); @@ -234,26 +234,20 @@ // Zahlungsbedingung anzeigen - if (isset($oOrder['arCalculation']['payment'][0]['payment_key'])) - { - - $pdf->Text($rhead_left + 120, $rhead_top + $sum_multi_offset, __("Zahlungsbedingungen", "wpsg")); - $pdf->Text($rhead_left + 120, $rhead_top + $sum_multi_offset + 6, $this->arPayment[$oOrder['arCalculation']['payment'][0]['payment_key']]['name']); - - } - + $pdf->Text($rhead_left + 120, $rhead_top + $sum_multi_offset, __("Zahlungsbedingungen", "wpsg")); + $pdf->Text($rhead_left + 120, $rhead_top + $sum_multi_offset + 6, $oOrder->getPaymentLabel()); + // Bestellnummer anzeigen $pdf->Text($rhead_left + 155, $rhead_top + $sum_multi_offset, __("Best. Nr.", "wpsg")); - $pdf->Text($rhead_left + 155, $rhead_top + $sum_multi_offset + 6, ((trim($oOrder['data']['onr']) != '')?$oOrder['data']['onr']:$oOrder['data']['id'])); + $pdf->Text($rhead_left + 155, $rhead_top + $sum_multi_offset + 6, $oOrder->getNr()); $summe = 0; - $mwst_value = array_values($oOrder['arCalculation']['tax'])[0]; $bKopf = false; $pnr = 1; $offset = 0; $count = 0; - foreach ($oOrder['produkte'] as $p) - { - - if (!$bKopf) - { + foreach ($oOrder->getOrderProducts() as $oOrderProduct) { + + $product_id = $oOrderProduct->getProductId(); + + if (!$bKopf) { $pdf->SetFont('Arial', 'B', 9); @@ -262,10 +256,8 @@ $pdf->setXY($prod_left + 10, $prod_top + $sum_multi_offset); - if(is_array($mwst_value['tax_value'])) { - $pdf->Cell( ((sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, "Name", 1, 0, 'L'); - } - - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') - { + + $pdf->Cell((($bTaxCol)?87:102), 8, "Name", 1, 0, 'L'); + + if ($bTaxCol) { $pdf->setXY($prod_left + 97, $prod_top + $sum_multi_offset); @@ -291,12 +283,9 @@ $pdf->setXY($prod_left, $prod_top + $offset + $sum_multi_offset); - if ($this->get_option('wpsg_mod_rechnungen_anr') == '1') - { - - $pdf->Cell(10, 8, $p['anr'], 0, 0, 'C'); - - } - else - { + if ($this->get_option('wpsg_mod_rechnungen_anr') == '1') { + + $pdf->Cell(10, 8, $oOrderProduct->getProduct()->getProductNr(), 0, 0, 'C'); + + } else { $pdf->Cell(10, 8, $pnr.".", 0, 0, 'C'); @@ -305,18 +294,13 @@ /* Wenn Detailname vorhanden, wird der Detailname auf Rechnung verwendet */ - $produkt_text = $this->getProductName($this->getProduktID($p['id']), true); - - /* Falls Detailname vorhanden, wird jetzt der Produktname verwendet */ - /* $produkt_text = $this->getProductName($this->getProduktID($p['id']), false); */ - - $produktBeschreibung = trim(strip_tags($p['beschreibung'])); - - if ($this->isOtherLang()) - { - - $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['id']))."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'"); - - if (is_array($trans_db) && sizeof($trans_db) > 0) - { + $produkt_text = $this->getProductName($product_id, true); + + $produktBeschreibung = trim(strip_tags($oOrderProduct->getProduct()->getShortDescription())); + + if ($this->isOtherLang()) { + + $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_id)."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'"); + + if (is_array($trans_db) && sizeof($trans_db) > 0) { $produkt_text = $trans_db['name']; @@ -332,14 +316,11 @@ // Produktvariablen - if ($this->hasMod('wpsg_mod_productvars') && $this->get_option("wpsg_mod_rechnungen_showpv") == "1") - { - - $arPV = $this->callMod('wpsg_mod_productvars', 'getAllProductVarValues', array($oOrder['data']['id'], $p['product_index'])); - - if (wpsg_isSizedArray($arPV)) - { - - foreach ($arPV as $pv) - { + if ($this->hasMod('wpsg_mod_productvars') && $this->get_option("wpsg_mod_rechnungen_showpv") == "1") { + + $arPV = $this->callMod('wpsg_mod_productvars', 'getAllProductVarValues', array($oOrder->getId(), $oOrderProduct->getProductIndex())); + + if (wpsg_isSizedArray($arPV)) { + + foreach ($arPV as $pv) { $produkt_text .= "\r\n".$pv['name'].': '.$pv['value']; @@ -352,20 +333,15 @@ } - if ($this->get_option('wpsg_mod_rechnungen_anr') === '2') - { - - $anr = $this->getProductAnr($p['productkey']); + if ($this->get_option('wpsg_mod_rechnungen_anr') === '2') { + + $anr = $this->getProductAnr($oOrderProduct->getProductKey()); $produkt_text .= "\r\n".wpsg_translate(__('Artikelnummer: #1#', 'wpsg'), $anr); } - - $produkt_text_cell_width = 102; - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') - { - $produkt_text_cell_width = 87; - } + + if ($bTaxCol) $produkt_text_cell_width = 87; + else $produkt_text_cell_width = 102; $produkt_text_width = $pdf->GetStringWidth($produkt_text); - //$produkt_text_cell_width = (($this->arMwSt == "-1")?87:102); $height += 5 * ceil($produkt_text_width / $produkt_text_cell_width) + 3; @@ -373,28 +349,16 @@ $height_y = $pdf->getY(); $height = 2 + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $offset + 1.5 + $sum_multi_offset, 5, $produkt_text, 0, 'L', 0, $produkt_text_cell_width); - - //$height += 3 + 5 + $pdf->getY() - $height_y; - //$pdf->Cell((($this->arMwSt == "-1")?102:87), 8, $produkt_text, 0, 0, 'L'); - - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') { + + if ($bTaxCol) { $pdf->setXY($prod_left + 97, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(15, 8, (($this->view['basket']['noMwSt'] == '1')?'0.00 %':wpsg_ff($p['mwst_value'], '%')), 0, 0, 'C'); + $pdf->Cell(15, 8, (($bNoTax)?'0.00 %':wpsg_ff($oOrderProduct->getTaxValue(), '%')), 0, 0, 'C'); } $pdf->setXY($prod_left + 112, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(15, 8, $p['menge'], 0, 0, 'C'); - - if (wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO) - { - $preis = $p['preis_netto']; - - //TODO - } - else - { - $preis = $p['preis_brutto']; - } + $pdf->Cell(15, 8, $oOrderProduct->getAmount(), 0, 0, 'C'); + + $preis = $oOrderProduct->getPrice(wpsg_ShopController::getShop()->getFrontendTaxview()); $pdf->setXY($prod_left + 127, $prod_top + $offset + $sum_multi_offset); @@ -402,5 +366,5 @@ $pdf->setXY($prod_left + 152, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(25, 8, wpsg_ff($preis * $p['menge'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(25, 8, wpsg_ff($oOrderProduct->getPriceSum(wpsg_ShopController::getShop()->getFrontendTaxview()), $this->get_option('wpsg_currency')), 0, 0, 'R'); /** @@ -408,6 +372,5 @@ */ $pBeschreibungHeight = 0; - if ($this->get_option("wpsg_rechnungen_pbeschreibung") == "1" && trim(strip_tags($p['beschreibung'])) != '') - { + if ($this->get_option("wpsg_rechnungen_pbeschreibung") == "1" && trim(strip_tags($p['beschreibung'])) != '') { $produktBeschreibung = nl2br($produktBeschreibung); @@ -432,11 +395,9 @@ * Produktattribute ? */ - if ($this->get_option('wpsg_rechnungen_produktattribute') == '1') - { + if ($this->get_option('wpsg_rechnungen_produktattribute') == '1') { $attributeInfo = $this->callMod('wpsg_mod_produktattribute', 'getProductAttributeByProductId', array($this->getProduktId($p['id']))); - foreach ($attributeInfo as $pa) - { + foreach ($attributeInfo as $pa) { $pa_text = $pa['name'].': '.$pa['value']; @@ -449,6 +410,5 @@ * Variante ? */ - if (preg_match('/pv_(.*)/', $p['productkey'])) - { + if (preg_match('/pv_(.*)/', $p['productkey'])) { $variInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['productkey'])); @@ -463,16 +423,13 @@ * Lieferschein ? */ - if ($this->hasMod('wpsg_mod_deliverynote')) - { - - $arDN_order = $this->callMod('wpsg_mod_deliverynote', 'loadDeliveryNotesFromOrder', array($oOrder['data']['id'])); - - if (sizeof($arDN_order) > 1) - { - - $deliveryTimeProduct = $this->callMod('wpsg_mod_deliverynote', 'getProductDeliveryTime', array($oOrder['data']['id'], $p['product_index'])); - - if ($deliveryTimeProduct !== false) - { + if ($this->hasMod('wpsg_mod_deliverynote')) { + + $arDN_order = $this->callMod('wpsg_mod_deliverynote', 'loadDeliveryNotesFromOrder', array($oOrder->getId())); + + if (sizeof($arDN_order) > 1) { + + $deliveryTimeProduct = $this->callMod('wpsg_mod_deliverynote', 'getProductDeliveryTime', array($oOrder->getId(), $oOrderProduct->getProductIndex())); + + if ($deliveryTimeProduct !== false) { $height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5 + $sum_multi_offset, 5, wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct)), 0, 'L', 0, $produkt_text_cell_width); @@ -487,8 +444,7 @@ $pdf->Rect($prod_left, $prod_top + $offset + $sum_multi_offset, 10, $height); - $pdf->Rect($prod_left + 10, $prod_top + $offset + $sum_multi_offset, ((sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), $height); - - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') - { + $pdf->Rect($prod_left + 10, $prod_top + $offset + $sum_multi_offset, (($bTaxCol == '1')?87:102), $height); + + if ($bTaxCol) { $pdf->Rect($prod_left + 97, $prod_top + $offset + $sum_multi_offset, 15, $height); @@ -507,6 +463,5 @@ $summe += $p['price'] * $p['menge']; - if ($pdf->getY() > 220 || ($count >= $prod_break && sizeof($oOrder['arCalculation']['produkte']) > ($pnr - 1))) - { + if ($pdf->getY() > 220 || ($count >= $prod_break && sizeof($oOrder->getOrderProducts()) > ($pnr - 1))) { AddRechnungPage($this, $pdf); @@ -516,9 +471,9 @@ } // produkte - wpsg_debug($oOrder['arCalculation']); + // Gutschein - if (wpsg_isSizedArray($oOrder['arCalculation']['voucher'])) { - - foreach ($oOrder['arCalculation']['voucher'] as $v) { + if (wpsg_isSizedArray($arCalculation['voucher'])) { + + foreach ($arCalculation['voucher'] as $v) { $pdf->SetFont('Arial', '', 9); @@ -527,13 +482,10 @@ $pdf->setXY($prod_left + 10, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell( ((sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $v['code']), 1, 0, 'L'); - - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') - { - - $mwst = __('anteilig', 'wpsg'); + $pdf->Cell( (($bTaxCol)?87:102), 8, wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $v['code']), 1, 0, 'L'); + + if ($bTaxCol) { $pdf->setXY($prod_left + 97, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(15, 8, $mwst, 1, 0, 'C'); + $pdf->Cell(15, 8, __('anteilig', 'wpsg'), 1, 0, 'C'); } @@ -558,6 +510,7 @@ // Versandkosten - if ($oOrder['arCalculation']['sum']['preis_shipping'] != '' && $oOrder['arCalculation']['sum']['preis_shipping'] != 0) - { + $cost_shipping = ((wpsg_ShopController::getShop()->getFrontendTaxview() === WPSG_BRUTTO)?$arCalculation['sum']['shipping_brutto']:$arCalculation['sum']['shipping_netto']); + + if ($arCalculation['sum']['shipping_brutto'] > 0) { $pdf->SetFont('Arial', '', 9); @@ -566,19 +519,15 @@ $pdf->setXY($prod_left + 10, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell( ((sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Versandkosten "#1#"', 'wpsg'), $this->view['oOrder']->getShippingLabel()), 1, 0, 'L'); - - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') - { - - if ($this->arShipping[$oOrder['data']['type_shipping']]['mwst_null'] == '1' && $oOrder['basket']['noMwSt'] == '1') - { + $pdf->Cell( (($bTaxCol)?87:102), 8, wpsg_translate(__('Versandkosten "#1#"', 'wpsg'), $oOrder->getShippingLabel()), 1, 0, 'L'); + + if ($bTaxCol) { + + if ($bNoTax) { $mwst = 0; - } - else - { - - if ($oOrder['arCalculation']['shipping'][0]['tax_key'] === '0') { + } else { + + if ($arCalculation['shipping'][0]['tax_key'] === '0') { $mwst = _('anteilig'); @@ -586,11 +535,11 @@ } else { - $mwst = wpsg_ff($oOrder['arCalculation']['shipping'][0]['tax'], '%'); - $mwst = wpsg_ff($oOrder['arCalculation']['tax'][$oOrder['arCalculation']['shipping'][0]['tax_key']]['tax_value'], '%'); + $mwst = wpsg_ff($arCalculation['shipping'][0]['tax'], '%'); + $mwst = wpsg_ff($arCalculation['tax'][$arCalculation['shipping'][0]['tax_key']]['tax_value'], '%'); } } - + $pdf->setXY($prod_left + 97, $prod_top + $offset + $sum_multi_offset); $pdf->Cell(15, 8, $mwst, 1, 0, 'C'); @@ -602,57 +551,17 @@ $pdf->setXY($prod_left + 127, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(25, 8, wpsg_ff($oOrder['arCalculation']['sum']['preis_shipping'], $this->get_option('wpsg_currency')), 1, 0, 'R'); + $pdf->Cell(25, 8, wpsg_ff($arCalculation['sum']['shipping_brutto'], $this->get_option('wpsg_currency')), 1, 0, 'R'); $pdf->setXY($prod_left + 152, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(25, 8, wpsg_ff($oOrder['arCalculation']['sum']['preis_shipping'], $this->get_option('wpsg_currency')), 1, 0, 'R'); + $pdf->Cell(25, 8, wpsg_ff($arCalculation['sum']['shipping_brutto'], $this->get_option('wpsg_currency')), 1, 0, 'R'); $offset += 8; - - // Zusammengesetzte Versandarten darstellen - /* - if (wpsg_isSizedArray($this->view['basket']['shipping']['methods'])) { - - foreach ($this->view['basket']['shipping']['methods'] as $shipping) { - - $pdf->SetFont('Arial', '', 9); - $pdf->setXY($prod_left, $prod_top + $offset); - $pdf->Cell(10, 8, '', 1, 0, 'C'); $pnr ++; - - $pdf->setXY($prod_left + 10, $prod_top + $offset); - $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, $this->getShippingName($shipping), 1, 0, 'L'); - - if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') - { - - if ($this->view['basket']['shipping'][$shipping]['tax_rata'] == 1) { $mwst = __('Anteilig', 'wpsg'); } - else { $mwst = wpsg_ff($this->view['basket']['shipping'][$shipping]['mwst'], '%'); } - - $pdf->setXY($prod_left + 97, $prod_top + $offset); - $pdf->Cell(15, 8, $mwst, 1, 0, 'C'); - - } - - $pdf->setXY($prod_left + 112, $prod_top + $offset); - $pdf->Cell(15, 8, '1', 1, 0, 'C'); - - $pdf->setXY($prod_left + 127, $prod_top + $offset); - $pdf->Cell(25, 8, wpsg_ff($this->view['basket']['shipping'][$shipping]['preis_shipping_brutto'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - - $pdf->setXY($prod_left + 152, $prod_top + $offset); - $pdf->Cell(25, 8, wpsg_ff($this->view['basket']['shipping'][$shipping]['preis_shipping_brutto'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - - $offset += 8; - - } - - } - */ - } // Zahlungskosten - if ($oOrder['arCalculation']['sum']['preis_payment'] != '' && $oOrder['arCalculation']['sum']['preis_payment'] != 0) - { + $cost_payment = ((wpsg_ShopController::getShop()->getFrontendTaxview() === WPSG_BRUTTO)?$arCalculation['sum']['payment_brutto']:$arCalculation['sum']['payment_netto']); + + if ($cost_payment > 0) { $pdf->SetFont('Arial', '', 9); @@ -661,17 +570,15 @@ $pdf->setXY($prod_left + 10, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell( ((sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, $this->arPayment[$oOrder['data']['type_payment']]['name'], 1, 0, 'L'); - - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') - { - - if ($this->arPayment[$oOrder['data']['type_payment']]['mwst_null'] == '1' && $this->view['basket']['noMwSt'] == '1') - { + $pdf->Cell( (($bTaxCol)?87:102), 8, $oOrder->getPaymentLabel(), 1, 0, 'L'); + + if ($bTaxCol) { + + if ($bNoTax) { + $mwst = 0; - } - else - { - - if ($oOrder['arCalculation']['payment'][0]['tax_key'] === '0') { + + } else { + + if ($arCalculation['payment'][0]['tax_key'] === '0') { $mwst = _('anteilig'); @@ -679,6 +586,6 @@ } else { - $mwst = wpsg_ff($oOrder['arCalculation']['payment'][0]['tax'], '%'); - $mwst = wpsg_ff($oOrder['arCalculation']['tax'][$oOrder['arCalculation']['payment'][0]['tax_key']]['tax_value'], '%'); + $mwst = wpsg_ff($arCalculation['payment'][0]['tax'], '%'); + $mwst = wpsg_ff($arCalculation['tax'][$arCalculation['payment'][0]['tax_key']]['tax_value'], '%'); } @@ -695,8 +602,8 @@ $pdf->setXY($prod_left + 127, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(25, 8, wpsg_ff($oOrder['arCalculation']['sum']['preis_payment'], $this->get_option('wpsg_currency')), 1, 0, 'R'); + $pdf->Cell(25, 8, wpsg_ff($cost_payment, $this->get_option('wpsg_currency')), 1, 0, 'R'); $pdf->setXY($prod_left + 152, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell(25, 8, wpsg_ff($oOrder['arCalculation']['sum']['preis_payment'], $this->get_option('wpsg_currency')), 1, 0, 'R'); + $pdf->Cell(25, 8, wpsg_ff($cost_payment, $this->get_option('wpsg_currency')), 1, 0, 'R'); $offset += 8; @@ -704,7 +611,32 @@ } + // Rabatt + if ($arCalculation['sum']['discount_brutto'] < 0) { + + $pdf->SetFont('Arial', '', 9); + $pdf->setXY($prod_left, $prod_top + $offset + $sum_multi_offset); + $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++; + + $pdf->setXY($prod_left + 10, $prod_top + $offset + $sum_multi_offset); + $pdf->Cell( (($bTaxCol)?87:102), 8, _('Rabatt'), 1, 0, 'L'); + + $pdf->setXY($prod_left + 97, $prod_top + $offset + $sum_multi_offset); + $pdf->Cell(15, 8, _('Anteilig'), 1, 0, 'C'); + + $pdf->setXY($prod_left + 112, $prod_top + $offset + $sum_multi_offset); + $pdf->Cell(15, 8, '1', 1, 0, 'C'); + + $pdf->setXY($prod_left + 127, $prod_top + $offset + $sum_multi_offset); + $pdf->Cell(25, 8, wpsg_ff($arCalculation['sum']['discount_brutto'], $this->get_option('wpsg_currency')), 1, 0, 'R'); + + $pdf->setXY($prod_left + 152, $prod_top + $offset + $sum_multi_offset); + $pdf->Cell(25, 8, wpsg_ff($arCalculation['sum']['discount_brutto'], $this->get_option('wpsg_currency')), 1, 0, 'R'); + + $offset += 8; + + } + // GebÃŒhr - if (wpsg_tf(wpsg_getStr($this->view['storno_fee'])) > 0) - { + if (wpsg_tf(wpsg_getStr($this->view['storno_fee'])) > 0) { $pdf->SetFont('Arial', '', 9); @@ -717,16 +649,13 @@ $pdf->setXY($prod_left + 10, $prod_top + $offset + $sum_multi_offset); - $pdf->Cell( ((sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, $label, 1, 0, 'L'); - - if (sizeof($oOrder['arCalculation']['tax']) >= 2 || $this->get_option('wpsg_showMwstAlways') == '1') - { - - if ($this->view['basket']['noMwSt'] == '1') - { + $pdf->Cell( (($bTaxCol)?87:102), 8, $label, 1, 0, 'L'); + + if ($bTaxCol) { + + if ($bNoTax) { + $mwst = 0; - } - else - { - + + } else { $mwst = wpsg_ff($this->view['storno_fee_tax_value'], '%'); @@ -753,35 +682,43 @@ // Bestellbetrag einer einzelnen Bestellung - if ($arCalculation['noMwSt'] == '1') - { + if ($bNoTax) { + $pdf->Text($prod_left + 115, $prod_top + $offset + $sum_multi_offset + 6, __("Bestellbetrag (NETTO):", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset + $sum_multi_offset + 1); - $pdf->Cell(37, 8, wpsg_ff($oOrder['arCalculation']['sum']['productsum_netto'] + $oOrder['arCalculation']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); - } - else - { + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['netto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + + } else { + $pdf->Text($prod_left + 115, $prod_top + $offset + $sum_multi_offset + 6, __("Bestellbetrag (BRUTTO):", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset + $sum_multi_offset + 1); - $pdf->Cell(37, 8, wpsg_ff($oOrder['arCalculation']['sum']['productsum_brutto'] + $oOrder['arCalculation']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['brutto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + } - $sum_multi_offset += ($offset + 30); - + } // FOREACH ORDER END + + $arCalculation = $this->view['arCalculationSum']; + + $offset = $sum_multi_offset - 30; $pdf->SetFont('Arial', '', 9); - if ($this->view['kunde']['ustidnr'] != "") - { - $offset += 10; + if ($this->view['kunde']['ustidnr'] != "") { + + $offset += 13; + $pdf->Text($prod_left, $prod_top + $offset, __("Ihre Umsatzsteuer-Identifikationsnummer:", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, $this->view['kunde']['ustidnr'], 0, 0, 'R'); + } $offset += 10; - if ($this->get_option('wpsg_kleinunternehmer')) - { + + $offset = $checkPageBreak($this, $offset, 6); + + if ($this->get_option('wpsg_kleinunternehmer')) { $pdf->Text($prod_left, $prod_top + $offset + 10, __("Es ergibt sich folgender Gesamtbetrag", "wpsg").':'); @@ -789,17 +726,15 @@ $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, wpsg_ff($sum_productsum_brutto + $arCalculation['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + $offset += 5; - } - else - { - - if ($arCalculation['noMwSt'] == '1') - { + } else { + + if ($bNoTax) { $pdf->Text($prod_left, $prod_top + $offset + 10, __("Es ergibt sich folgender Gesamtbetrag", "wpsg").':'); $pdf->Text($prod_left + 80, $prod_top + $offset + 10, __("BRUTTOBETRAG", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset + 10 - 5); - $pdf->Cell(37, 8, wpsg_ff($sum_topay_brutto + $arCalculation['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['brutto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); $offset += 5; @@ -808,7 +743,5 @@ $pdf->Cell(37, 8, wpsg_ff(0, $this->get_option('wpsg_currency')), 0, 0, 'R'); - } - else - { + } else { $pdf->Text($prod_left, $prod_top + $offset + 10, __("Der Gesamtbetrag setzt sich wie folgt zusammen", "wpsg")); @@ -816,14 +749,15 @@ $pdf->Text($prod_left + 80, $prod_top + $offset + 10, __("NETTOBETRAG GESAMT", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset + 10 - 5); - $pdf->Cell(37, 8, wpsg_ff($sum_topay_netto + $arCalculation['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); - - if (sizeof($arCalculation['tax']) >= 1) - { - - foreach ($arCalculation['tax'] as $mw) - { + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['netto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + + if (sizeof($arCalculation['tax']) >= 1) { + + foreach ($arCalculation['tax'] as $k => $mw) { + + if ($k === 0) continue; $offset += 5; - $pdf->Text($prod_left + 80, $prod_top + $offset + 10, __("MwSt. ", "wpsg").wpsg_ff($mw['value'], '%')); + + $pdf->Text($prod_left + 80, $prod_top + $offset + 10, __("MwSt. ", "wpsg").wpsg_ff($mw['tax_value'], '%')); $pdf->setXY($prod_left + 140, $prod_top + $offset + 10 - 5); $pdf->Cell(37, 8, wpsg_ff($mw['sum'], $this->get_option('wpsg_currency')), 0, 0, 'R'); @@ -833,27 +767,14 @@ } - if (sizeof($arCalculation['tax']) > 1) - { + if (sizeof($arCalculation['tax']) > 1) { $offset += 5; $pdf->Text($prod_left + 80, $prod_top + $offset + 10, __("MwSt. GESAMT", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset + 10 - 5); - $pdf->Cell(37, 8, wpsg_ff($sum_productsum_brutto - $sum_productsum_netto, $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['tax'], $this->get_option('wpsg_currency')), 0, 0, 'R'); } } - - } - - // Rabatt - if ($arCalculation['sum']['preis_rabatt'] > 0) - { - - $offset += 5; - - $pdf->Text($prod_left + 80, $prod_top + $offset + 10, __("Rabatt", "wpsg")); - $pdf->setXY($prod_left + 140, $prod_top + $offset + 10 - 5); - $pdf->Cell(37, 8, '-'.wpsg_ff($arCalculation['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); } @@ -867,5 +788,5 @@ $pdf->setFont('Arial', '', '9'); - $pdf->Cell(37, 8, wpsg_ff($sum_productsum_brutto, $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['brutto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); $pdf->setFont('Arial', '', '9'); @@ -893,5 +814,5 @@ /* Endbetrag wird fett ausgegeben */ $pdf->setFont('Arial', 'B', '9'); - $pdf->Cell(37, 8, wpsg_ff($sum_topay_brutto, $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['topay_brutto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); $pdf->setFont('Arial', '', '9'); @@ -903,5 +824,5 @@ /* Endbetrag wird fett ausgegeben */ $pdf->setFont('Arial', 'B', '9'); - $pdf->Cell(37, 8, wpsg_ff($sum_topay_brutto, $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['topay_brutto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); $pdf->setFont('Arial', '', '9'); @@ -949,96 +870,25 @@ $shipping_adress = false; - - if ($this->hasMod('wpsg_mod_shippingadress') && $this->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array('k_id' => $data['k_id'], 'o_id' => $data['id']))) { - - $pdf->setFont('Arial', 'B', 9); - $pdf->Text($prod_left, $prod_top + $offset + 10, __("Lieferanschrift", "wpsg").":"); - $offset += 5; - - $pdf->setFont('Arial', '', 9); - - $shipping_adress = ""; - if ($data['shipping_firma'] != "") - { - $shipping_adress .= $data['shipping_firma']."\r\n"; - } - $shipping_adress .= $data['shipping_vname'].' '.$data['shipping_name']."\r\n"; - $shipping_adress .= $data['shipping_strasse'].' '.$data['shipping_nr']."\r\n"; - //$shipping_adress .= $data['shipping_land']['kuerzel'].'-'; - - $shipping_adress .= $data['shipping_plz'].' '.$data['shipping_ort']."\r\n"; - $shipping_adress .= $data['shipping_land']['name']; - - - $start = $pdf->getY(); - $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset + 10, 5, $shipping_adress, 0, 'L', 0, 100); - $offset += $pdf->getY() - $start; - - $shipping_adress = true; - - } - + $offset += 5; - - // Bestellvariablen - if ($this->hasMod('wpsg_mod_ordervars') && $this->get_option('wpsg_mod_rechnungen_showov') == '1') - { - - $bvars = @unserialize($data['bvars']); - if (!is_array($bvars)) $bvars = array(); - - $strBVars = ""; - foreach ($bvars as $bvars_id => $bvars_value) - { - - $bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."' ORDER BY `pos` ASC, `id` ASC "); - - if ($bvars['typ'] == "1") // Auswahl - { - if ($bvars_value <= 0) $bvars_value = __("Keine Angabe", "wpsg"); - } - else if ($bvars['typ'] == "2") // Texteingabe - { - if (trim($bvars_value) == "") $bvars_value = __("Keine Angabe", "wpsg"); - } - else if ($bvars['typ'] == "3") // Checkbox - { - if ($bvars_value <= 0) $bvars_value = __("Keine Angabe", "wpsg"); - } - - $bvars_name = $this->callMod('wpsg_mod_ordervars', 'getNameById', array($bvars_id)); - $strBVars .= "\r\n".$bvars_name.": ".$bvars_value; - - } - - $pdf->SetFont('Arial', 'B', 9); - $pdf->Text($prod_left, $prod_top + $offset + 10, __("Angaben wÀhrend der Bestellung", "wpsg").":"); - $pdf->SetFont('Arial', '', 9); - $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset + 10, 5, $strBVars); - - } - - if (!file_exists($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($data['id'])))) - { + + if (!file_exists($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($data['id'])))) { mkdir($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($data['id'])), 0777, true); } - - $this->callMods('wpsg_mod_rechnungen_pdf', array(&$pdf, &$data['id'], &$this->view['preview'], &$this->view['invoice'])); - + $filename = $this->view['filename'].".pdf"; - - //ob_end_clean(); - - // wpsg_debug("Generierter Dateipfad: ".$this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($data['id'])).$filename, 'F'); // DEBUG - + if ($this->view['preview']) { - - $pdf->Output($filename, 'I'); + + //$pdf->Output($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array('multi')).$filename, 'F'); + $pdf->Output(); + + exit; } else { - $pdf->Output($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($data['id'])).$filename, 'F'); + $pdf->Output($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array('multi')).$filename, 'F'); // Hier wird der Dateiname an FPD ÃŒbergeben. Er soll sich aus der Rechnungsnummer ergeben, auch wenn das Dokument ÃŒber die ID gespeichert ist. @@ -1046,4 +896,3 @@ } - -?> + Index: /views/order/index.phtml =================================================================== --- /views/order/index.phtml (revision 8068) +++ /views/order/index.phtml (revision 8069) @@ -236,5 +236,5 @@
-
+ view['arData']) && sizeof($this->view['arData']) > 0) { ?> @@ -452,5 +452,5 @@ document.getElementById('wpsg_action').addEventListener('change', (event) => { - + if (parseInt(event.target.value) >= 0) { @@ -463,4 +463,16 @@ } + let el_doaction = document.getElementById('doaction'); + + if (event.target.value === 'writeMultiRechnung') { + + el_doaction.style.display = 'none'; + + } else { + + el_doaction.style.display = 'block'; + + } + }); @@ -485,4 +497,32 @@ + +
+ + + + + + + +
@@ -504,5 +544,5 @@ }); - +