Fixes #551 - vt7: Extension banner show also 6.x extension

layouts/v7/modules/Settings/ExtensionStore/ExtensionCompactableError.tpl → layouts/v7/modules/Settings/ExtensionStore/ExtensionCompatibleError.tpl

@@ -16,11 +16,16 @@
 						<table border="0" cellpadding="5" cellspacing="0" width="98%">
 							<tbody>
 								<tr>
-									<td rowspan="2" width="10%"><img src="{vimage_path("denied.gif")}" style="margin: 10px;"></td>
-									<td rowspan="2" width="40%" style="border-bottom: 1px solid rgb(204, 204, 204);">
+									<td rowspan="2"><img src="{vimage_path("denied.gif")}" style="margin: 10px;"></td>
+									<td width="80%" style="border-bottom: 1px solid rgb(204, 204, 204);">
 										<span class="genHeaderSmall"><b>{vtranslate($EXTENSION_LABEL, $QUALIFIED_MODULE)}</b> {vtranslate('LBL_EXTENSION_NOT_COMPATABLE', $QUALIFIED_MODULE)}</span>
 									</td>
 								</tr>
+								<tr>
+									<td class="small" align="right" nowrap="nowrap">
+										<a href="index.php?module=ExtensionStore&parent=Settings&view=ExtensionStore">{vtranslate('LBL_GO_BACK', $MODULE)}</a><br>
+									</td>
+								</tr>
 							</tbody>
 						</table>
 					</div>

pkg/vtiger/modules/ExtensionStore/settings/views/ExtensionStore.php

@@ -132,45 +132,52 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_
 		$modelInstance = $this->getModelInstance();
 
 		$extensionDetail = $modelInstance->getExtensionListings($extensionId);
-		$customerReviews = $modelInstance->getCustomerReviews($extensionId);
-		$screenShots = $modelInstance->getScreenShots($extensionId);
-		$authorInfo = $modelInstance->getListingAuthor($extensionId);
-		$registrationStatus = $modelInstance->checkRegistration();
+		$extension = $extensionDetail[$extensionId];
 
-		if ($registrationStatus) {
-			$pwdStatus = $modelInstance->passwordStatus();
-			if (!$pwdStatus) {
-				$sessionIdentifer = $modelInstance->getSessionIdentifier();
-				$pwd = $_SESSION[$sessionIdentifer.'_password'];
-				if (!empty($pwd)) {
-					$pwdStatus = true;
+		if ($extension && $extension->isVtigerCompatible()) {
+			$customerReviews = $modelInstance->getCustomerReviews($extensionId);
+			$screenShots = $modelInstance->getScreenShots($extensionId);
+			$authorInfo = $modelInstance->getListingAuthor($extensionId);
+			$registrationStatus = $modelInstance->checkRegistration();
+
+			if ($registrationStatus) {
+				$pwdStatus = $modelInstance->passwordStatus();
+				if (!$pwdStatus) {
+					$sessionIdentifer = $modelInstance->getSessionIdentifier();
+					$pwd = $_SESSION[$sessionIdentifer.'_password'];
+					if (!empty($pwd)) {
+						$pwdStatus = true;
+					}
 				}
+				$viewer->assign('PASSWORD_STATUS', $pwdStatus);
 			}
-			$viewer->assign('PASSWORD_STATUS', $pwdStatus);
-		}
 
-		if ($registrationStatus && $pwdStatus) {
-			$customerProfile = $modelInstance->getProfile();
-			$customerCardId = $customerProfile['CustomerCardId'];
-			if (!empty($customerCardId)) {
-				$customerCardDetails = $modelInstance->getCardDetails($customerCardId);
-				$viewer->assign('CUSTOMER_CARD_INFO', $customerCardDetails);
+			if ($registrationStatus && $pwdStatus) {
+				$customerProfile = $modelInstance->getProfile();
+				$customerCardId = $customerProfile['CustomerCardId'];
+				if (!empty($customerCardId)) {
+					$customerCardDetails = $modelInstance->getCardDetails($customerCardId);
+					$viewer->assign('CUSTOMER_CARD_INFO', $customerCardDetails);
+				}
+				$viewer->assign('CUSTOMER_PROFILE', $customerProfile);
 			}
-			$viewer->assign('CUSTOMER_PROFILE', $customerProfile);
-		}
 
-		$extension = $extensionDetail[$extensionId];
-		$viewer->assign('IS_PRO', true);
-		$viewer->assign('MODULE_ACTION', $moduleAction);
-		$viewer->assign('SCREEN_SHOTS', $screenShots);
-		$viewer->assign('AUTHOR_INFO', $authorInfo);
-		$viewer->assign('CUSTOMER_REVIEWS', $customerReviews);
-		$viewer->assign('EXTENSION_DETAIL', $extension);
-		$viewer->assign('EXTENSION_MODULE_MODEL', $extension->get('moduleModel'));
-		$viewer->assign('EXTENSION_ID', $extensionId);
-		$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);
-		$viewer->assign('REGISTRATION_STATUS', $registrationStatus);
-		$viewer->view('Detail.tpl', $qualifiedModuleName);
+			$viewer->assign('IS_PRO', true);
+			$viewer->assign('MODULE_ACTION', $moduleAction);
+			$viewer->assign('SCREEN_SHOTS', $screenShots);
+			$viewer->assign('AUTHOR_INFO', $authorInfo);
+			$viewer->assign('CUSTOMER_REVIEWS', $customerReviews);
+			$viewer->assign('EXTENSION_DETAIL', $extension);
+			$viewer->assign('EXTENSION_MODULE_MODEL', $extension->get('moduleModel'));
+			$viewer->assign('EXTENSION_ID', $extensionId);
+			$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);
+			$viewer->assign('REGISTRATION_STATUS', $registrationStatus);
+			$viewer->view('Detail.tpl', $qualifiedModuleName);
+		} else {
+			$viewer->assign('EXTENSION_LABEL', $extension->get('label'));
+			$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);
+			$viewer->view('ExtensionCompatibleError.tpl', $qualifiedModuleName);
+		}
 	}
 
 	protected function installationLog(Vtiger_Request $request) {