Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 7257) +++ /controller/wpsg_ShopController.class.php (revision 7258) @@ -721,4 +721,38 @@ } // public function init() + public function getShopLocations() { + + $arReturn = [ + 1 => [ + 'label' => __('Hauptsitz', 'wpsg'), + 'street' => $this->get_option('wpsg_shopdata_street'), + 'zip' => $this->get_option('wpsg_shopdata_zip'), + 'city' => $this->get_option('wpsg_shopdata_city'), + 'country' => $this->getDefaultCountry()->getName(), + 'tel' => $this->get_option('wpsg_shopdata_tel'), + 'fax' => $this->get_option('wpsg_shopdata_fax'), + 'email' => $this->get_option('wpsg_shopdata_email') + ], + ]; + + if ($this->get_option('wpsg_shopdata_2') === '1') { + + $arReturn[2] = [ + 'label' => __('Zweigstelle', 'wpsg'), + 'street' => $this->get_option('wpsg_shopdata_2_street'), + 'zip' => $this->get_option('wpsg_shopdata_2_zip'), + 'city' => $this->get_option('wpsg_shopdata_2_city'), + 'country' => $this->get_option('wpsg_shopdata_2_country'), + 'tel' => $this->get_option('wpsg_shopdata_2_tel'), + 'fax' => $this->get_option('wpsg_shopdata_2_fax'), + 'email' => $this->get_option('wpsg_shopdata_2_email') + ]; + + } + + return $arReturn; + + } + /** * Initiiert den Shop Index: /lib/wpsg_basket_widget.class.php =================================================================== --- /lib/wpsg_basket_widget.class.php (revision 7257) +++ /lib/wpsg_basket_widget.class.php (revision 7258) @@ -41,6 +41,8 @@ $GLOBALS['wpsg_sc']->render(WPSG_PATH_VIEW.'/warenkorb/index.phtml'); - - } // function widget($args, $settings) + + $GLOBALS['wpsg_sc']->basket->reset(); + + } // function widget($args, $settings) function form($instance) Index: ds/wpsg_mod_anschreiben.class.php =================================================================== --- /mods/wpsg_mod_anschreiben.class.php (revision 7257) +++ (revision ) @@ -1,618 +1,0 @@ -name = __('Anschreiben', 'wpsg'); - $this->group = __('Bestellung', 'wpsg'); - $this->desc = __('Ermöglicht die Erstellung von Anschreibenen.', 'wpsg'); - - } // public function __construct() - - public function init() - { - - require_once(dirname(__FILE__).'/mod_anschreiben/wpsg_anschreiben.class.php'); - - $this->fields = array( - 'firma' => __('Firmenname', 'wpsg'), - 'name' => __('Name', 'wpsg'), - 'strasse' => __('Straße', 'wpsg'), - 'plzort' => __('PLZ/Ort', 'wpsg'), - 'land' => __('Land', 'wpsg'), - 'tel' => __('Tel', 'wpsg'), - 'fax' => __('Fax', 'wpsg'), - 'mail' => __('E-Mail', 'wpsg'), - 'web' => __('Web', 'wpsg'), - 'strnr' => __('Steuer-Nr', 'wpsg'), - 'ustidnr' => __('UStIdNr.', 'wpsg'), - 'knr' => __('Kontonummer', 'wpsg'), - 'blz' => __('BLZ', 'wpsg'), - 'bank' => __('Bank', 'wpsg'), - 'user1' => __('Benutzer 1', 'wpsg'), - 'user2' => __('Benutzer 2', 'wpsg'), - 'user3' => __('Benutzer 3', 'wpsg'), - 'user4' => __('Benutzer 4', 'wpsg'), - 'user5' => __('Benutzer 5', 'wpsg') - ); - - } // public function init() - - public function install() - { - - require_once(WPSG_PATH_WP.'/wp-admin/includes/upgrade.php'); - - /** - * Tabelle fÃŒr die Lieferanten - */ - $sql = "CREATE TABLE ".WPSG_TBL_anschreiben." ( - id int(25) NOT NULL AUTO_INCREMENT, - order_id int(25) NOT NULL , - cdate DATETIME NOT NULL , - lnr VARCHAR(255) NOT NULL , - delivery_date DATETIME NOT NULL , - note TEXT NOT NULL, - cancel int(1) NOT NULL, - product_indexes TEXT NOT NULL, - PRIMARY KEY (id) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;"; - - // FrÃŒher gab es "product_keys" welches aber nicht eindeutig war, da es aktuell mehrmals den gleichen SchlÃŒssel im Warenkorb geben kann - - dbDelta($sql); - - - if ($this->shop->get_option('wpsg_mod_anschreiben_texte') === false) $this->resetAction(); - - } // public function install() - - public function settings_edit() - { - - $this->shop->view['wpsg_mod_anschreiben']['fields'] = $this->fields; - $this->shop->view['wpsg_mod_anschreiben']['arTexte'] = $this->shop->get_option('wpsg_mod_anschreiben_texte'); - if (!is_array($this->shop->view['wpsg_mod_anschreiben']['arTexte'])) $this->shop->view['wpsg_mod_anschreiben']['arTexte'] = array(); - - if (file_exists($this->getFilePath('').'wpsg_anschreiben_bp.jpg')) - { - $this->shop->view['wpsg_mod_anschreiben']['bp'] = $this->getFilePath('', true).'wpsg_anschreiben_bp.jpg'; - } - else if (file_exists($this->getFilePath('').'wpsg_anschreiben_bp.pdf')) - { - $this->shop->view['wpsg_mod_anschreiben']['bp'] = $this->getFilePath('', true).'wpsg_anschreiben_bp.pdf'; - } - else - { - $this->shop->view['wpsg_mod_anschreiben']['bp'] = false; - } - - if (file_exists($this->getFilePath('').'wpsg_anschreiben_logo.jpg')) - { - $this->shop->view['wpsg_mod_anschreiben']['logo'] = $this->getFilePath('', true).'wpsg_anschreiben_logo.jpg'; - } - else - { - $this->shop->view['wpsg_mod_anschreiben']['logo'] = false; - } - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_anschreiben/settings_edit.phtml'); - - } // public function settings_edit() - - /** - * zeigt das Formular zum Drucken in der Bestellverwaltung - */ - public function order_view($order_id, &$arSidebarArray) - { - - $arSidebarArray[$this->id] = array( - 'title' => $this->name, - 'content' => $this->shop->render(WPSG_PATH_VIEW.'mods/mod_anschreiben/order_view.phtml', false) - ); - - } // public function order_view_content($order_id) - - public function settings_save() - { - - $this->shop->update_option("wpsg_mod_anschreiben_texte", $_REQUEST['text']); - $this->shop->update_option('wpsg_mod_anschreiben_adressrow', $_REQUEST['wpsg_mod_anschreiben_adressrow']); - - - - if (file_exists($_FILES['wpsg_mod_anschreiben_bp']['tmp_name'])) - { - - $ending = strtolower(preg_replace("/(.*)\./", "", $_FILES['wpsg_mod_anschreiben_bp']['name'])); - - if ($ending != "jpg" && $ending != "jpeg" && $ending != "pdf") - { - $this->shop->addBackendError(__("UngÃŒltiger Dateityp (Briefpapier) ! Es sind nur JPG und PDF Dateien erlaubt!", "wpsg")); - } - else if ($ending == "jpg" || $ending == "jpeg") - { - move_uploaded_file($_FILES['wpsg_mod_anschreiben_bp']['tmp_name'], $this->getFilePath('').'wpsg_anschreiben_bp.jpg'); - } - else if ($ending == "pdf") - { - move_uploaded_file($_FILES['wpsg_mod_anschreiben_bp']['tmp_name'], $this->getFilePath('').'wpsg_anschreiben_bp.pdf'); - } - - } - else if ((array_key_exists('wpsg_mod_anschreiben_bp_del', $_REQUEST)) && ($_REQUEST['wpsg_mod_anschreiben_bp_del'] == "1")) - { - - @unlink($this->getFilePath('').'wpsg_anschreiben_bp.jpg'); - @unlink($this->getFilePath('').'wpsg_anschreiben_bp.pdf'); - - $this->shop->addBackendMessage(__('Briefpapier wurde erfolgreich gelöscht.', 'wpsg')); - - } - - - if (array_key_exists('wpsg_mod_anschreiben_logo_position_left', $_REQUEST) && strpos($_REQUEST['wpsg_mod_anschreiben_logo_position_left'], 'selected') !== false) - $wpsg_mod_anschreiben_logo_position = "left"; - - if (array_key_exists('wpsg_mod_anschreiben_logo_position_center', $_REQUEST) && strpos($_REQUEST['wpsg_mod_anschreiben_logo_position_center'], 'selected') !== false) - $wpsg_mod_anschreiben_logo_position = "center"; - - if (array_key_exists('wpsg_mod_anschreiben_logo_position_right', $_REQUEST) && strpos($_REQUEST['wpsg_mod_anschreiben_logo_position_right'], 'selected') !== false) - $wpsg_mod_anschreiben_logo_position = "right"; - - - if (file_exists($_FILES['wpsg_mod_anschreiben_logo']['tmp_name'])) - { - - $ending = strtolower(preg_replace("/(.*)\./", "", $_FILES['wpsg_mod_anschreiben_logo']['name'])); - - if ($ending != "jpg" && $ending != "jpeg") - { - $this->shop->addBackendError(__("UngÃŒltiger Dateityp (Logo) ! Es sind nur JPG und PDF Dateien erlaubt!", "wpsg")); - } - else if ($ending == "jpg" || $ending == "jpeg") - { - move_uploaded_file($_FILES['wpsg_mod_anschreiben_logo']['tmp_name'], $this->getFilePath('').'wpsg_anschreiben_logo.jpg'); - } - - } - else if ((array_key_exists('wpsg_mod_anschreiben_logo_del', $_REQUEST)) && ($_REQUEST['wpsg_mod_anschreiben_logo_del'] == "1")) - { - - @unlink($this->getFilePath('').'wpsg_anschreiben_logo.jpg'); - - $this->shop->addBackendMessage(__('Logo wurde erfolgreich gelöscht.', 'wpsg')); - - } - - $this->shop->update_option("wpsg_mod_anschreiben_logo_position", $wpsg_mod_anschreiben_logo_position ? $wpsg_mod_anschreiben_logo_position : null); - $this->shop->update_option("wpsg_mod_anschreiben_logo_transparency", $_REQUEST['wpsg_mod_anschreiben_logo_transparency']); - - } // public function settings_save() - - public function admin_presentation() - { - - echo wpsg_drawForm_Checkbox('wpsg_mod_anschreiben_pdf_beschreibung', __('Produktbeschreibung auf Anschreiben anzeigen', 'wpsg'), $this->shop->get_option('wpsg_mod_anschreiben_pdf_beschreibung')); - if ($this->shop->hasMod('wpsg_mod_productvariants')) echo wpsg_drawForm_Checkbox('wpsg_mod_anschreiben_pdf_varianten', __('Varianten auf Anschreiben anzeigen', 'wpsg'), $this->shop->get_option('wpsg_mod_anschreiben_pdf_varianten')); - - } // public function admin_presentation() - - public function admin_presentation_submit() - { - - $this->shop->update_option('wpsg_mod_anschreiben_pdf_beschreibung', $_REQUEST['wpsg_mod_anschreiben_pdf_beschreibung']); - - } // public function admin_presentation_submit() - - public function order_ajax() - { - - if (isset($_REQUEST['wpsg_anschreiben_preview'])) - { - - // Vorschau eines Anschreibenes aus der Bestellverwaltung - $this->writeanschreiben( - $_REQUEST['edit_id'], - explode(',', $_REQUEST['wpsg_mod_anschreiben_productindexes']), - strtotime($_REQUEST['wpsg_mod_anschreiben_date']), - true - ); - - die(); - - } - else if (wpsg_getStr($_REQUEST['do']) == 'get') - { - - $dn = new wpsg_anschreiben(); - $dn->load($_REQUEST['dn_id']); - - if ($dn->order_id != $_REQUEST['edit_id']) throw new \wpsg\Exception(__('Es wurde versucht ein Anschreiben von einer anderen Bestellung anzuzeigen', 'wpsg')); - - $filename = 'anschreiben_'.$dn->id.'.pdf'; - $file = $this->getFilePath($_REQUEST['edit_id']).$filename; - - wpsg_header::PDFPlugin($file); - - } - else if (isset($_REQUEST['wpsg_mod_anschreiben_write'])) - { - - if ($_REQUEST['edit_id'] <= 0) throw new \wpsg\Exception(__('Beim Erstellen des Anschreibendokumentes wurde keine BestellID ÃŒbergeben', 'wpsg')); - - $lnr = $this->buildLnr($_REQUEST['edit_id']); - - $arProductIndexes = explode(',', $_REQUEST['wpsg_mod_anschreiben_productindexes']); - - foreach ($arProductIndexes as $product_key) - { - - if (!wpsg_anschreiben::checkProductKey($product_key, $_REQUEST['edit_id'])) throw new \wpsg\Exception(__('Ein Anschreiben wurde fÃŒr ein Produkt bereits erstellt', 'wpsg')); - - } - - // In Datenbank eintragen - $dn_id = $this->db->ImportQuery(WPSG_TBL_anschreiben, array( - 'order_id' => wpsg_q($_REQUEST['edit_id']), - 'cdate' => "NOW()", - 'delivery_date' => date('Y-m-d', strtotime($_REQUEST['wpsg_mod_anschreiben_date'])), - 'lnr' => wpsg_q($lnr), - 'cancel' => '0', - 'product_indexes' => wpsg_q($_REQUEST['wpsg_mod_anschreiben_productindexes']) - )); - - $filename = 'anschreiben_'.$dn_id.'.pdf'; - - // Anschreiben erstellen - $bOK = $this->writeanschreiben( - $_REQUEST['edit_id'], - explode(',', $_REQUEST['wpsg_mod_anschreiben_productindexes']), - strtotime($_REQUEST['wpsg_mod_anschreiben_date']), - false, - $lnr, - $filename - ); - - if ($bOK === true) - { - - $file = $this->getFilePath($_REQUEST['edit_id']).'/'.$filename; - - if (!file_exists($file) || !is_file($file)) - { - - $this->db->Query("DELETE FROM `".WPSG_TBL_anschreiben."` WHERE `id` = '".wpsg_q($dn_id)."'"); - throw new \wpsg\Exception(__('Das Anschreibendokument wurde nicht wie vorgesehen angelegt', 'wpsg')); - - } - - wpsg_header::PDFPlugin($file); - - } - else - { - - $this->db->Query("DELETE FROM `".WPSG_TBL_anschreiben."` WHERE `id` = '".wpsg_q($dn_id)."'"); - throw new \wpsg\Exception(__('Beim Erstellen des Anschreibendokumentes ist ein Fehler aufgetreten', 'wpsg')); - - } - - } - - } // public function order_ajax() - - - public function delOrder(&$order_id) - { - - // Anschreibene in der Datenbank löschen - $this->db->Query("DELETE FROM `".WPSG_TBL_anschreiben."` WHERE `order_id` = '".wpsg_q($order_id)."'"); - - // Anschreibene im Dateisystem löschen - $path = $this->getFilePath($order_id); wpsg_rrmdir($path); - - } // public function delOrder(&$order_id) - - - public function be_ajax() - { - - if ($_REQUEST['do'] == 'reset') - { - - $this->resetAction(); - $this->shop->addBackendMessage(__('Grundeinstellungen wieder hergestellt', 'wpsg')); - - $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul='.$_REQUEST['modul']); - - } - else if ($_REQUEST['do'] == 'orderAjax') - { - - $this->order_ajax(); - - } - - - } // public function be_ajax() - - - - /** - * Generiert das Anschreiben fÃŒr eine Bestellung - */ - public function writeanschreiben($order_id, $arProductIndexes, $preview = false, $lnr = false, $filename = false) - { - - if($preview && is_null($order_id)) $order_id = 1; - - $this->shop->view['order'] = $this->shop->cache->loadOrder($order_id); - $this->shop->view['customer'] = $this->shop->cache->loadKunden($this->shop->view['order']['k_id']); - $this->shop->view['data'] = array(); - - // Wurde die Bestellung in einer anderen Sprache gemacht - if (trim($this->shop->view['order']['language']) != '') $this->shop->setTempLocale($this->shop->view['order']['language']); - - $oOrder = wpsg_order::getInstance($order_id); - - // Rechnungsadresse - $this->shop->view['data']['id'] = $this->shop->view['customer']['id']; - $this->shop->view['data']['firma'] = $this->shop->view['customer']['firma']; - $this->shop->view['data']['vname'] = $this->shop->view['customer']['vname']; - $this->shop->view['data']['name'] = $this->shop->view['customer']['name']; - $this->shop->view['data']['strasse'] = $this->shop->view['customer']['strasse']; - $this->shop->view['data']['hausnr'] = $this->shop->view['customer']['nr']; - $this->shop->view['data']['plz'] = $this->shop->view['customer']['plz']; - $this->shop->view['data']['ort'] = $this->shop->view['customer']['ort']; - $this->shop->view['data']['land'] = $this->shop->view['customer']['land']; - $this->shop->view['data']['land'] = strtoupper($oOrder->getInvoiceCountryName()); - - // Lieferadresse? - if ($this->shop->hasMod('wpsg_mod_shippingadress')) - { - - if ($this->shop->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array($this->shop->view['order']['k_id'], $order_id))) - { - - $adata = $this->db->fetchRow("SELECT A.* FROM `".WPSG_TBL_ADRESS."` AS A WHERE A.`id` = '".wpsg_q($this->shop->view['order']['shipping_adress_id'])."'"); - - - $this->shop->view['data']['firma'] = $adata['firma']; - $this->shop->view['data']['vname'] = $adata['vname']; - $this->shop->view['data']['name'] = $adata['name']; - $this->shop->view['data']['strasse'] = $adata['strasse']; - $this->shop->view['data']['hausnr'] = $adata['nr']; - $this->shop->view['data']['plz'] = $adata['plz']; - $this->shop->view['data']['ort'] = $adata['ort']; - $this->shop->view['data']['land'] = $adata['land']; - $this->shop->view['data']['land'] = strtoupper($oOrder->getShippingCountryName()); - - } - - } - - if (wpsg_isSizedInt($this->shop->view['data']['land'])) - { - - $this->shop->view['data']['land'] = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($this->shop->view['data']['land'])."'"); - - } - - $this->shop->view['preview'] = $preview; - - if ($liefer_datum === false) $this->shop->view['lDatum'] = time(); - else $this->shop->view['lDatum'] = $liefer_datum; - - $this->shop->view['data']['products'] = array(); - - foreach ($arProductIndexes as $product_index) - { - - $product_data = $this->db->fetchRow(" - SELECT - OP.*, - P.`name` - FROM - `".WPSG_TBL_ORDERPRODUCT."` AS OP - LEFT JOIN `".WPSG_TBL_PRODUCTS."` AS P ON (OP.`p_id` = P.`id`) - WHERE - OP.`product_index` = '".wpsg_q($product_index)."' AND - OP.`o_id` = '".wpsg_q($order_id)."' - "); - - if ($this->shop->isOtherLang()) - { - - $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_data['p_id'])."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); - - if ($produkt_trans['id'] > 0) - { - - $product_data['name'] = $produkt_trans['name']; - - } - - } - - $this->shop->view['data']['products'][$product_index] = $product_data; - - } - - if ($preview === true) - { - - $this->shop->view['filename'] = __('AnschreibenVorschau.pdf', 'wpsg'); - $this->shop->view['title'] = __('Anschreiben Vorschau', 'wpsg'); - $this->shop->view['lnr'] = $this->buildLnr($order_id); - - } - else - { - - $this->shop->view['filename'] = $filename; - $this->shop->view['title'] = __('Anschreiben', 'wpsg'); - $this->shop->view['lnr'] = $lnr; - - } - - $this->shop->view['oOrder'] = $this->shop->cache->loadOrderObject($order_id); - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_anschreiben/anschreiben_pdf.phtml'); - - $this->shop->restoreTempLocale(); - - return true; - - } // public function writeanschreiben($order_id, $preview = false) - - - /** - * LÀdt die Anschreibene einer Bestellung - * @param int $order_id ID der Bestellung - */ - public function loadanschreibensFromOrder($order_id) - { - - $anschreiben_ids = $this->db->fetchAssocField("SELECT DN.`id` FROM `".WPSG_TBL_anschreiben."` AS DN WHERE `order_id` = '".wpsg_q($order_id)."' "); - - $arReturn = array(); - - foreach ($anschreiben_ids as $anschreiben_id) - { - - $anschreiben = new wpsg_anschreiben(); - $anschreiben->load($anschreiben_id); - - $arReturn[$anschreiben_id] = $anschreiben; - - } - - return $arReturn; - - } // public function loadanschreibensFromOrder($order_id) - - - /** - * Gibt die Texte fÃŒr das PDF in der korrekten Sprache und mit ÃŒbersetzen Platzhaltern zurÃŒck - */ - public function getTexte($order_id) - { - - $arTexte = $this->shop->get_option("wpsg_mod_anschreiben_texte"); - - foreach ($arTexte as $k => $v) - { - - $arTexte[$k]['text'] = $this->shop->replaceUniversalPlatzhalter(__($arTexte[$k]['text'], 'wpsg'), $order_id); - - } - - return $arTexte; - - } // public function getTexte($order_id) - - /** - * LÀdt die vordefinierten Textfelder - */ - public function resetAction() - { - - $arData = array( - "firma" => array("aktiv" => "1", "x" => "24", "y" => "10", "fontsize" => 8, "text" => "%shopinfo_name%", "color" => "#000000"), - "name" => array("aktiv" => "1", "x" => "24", "y" => "13", "fontsize" => 8, "text" => "Inh. %shopinfo_owner%", "color" => "#000000"), - "strasse" => array("aktiv" => "1", "x" => "24", "y" => "16", "fontsize" => 8, "text" => "%shopinfo_street%", "color" => "#000000"), - "plzort" => array("aktiv" => "1", "x" => "24", "y" => "19", "fontsize" => 8, "text" => "%shopinfo_zip% %shopinfo_city%", "color" => "#000000"), - "land" => array("aktiv" => "1", "x" => "24", "y" => "22", "fontsize" => 8, "text" => "DEUTSCHLAND", "color" => "#000000"), - "tel" => array("aktiv" => "1", "x" => "75", "y" => "10", "fontsize" => 8, "text" => "Tel. %shopinfo_tel%", "color" => "#000000"), - "fax" => array("aktiv" => "1", "x" => "75", "y" => "13", "fontsize" => 8, "text" => "Fax. %shopinfo_fax%", "color" => "#000000"), - "mail" => array("aktiv" => "1", "x" => "75", "y" => "16", "fontsize" => 8, "text" => "Mail: %shopinfo_email%", "color" => "#000000"), - "web" => array("aktiv" => "1", "x" => "75", "y" => "19", "fontsize" => 8, "text" => "Web: ".site_url(), "color" => "#000000"), - "strnr" => array("aktiv" => "1", "x" => "24", "y" => "270", "fontsize" => 8, "text" => "Steuer-Nr.: %shopinfo_taxnr%", "color" => "#000000"), - "ustidnr" => array("aktiv" => "1", "x" => "24", "y" => "273", "fontsize" => 8, "text" => "USt-IdNr.: %shopinfo_ustidnr%", "color" => "#000000"), - "knr" => array("aktiv" => "1", "x" => "24", "y" => "276", "fontsize" => 8, "text" => "IBAN: %shopinfo_iban%", "color" => "#000000"), - "blz" => array("aktiv" => "1", "x" => "24", "y" => "279", "fontsize" => 8, "text" => "BIC: %shopinfo_bic%", "color" => "#000000"), - "bank" => array("aktiv" => "1", "x" => "24", "y" => "282", "fontsize" => 8, "text" => "Bank: %shopinfo_bankname%", "color" => "#000000"), - ); - - $this->shop->update_option("wpsg_mod_anschreiben_adressrow", "Absender: %shopinfo_name% %shopinfo_street% %shopinfo_zip% %shopinfo_city%"); - $this->shop->update_option("wpsg_mod_anschreiben_texte", $arData); - - } // public function resetAction() - - /** - * Gibt den Absoluten Pfad zurÃŒck wo die Anschreibene gespeichert sind - */ - public function getFilePath($order_id, $url = false) { - - if ($order_id == '') { - - // Briefpapier/Logo - if ($this->shop->isMultiBlog()) { - - $path = WPSG_PATH_CONTENT.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_anschreiben/'.$order_id.'/'; - $url_content = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_anschreiben/'; - - if ($url) $strReturn = $url_content.$order_id.'/'; - else $strReturn = $path; - - } else { - - $path = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_anschreiben/'.$order_id.'/'; - - if ($url) $strReturn = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_anschreiben/'.$order_id.'/'; - else $strReturn = $path.'/'; - - } - - } else { - - // Anschreiben aus Bestellung - $anschreiben = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_anschreiben."` AS DN WHERE `order_id` = '".wpsg_q($order_id)."' "); - $datum = $anschreiben['cdate']; - $ym = date('Y/m/', strtotime($datum)); - - if ($this->shop->isMultiBlog()) { - - $path = WPSG_PATH_CONTENT.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_anschreiben/'.$ym.$order_id.'/'; - $url_content = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_anschreiben/'.$ym; - - if ($url) $strReturn = $url_content.$order_id.'/'; - else $strReturn = $path; - - } else { - - $path = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_anschreiben/'.$ym.$order_id.'/'; - - if ($url) $strReturn = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_anschreiben/'.$ym.$order_id.'/'; - else $strReturn = $path.'/'; - - } - - } // if ($order_id == '') - - $this->shop->protectDirectory($path, [ - 'wpsg_anschreiben_logo.jpg', 'wpsg_anschreiben_bp.jpg', 'wpsg_anschreiben_bp.pdf' - ] ); - - return $strReturn; - - } // private function getFilePath($produkt_id, $url = false) - - } // class wpsg_mod_anschreiben extends wpsg_mod_basic - -?> Index: /mods/wpsg_mod_coverletter.class.php =================================================================== --- /mods/wpsg_mod_coverletter.class.php (revision 7258) +++ /mods/wpsg_mod_coverletter.class.php (revision 7258) @@ -0,0 +1,477 @@ +shop->prefix.'wpsg_coverletter'); + + /** + * Modul zur Generierung von Anschreibenen + * @author Daschmi + */ + class wpsg_mod_coverletter extends wpsg_mod_basic { + + var $lizenz = 0; + var $id = 2200; + var $hilfeURL = 'http://wpshopgermany.maennchen1.de/?p=3667'; + + public function __construct() { + + parent::__construct(); + + $this->name = __('Anschreiben', 'wpsg'); + $this->group = __('Bestellung', 'wpsg'); + $this->desc = __('Ermöglicht die Erstellung von Anschreibenen.', 'wpsg'); + + } // public function __construct() + + public function init() { + + $this->fields = array( + 'company' => __('Firmenname', 'wpsg'), + 'name' => __('Name', 'wpsg'), + 'street' => __('Straße', 'wpsg'), + 'zipcity' => __('PLZ/Ort', 'wpsg'), + 'country' => __('Land', 'wpsg'), + 'tel' => __('Tel', 'wpsg'), + 'fax' => __('Fax', 'wpsg'), + 'mail' => __('E-Mail', 'wpsg'), + 'web' => __('Web', 'wpsg'), + 'taxnr' => __('Steuer-Nr', 'wpsg'), + 'ustidnr' => __('UStIdNr.', 'wpsg'), + 'bank' => __('Bank', 'wpsg'), + 'iban' => __('IBAN', 'wpsg'), + 'bic' => __('BIC', 'wpsg'), + 'user1' => __('Benutzer 1', 'wpsg'), + 'user2' => __('Benutzer 2', 'wpsg'), + 'user3' => __('Benutzer 3', 'wpsg'), + 'user4' => __('Benutzer 4', 'wpsg'), + 'user5' => __('Benutzer 5', 'wpsg') + ); + + } // public function init() + + public function install() { + + require_once(WPSG_PATH_WP.'/wp-admin/includes/upgrade.php'); + + /** + * Tabelle fÃŒr die Lieferanten + */ + $sql = "CREATE TABLE ".WPSG_TBL_COVERLETTER." ( + id int(25) NOT NULL AUTO_INCREMENT, + cdate DATETIME NOT NULL, + order_id int(25) NOT NULL, + text TEXT NOT NULL, + KEY order_id (order_id), + PRIMARY KEY (id) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;"; + + dbDelta($sql); + + } // public function install() + + public function settings_edit() { + + $this->shop->view['wpsg_mod_coverletter']['fields'] = $this->fields; + $this->shop->view['wpsg_mod_coverletter']['arTexts'] = $this->shop->get_option('wpsg_mod_coverletter_texts'); + + if (!is_array($this->shop->view['wpsg_mod_coverletter']['arTexts'])) $this->shop->view['wpsg_mod_coverletter']['arTexts'] = array(); + + if (file_exists($this->getFilePath('').'wpsg_coverletter_bp.jpg')) { + + $this->shop->view['wpsg_mod_coverletter']['bp'] = $this->getFilePath('', true).'wpsg_coverletter_bp.jpg'; + + } else if (file_exists($this->getFilePath('').'wpsg_coverletter_bp.pdf')) { + + $this->shop->view['wpsg_mod_coverletter']['bp'] = $this->getFilePath('', true).'wpsg_coverletter_bp.pdf'; + + } else { + + $this->shop->view['wpsg_mod_coverletter']['bp'] = false; + + } + + if (file_exists($this->getFilePath('').'wpsg_coverletter_logo.jpg')) { + + $this->shop->view['wpsg_mod_coverletter']['logo'] = $this->getFilePath('', true).'wpsg_coverletter_logo.jpg'; + + } else { + + $this->shop->view['wpsg_mod_coverletter']['logo'] = false; + + } + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_coverletter/settings_edit.phtml'); + + } // public function settings_edit() + + /** + * zeigt das Formular zum Drucken in der Bestellverwaltung + */ + public function order_view($order_id, &$arSidebarArray) { + + $arSidebarArray[$this->id] = array( + 'title' => $this->name, + 'content' => $this->shop->render(WPSG_PATH_VIEW.'mods/mod_coverletter/order_view.phtml', false) + ); + + } // public function order_view_content($order_id) + + public function settings_save() { + + $this->shop->update_option("wpsg_mod_coverletter_texts", $_REQUEST['text']); + + if (file_exists($_FILES['wpsg_mod_coverletter_bp']['tmp_name'])) { + + $ending = strtolower(preg_replace("/(.*)\./", "", $_FILES['wpsg_mod_coverletter_bp']['name'])); + + if ($ending != "jpg" && $ending != "jpeg" && $ending != "pdf") { + + $this->shop->addBackendError(__("UngÃŒltiger Dateityp (Briefpapier) ! Es sind nur JPG und PDF Dateien erlaubt!", "wpsg")); + + } else if ($ending == "jpg" || $ending == "jpeg") { + + move_uploaded_file($_FILES['wpsg_mod_coverletter_bp']['tmp_name'], $this->getFilePath('').'wpsg_coverletter_bp.jpg'); + + } else if ($ending == "pdf") { + + move_uploaded_file($_FILES['wpsg_mod_coverletter_bp']['tmp_name'], $this->getFilePath('').'wpsg_coverletter_bp.pdf'); + + } + + } else if ((array_key_exists('wpsg_mod_coverletter_bp_del', $_REQUEST)) && ($_REQUEST['wpsg_mod_coverletter_bp_del'] == "1")) { + + @unlink($this->getFilePath('').'wpsg_coverletter_bp.jpg'); + @unlink($this->getFilePath('').'wpsg_coverletter_bp.pdf'); + + $this->shop->addBackendMessage(__('Briefpapier wurde erfolgreich gelöscht.', 'wpsg')); + + } + + if (array_key_exists('wpsg_mod_coverletter_logo_position_left', $_REQUEST) && strpos($_REQUEST['wpsg_mod_coverletter_logo_position_left'], 'selected') !== false) + $wpsg_mod_coverletter_logo_position = "left"; + + if (array_key_exists('wpsg_mod_coverletter_logo_position_center', $_REQUEST) && strpos($_REQUEST['wpsg_mod_coverletter_logo_position_center'], 'selected') !== false) + $wpsg_mod_coverletter_logo_position = "center"; + + if (array_key_exists('wpsg_mod_coverletter_logo_position_right', $_REQUEST) && strpos($_REQUEST['wpsg_mod_coverletter_logo_position_right'], 'selected') !== false) + $wpsg_mod_coverletter_logo_position = "right"; + + if (file_exists($_FILES['wpsg_mod_coverletter_logo']['tmp_name'])) { + + $ending = strtolower(preg_replace("/(.*)\./", "", $_FILES['wpsg_mod_coverletter_logo']['name'])); + + if ($ending != "jpg" && $ending != "jpeg") { + + $this->shop->addBackendError(__("UngÃŒltiger Dateityp (Logo) ! Es sind nur JPG und PDF Dateien erlaubt!", "wpsg")); + + } else if ($ending == "jpg" || $ending == "jpeg") { + + move_uploaded_file($_FILES['wpsg_mod_coverletter_logo']['tmp_name'], $this->getFilePath('').'wpsg_coverletter_logo.jpg'); + + } + + } else if ((array_key_exists('wpsg_mod_coverletter_logo_del', $_REQUEST)) && ($_REQUEST['wpsg_mod_coverletter_logo_del'] == "1")) { + + @unlink($this->getFilePath('').'wpsg_coverletter_logo.jpg'); + + $this->shop->addBackendMessage(__('Logo wurde erfolgreich gelöscht.', 'wpsg')); + + } + + $this->shop->update_option("wpsg_mod_coverletter_logo_position", $wpsg_mod_coverletter_logo_position?$wpsg_mod_coverletter_logo_position:null); + $this->shop->update_option("wpsg_mod_coverletter_logo_transparency", $_REQUEST['wpsg_mod_coverletter_logo_transparency']); + + } // public function settings_save() + + public function order_ajax() { + + if (isset($_REQUEST['wpsg_coverletter_preview'])) { + + // Vorschau eines Anschreibenes aus der Bestellverwaltung + $this->writeCoverLetter( + $_REQUEST['edit_id'], + $_REQUEST['text'], + true, + __('Vorschau', 'wpsg'), + 'coverletter-preview.pdf' + ); + + die(); + + } else if (isset($_REQUEST['wpsg_mod_coverletter_write'])) { + + if ($_REQUEST['edit_id'] <= 0) throw new \wpsg\Exception(__('Beim Erstellen des Anschreibendokumentes wurde keine BestellID ÃŒbergeben', 'wpsg')); + + // In Datenbank eintragen + $cl_id = $this->db->ImportQuery(WPSG_TBL_COVERLETTER, array( + 'order_id' => wpsg_q($_REQUEST['edit_id']), + 'cdate' => "NOW()", + 'text' => wpsg_q($_REQUEST['text']) + )); + + $filename = $this->getFilePath($_REQUEST['edit_id']).'/coverletter_'.$cl_id.'.pdf'; + + // Anschreiben erstellen + $bOK = $this->writeCoverLetter( + $_REQUEST['edit_id'], + $_REQUEST['text'], + false, + $cl_id, + $filename + ); + + if ($bOK === true) { + + if (!file_exists($filename) || !is_file($filename)) { + + $this->db->Query("DELETE FROM `".WPSG_TBL_COVERLETTER."` WHERE `id` = '".wpsg_q($cl_id)."'"); + + throw new \wpsg\Exception(__('Das Anschreibendokument wurde nicht wie vorgesehen angelegt', 'wpsg')); + + } + + wpsg_header::PDFPlugin($filename); + + } + else + { + + $this->db->Query("DELETE FROM `".WPSG_TBL_COVERLETTER."` WHERE `id` = '".wpsg_q($cl_id)."'"); + + throw new \wpsg\Exception(__('Beim Erstellen des Anschreibendokumentes ist ein Fehler aufgetreten', 'wpsg')); + + } + + } + + } // public function order_ajax() + + public function delOrder(&$order_id) { + + // Anschreibene in der Datenbank löschen + $this->db->Query("DELETE FROM `".WPSG_TBL_COVERLETTER."` WHERE `order_id` = '".wpsg_q($order_id)."'"); + + // Anschreibene im Dateisystem löschen + $path = $this->getFilePath($order_id); wpsg_rrmdir($path); + + } // public function delOrder(&$order_id) + + public function be_ajax() { + + if ($_REQUEST['do'] == 'reset') { + + $this->resetAction(); + $this->shop->addBackendMessage(__('Grundeinstellungen wieder hergestellt', 'wpsg')); + + $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul='.$_REQUEST['modul']); + + } else if (wpsg_isSizedString($_REQUEST['do'], 'getBp')) { + + $file = ''; + + if (file_exists($this->getFilePath('')."wpsg_coverletter_bp.pdf")) { + + $file = $this->getFilePath('')."wpsg_coverletter_bp.pdf"; + + header('Content-Type: application/pdf'); + + } else if (file_exists($this->getFilePath('')."wpsg_coverletter_bp.jpg")) { + + $file = $this->getFilePath('')."wpsg_coverletter_bp.jpg"; + + header("Content-type: image/jpeg"); + + } + + readfile($file); + + } else if (wpsg_isSizedString($_REQUEST['do'], 'getLogo')) { + + $logo = $this->getFilePath('').'wpsg_coverletter_logo.jpg'; + + header("Content-type: image/jpeg"); + readfile($logo); + + } else if ($_REQUEST['do'] == 'orderAjax') { + + $this->order_ajax(); + + } + + } // public function be_ajax() + + /** + * Generiert das Anschreiben fÃŒr eine Bestellung + */ + public function writeCoverLetter($order_id, $text, $preview, $clnr, $filename) { + + if ($preview === true && !wpsg_isSizedInt($order_id)) { + + $this->shop->view['order'] = [ + 'onr' => __('Vorschau', 'wpsg'), + 'cdate' => date('d.m.Y') + ]; + $this->shop->view['customer'] = [ + 'knr' => __('Vorschau', 'wpsg') + ]; + + } else { + + $this->shop->view['order'] = $this->shop->cache->loadOrder($order_id); + $this->shop->view['customer'] = $this->shop->cache->loadKunden($this->shop->view['order']['k_id']); + $this->shop->view['data'] = array(); + + } + + // Wurde die Bestellung in einer anderen Sprache gemacht + if (trim($this->shop->view['order']['language']) != '') $this->shop->setTempLocale($this->shop->view['order']['language']); + + $oOrder = wpsg_order::getInstance($order_id); + $this->shop->view['oOrder'] = $oOrder; + + // Rechnungsadresse + $this->shop->view['data']['id'] = $this->shop->view['customer']['id']; + $this->shop->view['data']['company'] = $this->shop->view['customer']['firma']; + $this->shop->view['data']['firstname'] = $this->shop->view['customer']['vname']; + $this->shop->view['data']['name'] = $this->shop->view['customer']['name']; + $this->shop->view['data']['street'] = $this->shop->view['customer']['strasse']; + $this->shop->view['data']['hnr'] = $this->shop->view['customer']['nr']; + $this->shop->view['data']['zip'] = $this->shop->view['customer']['plz']; + $this->shop->view['data']['city'] = $this->shop->view['customer']['ort']; + + $this->shop->view['data']['country'] = ''; + if ($oOrder->getInvoiceCountryID() !== $this->shop->getDefaultCountry(true)) $this->shop->view['data']['country'] = strtoupper($oOrder->getInvoiceCountryName()); + + if ($preview === true && !wpsg_isSizedInt($order_id)) { + + $this->shop->view['data']['company'] = __('Musterfirma', 'wpsg'); + $this->shop->view['data']['firstname'] = __('Max', 'wpsg'); + $this->shop->view['data']['name'] = __('Mustermann', 'wpsg'); + $this->shop->view['data']['street'] = __('Musterstraße'); + $this->shop->view['data']['hnr'] = '1'; + $this->shop->view['data']['zip'] = '12345'; + $this->shop->view['data']['city'] = __('Musterhausen', 'wpsg'); + $this->shop->view['data']['country'] = ''; // strtoupper($this->shop->getDefaultCountry()->getName()); + + } + + $this->shop->view['preview'] = $preview; + $this->shop->view['filename'] = $filename; + $this->shop->view['text'] = $text; + + // Benutzerdefinierte Felder + $this->shop->view['arTexts'] = $this->shop->get_option('wpsg_mod_coverletter_texts'); + + foreach ($this->shop->view['arTexts'] as $k => $t) { + + $this->shop->view['arTexts'][$k]['text'] = $this->shop->replaceUniversalPlatzhalter($t['text'], $oOrder->id); + + } + + $this->shop->view['title'] = __('Anschreiben', 'wpsg'); + $this->shop->view['clnr'] = $clnr; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_coverletter/coverletter_pdf.phtml'); + + $this->shop->restoreTempLocale(); + + return true; + + } // public function writeCoverLetter($order_id, $text, $preview, $nr, $filename) { + + /** + * LÀdt die Anschreibene einer Bestellung + * @param int $order_id ID der Bestellung + */ + public function getCoverLetterFromOrder($order_id) { + + return $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_COVERLETTER."` WHERE `order_id` = '".wpsg_q($order_id)."' "); + + } // public function loadanschreibensFromOrder($order_id) + + /** + * Gibt den Absoluten Pfad zurÃŒck wo die Anschreibene gespeichert sind + */ + public function getFilePath($order_id, $url = false) { + + if ($order_id == '') { + + // Briefpapier/Logo + if ($this->shop->isMultiBlog()) { + + $path = WPSG_PATH_CONTENT.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_coverletter/'.$order_id.'/'; + $url_content = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_coverletter/'; + + if ($url) $strReturn = $url_content.$order_id.'/'; + else $strReturn = $path; + + } else { + + $path = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_coverletter/'.$order_id.'/'; + + if ($url) $strReturn = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_coverletter/'.$order_id.'/'; + else $strReturn = $path.'/'; + + } + + } else { + + // Anschreiben aus Bestellung + $cl = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_COVERLETTER."` WHERE `order_id` = '".wpsg_q($order_id)."' "); + $ym = date('Y/m', strtotime($cl['cdate'])).'/'; + + if ($this->shop->isMultiBlog()) { + + $path = WPSG_PATH_CONTENT.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_coverletter/'.$ym.$order_id.'/'; + $url_content = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_coverletter/'.$ym; + + if ($url) $strReturn = $url_content.$order_id.'/'; + else $strReturn = $path; + + } else { + + $path = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_coverletter/'.$ym.$order_id.'/'; + + if ($url) $strReturn = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_coverletter/'.$ym.$order_id.'/'; + else $strReturn = $path.'/'; + + } + + } // if ($order_id == '') + + $this->shop->protectDirectory($path, [ + 'wpsg_coverletter_logo.jpg', 'wpsg_coverletter_bp.jpg', 'wpsg_coverletter_bp.pdf' + ] ); + + return $strReturn; + + } // private function getFilePath($produkt_id, $url = false) + + /* Private Funktionen */ + + /** + * LÀdt die vordefinierten Textfelder + */ + private function resetAction() { + + $arData = array( + "company" => array("aktiv" => "1", "x" => "24", "y" => "10", "fontsize" => 8, "text" => "%shopinfo_name%", "color" => "#000000"), + "name" => array("aktiv" => "1", "x" => "24", "y" => "13", "fontsize" => 8, "text" => "Inh. %shopinfo_owner%", "color" => "#000000"), + "street" => array("aktiv" => "1", "x" => "24", "y" => "16", "fontsize" => 8, "text" => "%shopinfo_street%", "color" => "#000000"), + "zipcity" => array("aktiv" => "1", "x" => "24", "y" => "19", "fontsize" => 8, "text" => "%shopinfo_zip% %shopinfo_city%", "color" => "#000000"), + "country" => array("aktiv" => "1", "x" => "24", "y" => "22", "fontsize" => 8, "text" => "DEUTSCHLAND", "color" => "#000000"), + "tel" => array("aktiv" => "1", "x" => "75", "y" => "10", "fontsize" => 8, "text" => "Tel. %shopinfo_tel%", "color" => "#000000"), + "fax" => array("aktiv" => "1", "x" => "75", "y" => "13", "fontsize" => 8, "text" => "Fax. %shopinfo_fax%", "color" => "#000000"), + "mail" => array("aktiv" => "1", "x" => "75", "y" => "16", "fontsize" => 8, "text" => "Mail: %shopinfo_email%", "color" => "#000000"), + "web" => array("aktiv" => "1", "x" => "75", "y" => "19", "fontsize" => 8, "text" => "Web: ".site_url(), "color" => "#000000"), + "taxnr" => array("aktiv" => "1", "x" => "145", "y" => "279", "fontsize" => 8, "text" => "Steuer-Nr.: %shopinfo_taxnr%", "color" => "#000000"), + "ustidnr" => array("aktiv" => "1", "x" => "145", "y" => "282", "fontsize" => 8, "text" => "USt-IdNr.: %shopinfo_ustidnr%", "color" => "#000000"), + "bank" => array("aktiv" => "1", "x" => "24", "y" => "279", "fontsize" => 8, "text" => "Bank: %shopinfo_bankname%", "color" => "#000000"), + "iban" => array("aktiv" => "1", "x" => "24", "y" => "282", "fontsize" => 8, "text" => "IBAN: %shopinfo_iban%", "color" => "#000000"), + "bic" => array("aktiv" => "1", "x" => "24", "y" => "285", "fontsize" => 8, "text" => "BLZ: %shopinfo_bic%", "color" => "#000000"), + ); + + $this->shop->update_option("wpsg_mod_coverletter_texts", $arData); + + } // public function resetAction() + + } // class wpsg_mod_coverletter extends wpsg_mod_basic Index: /views/admin/form/textarea.phtml =================================================================== --- /views/admin/form/textarea.phtml (revision 7257) +++ /views/admin/form/textarea.phtml (revision 7258) @@ -1,4 +1,12 @@
- + + view['field_config']['fullLabel'])) { ?> + +
+ + + + + view['field_config']['noLabel']) || $this->view['field_config']['noLabel'] != true) { ?> Index: /views/mods/mod_coverletter/coverletter_pdf.phtml =================================================================== --- /views/mods/mod_coverletter/coverletter_pdf.phtml (revision 7258) +++ /views/mods/mod_coverletter/coverletter_pdf.phtml (revision 7258) @@ -0,0 +1,147 @@ +AddPage(); + + if (file_exists($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_bp.pdf")) { + + $pdf->setSourceFile($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_bp.pdf"); + $tplidx = $pdf->importPage(1, '/MediaBox'); + $pdf->useTemplate($tplidx, 0, 0, 210); + + } else if (file_exists($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_bp.jpg")) { + + $pdf->image($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_bp.jpg", 0, 0, 210, 297, 'jpg'); + + } + + if (file_exists($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_logo.jpg")) { + + list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_logo.jpg"); + + // Umrechnung von Inch zu Pixel + $wPix = (25.4 * $width) / 96; + $hPix = (25.4 * $height) / 96; + + $transparency = str_replace("%", "", $shop->get_option('wpsg_mod_coverletter_logo_transparency')); + if($transparency !== "100") $transparency = str_replace(array("0", "00"), "", $transparency); + + $alpha = 1; + if (wpsg_isSizedString($transparency) && $transparency !== "100") $alpha = "0.$transparency"; + if (wpsg_isSizedString($transparency) && $transparency === "100") $alpha = $transparency; + + $logo_pos = $shop->get_option('wpsg_mod_coverletter_logo_position'); + + if(isset($logo_pos) && $logo_pos === "left") { $abscissa = 0; } + if(isset($logo_pos) && $logo_pos === "center") { $abscissa = 105 - ($wPix / 2); } + if(isset($logo_pos) && $logo_pos === "right") { $abscissa = 210 - $wPix; } + + $pdf->SetAlpha($alpha); + $pdf->image($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_logo.jpg", $abscissa, 0, $wPix, $hPix); + $pdf->SetAlpha(1); + + } + + // Adresse des Kunden + $pdf->SetFont('Arial', '', 12); + $pdf->Text($adress_left, $adress_top, $shop->view['data']['company']); + $pdf->Text($adress_left, $adress_top + 5, $shop->view['data']['firstname'].' '.$shop->view['data']['name']); + $pdf->Text($adress_left, $adress_top + 10, $shop->view['data']['street'].' '.$shop->view['data']['hnr']); + $pdf->Text($adress_left, $adress_top + 15, $shop->view['data']['zip'].' '.$shop->view['data']['city']); + $pdf->Text($adress_left, $adress_top + 20, $shop->view['data']['country']); + + // Daten + $pdf->SetFont('Arial', 'B', 16); + $pdf->Text($dndata_left, $dndata_top, $shop->view['title']); + $pdf->SetFont('Arial', 'B', 9); + $pdf->Text($dndata_left, $dndata_top + 6, $shop->view['clnr']); + $pdf->SetFont('Arial', '', 9); + + $pdf->Text($rdata_left + 100, $dndata_top, __("Kunden-Nr", "wpsg")); + $pdf->Text($rdata_left + 100, $dndata_top + 6, (($shop->view['customer']['knr'] != '')?$shop->view['customer']['knr']:$shop->view['customer']['id'])); + + $pdf->Text($rdata_left + 125, $dndata_top, __("Best. Nr.", "wpsg")); + $pdf->Text($rdata_left + 125, $dndata_top + 6, ((trim($shop->view['order']['onr']) != '')?$shop->view['order']['onr']:$shop->view['order']['id'])); + + $pdf->Text($rdata_left + 145, $dndata_top, __("Bestelldatum", "wpsg")); + $pdf->Text($rdata_left + 145, $dndata_top + 6, wpsg_formatTimestamp(strtotime($shop->view['order']['cdate']), true)); + + $pdf->Text($rdata_left + 170, $dndata_top, __("Datum", "wpsg")); + $pdf->Text($rdata_left + 170, $dndata_top + 6, wpsg_formatTimestamp(time(), true)); + + foreach ($shop->view['arTexts'] as $text) { + + if (isset($text['aktiv']) && $text['aktiv'] == 1) { + + $pdf->SetFont('Arial', 'B', ((intval($text['fontsize']) > 0)?intval($text['fontsize']):10)); + $pdf->wpsg_SetTextColor($text['color']); + $pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']); + $pdf->wpsg_SetTextColor("#000000"); + + } + + } + + // Text + $pdf->setFont('Arial', '', 10); + $pdf->wpsg_MultiCell($dndata_left - 1, $dndata_top + 12, 4, $shop->view['text']); + + } + + } + + // Positionierung der Absenderadresszeile + $absender_left = 25; + $absender_top = 50; + + // Positionierung der Zieladress + $adress_left = 25; + $adress_top = 55; + + // Positionierund des Lieferscheinkopfes + $dndata_left = 25; + $dndata_top = 90; + + // Positionierung der Produktdaten + $prod_left = 25; + $prod_top = 105; + + // Anzahl an Produkten pro Seite + $prod_break = 10; + + $pdf = new wpsg_fpdf(); + $pdf->SetAutoPageBreak(true, 5); + addCoverLetterPage($this, $pdf); + + $offset += 5; + + ob_end_clean(); + + if ($this->view['preview']) { + + $pdf->Output($this->view['filename'], 'I'); + + } else { + + $pdf->Output($this->view['filename'], 'F'); + + if ($this->view['output'] === true) $pdf->Output($this->view['filename'], 'I'); + + } + Index: /views/mods/mod_coverletter/order_view.phtml =================================================================== --- /views/mods/mod_coverletter/order_view.phtml (revision 7258) +++ /views/mods/mod_coverletter/order_view.phtml (revision 7258) @@ -0,0 +1,91 @@ + + + + + view['mod_anschreiben']['aranschreiben']) == 0 ) { ?> + +

+ + + + view['mod_anschreiben']['aranschreiben_gesamt'] as $a) { ?> + + + + + +
# + + + + + + + + callMod('wpsg_mod_anschreiben', 'getFilePath', array($this->view['data']['id'], true)).'A'.$r['anr'].'.pdf'; + + } ?> + +
+ + +
+ +
+ +
+ +
+
+ +
+ + getShopLocations(); ?> + $l) $arShopLocationLabels[$l_id] = $l['label']; ?> + + 1) { ?> + + + + + + + + + + true, 'fullLabel' => __('Text fÃŒr das Anschreiben', 'wpsg'), 'style' => 'height:200px']); ?> + +
+ + " style="float:left;" class="button button-primary" /> + +
+ +
+ +
+
+ + + + Index: /views/mods/mod_coverletter/settings_edit.phtml =================================================================== --- /views/mods/mod_coverletter/settings_edit.phtml (revision 7258) +++ /views/mods/mod_coverletter/settings_edit.phtml (revision 7258) @@ -0,0 +1,213 @@ + + +
+ +
+
+ + +
+ view['wpsg_mod_coverletter']['bp'] === false) { ?> +

+ + + + + + view['wpsg_mod_coverletter']['bp'] !== false) { $strSuffix = ' + '; + echo __($strSuffix); + } ?> +
+ true, 'helps' => 'wpsg_mod_coverletter_bp')); ?> + +
+ + +
+ view['wpsg_mod_coverletter']['logo'] === false) { ?> +

+ + + + + + get_option("wpsg_mod_coverletter_logo_position"); ?> + + + + + + + get_option("wpsg_mod_coverletter_logo_transparency") ?: "0%"; ?> + + view['logo'] !== false) { $strSuffix = ' +
+
+
+ + + +
+
+
+ +
+
+ +
+
'; + echo __($strSuffix); + } ?> + + + + +
+ + true, 'helps' => 'wpsg_mod_coverletter_logo')); ?> + +

+ + + + + + + + + + + + + + + view['wpsg_mod_coverletter']['fields'] as $f => $field_name) { ?> + + + + + + + + + + + +
+ + + + + + + + + + + view['wpsg_mod_coverletter']['arTexts'][$f]['aktiv']))?'checked="checked"':''); ?> /> +
+ + + +

+ +
+

+
+ +

+
+ +
+ +
+
+
+ +