diff options
| author | hartmut <noreply@maennchen1.de> | 2017-02-17 09:45:16 +0000 |
|---|---|---|
| committer | hartmut <noreply@maennchen1.de> | 2017-02-17 09:45:16 +0000 |
| commit | bd0b5538b14d9045e5abf2075dd2fbcdf37da8bc (patch) | |
| tree | 623d0894cb7ae58f1618b0e07174adf47c15530d /views/mods | |
| parent | 02b6408eadf9dbea15fcefcbcf2fea7e7808bd4a (diff) | |
checkReduceStock Option wpsg_mod_stock_allow und PHP-Warnung/Hinweis korrigiert
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6066 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views/mods')
| -rw-r--r-- | views/mods/mod_deliverynote/deliverynote_pdf.phtml | 17 | ||||
| -rw-r--r-- | views/mods/mod_statistics/chartturnover/quarter.phtml | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml index a627888..a644dca 100644 --- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml +++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml @@ -18,33 +18,34 @@ global $absender_left, $absender_top, $adress_left, $adress_top, $dndata_left, $dndata_top;
+ $rdata_left = 0;
$pdf->AddPage();
- if (file_exists($shop->callMod('wpsg_mod_deliverynote', getFilePath, array(''))."wpsg_deliverynote_bp.pdf"))
+ if (file_exists($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_bp.pdf"))
{
- $pagecount = $pdf->setSourceFile($shop->callMod('wpsg_mod_deliverynote', getFilePath, array(''))."wpsg_deliverynote_bp.pdf");
+ $pagecount = $pdf->setSourceFile($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_bp.pdf");
$tplidx = $pdf->importPage(1, '/MediaBox');
$pdf->useTemplate($tplidx, 0, 0, 210);
}
- else if (file_exists($shop->callMod('wpsg_mod_deliverynote', getFilePath, array(''))."wpsg_deliverynote_bp.jpg"))
+ else if (file_exists($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_bp.jpg"))
{
- $pdf->image($shop->callMod('wpsg_mod_deliverynote', getFilePath, array(''))."wpsg_deliverynote_bp.jpg", 0, 0, 210, 297, 'jpg');
+ $pdf->image($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_bp.jpg", 0, 0, 210, 297, 'jpg');
}
- if (file_exists($shop->callMod('wpsg_mod_deliverynote', getFilePath, array(''))."wpsg_deliverynote_logo.jpg"))
+ if (file_exists($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_logo.jpg"))
{
- list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_deliverynote', getFilePath, array(''))."wpsg_deliverynote_logo.jpg");
+ list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_logo.jpg");
$wPix = (25.4 * $width) / 96;
$hPix = (25.4 * $height) / 96;
- $pdf->image($shop->callMod('wpsg_mod_deliverynote', getFilePath, array(''))."wpsg_deliverynote_logo.jpg", 210 - $wPix, 0, $wPix, $hPix);
+ $pdf->image($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_logo.jpg", 210 - $wPix, 0, $wPix, $hPix);
}
@@ -52,7 +53,7 @@ $pdf->SetFont('Arial', '', 6);
$pdf->Text($absender_left, $absender_top, $shop->replaceUniversalPlatzhalter($shop->get_option("wpsg_mod_deliverynote_adressrow"), $shop->view['order']['id']));
- if ($shop->view['kunde']['kuerzel'] != "") $shop->view['kunde']['kuerzel'] = $shop->view['kunde']['kuerzel'].'-';
+ if (wpsg_getStr($shop->view['kunde']['kuerzel']) != "") $shop->view['kunde']['kuerzel'] = $shop->view['kunde']['kuerzel'].'-';
// Adresse des Kunden
$pdf->SetFont('Arial', '', 12);
diff --git a/views/mods/mod_statistics/chartturnover/quarter.phtml b/views/mods/mod_statistics/chartturnover/quarter.phtml index 7f18413..4e40783 100644 --- a/views/mods/mod_statistics/chartturnover/quarter.phtml +++ b/views/mods/mod_statistics/chartturnover/quarter.phtml @@ -19,7 +19,7 @@ $chartJS['legend'][$i] .= " highlighter: {";
- $chartJS['legend'][$i] .= " formatString: '<table><tr><td>KW %s ".$this->view['chart']['data'][$i]['year'].", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
+ $chartJS['legend'][$i] .= " formatString: '<table><tr><td>KW %s ".wpsg_getStr($this->view['chart']['data'][$i]['year']).", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
$chartJS['legend'][$i] .= " }";
|