'.nl2br(file_get_contents($arFiles[0][0])));
+
if ($arFiles[0][3] == self::FORMAT_CSV) header("Content-Type: text/csv");
else header("Content-Type: text/xml");
@@ -911,5 +913,5 @@
foreach ($oOrder->getOrderProducts() as $oOrderProduct) {
-
+
$arValues[] = $this->getValue($f, $profil['field_delimiter'], $order_id, $oOrderProduct->getProductId(), $oOrder->getCustomer()->getId(), $oOrderProduct->getId());
@@ -1674,7 +1676,5 @@
'produkt_weight' => __('Gewicht', 'wpsg'),
'produkt_anr' => __('Artikelnummer', 'wpsg'),
- 'produkt_menge' => __('Anzahl', 'wpsg'),
- 'produkt_ean' => __('EAN', 'wpsg'),
- 'produkt_gtin' => __('GTIN', 'wpsg')
+ 'produkt_menge' => __('Anzahl', 'wpsg')
)
),
@@ -1703,4 +1703,10 @@
),
);
+
+ foreach (wpsg_product::getProductCodeConfig() as $code_key => $code_data) {
+
+ $this->fields[20]['fields']['product_code_'.$code_key] = $code_data['label'];
+
+ }
if ($this->shop->hasMod('wpsg_mod_stock')) {
@@ -1869,4 +1875,7 @@
public function getValue($f, $profil_separator, $o_id, $p_id = null, $customer_id = null, $order_product_id = null) {
+ $oProduct = null;
+ $oOrderProduct = null;
+
$field_value = $f['value_key'];
@@ -1965,5 +1974,5 @@
if ($order_product_id !== null) {
-
+
if (isset($this->arCache['order_product_id'][$order_product_id])) {
@@ -2222,5 +2231,5 @@
case 'produkt_id': $return = $oProduct->getId(); break;
case 'produkt_index': $return = $oOrderProduct->getProductIndex(); break;
- case 'produkt_name': $return = $oProduct->getProductName(); break;
+ case 'produkt_name': if (!isset($oProduct)) throw new \Exception(); $return = $oProduct->getProductName(); break;
case 'product_url': $return = $oProduct->getProductURL(); break;
case 'product_picture_url':
@@ -2365,5 +2374,33 @@
default:
-
+
+ $return = null;
+
+ foreach (wpsg_product::getProductCodeConfig() as $code_key => $code_data) {
+
+ if ($field_value === 'product_code_'.$code_key) {
+
+ if ($oOrderProduct !== null) {
+
+ $pc_data = $oOrderProduct->getProduct()->getProductCode($code_key);
+
+ if ($pc_data === null) $return = '';
+ else $return = $pc_data['code'];
+
+ } else if (isset($oProduct)) {
+
+ $pc_data = $oProduct->getProductCode($code_key);
+
+ if ($pc_data === null) $return = '';
+ else $return = $pc_data['code'];
+
+ } else throw new \Exception();
+
+ }
+
+ }
+
+ if ($return !== null) break;
+
if (preg_match('/ov_\d+/', $field_value)) {
@@ -2377,13 +2414,17 @@
// Produktvariable (index kann auch 0 sein)
- if (isset($order['pvars'][$oOrderProduct->getProductIndex()])) {
-
- $return = $order['pvars'][$oOrderProduct->getProductIndex()][$produktvarid]??'';
-
- } else {
-
- $return = $order['pvars'][$oOrderProduct->getProductKey()][$produktvarid]??'';
-
- }
+ if (isset($oOrderProduct)) {
+
+ if (isset($order['pvars'][$oOrderProduct->getProductIndex()])) {
+
+ $return = $order['pvars'][$oOrderProduct->getProductIndex()][$produktvarid] ?? '';
+
+ } else {
+
+ $return = $order['pvars'][$oOrderProduct->getProductKey()][$produktvarid] ?? '';
+
+ }
+
+ }
} else if (preg_match('/pa_\d+/', $field_value)) {
@@ -2438,5 +2479,5 @@
}
- $return = substr($return, 0, intval($f['size']));
+ $return = substr($return??'', 0, intval($f['size']));
return $return;
Index: /mods/wpsg_mod_productgroups.class.php
===================================================================
--- /mods/wpsg_mod_productgroups.class.php (revision 8279)
+++ /mods/wpsg_mod_productgroups.class.php (revision 8280)
@@ -45,4 +45,5 @@
stock_value INT(11) NOT NULL,
lang TEXT NOT NULL,
+ pos INT (11) NOT NULL DEFAULT 0,
PRIMARY KEY (id)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
@@ -701,4 +702,5 @@
wpsg_checkRequest('name', [WPSG_SANITIZE_TEXTFIELD], __('Produktgruppenname'), $data);
+ wpsg_checkRequest('pos', [WPSG_SANITIZE_INT], __('Position'), $data);
wpsg_checkRequest('template_file', [WPSG_SANITIZE_VALUES, $arTemplateFiles], __('Template'), $data);
wpsg_checkRequest('infopage', [WPSG_SANITIZE_PAGEID], __('1nfo Seite'), $data);
Index: /mods/wpsg_mod_productvariants.class.php
===================================================================
--- /mods/wpsg_mod_productvariants.class.php (revision 8279)
+++ /mods/wpsg_mod_productvariants.class.php (revision 8280)
@@ -146,5 +146,5 @@
public function be_ajax() {
-
+
$action = $_REQUEST['subaction'].'Action';
@@ -1286,4 +1286,116 @@
}
+ private function convert_1Action(): void {
+
+ $arProductCol = $this->db->fetchAssocField("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '".WPSG_TBL_PRODUCTS."' ");
+
+ // EAN / GTIN aus dem Produktartikel Modul in die fixen Spalten
+ if ($this->shop->hasMod('wpsg_mod_produktartikel')) {
+
+ if (in_array('ean', $arProductCol)) {
+
+ $arProductData = $this->db->fetchAssoc("SELECT `id`, `ean` FROM `".WPSG_TBL_PRODUCTS."` WHERE `ean` != '' ");
+
+ if (sizeof($arProductData) > 0) {
+
+ foreach ($arProductData as $product_data) {
+
+ $oProduct = wpsg_product::getInstance(intval($product_data['id']));
+ $oProduct->setMeta('ean', $product_data['ean']);
+
+ $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, [
+ 'ean' => ''
+ ], " `id` = '".intval($oProduct->getId())."' ");
+
+ }
+
+ }
+
+ }
+
+ if (in_array('gtin', $arProductCol)) {
+
+ $arProductData = $this->db->fetchAssoc("SELECT `id`, `gtin` FROM `".WPSG_TBL_PRODUCTS."` WHERE `gtin` != '' ");
+
+ if (sizeof($arProductData) > 0) {
+
+ foreach ($arProductData as $product_data) {
+
+ $oProduct = wpsg_product::getInstance(intval($product_data['id']));
+ $oProduct->setMeta('gtin', $product_data['gtin']);
+
+ $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, [
+ 'gtin' => ''
+ ], " `id` = '".intval($oProduct->getId())."' ");
+
+ }
+
+ }
+
+ }
+
+ }
+
+ // ANR, EAN aus den Varianten
+ $arProductVariationCol = $this->db->fetchAssocField("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '".WPSG_TBL_PRODUCTS_VARIATION."' ");
+
+ if (in_array('anr', $arProductVariationCol) && in_array('ean', $arProductVariationCol)) {
+
+ $arProductVariationData = $this->db->fetchAssoc("SELECT DISTINCT `product_id` FROM `".WPSG_TBL_PRODUCTS_VARIATION."` WHERE `anr` != '' OR `ean` != '' ");
+ if (sizeof($arProductVariationData) > 0) {
+
+ foreach ($arProductVariationData as $product_variation_data) {
+
+ try {
+
+ $oProduct = wpsg_product::getInstance(intval($product_variation_data['product_id']));
+
+ $arPossibleKeys = $oProduct->getPossibleProductVariantKeys();
+
+ foreach ($arPossibleKeys as $k => $v) {
+
+ $oCombination = \wpsg\wpsg_combination::getByProductAndKey($oProduct->getId(), $v['var_key']);
+
+ $arKeyCombi = explode('|', $v['var_key']);
+ $arVarVari = [];
+
+ foreach ($arKeyCombi as $var_vari) {
+
+ list($var_id, $vari_id) = array_map('intval', explode(':', $var_vari));
+
+ $arVarVari[$var_id] = $vari_id;
+
+ }
+
+ $arAnr = [];
+
+ foreach ($this->db->fetchAssocField("SELECT `variant_id` FROM `".WPSG_TBL_PRODUCTS_VARIANT."` WHERE `variant_id` IN (".implode(',', array_keys($arVarVari)).") AND `product_id` = '".intval($oProduct->getId())."' ORDER BY `pos` ASC ") as $var_id) {
+
+ $arAnr[] = $this->db->fetchOne("SELECT `anr` FROM `".WPSG_TBL_PRODUCTS_VARIATION."` WHERE `variation_id` = '".intval($arVarVari[intval($var_id)])."' AND `product_id` = '".intval($oProduct->getId())."' ");
+
+ }
+
+ if ($oCombination->getMeta('anr', false, '') === '') $oCombination->setMeta('anr', trim(implode(' / ', $arAnr), '/ '));
+
+ }
+
+ $this->db->UpdateQuery(WPSG_TBL_PRODUCTS_VARIATION, [
+ 'anr' => '',
+ 'ean' => ''
+ ], " `product_id` = '".intval($product_variation_data['product_id'])."' ");
+
+ } catch (\Exception $e) { }
+
+ }
+
+ }
+
+ }
+
+ $this->shop->addBackendMessage(__('Es wurden alte Artikelnummern und EAN Nummern ÃŒberfÃŒhrt.', 'wpsg'));
+ $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin'); exit;
+
+ }
+
private function combinationAction(): void {
@@ -1305,13 +1417,20 @@
$oCombination->setMeta('anr', $data['combination']['anr']);
- $oCombination->setMeta('ean', $data['combination']['ean']);
- $oCombination->setMeta('mpn', $data['combination']['mpn']);
- $oCombination->setMeta('pzn', $data['combination']['pzn']);
- $oCombination->setMeta('sku', $data['combination']['sku']);
- $oCombination->setMeta('gtin', $data['combination']['gtin']);
- $oCombination->setMeta('upc', $data['combination']['upc']);
- $oCombination->setMeta('isbn', $data['combination']['isbn']);
- $oCombination->setMeta('issn', $data['combination']['issn']);
- $oCombination->setMeta('isin', $data['combination']['isin']);
+ $oCombination->setMeta('name', $data['combination']['name']);
+ $oCombination->setMeta('detailname', $data['combination']['detailname']);
+
+ foreach (($data['combination']['arProductCodes']??[]) as $code_key => $code_data) {
+
+ if ($code_data['set'] === true) {
+
+ $oCombination->setMeta($code_key, $code_data['code']);
+
+ } else {
+
+ $oCombination->setMeta($code_key, '');
+
+ }
+
+ }
}
@@ -1332,4 +1451,5 @@
$arPossibleKeys[$k]['id'] = intval(\wpsg\wpsg_combination::findByProductAndKey($oProduct->getId(), $v['var_key'])->getId());
+ $arPossibleKeys[$k]['url'] = \wpsg\wpsg_combination::getInstance($arPossibleKeys[$k]['id'])->getVariantUrl();
} catch (\Throwable $e) { $arPossibleKeys[$k]['id'] = 0; }
@@ -2409,61 +2529,4 @@
} // public function getVariantenInfoArray($vari_key)
-
- /**
- * Wird nach dem speichern des Produktes aus der saveAction des
- * Produktcontrollers aufgerufen
- *
- */
- public function produkt_save(&$produkt_id) {
-
- $varis = $GLOBALS['wpsg_sc']->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_PRODUCTS_VARIATION."` WHERE `product_id`='".wpsg_q($produkt_id)."' ");
-
- return;
- //TODO
- foreach ($varis as $v)
- {
- $im0 = unserialize($v['images']);
- $im0['pic'] = trim($im0['pic'], ',');
- $v['images'] = serialize($im0);
- var_dump('ALT:'.$v['images'].'
');
- //die($v['images']);
- $im1 = array();
- $im1 = $im0;
- //$im1['pic'] = array();
- //$im1['picOrder'] = $im0['picOrder'];
- //$im1['postid'] = array();
-
- $pids = explode(',', $im0['postid']);
- $postid = array();
- $pic = array();
- foreach ($pids as $pid)
- {
-
- $post = $GLOBALS['wpsg_sc']->db->fetchRow("SELECT * FROM `".$GLOBALS['wpdb']->prefix."posts` WHERE `ID` = '".wpsg_q($pid)."' ");
- if (isset($post['ID']))
- {
- //die($postid[count($postid) - 1].'/'.$post['ID']);
- if (($postid[count($postid) - 1]) != $post['ID']) {
- $postid[] = $post['ID'];
- $arrf = pathinfo($post['guid']);
- $file = $arrf['basename'];
- var_dump($file.'
');
- $file = preg_replace('/\-(\d+)x(\d+)\./', '.', $file);
- $pic[] = $file;
- }
- }
- }
- $im1['pic'] = implode(',', $pic);
- $im1['postid'] = implode(',', $postid);
- $images = serialize($im1);
- var_dump('NEU:'.$images.'
');
- //die($images);
- // Update WPSG_TBL_PRODUCTS_VARIATION
- $data = array('images' => $images);
- $GLOBALS['wpsg_sc']->db->UpdateQuery(WPSG_TBL_PRODUCTS_VARIATION, $data, "`id` = '".wpsg_q($v['id'])."'");
-
- }
- //die();
- } // public function produkt_save(&$produkt_id)
public function wpsg_mod_export_loadFields(&$arFields) {
@@ -2588,5 +2651,59 @@
}
-
- } // class wpsg_mod_productvariants extends wpsg_mod_basic
-
+
+ public function systemcheck(&$arData) {
+
+ $bNeedConvert = false;
+
+ $arProductCol = $this->db->fetchAssocField("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '".WPSG_TBL_PRODUCTS."' ");
+
+ // EAN / GTIN aus dem Produktartikel Modul in die fixen Spalten
+ if ($this->shop->hasMod('wpsg_mod_produktartikel')) {
+
+ if ($bNeedConvert === false && in_array('ean', $arProductCol)) {
+
+ $arProductIDs = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `ean` != '' ");
+ if (sizeof($arProductIDs) > 0) $bNeedConvert = true;
+
+ }
+
+ if ($bNeedConvert === false && in_array('gtin', $arProductCol)) {
+
+ $arProductIDs = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `gtin` != '' ");
+ if (sizeof($arProductIDs) > 0) $bNeedConvert = true;
+
+ }
+
+ }
+
+ // ANR, EAN aus den Varianten
+ if (!$bNeedConvert === false) {
+
+ $arProductVariationCol = $this->db->fetchAssocField("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '".WPSG_TBL_PRODUCTS_VARIATION."' ");
+
+ if (in_array('anr', $arProductVariationCol) && in_array('ean', $arProductVariationCol)) {
+
+ $arProductIDs = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_PRODUCTS_VARIATION."` WHERE `anr` != '' OR `ean` != '' ");
+ if (sizeof($arProductIDs) > 0) $bNeedConvert = true;
+
+ }
+
+ }
+
+ if ($bNeedConvert === true) {
+
+ $arData[] = [
+ 'wpsg_mod_productvariants_convert_1',
+ wpsg_ShopController::CHECK_ERROR,
+ wpsg_translate(
+ __('Es gibt alte Artikelnummern / EAN in Varianten die falsch zugeordnet sind. Klicken Sie hier um diese in die neue Struktur zu ÃŒberfÃŒhren.', 'wpsg'),
+ WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&modul=wpsg_mod_productvariants&action=module&noheader=1&subaction=convert_1'
+ )
+ ];
+
+ }
+
+ }
+
+ }
+
Index: /mods/wpsg_mod_produktartikel.class.php
===================================================================
--- /mods/wpsg_mod_produktartikel.class.php (revision 8279)
+++ /mods/wpsg_mod_produktartikel.class.php (revision 8280)
@@ -697,12 +697,5 @@
} // public function produkt_save_translation(&$produkt_id, &$trans_id)
-
- public function produkt_save_before(&$produkt_data) {
-
- $produkt_data['ean'] = wpsg_tf(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_produktartikel']['ean']), "isFloat"));
- $produkt_data['gtin'] = wpsg_tf(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_produktartikel']['gtin']), "isFloat"));
-
- } // public function produkt_save_before(&$produkt_data)
-
+
public function produkt_save(&$product_id) {
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php (revision 8279)
+++ /mods/wpsg_mod_rechnungen.class.php (revision 8280)
@@ -1731,21 +1731,20 @@
*/
if (file_exists($FilePath.'/'.$r_id.'.pdf')) {
-wpsg_debug('1');
- $file = $FilePath.'/'.$r_id.'.pdf'; }
- else if (file_exists($FilePath.'/'.$rnr.'.pdf')) {
-wpsg_debug('2');
- $file = $FilePath.'/'.$rnr.'.pdf'; }
- else if (file_exists($FilePath.'/'.'R'.$r_id.'.pdf')) {
-wpsg_debug('3');
- $file = $FilePath.'/'.'R'.$r_id.'.pdf'; }
- else {
-wpsg_debug('4');
- $file = $FilePath.'/'.'R'.$rnr.'.pdf'; }
-
-
-wpsg_debug($FilePath);
-wpsg_debug($file);
-wpsg_debug($rnr);
-
+
+ $file = $FilePath.'/'.$r_id.'.pdf';
+
+ } else if (file_exists($FilePath.'/'.$rnr.'.pdf')) {
+
+ $file = $FilePath.'/'.$rnr.'.pdf';
+
+ } else if (file_exists($FilePath.'/'.'R'.$r_id.'.pdf')) {
+
+ $file = $FilePath.'/'.'R'.$r_id.'.pdf';
+
+ } else {
+
+ $file = $FilePath.'/'.'R'.$rnr.'.pdf';
+
+ }
$file = $this->copyTemp($file, $rnr);
@@ -1772,9 +1771,4 @@
}
-
-
-wpsg_debug($arFiles);
-die();
-
$this->shop->sendMail($mail_text, $empfaenger, 'invoicemail', $arFiles, $order_id, false, $mail_html);
@@ -2067,15 +2061,9 @@
* Kopiert eine Datei temporÀr und benennt sie anhand der Rechnugnsnummer um
*/
- private function copyTemp($file, $rnr)
- {
+ private function copyTemp($file, $rnr) {
$path = $this->shop->getTempDir();
wpsg_copy($file, $path.'/'.$rnr.'.pdf');
-
-
-wpsg_debug('copyTemp');
-die();
-
return $path.'/'.$rnr.'.pdf';
Index: /views/mods/mod_productgroups/add.phtml
===================================================================
--- /views/mods/mod_productgroups/add.phtml (revision 8279)
+++ /views/mods/mod_productgroups/add.phtml (revision 8280)
@@ -70,4 +70,5 @@
view['templates'], $this->view['data']['template_file']); ?>
view['pages'], $this->view['data']['infopage']); ?>
+ view['data']['pos']); ?>
Index: /views/mods/mod_productgroups/index.phtml
===================================================================
--- /views/mods/mod_productgroups/index.phtml (revision 8279)
+++ /views/mods/mod_productgroups/index.phtml (revision 8280)
@@ -84,4 +84,5 @@
template_file == "0")?'Individuelle Produkttemplates':$pg->template_file); ?>
+
+
+ pos; ?>
Index: /views/mods/mod_productgroups/list.phtml
===================================================================
--- /views/mods/mod_productgroups/list.phtml (revision 8279)
+++ /views/mods/mod_productgroups/list.phtml (revision 8280)
@@ -12,7 +12,15 @@
?>
-view['data'] as $k => $g) { ?>
+view['data'] as $k => $g) {
+
+ $oProductgroup = wpsg_productgroup::getInstance(intval($k));
+
+ ?>
-
+
@@ -36,15 +44,17 @@
-
- = 0 && is_int($image)) { ?>
-
-
-
-
-
-
-
-
-
+ 0) { ?>
+
+ = 0 && is_int($image)) { ?>
+
+
+
+
+
+
+
+
+
+
Index: /views/mods/mod_productgroups/show_2.phtml
===================================================================
--- /views/mods/mod_productgroups/show_2.phtml (revision 8279)
+++ /views/mods/mod_productgroups/show_2.phtml (revision 8280)
@@ -51,5 +51,9 @@
else echo $page_url.'show='.$oProductgroup->getId();
- ?>" class="productgroup">
+ ?>" class="productgroup hasActiveDiscount())?'active_discount':'');
+
+ ?>">
getLabel(); ?>
Index: /views/mods/mod_productvariants/admin_edit.phtml
===================================================================
--- /views/mods/mod_productvariants/admin_edit.phtml (revision 8279)
+++ /views/mods/mod_productvariants/admin_edit.phtml (revision 8280)
@@ -38,5 +38,5 @@
view['product_id'])) { $colspan += 2; ?>
- get_option('wpsg_currency'))); ?>
@@ -317,5 +317,5 @@
- view['product_id'])) { ?>
+ view['product_id'])) { ?>
EAN:
@@ -334,5 +334,5 @@
-
+
+
+
@@ -410,4 +429,5 @@
#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; }
Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml (revision 8279)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml (revision 8280)
@@ -217,5 +217,7 @@
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)
@@ -257,6 +259,6 @@
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()));
Index: /views/order/product_table.phtml
===================================================================
--- /views/order/product_table.phtml (revision 8279)
+++ /views/order/product_table.phtml (revision 8280)
@@ -50,5 +50,10 @@
@@ -63,5 +68,5 @@
?>" title="">
- getProductName($p['product_id'])); ?>
+ getProductName(false)); ?>
Index: /views/produkt/addedit_productcodes.phtml
===================================================================
--- /views/produkt/addedit_productcodes.phtml (revision 8279)
+++ /views/produkt/addedit_productcodes.phtml (revision 8280)
@@ -11,5 +11,5 @@
namespace wpsg;
-
+
?>
@@ -23,35 +23,125 @@
$oProduct = \wpsg_product::getInstance(intval($this->view['data']['id']));
+ $arData = [];
+
+ foreach (\wpsg_product::getProductCodeConfig() as $code_key => $code_data) {
+
+ $product_code = $oProduct->getMeta($code_key, false, '');
+
+ $arData[$code_key] = [
+ 'label' => $code_data['label'],
+ 'code_key' => $code_key,
+ 'code' => trim($product_code),
+ 'set' => trim($product_code) !== ''
+ ];
+
+ }
+
?>
-
- __('Erster definierter Code', 'wpsg'),
- 'ean' => __('EAN als Standard', 'wpsg'),
- 'gtin' => __('GTIN als Standard', 'wpsg'),
- 'mpn' => __('MPN als Standard', 'wpsg'),
- 'pzn' => __('PZN als Standard', 'wpsg'),
- 'sku' => __('SKU als Standard', 'wpsg'),
- 'upc' => __('UPC als Standard', 'wpsg'),
- 'isbn' => __('ISBN als Standard', 'wpsg'),
- 'issn' => __('ISSN als Standard', 'wpsg'),
- 'isin' => __('ISIN als Standard', 'wpsg')
- ], $oProduct->getMeta('code_mode', false, '0'), ['help' => 'code_mode']); ?>
- getMeta('ean'), ['help' => 'ean']); ?>
- getMeta('gtin'), ['help' => 'gtin']); ?>
- getMeta('mpn'), ['help' => 'mpn']); ?>
- getMeta('pzn'), ['help' => 'pzn']); ?>
- getMeta('sku'), ['help' => 'sku']); ?>
- getMeta('upc'), ['help' => 'upc']); ?>
- getMeta('isbn'), ['help' => 'isbn']); ?>
- getMeta('issn'), ['help' => 'issn']); ?>
- getMeta('isin'), ['help' => 'isin']); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ hasMod('wpsg_mod_productvariants')) { ?>
+ Ist das Produkt ein Variantenprodukt, können die Codes unter Produktvarianten fÌr einzelne Variationen Ìberschrieben werden.
+
+ Ãnderungen mÃŒssen mit speichern bestÀtigt werden.
+
@@ -61,4 +151,5 @@
+
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml (revision 8279)
+++ /views/produkttemplates/standard.phtml (revision 8280)
@@ -13,5 +13,6 @@
/** @var wpsg_product $oProduct */
$oProduct = $this->view['oProduct'];
-
+ if (($this->view['data']['product_key']??'') !== '') $oProduct->setProductKey($this->view['data']['product_key']);
+
?>
@@ -24,5 +25,5 @@
titleDisplayed) { ?>
- getProductName($this->view['data']['id']); ?>
+ getProductName(); ?>
view['data']['detailname']; ?>
@@ -36,5 +37,5 @@