diff options
Diffstat (limited to 'views/admin')
| -rw-r--r-- | views/admin/kalkulation.phtml | 3 | ||||
| -rw-r--r-- | views/admin/versandzonen_list.phtml | 41 |
2 files changed, 43 insertions, 1 deletions
diff --git a/views/admin/kalkulation.phtml b/views/admin/kalkulation.phtml index 7579103..f342bd8 100644 --- a/views/admin/kalkulation.phtml +++ b/views/admin/kalkulation.phtml @@ -44,7 +44,8 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_hideemptyshipping', __('Versandkosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptypayment', __('Zahlungskosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_noroundamount', __('Vor Multiplikation mit Menge nicht runden', 'wpsg'), $this->get_option('wpsg_noroundamount'), ['help' => 'Preiskalkulation_wpsg_noroundamount']); ?>
-
+ <?php echo wpsg_drawForm_Checkbox('wpsg_deliverycountrytax', __('Mwst. gemäß Lieferland berechnen', 'wpsg'), $this->get_option('wpsg_deliverycountrytax'), ['help' => 'Preiskalkulation_wpsg_deliverycountrytax']); ?>
+
</div>
</div>
diff --git a/views/admin/versandzonen_list.phtml b/views/admin/versandzonen_list.phtml index 7134534..b099e3f 100644 --- a/views/admin/versandzonen_list.phtml +++ b/views/admin/versandzonen_list.phtml @@ -4,6 +4,23 @@ * Template für die Liste der Versandzonen
*/
+ $arShipping = $this->arShippingAll;
+
+ $arShippingPreset = [
+ '0' => __('Kundenvoreinstellung', 'wpsg'),
+ '-1' => __('günstigste Versandart', 'wpsg'),
+ ];
+
+ foreach ($arShipping as $s_key => $s) {
+
+ if (intval($s['deleted']) !== 1 && intval($s['active']) === 1) {
+
+ $arShippingPreset[$s_key] = $s['name'];
+
+ }
+
+ }
+
?>
<?php if (!is_array($this->view['data']) || sizeof($this->view['data']) <= 0) { ?>
<?php echo __('Bisher keine Versandzonen hinterlegt.', 'wpsg'); ?>
@@ -13,6 +30,7 @@ <tr>
<th class="col_name"><?php echo __('Bezeichnung', 'wpsg'); ?></th>
<th class="col_innereu"><?php echo __('Inner- gemeinschaftlich', 'wpsg'); ?></th>
+ <th class="col_shippingpreset"><?php echo __('Standardversandart', 'wpsg'); ?></th>
<th class="col_aktion"></th>
</tr>
</thead>
@@ -32,6 +50,29 @@ data-url="<?php echo html_entity_decode(wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', 'wpsg-admin-versandzonen-inline_edit-'.$vz['id'])); ?>"
<?php echo (($vz['innereu'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" name="innereu_<?php echo $vz['id']; ?>" id="innereu_<?php echo $vz['id']; ?>" />
</td>
+ <td class="col_shippingpreset">
+ <span id="vz_<?php echo $vz['id']; ?>_shippingpreset"><?php echo $arShippingPreset[$vz['shippingpreset']]; ?></span>
+ <script>
+
+ jQuery('#vz_<?php echo $vz['id']; ?>_shippingpreset').wpsg_editable('<?php
+
+ echo html_entity_decode(wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', 'wpsg-admin-versandzonen-inline_edit-'.$vz['id']));
+
+ ?>', {
+ submitdata: {
+ field: 'shippingpreset',
+ vz_id: '<?php echo $vz['id']; ?>'
+ },
+ data: <?php echo wpsg_prepare_for_inlineEdit($arShippingPreset); ?>,
+ type: 'select',
+ submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+ placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+ indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+ });
+
+ </script>
+ </td>
<td class="col_aktion">
<a class="wpsg_icon_plzedit" href="#" title="<?php echo __('Versandzonen PLZ bearbeiten', 'wpsg'); ?>" onclick="return wpsg_editPLZ(<?php echo $vz['id']; ?>);">[ PLZ ]</a>
|