From 8352f0594f5c6da5a1a7ca58b2ea490807768336 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 5 May 2023 11:06:39 +0000 Subject: - Feature: Produktkombinationen für Varianten - Feature: Productcodemanagement - Feature: Positionsnummer für Produktgruppen - Feature: Markierung wenn Produktgruppe aktiven Rabatt hat in Produktgruppenübersicht MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8280 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_productgroups/add.phtml | 1 + views/mods/mod_productgroups/index.phtml | 4 + views/mods/mod_productgroups/list.phtml | 36 +- views/mods/mod_productgroups/show_2.phtml | 6 +- views/mods/mod_productvariants/admin_edit.phtml | 8 +- .../produkt_addedit_content.phtml | 582 +++++++++++---------- views/mods/mod_rechnungen/invoice_pdf.phtml | 6 +- 7 files changed, 342 insertions(+), 301 deletions(-) (limited to 'views/mods') diff --git a/views/mods/mod_productgroups/add.phtml b/views/mods/mod_productgroups/add.phtml index 22983b0..2d304f6 100644 --- a/views/mods/mod_productgroups/add.phtml +++ b/views/mods/mod_productgroups/add.phtml @@ -69,6 +69,7 @@ view['templates'], $this->view['data']['template_file']); ?> view['pages'], $this->view['data']['infopage']); ?> + view['data']['pos']); ?>
diff --git a/views/mods/mod_productgroups/index.phtml b/views/mods/mod_productgroups/index.phtml index 18b19d1..b5cdc02 100644 --- a/views/mods/mod_productgroups/index.phtml +++ b/views/mods/mod_productgroups/index.phtml @@ -83,6 +83,7 @@ + @@ -122,6 +123,9 @@ template_file == "0")?'Individuelle Produkttemplates':$pg->template_file); ?> + + + pos; ?> countProducts(); ?> diff --git a/views/mods/mod_productgroups/list.phtml b/views/mods/mod_productgroups/list.phtml index 440af68..fbdaeff 100644 --- a/views/mods/mod_productgroups/list.phtml +++ b/views/mods/mod_productgroups/list.phtml @@ -11,9 +11,17 @@ ?> -view['data'] as $k => $g) { ?> +view['data'] as $k => $g) { + + $oProductgroup = wpsg_productgroup::getInstance(intval($k)); + + ?> -
+

@@ -35,17 +43,19 @@ - - = 0 && is_int($image)) { ?> -
- - - - - -
- - + 0) { ?> + + = 0 && is_int($image)) { ?> +
+ + + + + +
+ + + diff --git a/views/mods/mod_productgroups/show_2.phtml b/views/mods/mod_productgroups/show_2.phtml index 2f8eaef..5d5db54 100644 --- a/views/mods/mod_productgroups/show_2.phtml +++ b/views/mods/mod_productgroups/show_2.phtml @@ -50,7 +50,11 @@ if (intval($oProductgroup->__get('infopage')) > 0) echo \get_permalink(intval($oProductgroup->__get('infopage'))); else echo $page_url.'show='.$oProductgroup->getId(); - ?>" class="productgroup"> + ?>" class="productgroup hasActiveDiscount())?'active_discount':''); + + ?>">
getLabel(); ?>
diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml index ebfc9a6..57f7ddb 100644 --- a/views/mods/mod_productvariants/admin_edit.phtml +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -37,7 +37,7 @@ view['product_id'])) { $colspan += 2; ?> - + hasMod('wpsg_mod_stock')) { ?> @@ -170,7 +170,7 @@ view['product_id'])) { ?> - + get_option('wpsg_currency'))); ?> hasMod('wpsg_mod_stock')) { ?> @@ -316,7 +316,7 @@
- view['product_id'])) { ?> + view['product_id'])) { ?>
EAN: @@ -333,7 +333,7 @@
- + + + @@ -409,6 +428,7 @@ #wpsg_mod_productvars_combination .top_filter { display:grid; grid-template-columns:repeat(3, minmax(0, 1fr)); row-gap:1rem; column-gap:1rem; margin-bottom:2rem; } #wpsg_mod_productvars_combination .top_filter select { width:100%; } #wpsg_mod_productvars_combination .panel-title { display:flex; justify-content:space-between; align-items:center; } + #wpsg_mod_productvars_combination .panel-title a.url { color:inherit; margin-right:1rem; display:inline-block; } #wpsg_mod_productvars_combination .panel-title .glyphicon { cursor:pointer; } #wpsg_mod_productvars_combination .panel { margin-bottom:10px; } #wpsg_mod_productvars_combination .loading_layer { z-index:10; position:absolute; left:0; top:0; width:100%; height:100%; background-color:rgba(255, 255, 255, 0.5); display:flex; justify-content:center; align-items:center; } diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index 6434ade..4f49dad 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -216,7 +216,9 @@ $bKopf = false; $pnr = 1; $offset = 0; $count = 0; foreach ($this->view['basket']['arCalculation']['product'] as $p) { + $product = wpsg_product::getInstance($p['product_id']); + if (($p['product_key']??'') !== '') $product->setProductKey($p['product_key']); if (!$bKopf) { @@ -256,8 +258,8 @@ if ($this->get_option('wpsg_mod_rechnungen_anr') == '1') $pdf->Cell(10, 8, $product->getNr(), 0, 0, 'C'); else $pdf->Cell(10, 8, $pnr.".", 0, 0, 'C'); - if ($this->get_option('wpsg_rechnungen_pdetailname') == '1') $produkt_text = $this->getProductName($this->getProduktID($p['product_id']), true); - else $produkt_text = $this->getProductName($this->getProduktID($p['product_id']), false); + if ($this->get_option('wpsg_rechnungen_pdetailname') == '1') $produkt_text = $product->getProductName(true); + else $produkt_text = $product->getProductName(false); $produktBeschreibung = trim(strip_tags($product->getShortDescription())); -- cgit v1.2.3