From 3d917b6c61c632be1ca15009e8dae1ed21c70328 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 10 Jun 2022 06:17:08 +0000 Subject: - Backup git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8007 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/kundendaten_tab3.phtml | 18 +- views/mods/mod_deliverytime/product_bottom.phtml | 31 +++ .../produkt_addedit_allgemein.phtml | 31 ++- views/mods/mod_rechnungen/accounting_pdf.phtml | 16 +- .../order_view_orderdata_after.phtml | 243 +++++++++++++++++++++ views/mods/mod_rechnungen/order_view_row.phtml | 61 ++++++ views/order/view_orderdata.phtml | 2 + views/produkttemplates/standard.phtml | 2 +- 8 files changed, 389 insertions(+), 15 deletions(-) create mode 100755 views/mods/mod_deliverytime/product_bottom.phtml create mode 100755 views/mods/mod_rechnungen/order_view_orderdata_after.phtml create mode 100644 views/mods/mod_rechnungen/order_view_row.phtml diff --git a/views/admin/kundendaten_tab3.phtml b/views/admin/kundendaten_tab3.phtml index 6c9016f..8abd619 100644 --- a/views/admin/kundendaten_tab3.phtml +++ b/views/admin/kundendaten_tab3.phtml @@ -6,8 +6,22 @@ ?> -view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?> -view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?> + __('günstigste Versandart', 'wpsg') + ] + $this->view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); + +?> + + __('günstigste Zahlungsart', 'wpsg') + ] + $this->view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); + +?> + view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => 'nohspc_'.wpsg_translate(__('Die Länder können in der Länderverwaltung definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender') )); ?> diff --git a/views/mods/mod_deliverytime/product_bottom.phtml b/views/mods/mod_deliverytime/product_bottom.phtml new file mode 100755 index 0000000..3687401 --- /dev/null +++ b/views/mods/mod_deliverytime/product_bottom.phtml @@ -0,0 +1,31 @@ +view['wpsg_mod_deliverytime']['available_date']; + $t_date = strtotime($available_date); + + $nowplusoneday = strtotime('+1 days'); + $days_between = ceil(($t_date - mktime(0, 0, 0)) / (24 * 60 * 60)); + +?> + + + +
+ +
+ + + +
+ +
+ + diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml index 9576850..b25033e 100644 --- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml +++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml @@ -17,6 +17,7 @@ view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime']), array('unit' => __('Tage', 'wpsg'), 'help' => 'wpsg_mod_deliverytime_input')); ?> + view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'])) {?> 'Moduleinstellungen', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_store')); ?> @@ -53,9 +54,35 @@ view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidaytext'], array('help' => 'wpsg_mod_deliverytime_holidayText')); ?> - -
+ + __('Nein', 'wpsg'), + '1' => __('Ja', 'wpsg') + ], $this->view['wpsg_mod_deliverytime']['set_available']??'0'); ?> + + + + + +
diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml index 9732bc9..ec314b6 100644 --- a/views/mods/mod_rechnungen/accounting_pdf.phtml +++ b/views/mods/mod_rechnungen/accounting_pdf.phtml @@ -92,8 +92,8 @@ $pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']); $pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['nr'])); $pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']); - if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0') - $pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName())); + + if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0') $pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName())); // Rechnungsdaten $pdf->SetFont('Arial', 'B', 16); @@ -829,7 +829,7 @@ } else { $offset += 5; - $pdf->Text($prod_left + 100, $prod_top + $offset, __("SUMME", "wpsg")); + $pdf->Text($prod_left + 80, $prod_top + $offset, __("SUMME", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); /* Endbetrag wird fett ausgegeben */ @@ -968,20 +968,16 @@ ob_end_clean(); - if ($this->view['preview']) - { + if ($this->view['preview']) { $pdf->Output($filename, 'I'); - } - else - { + } else { $pdf->Output($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'])).$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. - if ($this->view['output'] === true) $pdf->Output($this->view['filename_out'], 'I'); + $pdf->Output($this->view['filename_out'], 'I'); } -?> \ No newline at end of file diff --git a/views/mods/mod_rechnungen/order_view_orderdata_after.phtml b/views/mods/mod_rechnungen/order_view_orderdata_after.phtml new file mode 100755 index 0000000..0decca8 --- /dev/null +++ b/views/mods/mod_rechnungen/order_view_orderdata_after.phtml @@ -0,0 +1,243 @@ +view['oCustomer']??null; + + /** @var \wpsg_order $oOrder */ + $oOrder = $this->view['oOrder']??null; + + $wpsg_rechnungen_footer = $this->get_option("wpsg_rechnungen_footer"); + + if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer")); + if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array(); + + $default = $this->get_option('wpsg_rechnungen_foottext_standard'); + +?> + + +
+ + + +
+ +
+ +
+ + view['data']['id']); ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0) { ?> + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + view['data']['id']); ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/views/mods/mod_rechnungen/order_view_row.phtml b/views/mods/mod_rechnungen/order_view_row.phtml new file mode 100644 index 0000000..5ab2eab --- /dev/null +++ b/views/mods/mod_rechnungen/order_view_row.phtml @@ -0,0 +1,61 @@ +view['wpsg_mod_rechnungen']['storno_amount']; + $invoice_amount = $this->view['wpsg_mod_rechnungen']['invoice_amount']; + + /** @var wpsg_order_product $oOrderProduct */ + $oOrderProduct = $this->view['wpsg_mod_rechnungen']['oOrderProduct']; + + $p = $this->view['wpsg_mod_rechnungen']['product']; + $product_index = $this->view['wpsg_mod_rechnungen']['product']['product_index']; + +?> + + +
+ + 0) { ?> + + + + + + 0) { ?> + + + + + +
+ callMod('wpsg_mod_rechnungen', 'getInvoiceToOrderProduct', [$oOrderProduct]); ?> + 0) { ?> +
+ + getNr(true); ?> + +
+ + + \ No newline at end of file diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml index e375955..d40ce6a 100644 --- a/views/order/view_orderdata.phtml +++ b/views/order/view_orderdata.phtml @@ -354,6 +354,8 @@ + callMods('order_view_orderdata_after', [intval($_REQUEST['edit_id'])]); ?> + diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index 0af1189..cdd5931 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -30,7 +30,7 @@ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - + callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-- cgit v1.2.3