* ready for tt_products 2.8.14 in TER

franzholz · Feb 16, 2017 · 6090118 · 6090118
1 parent a8c2194
commit 6090118
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2017-02-16 Franz Holzinger <[email protected]>
+    * ready for tt_products 2.8.14 in TER
+
 2016-12-10 Franz Holzinger <[email protected]>
 	* workaround for TYPO3 bug #78944: remove transOrigPointerField and transOrigPointerTable from all language overlay tables
 	* bugfix: tax not taken from TAXpercentage because an is_numeric must be used instead of floatval

diff --git a/control/class.tx_ttproducts_main.php b/control/class.tx_ttproducts_main.php
@@ -885,7 +885,7 @@ public function products_tracking (&$errorCode, &$templateCode, $theCode)	{ // t
 						$content = '<a href="' . $relfilename . '" >' . $message . '</a>';
 						break;
 					default:
-						debug('error in ' . TT_PRODUCTS_EXT . ' calling function products_tracking with $theCode = "' . $theCode . '"');
+						debug('error in ' . TT_PRODUCTS_EXT . ' calling function products_tracking with $theCode = "' . $theCode . '"'); // keep this
 				}
 			} else {	// ... else output error page
 				$msgSubpart = '###TRACKING_WRONG_NUMBER###';

diff --git a/lib/class.tx_ttproducts_tables.php b/lib/class.tx_ttproducts_tables.php
@@ -112,7 +112,7 @@ public function &get ($functablename, $bView=FALSE)	{
 		}
 
 		if (!$classNameArray['model'] || $bView && !$classNameArray['view'])	{
-			debug('Error in '.TT_PRODUCTS_EXT.'. No class found after calling function tx_ttproducts_tables::get with parameters "'.$functablename.'", '.$bView.'.','internal error', __LINE__, __FILE__);
+			debug('Error in '.TT_PRODUCTS_EXT.'. No class found after calling function tx_ttproducts_tables::get with parameters "'.$functablename.'", '.$bView.'.','internal error', __LINE__, __FILE__); // keep this
 			return 'ERROR';
 		}
 
@@ -125,7 +125,7 @@ public function &get ($functablename, $bView=FALSE)	{
 					list($extKey, $className) = t3lib_div::trimExplode(':', $className, TRUE);
 
 					if (!t3lib_extMgm::isLoaded($extKey))	{
-						debug('Error in '.TT_PRODUCTS_EXT.'. No extension "' . $extKey . '" has been loaded to use class class.' . $className . '.','internal error',  __LINE__,  __FILE__);
+						debug('Error in '.TT_PRODUCTS_EXT.'. No extension "' . $extKey . '" has been loaded to use class class.' . $className . '.','internal error',  __LINE__,  __FILE__); // keep this
 						continue;
 					}
 					$path = t3lib_extMgm::extPath($extKey);
@@ -136,7 +136,7 @@ public function &get ($functablename, $bView=FALSE)	{
 					$classRef = $classFile . ':&' . $className;
 					$tableObj[$k] = t3lib_div::getUserObj($classRef);	// fetch and store it as persistent object
 				} else {
-					debug ($classFile, 'File not found: ' . $classFile . ' in file class.tx_ttproducts_tables.php');
+					debug ($classFile, 'File not found: ' . $classFile . ' in file class.tx_ttproducts_tables.php'); // keep this
 				}
 			}
 		}
