From ac3b2263a4a985f40a1d16805816185c7cd00984 Mon Sep 17 00:00:00 2001 From: thomas Date: Tue, 14 Jun 2016 13:30:15 +0000 Subject: - optionale Produktanzeige für eingeloggte Benutzer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5548 0d5edaf7-2b12-4e95-93f4-047927463d4b --- .../mods/mod_kundenverwaltung/settings_edit.phtml | 2 + views/mods/mod_productindex/layouts/grid.phtml | 45 ++++++------ views/mods/mod_productindex/layouts/list.phtml | 45 +++++++----- views/mods/mod_scaleprice/product_bottom.phtml | 74 ++++++++++--------- views/mods/mod_varianten/produkt.phtml | 52 ++++++++++---- views/produkttemplates/standard.phtml | 82 +++++++++++++--------- 6 files changed, 183 insertions(+), 117 deletions(-) diff --git a/views/mods/mod_kundenverwaltung/settings_edit.phtml b/views/mods/mod_kundenverwaltung/settings_edit.phtml index 85430f4..4c8ea4a 100644 --- a/views/mods/mod_kundenverwaltung/settings_edit.phtml +++ b/views/mods/mod_kundenverwaltung/settings_edit.phtml @@ -10,6 +10,8 @@ get_option('wpsg_mod_kundenverwaltung_showCheckoutRegister'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegister')); ?> get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand')); ?> get_option('wpsg_mod_kundenverwaltung_loginZwang'), array('help' => 'wpsg_mod_kundenverwaltung_loginZwang')); ?> +get_option('wpsg_mod_kundenverwaltung_preisAnzeige'), array('help' => 'wpsg_mod_kundenverwaltung_preisAnzeige')); ?> + __('Auf Profilseite leiten', 'wpsg'), '1' => __('Auf aktueller Seite bleiben', 'wpsg') diff --git a/views/mods/mod_productindex/layouts/grid.phtml b/views/mods/mod_productindex/layouts/grid.phtml index 7316056..9bdb8dc 100644 --- a/views/mods/mod_productindex/layouts/grid.phtml +++ b/views/mods/mod_productindex/layouts/grid.phtml @@ -141,27 +141,32 @@ - -
- - get_option('wpsg_currency')); ?> - - get_option('wpsg_currency'))); ?> - -
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> - - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> + + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> +
+ + get_option('wpsg_currency')); ?> + + get_option('wpsg_currency'))); ?> + +
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> + + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> + +
-
- + + +
diff --git a/views/mods/mod_productindex/layouts/list.phtml b/views/mods/mod_productindex/layouts/list.phtml index e2b2f71..22fb214 100644 --- a/views/mods/mod_productindex/layouts/list.phtml +++ b/views/mods/mod_productindex/layouts/list.phtml @@ -136,26 +136,33 @@ getProductName($this->getProduktID($p['id']), true); ?>
-
- - get_option('wpsg_currency')); ?> - - get_option('wpsg_currency'))); ?> - -
- get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> - - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> + + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> +
+ + get_option('wpsg_currency')); ?> + + get_option('wpsg_currency'))); ?> + +
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> + + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?> + +
-
- + + + +
hasMod('wpsg_mod_stock') && $this->callMod('wpsg_mod_stock', 'checkBestand', array($p['id'], 1)) === false) { ?> diff --git a/views/mods/mod_scaleprice/product_bottom.phtml b/views/mods/mod_scaleprice/product_bottom.phtml index 44618d0..0bca756 100644 --- a/views/mods/mod_scaleprice/product_bottom.phtml +++ b/views/mods/mod_scaleprice/product_bottom.phtml @@ -7,39 +7,49 @@ ?>
- view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?> -
- view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?> -
- -
    - - view['wpsg_mod_scaleprice']['typ'] != wpsg_mod_scaleprice::TYP_QUANTITY || $this->view['wpsg_mod_scaleprice']['scale'][0]['scale'] != '1') { ?> -
  • - - view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?> - view['wpsg_mod_scaleprice']['scale'][0]['scale'], __('Stück', 'wpsg')); ?> - view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?> - view['wpsg_mod_scaleprice']['scale'][0]['scale'], $this->get_option('wpsg_mod_weight_unit')); ?> - - - view['wpsg_mod_scaleprice']['base'], $this->get_option('wpsg_currency')); ?> - callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($this->view['wpsg_mod_scaleprice']['base'], $this->view['data']['fmenge'], $this->view['data']['feinheit'])); ?> -
    • + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?> +
    + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?> +
    - - view['wpsg_mod_scaleprice']['scale'] as $scale) { ?> -
  • - - view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?> - - view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?> - get_option('wpsg_mod_weight_unit')); ?> +
      + + view['wpsg_mod_scaleprice']['typ'] != wpsg_mod_scaleprice::TYP_QUANTITY || $this->view['wpsg_mod_scaleprice']['scale'][0]['scale'] != '1') { ?> +
    • + + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?> + view['wpsg_mod_scaleprice']['scale'][0]['scale'], __('Stück', 'wpsg')); ?> + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?> + view['wpsg_mod_scaleprice']['scale'][0]['scale'], $this->get_option('wpsg_mod_weight_unit')); ?> + + + view['wpsg_mod_scaleprice']['base'], $this->get_option('wpsg_currency')); ?> + callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($this->view['wpsg_mod_scaleprice']['base'], $this->view['data']['fmenge'], $this->view['data']['feinheit'])); ?> +
      • + + + view['wpsg_mod_scaleprice']['scale'] as $scale) { ?> +
    • + + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?> + + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?> + get_option('wpsg_mod_weight_unit')); ?> + + + get_option('wpsg_currency')); ?> + callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($scale['value'], $this->view['data']['fmenge'] , $this->view['data']['feinheit'])); ?> +
      • - - get_option('wpsg_currency')); ?> - callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($scale['value'], $this->view['data']['fmenge'] , $this->view['data']['feinheit'])); ?> - +
    + + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?> +
    + view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?> +
    -
