refactor(InventoryModules) move duplicate code to function

tsolucio · Jun 1, 2021 · b755093 · b755093
1 parent 3d64484
commit b755093
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 112 deletions.
diff --git a/modules/Invoice/EditView.php b/modules/Invoice/EditView.php
@@ -375,34 +375,9 @@
 	$smarty->assign('AVAILABLE_PRODUCTS', 'true');
 	$smarty->assign('MODE', $focus->mode);
 }
-
-$cbMap = cbMap::getMapByName($currentModule.'InventoryDetails', 'MasterDetailLayout');
-$smarty->assign('moreinfofields', '');
-if ($cbMap!=null && isPermitted('InventoryDetails', 'EditView')=='yes') {
-	$cbMapFields = $cbMap->MasterDetailLayout();
-	$smarty->assign('moreinfofields', "'".implode("','", $cbMapFields['detailview']['fieldnames'])."'");
-	if (empty($associated_prod) && $isduplicate != 'true') { // creating
-		$product_Detail = $col_fields = array();
-		foreach ($cbMapFields['detailview']['fields'] as $mdfield) {
-			if ($mdfield['fieldinfo']['name']=='id') {
-				continue;
-			}
-			$col_fields[$mdfield['fieldinfo']['name']] = '';
-			$foutput = getOutputHtml(
-				$mdfield['fieldinfo']['uitype'],
-				$mdfield['fieldinfo']['name'],
-				$mdfield['fieldinfo']['label'],
-				100,
-				$col_fields,
-				0,
-				'InventoryDetails',
-				'edit',
-				$mdfield['fieldinfo']['typeofdata']
-			);
-			$product_Detail['moreinfo'][] = $foutput;
-		}
-		$associated_prod = $product_Detail;
-	}
+if (empty($associated_prod) && $isduplicate != 'true') { // creating
+	include_once 'modules/cbMap/processmap/MasterDetailLayout.php';
+	$associated_prod = MasterDetailLayout::setCreateAsociatedProductsValue($currentModule, $smarty);
 }
 
 list($v1, $v2, $associated_prod, $customtemplatename) = cbEventHandler::do_filter('corebos.filter.inventory.itemrow.edit', array($currentModule, $focus, $associated_prod, ''));

diff --git a/modules/PurchaseOrder/EditView.php b/modules/PurchaseOrder/EditView.php
@@ -215,34 +215,9 @@
 	$smarty->assign('AVAILABLE_PRODUCTS', 'true');
 	$smarty->assign('MODE', $focus->mode);
 }
-$cbMap = cbMap::getMapByName($currentModule.'InventoryDetails', 'MasterDetailLayout');
-$smarty->assign('moreinfofields', '');
-if ($cbMap!=null && isPermitted('InventoryDetails', 'EditView')=='yes') {
-	$cbMapFields = $cbMap->MasterDetailLayout();
-	$smarty->assign('moreinfofields', "'".implode("','", $cbMapFields['detailview']['fieldnames'])."'");
-	if (empty($associated_prod) && $isduplicate != 'true') { // creating
-		$product_Detail = $col_fields = array();
-		foreach ($cbMapFields['detailview']['fields'] as $mdfield) {
-			if ($mdfield['fieldinfo']['name']=='id') {
-				continue;
-			}
-			$col_fields[$mdfield['fieldinfo']['name']] = '';
-			$foutput = getOutputHtml(
-				$mdfield['fieldinfo']['uitype'],
-				$mdfield['fieldinfo']['name'],
-				$mdfield['fieldinfo']['label'],
-				100,
-				$col_fields,
-				0,
-				'InventoryDetails',
-				'edit',
-				$mdfield['fieldinfo']['typeofdata']
-			);
-			$product_Detail['moreinfo'][] = $foutput;
-		}
-		$associated_prod = $product_Detail;
-		$smarty->assign('ASSOCIATEDPRODUCTS', $associated_prod);
-	}
+if (empty($associated_prod) && $isduplicate != 'true') { // creating
+	include_once 'modules/cbMap/processmap/MasterDetailLayout.php';
+	$associated_prod = MasterDetailLayout::setCreateAsociatedProductsValue($currentModule, $smarty);
 }
 
 list($v1, $v2, $associated_prod, $customtemplatename) = cbEventHandler::do_filter('corebos.filter.inventory.itemrow.edit', array($currentModule, $focus, $associated_prod, ''));

diff --git a/modules/Quotes/EditView.php b/modules/Quotes/EditView.php
@@ -246,34 +246,9 @@
 } else {
 	$smarty->assign('ROWCOUNT', '1');
 }
