Skip to content
Snippets Groups Projects
Commit d92597a4 authored by vtigerosm's avatar vtigerosm
Browse files

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

parents e1b2d1ff 13271cb3
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 403 additions and 472 deletions
languages/en_us/Settings/ExtensionStore.php deleted 100644 → 0
+ 0
− 133
View file @ e1b2d1ff
<?php
/*+***********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.0
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
*************************************************************************************/
$languageStrings = array(
'LBL_PUBLISHER' => 'Publisher',
'LBL_LICENSE' => 'License',
'LBL_PUBLISHED_ON' => 'Published on',
'LBL_INSTALL' => 'Install',
'LBL_UPGRADE' => 'Upgrade',
'LBL_VERSION' => 'Version',
'LBL_DECLINE' => 'Decline',
'LBL_ACCEPT_AND_INSTALL' => 'Accept and Install',
'LBL_OK' => 'OK',
'LBL_EXTENSION_NOT_COMPATABLE' => 'Extension is not Compatable',
'LBL_INVALID_FILE' => 'Invalid File',
'LBL_NO_LICENSE_PROVIDED' => 'No License Provided',
'LBL_INSTALLATION' => 'Installation',
'LBL_FAILED' => 'Failed',
'LBL_SUCCESSFULL' => 'Successful',
'LBL_INSTALLATION_LOG' => 'Installation Log',
'LBL_UPDATED_MODULE' => ' module was updated successfully.',
'LBL_UPDATING_MODULE' => 'Updating Module',
'LBL_MARKET_PLACE' => 'Market Place',
//Extension Store translations
'LBL_VTIGER_EXTENSION_STORE' => 'Vtiger Extension Store',
'LBL_SEARCH_FOR_AN_EXTENSION' => 'Search for an extension..',
'LBL_DOWNLOADS' => 'Downloads',
'LBL_NO_EXTENSIONS_FOUND' => 'No Extensions Found',
'LBL_REGISTER_TO_MARKET_PLACE' => 'Register to Marketplace',
'LBL_MARKETPLACE_REGISTRATION' => 'Marketplace Registration',
'LBL_MARKETPLACE_LOGIN' => 'Marketplace Login',
'LBL_NEW_TO_MARKETPLCAE' => 'New to Marketplace ?',
'LBL_CREATE_AN_ACCOUNT' => 'Create a new account',
'LBL_SETUP_CARD_DETAILS' => 'Setup Card Details',
'LBL_SETUP_CARD' => 'Setup Card',
'LBL_CARD_NUMBER' => 'Card Number',
'LBL_EXP_MONTH' => 'Exp Month',
'LBL_EXP_YEAR' => 'Exp Year',
'LBL_CVC_CODE' => 'CVC Code',
'LBL_RESET' => 'Reset',
'LBL_EXTENSION_STORE' => 'Extension Store',
'LBL_INSTALLED' => 'Installed',
'LBL_UPDATE_CARD_DETAILS' => 'Update Card Details',
'LBL_BY' => 'by',
'LBL_RATINGS' => 'Ratings',
'LBL_DESCRIPTION' => 'Description',
'LBL_AUTHOR_INFORMATION' => 'Author Information',
'LBL_AUTHOR_NAME' => 'Author Name',
'LBL_PHONE' => 'Phone',
'LBL_EMAIL' => 'Email',
'LBL_SCREEN_SHOTS' => 'Screenshots',
'LBL_CUSTOMER_RATINGS' => 'Customer Ratings',
'LBL_CUSTOMER_REVIEWS' => 'Customer Reviews',
'LBL_WRITE_A_REVIEW' => 'Write a Review',
'LBL_CUSTOMER_REVIEW' => 'Customer Review',
'LBL_REVIEW' => 'Review',
'LBL_CUSTOMERS_REVIEWED' => 'Customers Reviewed',
'LBL_SINGLE_CUSTOMER_REVIEWED' => 'Single Customer Reviewed',
'LBL_INSTALLATION_FAILED' => 'Installation Failed',
'LBL_SUCCESSFULL_INSTALLATION' => 'Successful Installation',
'LBL_INSTALL_FROM_ZIP' => 'Install from Zip',
'LBL_MORE_DETAILS' => 'More Details',
'Install' => 'Install',
'Upgrade' => 'Upgrade',
'LBL_RATE_IT' => 'Rate it.',
'LBL_UNINSTALL' => 'Uninstall',
'LBL_LAUNCH' => 'Launch',
'LBL_SIGN_UP_FOR_FREE' => 'Sign up for free',
'LBL_EMAIL_ADDRESS' => 'Email address',
'LBL_FIRST_NAME' => 'First name',
'LBL_LAST_NAME' => 'Last name',
'LBL_COMPANY_NAME' => 'Company name',
'LBL_PASSWORD' => 'Password',
'LBL_CONFIRM_PASSWORD' => 'Confirm password',
'LBL_REGISTER' => 'Register',
'LBL_EXTENSION_STORE_LOGIN' => 'Extensionstore Login',
'LBL_REMEMBER_ME' => 'Remember me',
'LBL_TRY_IT' => 'Try it',
'LBL_TRIAL_INSTALLED' => 'Trial Installed',
'LBL_BUY' => 'Buy ',
'LBL_LOGIN_TO_MARKET_PLACE' => 'Login to Marketplace',
'LBL_LOGIN' => 'Login',
'LBL_PHP_EXTENSION_LOADER_IS_NOT_AVAIABLE' => 'Please install extension loader',
'LBL_INSTALL_EXTENSION_LOADER' => 'Install Extension Loader',
'LBL_TO_CONTINUE_USING_EXTENSION_STORE' => 'To continue using Extension Store please install ',
'LBL_DOWNLOAD' => 'Download',
'LBL_COMPATIABLE_EXTENSION' => ' and enable it as zend_extension.',
'LBL_MORE_DETAILS_ON_INSTALLATION' => 'For more details on installation ',
'LBL_READ_HERE' => 'read here',
'LBL_REVIEWS' => 'Reviews',
'LBL_SIGNUP_FOR_MARKET_PLACE' => 'Signup for Marketplace',
'LBL_UNAUTHORIZED' => 'Unauthorized',
'LBL_EXPIRY_DATE' => 'Expiry Date',
'firstname' => 'First Name',
'lastname' => 'Last Name',
'email' => 'Email',
'company' => 'Company',
'Phone' => 'Phone',
'Website' => 'Website',
'LBL_SECURITY_CODE' => 'Security Code',
'LBL_WHAT_IS_SECURITY_CODE' => 'What is Security Code ?',
'LBL_CARD_NUMBER_PLACEHOLDER' => '16 digit number on your card',
'LBL_SECURITY_CODE_HELP_CONTENT' => 'The CVV Number(Card Verification Value) on your credit/debit card is a 3 digit number on VISA®, MasterCard® etc.. branded credit/debit cards.',
'LBL_ENTER_REGISTERED_EMAIL' => 'Enter your registered email',
'LBL_RESET_PASSWORD_LINK_EMAILED' => 'Reset Password link emailed to you!',
'LBL_FORGOT_PASSWORD' => 'Forgot Password',
'LBL_ALREADY_INSTALLED_MODULE_BUILDER' => 'Already created by module builder',
'LBL_REVIEW_RESTRICTED' => 'Reviewing restricted',
);
$jsLanguageStrings = array(
'JS_PLEASE_SETUP_CARD_DETAILS_TO_INSTALL_THIS_EXTENSION' => 'Please setup card details to install this extension',
'JS_UPDATE_CARD_DETAILS' => 'Update Card Details',
'JS_ON' => 'on',
'JS_RATINGS' => 'Ratings',
'JS_INSTALLED' => 'Installed',
'JS_TRIAL_INSTALLED' => 'Trial Installed',
'JS_PLEASE_INSTALL_EXTENSION_LOADER_TO_INSTALL_THIS_EXTENSION_FROM_BELOW_LINK' => 'Please install extension loader to install this extension from below link',
'JS_PLEASE_LOGIN_TO_MARKETPLACE_FOR_INSTALLING_EXTENSION' => 'Please login to marketplace for installing extension',
'JS_PLEASE_SETUP_CARD_DETAILS_TO_INSTALL_EXTENSION' => 'Please setup card details to install extension',
'JS_PLEASE_LOGIN_TO_MARKETPLACE_FOR_UNINSTALLING_EXTENSION' => 'Please login to marketplace for uninstalling extension',
'JS_CARD_DETAILS_UPDATED' => 'Card details updated!',
'JS_PASSWORDS_MISMATCH' => "Passwords didn't match!",
'JS_ARE_YOU_SURE_UNINSTALL' => 'Are you sure you want to uninstall this Extension',
'JS_ARE_YOU_SURE_INSTALL' => 'Are you sure you want to install this extension',
);
\ No newline at end of file
layouts/v7/modules/Settings/ExtensionStore/Detail.tpl
+ 202
− 202
View file @ d92597a4
This diff is collapsed.
layouts/v7/modules/Settings/ExtensionStore/ExtensionCompatibleError.tpl 0 → 100644
+ 37
− 0
View file @ d92597a4
{*+**********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
*************************************************************************************}
{strip}
<div style="min-height: 600px;">
<table border="0" cellpadding="5" cellspacing="0" width="100%" style="margin-top: 100px;">
<tr>
<td align="center">
<div style="border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 40%; position: relative;padding-right: 3px;">
<table border="0" cellpadding="5" cellspacing="0" width="98%">
<tbody>
<tr>
<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> {ucfirst(strtolower(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>
</td>
</tr>
</table>
{include file="CardSetupModals.tpl"|@vtemplate_path:$QUALIFIED_MODULE QUALIFIED_MODULE=$QUALIFIED_MODULE}
</div>
{strip}
\ No newline at end of file
modules/Migration/schema/700_to_701.php
+ 3
− 2
View file @ d92597a4
...@@ -32,8 +32,9 @@ if(defined('VTIGER_UPGRADE')) { ...@@ -32,8 +32,9 @@ if(defined('VTIGER_UPGRADE')) {
) ENGINE=InnoDB DEFAULT CHARSET=utf8", true); ) ENGINE=InnoDB DEFAULT CHARSET=utf8", true);
} }
$updateModulesList = array( 'Project' => 'packages/vtiger/optional/Projects.zip', $updateModulesList = array( 'Project' => 'packages/vtiger/optional/Projects.zip',
'Google' => 'packages/vtiger/optional/Google.zip'); 'Google' => 'packages/vtiger/optional/Google.zip',
'ExtensionStore'=> 'packages/vtiger/marketplace/ExtensionStore.zip');
foreach ($updateModulesList as $moduleName => $packagePath) { foreach ($updateModulesList as $moduleName => $packagePath) {
$moduleInstance = Vtiger_Module::getInstance($moduleName); $moduleInstance = Vtiger_Module::getInstance($moduleName);
if($moduleInstance) { if($moduleInstance) {
......
packages/vtiger/marketplace/ExtensionStore.zip
+ 0
− 0
View file @ d92597a4
No preview for this file type
pkg/vtiger/modules/ExtensionStore/languages/en_us/Settings/ExtensionStore.php
+ 115
− 101
View file @ d92597a4
<?php <?php
/* /* +**********************************************************************************
* Copyright (C) www.vtiger.com. All rights reserved. * The contents of this file are subject to the vtiger CRM Public License Version 1.1
* @license Proprietary * ("License"); You may not use this file except in compliance with the License
*/ * The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
* ***********************************************************************************/
$languageStrings = array( $languageStrings = array(
'LBL_PUBLISHER' => 'Publisher', 'LBL_PUBLISHER' => 'Publisher',
'LBL_LICENSE' => 'License', 'LBL_LICENSE' => 'License',
...@@ -22,102 +27,111 @@ $languageStrings = array( ...@@ -22,102 +27,111 @@ $languageStrings = array(
'LBL_INSTALLATION_LOG' => 'Installation Log', 'LBL_INSTALLATION_LOG' => 'Installation Log',
'LBL_UPDATED_MODULE' => ' module was updated successfully.', 'LBL_UPDATED_MODULE' => ' module was updated successfully.',
'LBL_UPDATING_MODULE' => 'Updating Module', 'LBL_UPDATING_MODULE' => 'Updating Module',
'LBL_MARKET_PLACE' => 'Market Place',
//Extension Store translations
'LBL_VTIGER_EXTENSION_STORE' => 'Vtiger Extension Store', //Extension Store translations
'LBL_SEARCH_FOR_AN_EXTENSION' => 'Search for an extension..', 'LBL_VTIGER_EXTENSION_STORE' => 'Vtiger Extension Store',
'LBL_DOWNLOADS' => 'Downloads', 'LBL_SEARCH_FOR_AN_EXTENSION' => 'Search for an extension..',
'LBL_NO_EXTENSIONS_FOUND' => 'No Extensions Found', 'LBL_DOWNLOADS' => 'Downloads',
'LBL_REGISTER_TO_MARKET_PLACE' => 'Register to Marketplace', 'LBL_NO_EXTENSIONS_FOUND' => 'No Extensions Found',
'LBL_MARKETPLACE_REGISTRATION' => 'Marketplace Registration', 'LBL_REGISTER_TO_MARKET_PLACE' => 'Register to Marketplace',
'LBL_MARKETPLACE_LOGIN' => 'Marketplace Login', 'LBL_MARKETPLACE_REGISTRATION' => 'Marketplace Registration',
'LBL_NEW_TO_MARKETPLCAE' => 'New to Marketplace ?', 'LBL_MARKETPLACE_LOGIN' => 'Marketplace Login',
'LBL_CREATE_AN_ACCOUNT' => 'Create a new account', 'LBL_NEW_TO_MARKETPLCAE' => 'New to Marketplace ?',
'LBL_SETUP_CARD_DETAILS' => 'Setup Card Details', 'LBL_CREATE_AN_ACCOUNT' => 'Create a new account',
'LBL_SETUP_CARD' => 'Setup Card', 'LBL_SETUP_CARD_DETAILS' => 'Setup Card Details',
'LBL_CARD_NUMBER' => 'Card Number', 'LBL_SETUP_CARD' => 'Setup Card',
'LBL_EXP_MONTH' => 'Exp Month', 'LBL_CARD_NUMBER' => 'Card Number',
'LBL_EXP_YEAR' => 'Exp Year', 'LBL_EXP_MONTH' => 'Exp Month',
'LBL_CVC_CODE' => 'CVC Code', 'LBL_EXP_YEAR' => 'Exp Year',
'LBL_RESET' => 'Reset', 'LBL_CVC_CODE' => 'CVC Code',
'LBL_EXTENSION_STORE' => 'Extension Store', 'LBL_RESET' => 'Reset',
'LBL_INSTALLED' => 'Installed', 'LBL_EXTENSION_STORE' => 'Extension Store',
'LBL_UPDATE_CARD_DETAILS' => 'Update Card Details', 'LBL_INSTALLED' => 'Installed',
'LBL_BY' => 'by', 'LBL_UPDATE_CARD_DETAILS' => 'Update Card Details',
'LBL_RATINGS' => 'Ratings', 'LBL_BY' => 'by',
'LBL_DESCRIPTION' => 'Description', 'LBL_RATINGS' => 'Ratings',
'LBL_AUTHOR_INFORMATION' => 'Author Information', 'LBL_DESCRIPTION' => 'Description',
'LBL_AUTHOR_NAME' => 'Author Name', 'LBL_AUTHOR_INFORMATION' => 'Author Information',
'LBL_PHONE' => 'Phone', 'LBL_AUTHOR_NAME' => 'Author Name',
'LBL_EMAIL' => 'Email', 'LBL_PHONE' => 'Phone',
'LBL_SCREEN_SHOTS' => 'Screenshots', 'LBL_EMAIL' => 'Email',
'LBL_CUSTOMER_RATINGS' => 'Customer Ratings', 'LBL_SCREEN_SHOTS' => 'Screenshots',
'LBL_CUSTOMER_REVIEWS' => 'Customer Reviews', 'LBL_CUSTOMER_RATINGS' => 'Customer Ratings',
'LBL_WRITE_A_REVIEW' => 'Write a Review', 'LBL_CUSTOMER_REVIEWS' => 'Customer Reviews',
'LBL_CUSTOMER_REVIEW' => 'Customer Review', 'LBL_WRITE_A_REVIEW' => 'Write a Review',
'LBL_REVIEW' => 'Review', 'LBL_CUSTOMER_REVIEW' => 'Customer Review',
'LBL_CUSTOMERS_REVIEWED' => 'Customers Reviewed', 'LBL_REVIEW' => 'Review',
'LBL_SINGLE_CUSTOMER_REVIEWED' => 'Single Customer Reviewed', 'LBL_CUSTOMERS_REVIEWED' => 'Customers Reviewed',
'LBL_INSTALLATION_FAILED' => 'Installation Failed', 'LBL_SINGLE_CUSTOMER_REVIEWED' => 'Single Customer Reviewed',
'LBL_SUCCESSFULL_INSTALLATION' => 'Successful Installation', 'LBL_INSTALLATION_FAILED' => 'Installation Failed',
'LBL_INSTALL_FROM_ZIP' => 'Install from Zip', 'LBL_SUCCESSFULL_INSTALLATION' => 'Successful Installation',
'LBL_MORE_DETAILS' => 'More Details', 'LBL_INSTALL_FROM_ZIP' => 'Install from Zip',
'Install' => 'Install', 'LBL_MORE_DETAILS' => 'More Details',
'Upgrade' => 'Upgrade', 'Install' => 'Install',
'LBL_RATE_IT' => 'Rate it.', 'Upgrade' => 'Upgrade',
'LBL_UNINSTALL' => 'UnInstall', 'LBL_RATE_IT' => 'Rate it.',
'LBL_LAUNCH' => 'Launch', 'LBL_UNINSTALL' => 'Uninstall',
'LBL_SIGN_UP_FOR_FREE' => 'Sign up for free', 'LBL_LAUNCH' => 'Launch',
'LBL_EMAIL_ADDRESS' => 'Email address', 'LBL_SIGN_UP_FOR_FREE' => 'Sign up for free',
'LBL_FIRST_NAME' => 'First name', 'LBL_EMAIL_ADDRESS' => 'Email address',
'LBL_LAST_NAME' => 'Last name', 'LBL_FIRST_NAME' => 'First name',
'LBL_COMPANY_NAME' => 'Company name', 'LBL_LAST_NAME' => 'Last name',
'LBL_PASSWORD' => 'Password', 'LBL_COMPANY_NAME' => 'Company name',
'LBL_CONFIRM_PASSWORD' => 'Confirm password', 'LBL_PASSWORD' => 'Password',
'LBL_REGISTER' => 'Register', 'LBL_CONFIRM_PASSWORD' => 'Confirm password',
'LBL_EXTENSION_STORE_LOGIN' => 'Extensionstore Login', 'LBL_REGISTER' => 'Register',
'LBL_REMEMBER_ME' => 'Remember me', 'LBL_EXTENSION_STORE_LOGIN' => 'Extensionstore Login',
'LBL_TRY_IT' => 'Try it', 'LBL_REMEMBER_ME' => 'Remember me',
'LBL_TRIAL_INSTALLED' => 'Trial Installed', 'LBL_TRY_IT' => 'Try it',
'LBL_BUY' => 'Buy ', 'LBL_TRIAL_INSTALLED' => 'Trial Installed',
'LBL_LOGIN_TO_MARKET_PLACE' => 'Login to Marketplace', 'LBL_BUY' => 'Buy ',
'LBL_LOGIN' => 'Login', 'LBL_LOGIN_TO_MARKET_PLACE' => 'Login to Marketplace',
'LBL_PHP_EXTENSION_LOADER_IS_NOT_AVAIABLE' => 'Please install extension loader', 'LBL_LOGIN' => 'Login',
'LBL_INSTALL_EXTENSION_LOADER' => 'Install Extension Loader', 'LBL_PHP_EXTENSION_LOADER_IS_NOT_AVAIABLE' => 'Please install extension loader',
'LBL_TO_CONTINUE_USING_EXTENSION_STORE' => 'To continue using Extension Store please install ', 'LBL_INSTALL_EXTENSION_LOADER' => 'Install Extension Loader',
'LBL_DOWNLOAD' => 'Download', 'LBL_TO_CONTINUE_USING_EXTENSION_STORE' => 'To continue using Extension Store please install ',
'LBL_COMPATIABLE_EXTENSION' => ' and enable it as zend_extension.', 'LBL_DOWNLOAD' => 'Download',
'LBL_MORE_DETAILS_ON_INSTALLATION' => 'For more details on installation ', 'LBL_COMPATIABLE_EXTENSION' => ' and enable it as zend_extension.',
'LBL_READ_HERE' => 'read here', 'LBL_MORE_DETAILS_ON_INSTALLATION' => 'For more details on installation ',
'LBL_REVIEWS' => 'Reviews', 'LBL_READ_HERE' => 'read here',
'LBL_SIGNUP_FOR_MARKET_PLACE' => 'Signup for Marketplace', 'LBL_REVIEWS' => 'Reviews',
'LBL_UNAUTHORIZED' => 'Unauthorized', 'LBL_SIGNUP_FOR_MARKET_PLACE' => 'Signup for Marketplace',
'LBL_EXPIRY_DATE' => 'Expiry Date', 'LBL_UNAUTHORIZED' => 'Unauthorized',
'LBL_LOGOUT' => 'Logout', 'LBL_EXPIRY_DATE' => 'Expiry Date',
'LBL_LOGOUT' => 'Logout',
'firstname' => 'First Name',
'lastname' => 'Last Name', 'firstname' => 'First Name',
'email' => 'Email', 'lastname' => 'Last Name',
'company' => 'Company', 'email' => 'Email',
'Phone' => 'Phone', 'company' => 'Company',
'Website' => 'Website', 'Phone' => 'Phone',
'LBL_SECURITY_CODE' => 'Security Code', 'Website' => 'Website',
'LBL_WHAT_IS_SECURITY_CODE' => 'What is Security Code ?', 'LBL_SECURITY_CODE' => 'Security Code',
'LBL_CARD_NUMBER_PLACEHOLDER' => '16 digit number on your card', 'LBL_WHAT_IS_SECURITY_CODE' => 'What is Security Code ?',
'LBL_SECURITY_CODE_HELP_CONTENT' => 'The CVV Number(Card Verification Value) on your credit/debit card is a 3 digit number on VISA®, MasterCard® etc.. branded credit/debit cards.', 'LBL_CARD_NUMBER_PLACEHOLDER' => '16 digit number on your card',
'LBL_SECURITY_CODE_HELP_CONTENT' => 'The CVV Number(Card Verification Value) on your credit/debit card is a 3 digit number on VISA®, MasterCard® etc.. branded credit/debit cards.',
'LBL_ENTER_REGISTERED_EMAIL' => 'Enter your registered email',
'LBL_RESET_PASSWORD_LINK_EMAILED' => 'Reset Password link emailed to you!',
'LBL_FORGOT_PASSWORD' => 'Forgot Password',
'LBL_ALREADY_INSTALLED_MODULE_BUILDER' => 'Already created by module builder',
'LBL_REVIEW_RESTRICTED' => 'Reviewing restricted',
); );
$jsLanguageStrings = array( $jsLanguageStrings = array(
'JS_PLEASE_SETUP_CARD_DETAILS_TO_INSTALL_THIS_EXTENSION' => 'Please setup card details to install this extension', 'JS_PLEASE_SETUP_CARD_DETAILS_TO_INSTALL_THIS_EXTENSION' => 'Please setup card details to install this extension',
'JS_UPDATE_CARD_DETAILS' => 'Update Card Details', 'JS_UPDATE_CARD_DETAILS' => 'Update Card Details',
'JS_ON' => 'on', 'JS_ON' => 'on',
'JS_RATINGS' => 'Ratings', 'JS_RATINGS' => 'Ratings',
'JS_INSTALLED' => 'Installed', 'JS_INSTALLED' => 'Installed',
'JS_TRIAL_INSTALLED' => 'Trial Installed', 'JS_TRIAL_INSTALLED' => 'Trial Installed',
'JS_PLEASE_INSTALL_EXTENSION_LOADER_TO_INSTALL_THIS_EXTENSION_FROM_BELOW_LINK' => 'Please install extension loader to install this extension from below link', 'JS_PLEASE_INSTALL_EXTENSION_LOADER_TO_INSTALL_THIS_EXTENSION_FROM_BELOW_LINK' => 'Please install extension loader to install this extension from below link',
'JS_PLEASE_LOGIN_TO_MARKETPLACE_FOR_INSTALLING_EXTENSION' => 'Please login to marketplace for installing extension', 'JS_PLEASE_LOGIN_TO_MARKETPLACE_FOR_INSTALLING_EXTENSION' => 'Please login to marketplace for installing extension',
'JS_PLEASE_SETUP_CARD_DETAILS_TO_INSTALL_EXTENSION' => 'Please setup card details to install extension', 'JS_PLEASE_SETUP_CARD_DETAILS_TO_INSTALL_EXTENSION' => 'Please setup card details to install extension',
'JS_PLEASE_LOGIN_TO_MARKETPLACE_FOR_UNINSTALLING_EXTENSION' => 'Please login to marketplace for uninstalling extension', 'JS_PLEASE_LOGIN_TO_MARKETPLACE_FOR_UNINSTALLING_EXTENSION' => 'Please login to marketplace for uninstalling extension',
'JS_LBL_ARE_YOU_SURE_YOU_WANT_TO_INSTALL_THIS_EXTENSION' => 'Are you sure you want to install this extension?', 'JS_LBL_ARE_YOU_SURE_YOU_WANT_TO_INSTALL_THIS_EXTENSION' => 'Are you sure you want to install this extension?',
'JS_CARD_DETAILS_UPDATED' => 'Card details updated!', 'JS_CARD_DETAILS_UPDATED' => 'Card details updated!',
'JS_LBL_ARE_YOU_SURE_YOU_WANT_TO_LOGOUT_FROM_EXTENSION' => 'Are you sure you want to log out from extension?', 'JS_LBL_ARE_YOU_SURE_YOU_WANT_TO_LOGOUT_FROM_EXTENSION' => 'Are you sure you want to log out from extension?',
); 'JS_PASSWORDS_MISMATCH' => "Passwords didn't match!",
'JS_ARE_YOU_SURE_UNINSTALL' => 'Are you sure you want to uninstall this Extension',
'JS_ARE_YOU_SURE_INSTALL' => 'Are you sure you want to install this extension',
);
\ No newline at end of file
pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php
+ 6
− 1
View file @ d92597a4
...@@ -176,7 +176,12 @@ class Settings_ExtensionStore_ExtnStore_Connector { ...@@ -176,7 +176,12 @@ class Settings_ExtensionStore_ExtnStore_Connector {
* @return type json reponse * @return type json reponse
*/ */
public function getListings($id = null, $type = 'Extension') { public function getListings($id = null, $type = 'Extension') {
$q = $id ? array('id' => $id, 'type' => $type) : array('type' => $type); global $vtiger_current_version;
$q = array('type' => $type, 'vv'=> $vtiger_current_version);
if ($id) {
$q['id'] = $id;
}
try { try {
$response = $this->api('/app/listings', 'GET', $q ? array('q' => Zend_Json::encode($q)) : null, false); $response = $this->api('/app/listings', 'GET', $q ? array('q' => Zend_Json::encode($q)) : null, false);
return array('success' => true, 'response' => $response); return array('success' => true, 'response' => $response);
......
pkg/vtiger/modules/ExtensionStore/settings/views/ExtensionStore.php
+ 40
− 33
View file @ d92597a4
...@@ -132,45 +132,52 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_ ...@@ -132,45 +132,52 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_
$modelInstance = $this->getModelInstance(); $modelInstance = $this->getModelInstance();
$extensionDetail = $modelInstance->getExtensionListings($extensionId); $extensionDetail = $modelInstance->getExtensionListings($extensionId);
$customerReviews = $modelInstance->getCustomerReviews($extensionId); $extension = $extensionDetail[$extensionId];
$screenShots = $modelInstance->getScreenShots($extensionId);
$authorInfo = $modelInstance->getListingAuthor($extensionId);
$registrationStatus = $modelInstance->checkRegistration();
if ($registrationStatus) { if ($extension && $extension->isVtigerCompatible()) {
$pwdStatus = $modelInstance->passwordStatus(); $customerReviews = $modelInstance->getCustomerReviews($extensionId);
if (!$pwdStatus) { $screenShots = $modelInstance->getScreenShots($extensionId);
$sessionIdentifer = $modelInstance->getSessionIdentifier(); $authorInfo = $modelInstance->getListingAuthor($extensionId);
$pwd = $_SESSION[$sessionIdentifer.'_password']; $registrationStatus = $modelInstance->checkRegistration();
if (!empty($pwd)) {
$pwdStatus = true; 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) { if ($registrationStatus && $pwdStatus) {
$customerProfile = $modelInstance->getProfile(); $customerProfile = $modelInstance->getProfile();
$customerCardId = $customerProfile['CustomerCardId']; $customerCardId = $customerProfile['CustomerCardId'];
if (!empty($customerCardId)) { if (!empty($customerCardId)) {
$customerCardDetails = $modelInstance->getCardDetails($customerCardId); $customerCardDetails = $modelInstance->getCardDetails($customerCardId);
$viewer->assign('CUSTOMER_CARD_INFO', $customerCardDetails); $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('IS_PRO', true); $viewer->assign('MODULE_ACTION', $moduleAction);
$viewer->assign('MODULE_ACTION', $moduleAction); $viewer->assign('SCREEN_SHOTS', $screenShots);
$viewer->assign('SCREEN_SHOTS', $screenShots); $viewer->assign('AUTHOR_INFO', $authorInfo);
$viewer->assign('AUTHOR_INFO', $authorInfo); $viewer->assign('CUSTOMER_REVIEWS', $customerReviews);
$viewer->assign('CUSTOMER_REVIEWS', $customerReviews); $viewer->assign('EXTENSION_DETAIL', $extension);
$viewer->assign('EXTENSION_DETAIL', $extension); $viewer->assign('EXTENSION_MODULE_MODEL', $extension->get('moduleModel'));
$viewer->assign('EXTENSION_MODULE_MODEL', $extension->get('moduleModel')); $viewer->assign('EXTENSION_ID', $extensionId);
$viewer->assign('EXTENSION_ID', $extensionId); $viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);
$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName); $viewer->assign('REGISTRATION_STATUS', $registrationStatus);
$viewer->assign('REGISTRATION_STATUS', $registrationStatus); $viewer->view('Detail.tpl', $qualifiedModuleName);
$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) { protected function installationLog(Vtiger_Request $request) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.