diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index b7762c0f098..696339c490f 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -41,7 +41,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
-require_once DOL_DOCUMENT_ROOT.'/admin/remotestore/class/dolistore.class.php';
require_once DOL_DOCUMENT_ROOT.'/admin/remotestore/class/externalModules.class.php';
'
@@ -1273,7 +1272,6 @@ if ($mode == 'marketplace') {
print '
'."\n";
print '| '.$form->textwithpicto($langs->trans("Provider"), $langs->trans("WebSiteDesc")).' | ';
print ' | ';
- print ''.$langs->trans("URL").' | ';
print ' | ';
print '
';
@@ -1281,21 +1279,26 @@ if ($mode == 'marketplace') {
print ''."\n";
$url = 'https://www.dolistore.com';
print ' | ';
- print ''.$langs->trans("DoliStoreDesc").' | ';
- print ''.img_picto('', 'url', 'class="pictofixedwidth"').''.$url.' | ';
+ print ''.$langs->trans("DoliStoreDesc").' ';
+ print img_picto('', 'url', 'class="pictofixedwidth"').''.$url.' | ';
print '';
if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_ENABLE_DOLISTORE')) {
- $messagetoadd = '';
+ $messagetoadd = ' ';
if ($remotestore->dolistoreApiStatus <= 0) {
- $messagetoadd = ' '.$remotestore->dolistoreApiError.' Failed to login to: '.$remotestore->dolistore_api_url;
- $messagetoadd .= ' using API public key: '.$remotestore->dolistore_api_key;
- // Add basic auth if needed
- $basicAuthLogin = getDolGlobalString('MAIN_MODULE_DOLISTORE_BASIC_LOGIN');
- $basicAuthPassword = getDolGlobalString('MAIN_MODULE_DOLISTORE_BASIC_PASSWORD');
- if ($basicAuthLogin) {
- $messagetoadd .= ' using basic auth login: base64('.$basicAuthLogin.':'.$basicAuthPassword.')';
- }
+ $messagetoadd = ' '.$remotestore->dolistoreApiError.' Failed to get answer of remote API server ';
}
+
+ $messagetoadd .= ' Using Shop address MAIN_MODULE_DOLISTORE_SHOP_URL = '.$remotestore->shop_url;
+ $messagetoadd .= ' Using Remote API addtess MAIN_MODULE_DOLISTORE_API_URL = '.$remotestore->dolistore_api_url;
+ $messagetoadd .= ' Using API public key MAIN_MODULE_DOLISTORE_API_KEY = '.$remotestore->dolistore_api_key;
+ // Add basic auth if needed
+ $basicAuthLogin = getDolGlobalString('MAIN_MODULE_DOLISTORE_BASIC_LOGIN');
+ $basicAuthPassword = getDolGlobalString('MAIN_MODULE_DOLISTORE_BASIC_PASSWORD');
+ if ($basicAuthLogin) {
+ $messagetoadd .= ' Using basic auth login: base64('.$basicAuthLogin.':'.$basicAuthPassword.')';
+ }
+ $messagetoadd .= '';
+
print $remotestore->libStatus($remotestore->dolistoreApiStatus, 2, $messagetoadd);
}
print ' | ';
@@ -1305,11 +1308,12 @@ if ($mode == 'marketplace') {
print '
'."\n";
$url = 'https://github.com/Dolibarr/dolibarr-community-modules';
print ' | ';
- print ''.$langs->trans("CommunityModulesDesc").' | ';
- print ''.img_picto('', 'url', 'class="pictofixedwidth"').''.$url.' | ';
+ print ''.$langs->trans("CommunityModulesDesc").' ';
+ print img_picto('', 'url', 'class="pictofixedwidth"').''.$url.' | ';
print '';
if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_ENABLE_COMMUNITY_REPO')) {
- print $remotestore->libStatus($remotestore->githubFileStatus, 2, ' Content of repository file '.$remotestore->file_source_url.' is in the cache file '.$remotestore->cache_file.'');
+ $messagetoadd = '
Content of the repository index file '.$remotestore->file_source_url.' is in the local cache file '.$remotestore->cache_file.'';
+ print $remotestore->libStatus($remotestore->githubFileStatus, 2, $messagetoadd);
}
print ' | ';
print '
';
@@ -1335,19 +1339,21 @@ if ($mode == 'marketplace') {
print ''.$langs->trans('DOLISTOREdescriptionLong').'
';
- //$previouslink = $remotestore->get_previous_link();
- //$nextlink = $remotestore->get_next_link();
+ $categories_tree = $remotestore->getCategories(); // Call API to get the categories
- $categories_tree = $remotestore->getCategories();
$products_list = $remotestore->getProducts($options);
+
$previouslink = $remotestore->get_previous_link();
+
$nextlink = $remotestore->get_next_link();
+
print '