-$cbMap = cbMap::getMapByName($currentModule.'InventoryDetails', 'MasterDetailLayout');
-$smarty->assign('moreinfofields', '');
-if ($cbMap!=null && isPermitted('InventoryDetails', 'EditView')=='yes') {
-	$cbMapFields = $cbMap->MasterDetailLayout();
-	$smarty->assign('moreinfofields', "'".implode("','", $cbMapFields['detailview']['fieldnames'])."'");
-	if (empty($associated_prod) && $isduplicate != 'true') { // creating
-		$product_Detail = $col_fields = array();
-		foreach ($cbMapFields['detailview']['fields'] as $mdfield) {
-			if ($mdfield['fieldinfo']['name']=='id') {
-				continue;
-			}
-			$col_fields[$mdfield['fieldinfo']['name']] = '';
-			$foutput = getOutputHtml(
-				$mdfield['fieldinfo']['uitype'],
-				$mdfield['fieldinfo']['name'],
-				$mdfield['fieldinfo']['label'],
-				100,
-				$col_fields,
-				0,
-				'InventoryDetails',
-				'edit',
-				$mdfield['fieldinfo']['typeofdata']
-			);
-			$product_Detail['moreinfo'][] = $foutput;
-		}
-		$associated_prod = $product_Detail;
-		$smarty->assign('ASSOCIATEDPRODUCTS', $associated_prod);
-	}
+if (empty($associated_prod) && $isduplicate != 'true') { // creating
+	include_once 'modules/cbMap/processmap/MasterDetailLayout.php';
+	$associated_prod = MasterDetailLayout::setCreateAsociatedProductsValue($currentModule, $smarty);
 }
 
 list($v1, $v2, $associated_prod, $customtemplatename) = cbEventHandler::do_filter('corebos.filter.inventory.itemrow.edit', array($currentModule, $focus, $associated_prod, ''));

diff --git a/modules/SalesOrder/EditView.php b/modules/SalesOrder/EditView.php
@@ -342,34 +342,9 @@
 	$smarty->assign('AVAILABLE_PRODUCTS', 'true');
 	$smarty->assign('MODE', $focus->mode);
 }
-$cbMap = cbMap::getMapByName($currentModule.'InventoryDetails', 'MasterDetailLayout');
-$smarty->assign('moreinfofields', '');
-if ($cbMap!=null && isPermitted('InventoryDetails', 'EditView')=='yes') {
-	$cbMapFields = $cbMap->MasterDetailLayout();
-	$smarty->assign('moreinfofields', "'".implode("','", $cbMapFields['detailview']['fieldnames'])."'");
-	if (empty($associated_prod) && $isduplicate != 'true') { // creating
-		$product_Detail = $col_fields = array();
-		foreach ($cbMapFields['detailview']['fields'] as $mdfield) {
-			if ($mdfield['fieldinfo']['name']=='id') {
-				continue;
-			}
-			$col_fields[$mdfield['fieldinfo']['name']] = '';
-			$foutput = getOutputHtml(
-				$mdfield['fieldinfo']['uitype'],
-				$mdfield['fieldinfo']['name'],
-				$mdfield['fieldinfo']['label'],
-				100,
-				$col_fields,
-				0,
-				'InventoryDetails',
-				'edit',
-				$mdfield['fieldinfo']['typeofdata']
-			);
-			$product_Detail['moreinfo'][] = $foutput;
-		}
-		$associated_prod = $product_Detail;
-		$smarty->assign('ASSOCIATEDPRODUCTS', $associated_prod);
-	}
+if (empty($associated_prod) && $isduplicate != 'true') { // creating
+	include_once 'modules/cbMap/processmap/MasterDetailLayout.php';
+	$associated_prod = MasterDetailLayout::setCreateAsociatedProductsValue($currentModule, $smarty);
 }
 
 list($v1, $v2, $associated_prod, $customtemplatename) = cbEventHandler::do_filter('corebos.filter.inventory.itemrow.edit', array($currentModule, $focus, $associated_prod, ''));

diff --git a/modules/cbMap/processmap/MasterDetailLayout.php b/modules/cbMap/processmap/MasterDetailLayout.php
@@ -287,5 +287,36 @@ public function getRelatedFieldInfo($fieldname) {
 		}
 		return $this->relatedfieldsinfo[$module][$ret];
 	}
+
+	// creating > empty($associated_prod) && $isduplicate != 'true'
+	public static function setCreateAsociatedProductsValue($module, &$smarty) {
+		$cbMap = cbMap::getMapByName($module.'InventoryDetails', 'MasterDetailLayout');
+		$smarty->assign('moreinfofields', '');
+		$product_Detail = array();
+		if ($cbMap!=null && isPermitted('InventoryDetails', 'EditView')=='yes') {
+			$cbMapFields = $cbMap->MasterDetailLayout();
+			$smarty->assign('moreinfofields', "'".implode("','", $cbMapFields['detailview']['fieldnames'])."'");
+			$col_fields = array();
+			foreach ($cbMapFields['detailview']['fields'] as $mdfield) {
+				if ($mdfield['fieldinfo']['name']=='id') {
+					continue;
+				}
+				$col_fields[$mdfield['fieldinfo']['name']] = '';
+				$foutput = getOutputHtml(
+					$mdfield['fieldinfo']['uitype'],
+					$mdfield['fieldinfo']['name'],
+					$mdfield['fieldinfo']['label'],
+					100,
+					$col_fields,
+					0,
+					'InventoryDetails',
+					'edit',
+					$mdfield['fieldinfo']['typeofdata']
+				);
+				$product_Detail['moreinfo'][] = $foutput;
+			}
+		}
+		return $product_Detail;
+	}
 }
 ?>