@@ -149,7 +149,7 @@ public function &get ($functablename, $bView=FALSE)	{
 				);
 			}
 		} else {
-			debug ('Object for \''.$functablename.'\' has not been found.','internal error in '.TT_PRODUCTS_EXT, __LINE__, __FILE__);
+			debug ('Object for \''.$functablename.'\' has not been found.','internal error in '.TT_PRODUCTS_EXT, __LINE__, __FILE__); // keep this
 		}
 
 		if (isset($tableObj['view']) && is_object($tableObj['view']) && isset($tableObj['model']) && is_object($tableObj['model']))	{
@@ -178,7 +178,7 @@ public function &getMM ($functablename)	{
 				);
 			}
 		} else {
-			debug ('Object for \''.$functablename.'\' has not been found.','internal error in '.TT_PRODUCTS_EXT, __LINE__, __FILE__);
+			debug ('Object for \''.$functablename.'\' has not been found.','internal error in '.TT_PRODUCTS_EXT, __LINE__, __FILE__); // keep this
 		}
 		return $tableObj;
 	}

diff --git a/locallang_db.xml b/locallang_db.xml
@@ -104,13 +104,16 @@
 			<label index="tt_products_cat.discount_disable">Disable Discount:</label>
 			<label index="tt_products_cat.highlight">Highlight</label>
 			<label index="tt_products_cat.sliderimage">Slider Image</label>
+			<label index="tt_products_cat.parent_category">Parent category</label>
 			<label index="tt_products_cat_language">Product category (alternative language)</label>
 			<label index="tt_products_cat_language.sys_language_uid">Language</label>
 			<label index="tt_products_cat_language.cat_uid">Product category record</label>
 			<label index="tt_products_articles">Product articles</label>
 			<label index="tt_products_articles.uid_product">Product</label>
 			<label index="tt_products_articles.config">Configuration:</label>
 			<label index="tt_products_articles.config.isaddedprice">price is added</label>
+			<label index="tt_products_articles.graduated_config">Graduated Price Configuration:</label>
+			<label index="tt_products_articles.graduated_config.addParentProductCount">Add the product counts of the parent product</label>
 			<label index="tt_products_articles_language">Product articles (alternative language)</label>
 			<label index="tt_products_articles_language.article_uid">Product article</label>
 			<label index="tt_products_attribute_mm_graduated_price">Relation product attributes to gradutated prices</label>

diff --git a/view/class.tx_ttproducts_list_view.php b/view/class.tx_ttproducts_list_view.php
@@ -1509,6 +1509,7 @@ public function &printView (
 					$addQueryString[$itemTableView->getPivar()] = intval($row['uid']);
 					$piVarCat = $pibaseObj->piVars[$categoryTableView->getPivar()];
 					$bUseBackPid = ($pid != $TSFE->id);
+
 					if ($piVarCat)	{
 						if ($this->conf['PIDlistDisplay'])	{
 							$bUseBackPid = FALSE;
@@ -1520,10 +1521,11 @@ public function &printView (
 					} // 'tx_ttproducts_pi_search'
 					$queryString = $this->urlObj->getLinkParams('begin_at', $addQueryString, FALSE, $bUseBackPid, $itemTableView->getPivar(), $categoryTableView->getPivar());
 					$pageLink = htmlspecialchars($pibaseObj->pi_linkTP_keepPIvars_url($queryString,1,0,$pid));
+
 					if ($childCatWrap)	{
 						$wrappedSubpartArray['###LINK_ITEM###'] = t3lib_div::trimExplode('|',$childCatWrap);
 					} else {
-						$wrappedSubpartArray['###LINK_ITEM###'] = array('<a href="' . $pageLink . '"' . $css_current . '>','</a>');
+						$wrappedSubpartArray['###LINK_ITEM###'] = array('<a href="' . $pageLink . '"' . $css_current . '>', '</a>');
 					}
 
 					if (count($mergeRow))	{
@@ -1594,7 +1596,6 @@ public function &printView (
 
 						$markerArray = array_merge($markerArray, $currPriceMarkerArray);
 
-// 						include_once (PATH_BE_ttproducts.'view/class.tx_ttproducts_basketitem_view.php');
 						$basketItemView = t3lib_div::getUserObj('tx_ttproducts_basketitem_view');
 						$basketItemView->init($this->pibaseClass, $basketObj->basketExt,  $basketObj->getItemObj());
 						$basketItemView->getItemMarkerArray(