From 4c306ebdbef57cd127c7b885ede530310e1d81d4 Mon Sep 17 00:00:00 2001 From: hartmut Date: Thu, 15 Jun 2017 10:06:43 +0000 Subject: Basket und Overview responsible git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6332 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_abo/overview_row.phtml | 21 +- views/mods/mod_basketteaser/basket_row.phtml | 4 +- views/mods/mod_deliverytime/overview_row.phtml | 35 +- views/mods/mod_productvariants/overview_row.phtml | 30 ++ views/mods/mod_productvars/overview_row.phtml | 20 +- views/mods/mod_produktattribute/overview_row.phtml | 18 +- views/mods/mod_weight/overview_row.phtml | 19 +- views/mods/mod_weight/overview_row_end.phtml | 15 +- views/warenkorb/basket.phtml | 26 +- views/warenkorb/overview.phtml | 512 ++++++++++++--------- 10 files changed, 433 insertions(+), 267 deletions(-) create mode 100644 views/mods/mod_productvariants/overview_row.phtml (limited to 'views') diff --git a/views/mods/mod_abo/overview_row.phtml b/views/mods/mod_abo/overview_row.phtml index fb7bbf5..75b57fe 100644 --- a/views/mods/mod_abo/overview_row.phtml +++ b/views/mods/mod_abo/overview_row.phtml @@ -1,13 +1,20 @@ - - : - - view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?> - - \ No newline at end of file +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
+ view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?> +
+
+ +
+ +
\ No newline at end of file diff --git a/views/mods/mod_basketteaser/basket_row.phtml b/views/mods/mod_basketteaser/basket_row.phtml index bea76f3..7d8b0ea 100644 --- a/views/mods/mod_basketteaser/basket_row.phtml +++ b/views/mods/mod_basketteaser/basket_row.phtml @@ -22,11 +22,11 @@
- +
- +
\ No newline at end of file diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml index fe27e24..87ccdc9 100644 --- a/views/mods/mod_deliverytime/overview_row.phtml +++ b/views/mods/mod_deliverytime/overview_row.phtml @@ -5,26 +5,31 @@ */ ?> - - : - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?> - view['wpsg_mod_deliverytime']['deliverytime'] ?> + view['wpsg_mod_deliverytime']['deliverytime'] ?> get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?> - get_option('wpsg_mod_deliverytime_mode_days_default')); ?> + get_option('wpsg_mod_deliverytime_mode_days_default')); ?> - - - +
+
+ +
+ +
get_option('wpsg_mod_deliverytime_delay') == '1') { ?> - - -
- get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> -
- - +
+
+ get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> + +
+
\ No newline at end of file diff --git a/views/mods/mod_productvariants/overview_row.phtml b/views/mods/mod_productvariants/overview_row.phtml new file mode 100644 index 0000000..1ca7e07 --- /dev/null +++ b/views/mods/mod_productvariants/overview_row.phtml @@ -0,0 +1,30 @@ + +view['variante']) ?> +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
+ + view['variante'] as $vari => $value) { ?> + + : ; ; get_option('wpsg_currency') ?> +
+ + + + view['variante']['key']; ?> + +
+
+ +
+ +
\ No newline at end of file diff --git a/views/mods/mod_productvars/overview_row.phtml b/views/mods/mod_productvars/overview_row.phtml index b3cd82a..7499b5a 100644 --- a/views/mods/mod_productvars/overview_row.phtml +++ b/views/mods/mod_productvars/overview_row.phtml @@ -6,11 +6,15 @@ ?> view['wpsg_mod_productvars']['data']) && sizeof($this->view['wpsg_mod_productvars']['data']) > 0) { ?> + view['wpsg_mod_productvars']['data'] as $pv) { ?> - - : - - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + * +
+
+ view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']] == 'not_set') { ?> @@ -25,7 +29,11 @@ - - +
+
+ +
+ +
\ No newline at end of file diff --git a/views/mods/mod_produktattribute/overview_row.phtml b/views/mods/mod_produktattribute/overview_row.phtml index 2059efb..13389a0 100644 --- a/views/mods/mod_produktattribute/overview_row.phtml +++ b/views/mods/mod_produktattribute/overview_row.phtml @@ -7,11 +7,17 @@ ?> view['wpsg_mod_produktattribute']['data'] as $pa_id) { ?> - - - : - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?> +
+
callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?> - - +
+
+ +
+ +
\ No newline at end of file diff --git a/views/mods/mod_weight/overview_row.phtml b/views/mods/mod_weight/overview_row.phtml index 921f387..92dc032 100644 --- a/views/mods/mod_weight/overview_row.phtml +++ b/views/mods/mod_weight/overview_row.phtml @@ -5,9 +5,16 @@ */ ?> - - : - - view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?> - - \ No newline at end of file +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
+ view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?> +
+
+ +
+ +
\ No newline at end of file diff --git a/views/mods/mod_weight/overview_row_end.phtml b/views/mods/mod_weight/overview_row_end.phtml index 12da77e..de38b35 100644 --- a/views/mods/mod_weight/overview_row_end.phtml +++ b/views/mods/mod_weight/overview_row_end.phtml @@ -5,11 +5,14 @@ */ ?> - - +
+
: - - +
+
view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?> - - \ No newline at end of file +
+
+ +
+
\ No newline at end of file diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index a59e6ee..3320550 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -37,16 +37,16 @@
- view['basket']['produkte'] as $k => $product_data) { $i ++; ?> + view['basket']['produkte'] as $k => $product_data) { $i ++; ?>
view['$bPicture'] = false; ?> - get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { + get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { - if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']); - else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id']))); + if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']); + else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id']))); ?>
@@ -70,7 +70,6 @@ if (wpsg_isSizedString($url)) $this->view['$bPicture'] = true; echo ""; ?> -
@@ -137,13 +136,12 @@
- callMods('basket_row', array(&$product_data, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?> + callMods('basket_row', array(&$product_data, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?>
-
@@ -161,7 +159,7 @@
- <?php echo __('Löschen', 'wpsg'); ?> + <?php echo __('Löschen', 'wpsg'); ?>
@@ -208,7 +206,7 @@ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: getFrontendTaxview() == WPSG_NETTO) { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: @@ -252,7 +250,7 @@ { echo __('anteilig', 'wpsg'); - + } else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping)) { @@ -264,7 +262,7 @@ ?>
- view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?> + view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
@@ -274,8 +272,8 @@
arPayment) > 1) { ?> - + arPayment as $p_id => $p) { ?> @@ -343,7 +341,7 @@ view['basket']['mwst'] as $mwst) { ?>
- : + :
get_option('wpsg_currency'); ?> diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 972390b..f8036a0 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -6,7 +6,7 @@ */ //wpsg_debug($this->view['basket']); - + ?>
@@ -20,23 +20,23 @@

- +
- + hasMod('wpsg_mod_ordercondition')) { ?>
-
+
- + callMods('overview_top', array(&$this->view['basket'])); ?> - +
  Ändern]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT2)); ?> @@ -44,17 +44,17 @@
