diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/css/admin.css | 8 | ||||
| -rw-r--r-- | views/mods/mod_paypalapi/order_view_afterpayment.phtml | 6 | ||||
| -rw-r--r-- | views/mods/mod_printshop/basket_row_before.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_printshop/mail_row.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_printshop/mail_row_html.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_printshop/overview_row_before.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_printshop/produkt_addedit_content.phtml | 6 |
7 files changed, 16 insertions, 14 deletions
diff --git a/views/css/admin.css b/views/css/admin.css index f40bc15..5cbe9e5 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -75,10 +75,10 @@ .wp-admin #wpsg-bs select { max-width:100%; padding-right:0; line-height:initial; }
.wp-admin #wpsg-bs .checkbox input { margin-top:3px; width:15px; height:15px; }
-.branch-5-3.wp-admin #wpsg-bs .checkbox input:before { margin:1px 0 0 1px; width:10px; height:10px; }
-.branch-5-3 #wpsg-bs input[type=checkbox], input[type=radio] { width:16px; height:16px; }
-.branch-5-3 #wpsg-bs input[type=checkbox]:checked::before { width:14px; height:14px; margin:0; }
-.branch-5-3 #wpsg-bs input[type=radio]:checked::before { width:6px; height:6px; margin:4px; }
+.wp-admin #wpsg-bs .checkbox input:before { margin:1px 0 0 1px; width:10px; height:10px; }
+#wpsg-bs input[type=checkbox], input[type=radio] { width:16px; height:16px; }
+#wpsg-bs input[type=checkbox]:checked::before { width:14px; height:14px; margin:0; }
+#wpsg-bs input[type=radio]:checked::before { width:6px; height:6px; margin:4px; }
/* Allgemeine Klassen */
.wpsg_grey { color:#999999; }
diff --git a/views/mods/mod_paypalapi/order_view_afterpayment.phtml b/views/mods/mod_paypalapi/order_view_afterpayment.phtml index 1c5e9a7..cf35149 100644 --- a/views/mods/mod_paypalapi/order_view_afterpayment.phtml +++ b/views/mods/mod_paypalapi/order_view_afterpayment.phtml @@ -5,8 +5,8 @@ */
$wpsg_mod_paypalapi_paymentid = $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid');
- $wpsg_mod_paypalapi_saleid = $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid')
-
+ $wpsg_mod_paypalapi_saleid = $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_saleid');
+
?>
<?php if (wpsg_isSizedString($wpsg_mod_paypalapi_paymentid)) { ?>
@@ -17,7 +17,7 @@ wpsg_admin_url('Order', 'ajax', ['noheader' => '1', 'mod' => 'wpsg_mod_paypalapi', 'do' => 'refresh', 'edit_id' => $this->view['oOrder']->id])
//WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_paypalapi&do=refresh&edit_id='.$this->view['oOrder']->id
),
- wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentstate'))
+ wpsg_translate(__('#1# (#2#)', 'wpsg'), $wpsg_mod_paypalapi_paymentid, $this->view['oOrder']->getMeta('wpsg_mod_paypalapi_paymentstate'))
); ?>
<?php } ?>
diff --git a/views/mods/mod_printshop/basket_row_before.phtml b/views/mods/mod_printshop/basket_row_before.phtml index f596d70..234965e 100644 --- a/views/mods/mod_printshop/basket_row_before.phtml +++ b/views/mods/mod_printshop/basket_row_before.phtml @@ -25,7 +25,7 @@ <div class="title">
<span class="label"><?php echo __("Fläche", "wpsg"); ?></span>
<span class="rect">
- (<?php echo wpsg_ff($view['width'], $view['unit_price'], true, 0); ?> x <?php echo wpsg_ff($view['length'], $view['unit_price'], true, 0); ?>)
+ (<?php echo wpsg_ff($view['width'], $view['unit_input'], true, 0); ?> x <?php echo wpsg_ff($view['length'], $view['unit_input'], true, 0); ?>)
</span>
</div>
<div class="price">
diff --git a/views/mods/mod_printshop/mail_row.phtml b/views/mods/mod_printshop/mail_row.phtml index fd98b6c..c920b6d 100644 --- a/views/mods/mod_printshop/mail_row.phtml +++ b/views/mods/mod_printshop/mail_row.phtml @@ -9,9 +9,9 @@ $view = $this->view['wpsg_mod_printshop'];
// 150,55 m x 1,5 m = 225,83 m²
- $strOut = wpsg_ff($view['width'], $view['unit_price'], true, 0).' x '.wpsg_ff($view['length'], $view['unit_price'], true, 0).' = '.wpsg_ff($view['area'], $view['unit_price'].'²');
+ $strOut = wpsg_ff($view['width'], $view['unit_input'], true, 0).' x '.wpsg_ff($view['length'], $view['unit_input'], true, 0).' = '.wpsg_ff($view['area'], $view['unit_price'].'²');
// (1 m² ≅ 1,00 EUR)
- $strOut .= '('.wpsg_ff($view['price_onepice'], $this->get_option('wpsg_currency').' / '.$view['unit_price'].'²').')';
+ $strOut .= ' ('.wpsg_ff($view['price_onepice'], $this->get_option('wpsg_currency').' / '.$view['unit_price'].'²').')';
echo wpsg_pad_left(__('Größe:', 'wpsg').' ', 12); ?><?php echo $strOut; ?>
diff --git a/views/mods/mod_printshop/mail_row_html.phtml b/views/mods/mod_printshop/mail_row_html.phtml index 5762585..577dc86 100644 --- a/views/mods/mod_printshop/mail_row_html.phtml +++ b/views/mods/mod_printshop/mail_row_html.phtml @@ -13,7 +13,7 @@ <tr class="productrow productrow2 <?php echo ((($view['i'] % 2) == 0)?'productrow_odd':'productrow_even'); ?>">
<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"> </td>
<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_productvars_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'5':'4'); ?>">
- <?php echo __('Größe', 'wpsg'); ?>: <?php echo wpsg_ff($view['width'], $view['unit_price'], true, 0); ?> x <?php echo wpsg_ff($view['length'], $view['unit_price'], true, 0); ?> = <?php echo wpsg_ff($view['area'], $view['unit_price'].'²'); ?>
+ <?php echo __('Größe', 'wpsg'); ?>: <?php echo wpsg_ff($view['width'], $view['unit_input'], true, 0); ?> x <?php echo wpsg_ff($view['length'], $view['unit_input'], true, 0); ?> = <?php echo wpsg_ff($view['area'], $view['unit_price'].'²'); ?>
(1 <?php echo $view['unit_price'] ?>² ≅ <?php echo wpsg_ff($view['price_onepice'], $this->get_option('wpsg_currency')); ?>)
</td>
</tr>
diff --git a/views/mods/mod_printshop/overview_row_before.phtml b/views/mods/mod_printshop/overview_row_before.phtml index f596d70..234965e 100644 --- a/views/mods/mod_printshop/overview_row_before.phtml +++ b/views/mods/mod_printshop/overview_row_before.phtml @@ -25,7 +25,7 @@ <div class="title">
<span class="label"><?php echo __("Fläche", "wpsg"); ?></span>
<span class="rect">
- (<?php echo wpsg_ff($view['width'], $view['unit_price'], true, 0); ?> x <?php echo wpsg_ff($view['length'], $view['unit_price'], true, 0); ?>)
+ (<?php echo wpsg_ff($view['width'], $view['unit_input'], true, 0); ?> x <?php echo wpsg_ff($view['length'], $view['unit_input'], true, 0); ?>)
</span>
</div>
<div class="price">
diff --git a/views/mods/mod_printshop/produkt_addedit_content.phtml b/views/mods/mod_printshop/produkt_addedit_content.phtml index 20f2a8c..b54881e 100644 --- a/views/mods/mod_printshop/produkt_addedit_content.phtml +++ b/views/mods/mod_printshop/produkt_addedit_content.phtml @@ -42,7 +42,9 @@ <br />
- <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[unit_price]', __('Einheit (Ohne ²)'), $view['unit_price']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[unit_price]', __('Preiseinheit (Ohne ²)', 'wpsg'), $view['unit_price']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[unit_input]', __('Eingabeeinheit (Ohne ²)', 'wpsg'), $view['unit_input']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[factor_price_input]', __('Faktor Preis- zu Eingabeeinheit', 'wpsg'), wpsg_ff($view['factor_price_input'], false, true, 0)); ?>
<div class="wpsg_mod_printshop_mode wpsg_mod_printshop_mode_<?php echo wpsg_mod_printshop::MODE_AREA; ?>">
@@ -193,7 +195,7 @@ jQuery(document).ready(function() {
- jQuery('#wpsg_mod_printshop_productupload_set').on('change', function() {
+ jQuery('#wpsg_mod_printshopproductupload_set').on('change', function() {
if (jQuery(this).prop('checked') === true) {
|