summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorDaniel Schmitzer <noreply@maennchen1.de>2022-11-02 12:16:20 +0000
committerDaniel Schmitzer <noreply@maennchen1.de>2022-11-02 12:16:20 +0000
commitb092668665e24d849e43d540769b852ae3685ddf (patch)
tree33e5391df648ab3a7aea384fb24b5e6902287475 /views
parent38b185264555d2c0f8440b0115b5e30a12a3b4b6 (diff)
- Feature: Steuerberechnung nach Lieferland (Option)
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8134 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views')
-rw-r--r--views/admin/kalkulation.phtml3
-rw-r--r--views/warenkorb/basket.phtml4
2 files changed, 4 insertions, 3 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/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index e3ba53f..f299b13 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -10,7 +10,7 @@
//wpsg_debug($this->arShipping);
//wpsg_debug(__('Deutschland', 'wpsg'));
-
+
if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
else $display_brutto_netto = 'netto';
@@ -245,7 +245,7 @@
<?php if ($this->get_option('wpsg_hideBasketCountrySelect') != '1') { ?>
<select name="set_land" id="set_land" class="wpsg_form_submit set_land">
<?php foreach ($this->view['arLander'] as $l_id => $l) { ?>
- <option <?php echo (($l_id == $this->getFrontendCountry(true))?'selected="selected"':''); ?> value="<?php echo $l_id; ?>"><?php echo wpsg_hspc(__($l, 'wpsg')); ?></option>
+ <option <?php echo (($l_id == $this->getFrontendShippingCountry(true))?'selected="selected"':''); ?> value="<?php echo $l_id; ?>"><?php echo wpsg_hspc(__($l, 'wpsg')); ?></option>
<?php } ?>
</select>
<?php } else { ?>