arPayment[$this->view['basket']['checkout']['payment']]['name']); ?>
arShipping[$this->view['basket']['checkout']['shipping']]['name']); ?>
- + get_option('wpsg_admin_pflicht')['anrede_auswahl']); ?> - + view['basket']['checkout']['diff_shippingadress']) == '1') { ?>
  Ändern]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?>
- view['basket']['checkout']['firma']) != '') { ?> + view['basket']['checkout']['firma']) != '') { ?> view['basket']['checkout']['firma']); ?>
view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> view['basket']['checkout']['vname']); ?> view['basket']['checkout']['name']); ?>
@@ -62,15 +62,15 @@ view['basket']['checkout']['plz']); ?> view['basket']['checkout']['ort']); ?>
view['basket']['land'])) { ?> view['basket']['land']['name']); ?> - -
+ +

- +
  Ändern]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?>
- view['basket']['checkout']['shipping_firma']) != '') { ?> + view['basket']['checkout']['shipping_firma']) != '') { ?> view['basket']['checkout']['shipping_firma']); ?>
view['basket']['checkout']['shipping_title'] != '' && $this->view['basket']['checkout']['shipping_title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['shipping_title']]:''); ?> view['basket']['checkout']['shipping_vname']); ?> view['basket']['checkout']['shipping_name']); ?>
@@ -78,12 +78,12 @@ view['basket']['checkout']['shipping_plz']); ?> view['basket']['checkout']['shipping_ort']); ?>
view['basket']['shipping_land'])) { ?> view['basket']['shipping_land']['name']); ?> - -
+ +

- + - +
  hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?> @@ -92,7 +92,7 @@ Ändern]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?>
- view['basket']['checkout']['firma']) != '') { ?> + view['basket']['checkout']['firma']) != '') { ?> view['basket']['checkout']['firma']); ?>
view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> view['basket']['checkout']['vname']; ?> view['basket']['checkout']['name']; ?>
@@ -100,210 +100,313 @@ view['basket']['checkout']['plz']); ?> view['basket']['checkout']['ort']); ?>
view['basket']['land'])) { ?> view['basket']['land']['name']); ?> - -
+ +

- + view['basket']['checkout']['ustidnr'])) { ?> : view['basket']['checkout']['ustidnr']); ?>

- +
  Ändern]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_BASKET)); ?>