+
\ No newline at end of file diff --git a/views/mods/mod_varianten/produkt.phtml b/views/mods/mod_varianten/produkt.phtml index bf5b276..8525ef9 100644 --- a/views/mods/mod_varianten/produkt.phtml +++ b/views/mods/mod_varianten/produkt.phtml @@ -32,7 +32,8 @@
- + +
+ $vari) { if ($vari['aktiv'] == "1") { $j ++; ?> hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?> @@ -109,11 +119,18 @@ view['wpsg_mod_varianten']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_getProduktId($this->view['data']['id']); ?>__" onclick="wpsg_vp_switch(getProduktId($this->view['data']['id']); ?>, view['product_index']; ?>);" type="radio" name="wpsg_vp[]" value="" />  - - callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?> - (get_option('wpsg_currency')); ?>) + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + + callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?> + (get_option('wpsg_currency')); ?>) + + + + - + + get_option("wpsg_vp_showpic") == "1" && isset($vari['showpic']) && $vari['showpic'] != false) { ?> @@ -136,15 +153,26 @@ - + +
- + \ No newline at end of file diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index 515175e..29ec158 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -63,37 +63,46 @@ -
- - - - view['data']['preis'], $this->get_option('wpsg_currency')); ?> - view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> - - hasMod('wpsg_mod_discount') && $this->view['data']['preis_prediscount'] > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> -
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> -
- -
+ + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - +
+ + + + view['data']['preis'], $this->get_option('wpsg_currency')); ?> + view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> + + hasMod('wpsg_mod_discount') && $this->view['data']['preis_prediscount'] > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> +
+ : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> +
+
+ + get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ + + +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + +
+ + + + + + + + hasMod('wpsg_mod_fuellmenge')) { ?> @@ -200,12 +209,17 @@
- - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - - - - + + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + callMods('productForSale', array($this->view['data']['product_key']))) { ?> + + + + + + + hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> -- cgit v1.2.3