diff options
| -rw-r--r-- | views/mods/mod_deliverynote/deliverynote_pdf.phtml | 17 | ||||
| -rw-r--r-- | views/mods/mod_statistics/chartturnover/quarter.phtml | 2 | ||||
| -rw-r--r-- | views/order/view.phtml | 19 | ||||
| -rw-r--r-- | views/order/view_orderdata.phtml | 21 |
4 files changed, 47 insertions, 12 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] .= " }";
diff --git a/views/order/view.phtml b/views/order/view.phtml index 5ae9a2e..00a5233 100644 --- a/views/order/view.phtml +++ b/views/order/view.phtml @@ -147,11 +147,19 @@ jQuery(document).ready(function() {
+ wpsg_view_orderdata_hide();
+
jQuery('#wpsg_order_view_tabs a.list-group-item').bind('click', function() {
jQuery('#wpsg_order_view_tabs a').removeClass('active');
jQuery('.wpsg_order_view_tab_content').hide();
+ tab = jQuery(this).attr('wpsg-data-target');
+ if (tab == 'orderdata') {
+ wpsg_view_orderdata_show();
+ } else {
+ wpsg_view_orderdata_hide();
+ }
jQuery(this).addClass('active');
jQuery('#tab' + jQuery(this).attr('wpsg-data-target')).show();
@@ -160,6 +168,17 @@ } );
+ co = jQuery.cookie('wpsg_order_view_tab');
+ if (co === undefined) {
+ jQuery("[wpsg-data-target='general']").trigger("click");
+ } else {
+ jQuery("[wpsg-data-target='" + co + "']").trigger("click");
+ }
+ //jQuery('#wpsg_order_view_tabs a').removeClass('active');
+ //jQuery('.wpsg_order_view_tab_content').hide();
+ //jQuery('#tabgeneral').show();
+ //jQuery("[wpsg-data-target='general']").addClass('active');
+
} );
/* ]]> */</script>
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml index 14968dc..26891ba 100644 --- a/views/order/view_orderdata.phtml +++ b/views/order/view_orderdata.phtml @@ -308,12 +308,27 @@ gs_id = <?php echo $gs_id; ?>;
prval = <?php echo $prval; ?>;
- if (gs_id > 0) { jQuery('#LinkGutscheinNeu').hide(); }
- if (prval != 0) { jQuery('#LinkRabattNeu').hide(); }
+ wpsg_view_orderdata_show();
} );
-
+ function wpsg_view_orderdata_show() {
+ jQuery('#LinkGutscheinNeu').show();
+ jQuery('#LinkRabattNeu').show();
+ jQuery('#LinkProduktNeu').show();
+ jQuery('#LinkSendMail').show();
+
+ if (gs_id > 0) { jQuery('#LinkGutscheinNeu').hide(); }
+ if (prval != 0) { jQuery('#LinkRabattNeu').hide(); }
+ }
+
+ function wpsg_view_orderdata_hide() {
+ jQuery('#LinkGutscheinNeu').hide();
+ jQuery('#LinkRabattNeu').hide();
+ jQuery('#LinkProduktNeu').hide();
+ jQuery('#LinkSendMail').hide();
+ }
+
var Modul2 = {
eigenschaft : "wert",
methode : function () {
|