- +
- - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?> - callMods('overview_row', array(&$p, $i)); $strOverviewRow = ob_get_contents(); ob_end_clean(); ?> - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - + + view['basket']['produkte'] as $k => $product_data) { $i ++; ?> + +
+ + view['$bPicture'] = false; ?> + + get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { + + if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']); + else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id']))); + + ?> +
+ + + callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($product_data['product_key'])); + if (wpsg_isSizedArray($arr)) + { + $ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail'); + $url = $ais[0]; + } + else + { + $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail')); + } + } else { + $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail')); + } + if (wpsg_isSizedString($url)) $this->view['$bPicture'] = true; + echo ""; + ?> + -
- - - - - + - view['basket']['gs'])) { ?> - - - + +
+ +
+ getProduktLink($product_data)) { ?> + + + + + + +
+ + +
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ get_option('wpsg_currency')); ?> +
+
+
+
+ +
+
+ get_option('wpsg_currency')); ?> +
+
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> -
+
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
+ +
+
+ +
+ +
- - - - - + + callMods('overview_row', array(&$product_data, $i)); $strOverviewRow= ob_get_contents(); ob_end_clean(); ?> + + + + + + + +
+ + + view['basket']['gs'])) { $bLine = true; ?> +
+
+ view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?> +
+
+
+
 
+
1
+
+ view['basket']['gs']['calc'] == 'p') { ?> + view['basket']['gs']['value'], '%'); ?> + + view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?> + +
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> +
+
view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
+
+ + +
view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?> -
- - +
+ : +
view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - +
+ +
- - - - - +
+ view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> +
- - - - - view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?> - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - - get_option("wpsg_kleinunternehmer") == "1") { ?> - - - - - - - - - - - - - view['basket']['mwst'] as $mwst_id => $mwst) { ?> - - - - - - - - - - - - callMods('overview_row_end', array(&$this->view)); ?> - -
- - get_option('wpsg_currency'); ?> % get_option('wpsg_currency'); ?>
- get_option('wpsg_mod_produktbilder_overviewimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { - - if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']); - else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($p['id']))); - - ?> -
- - - - callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'thumbnail')); - } else { - $img_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['productkey'], 'thumbnail')); - } ?> - - <?php echo wpsg_translate(__('Produktbilder von Produkte #1#', 'wpsg'), $p['name']); ?> - - - -
- - getProduktLink($p)) { ?> - - - - -
1view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?> view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
- get_option('wpsg_kleinunternehmer') == '1') { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: - - getFrontendTaxview() == WPSG_NETTO) { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: - - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: - + + + +
+ + +
+
+ get_option("wpsg_kleinunternehmer") == "1") { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: + + getFrontendTaxview() == WPSG_NETTO) { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: + + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: -
- view['basket']['sum']['preis']); ?> get_option('wpsg_currency'); ?> -
+ + +
+ view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?> +
+ + + view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> +
+
Versandkosten (#2#)', 'wpsg'), $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN), $this->arShipping[$this->view['basket']['checkout']['shipping']]['name'] - ); ?>: -
- view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true) { ?> - - - arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'); ?> - - - view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?> -
+ ); ?>: + + +
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { + if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true) + { + + echo __('anteilig', 'wpsg'); + + } + else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping)) + { + + echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'); + + } + } + ?> +
+
+ view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?> +
+ + + + + hasMod('wpsg_mod_crefopay')) { ?> +
+
arPayment[$this->view['basket']['checkout']['payment']]['name']); ?>: -
- view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true) { ?> - - - arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%'); ?> - - + +
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { + + if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true) + { + + echo __('anteilig', 'wpsg'); + + } + else if (array_key_exists(wpsg_getStr($this->view['basket']['checkout']['payment']), $this->arPayment)) + { + + echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%'); + + } + + } ?> +
+
view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?> -
get_option('wpsg_kleinunternehmer_text'); ?>
+ + + + + + +
+
+ +
+
+ +
+
+ +
+
: -
- view['basket']['sum']['preis_gesamt_brutto']); ?> get_option('wpsg_currency'); ?> -
+ +
+ view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> +
+ + + +
+
: -
- view['basket']['sum']['preis_gesamt_netto']); ?> get_option('wpsg_currency'); ?> -
- - - get_option('wpsg_currency'); ?> -
+ +
+ view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')); ?> +
+ + + view['basket']['mwst'] as $mwst) { ?> +
+
+ : +
+
+ get_option('wpsg_currency'); ?> +
+
+ +
+
+
: -
+ +
view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> -
- +
+
+
+ + + callMods('overview_row_end', array(&$this->view)); ?> +
+ +
+ + +
- +
- + view['basket']['checkout']['comment'] != '') { ?>
  @@ -312,20 +415,19 @@
view['basket']['checkout']['comment'] ?>
- - - + + + callMods('overview_inner_prebutton', array(&$this->view)); ?> - + +
- -
- - - - + + + +
- - + +
-- cgit v1.2.3