Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v23

Browse Source
This commit is contained in:
Laurent Destailleur
2025-11-23 16:15:59 +01:00
parent aac48b7f01
commit 53e926371b
7 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/modules.php
View File

@@ -724,9 +724,6 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$deschelp .= '<br>'; $deschelp .= '<br>';
} }
} }
//if ($mode == 'marketplace') {
// $deschelp = '<div class="info hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></div><br>\n";
//}
if ($mode == 'deploy') { if ($mode == 'deploy') {
$deschelp = '<div class="info hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></div><br>\n"; $deschelp = '<div class="info hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></div><br>\n";
} }
@@ -801,7 +798,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small nomarginleft" value="'.dolPrintHTMLForAttribute($langs->trans("Refresh")).'">'; $moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small nomarginleft" value="'.dolPrintHTMLForAttribute($langs->trans("Refresh")).'">';
if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) { if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
$moreforfilter .= ' '; $moreforfilter .= ' ';
$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderbottom nomargintop nomarginbottom" value="'.dolPrintHTMLForAttribute($langs->trans("Reset")).'">'; $moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderall nomargintop nomarginbottom" value="'.dolPrintHTMLForAttribute($langs->trans("Reset")).'">';
} }
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
@@ -1421,7 +1418,7 @@ if ($mode == 'marketplace') {
<div id="listing-content" class="div-table-responsive" <?php if (empty($categories_tree)) { ?>style="width:100%;"<?php } ?>> <div id="listing-content" class="div-table-responsive" <?php if (empty($categories_tree)) { ?>style="width:100%;"<?php } ?>>
<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent"> <table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
<tbody id="listOfModules"> <tbody id="listOfModules">
<?php //echo $remotestore->get_products($nbmaxtoshow); ?> <!-- $product_list is $remotestore->getProducts($options) done previously -->
<?php print $products_list; ?> <?php print $products_list; ?>
</tbody> </tbody>
</table> </table>

18
htdocs/admin/remotestore/class/externalModules.class.php
View File

@@ -366,6 +366,22 @@ class ExternalModules
$this->numberTotalOfProducts = 0; $this->numberTotalOfProducts = 0;
// Special case of category goodies
if ($this->categorie == 87) {
$html = '<div class="shop-container">
<div class="shop-image">
<a href="https://merch.dolibarr.org/" target="_blank">
<img src="https://www.dolistore.com/medias/image/marketplace/img/goodies-shop.jpg" width="50%" alt="DoliStore Merch and Gifts" />
<div class="shop-overlay">
<button target="new" class="shop-button">'.$langs->trans("GoodiesButtonTitle").' <i class="icon-chevron-right"></i></button>
</div>
</a>
</div>
</div>';
return $html;
}
// Fetch the products from Dolistore source // Fetch the products from Dolistore source
$dolistoreProducts = array(); $dolistoreProducts = array();
@@ -638,7 +654,7 @@ class ExternalModules
$this->numberOfProducts = count($this->products); $this->numberOfProducts = count($this->products);
return $html ; return $html;
} }
/** /**

35
htdocs/admin/remotestore/css/store.css
View File

@@ -195,17 +195,48 @@ textarea.row4{
h2.appTitle small{ h2.appTitle small{
font-weight: normal; font-weight: normal;
} }
/*
tr.NotCompatible{ tr.NotCompatible{
opacity: 0.5; opacity: 1;
} }
tr.NotCompatible:hover{ tr.NotCompatible:hover{
opacity: 0.7; opacity: 0.9;
} }
*/
span.details{ span.details{
font-size: 1em; font-size: 1em;
margin-left: 10px; margin-left: 10px;
vertical-align: super; vertical-align: super;
} }
.storedesc {
opacity: 0.5;
}
.shop-container {
border-top: none;
overflow: hidden;
text-align: center;
background-color: #fff;
box-shadow: 0 8px 20px rgba(0, 0, 0, .1);
transition: transform .3s;
transform: scale(1);
}
.shop-button {
position: absolute;
top: 20%;
left: 50%;
padding: 10px 20px;
border: none;
border-radius: 8px;
text-transform: uppercase;
font-size: 16px;
color: #fff;
background-color: #ff5f57;
box-shadow: 0 5px 15px rgba(255, 95, 87, .3);
transition: background-color .3s, transform .3s;
transform: translate(-50%, -50%);
cursor: pointer;
}
@media only screen and (min-width: 1150px) { @media only screen and (min-width: 1150px) {

22
htdocs/core/lib/functions.lib.php
View File

@@ -14082,19 +14082,19 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
* // phpcs:disable * // phpcs:disable
* @param array{confirm?:array{url?:string,title?:string,content?:string,use_unsecured_unescapedattr?:bool|string[],action-btn-label?:string,cancel-btn-label?:string,modal?:bool},attr?:array<string,mixed>,areDropdownButtons?:bool,backtopage?:string,lang?:string,enabled?:bool,perm?:int<0,1>,label?:string,url?:string,isDropdown?:int<0,1>,isDropDown?:int<0,1>} $params = [ // Various params for future : recommended rather than adding more function arguments * @param array{confirm?:array{url?:string,title?:string,content?:string,use_unsecured_unescapedattr?:bool|string[],action-btn-label?:string,cancel-btn-label?:string,modal?:bool},attr?:array<string,mixed>,areDropdownButtons?:bool,backtopage?:string,lang?:string,enabled?:bool,perm?:int<0,1>,label?:string,url?:string,isDropdown?:int<0,1>,isDropDown?:int<0,1>} $params = [ // Various params for future : recommended rather than adding more function arguments
* 'attr' => [ // to add or override button attributes * 'attr' => [ // to add or override button attributes
* 'xxxxx' => '', // your xxxxx attribute you want * 'xxxxx' => '', // your xxxxx attribute you want
* 'class' => 'reposition', // to add more css class to the button class attribute * 'class' => 'reposition', // to add more css class to the button class attribute
* 'classOverride' => '' // to replace class attribute of the button * 'classOverride' => '' // to replace class attribute of the button
* ], * ],
* 'confirm' => [ * 'confirm' => [
* 'url' => 'http://', // Override Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm. * 'url' => 'http://', // Override Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
* 'title' => '', // Override title of modal, if empty default title use "ConfirmBtnCommonTitle" lang key * 'title' => '', // Override title of modal, if empty default title use "ConfirmBtnCommonTitle" lang key
* 'action-btn-label' => '', // Override label of action button, if empty default label use "Confirm" lang key * 'action-btn-label' => '', // Override label of action button, if empty default label use "Confirm" lang key
* 'cancel-btn-label' => '', // Override label of cancel button, if empty default label use "CloseDialog" lang key * 'cancel-btn-label' => '', // Override label of cancel button, if empty default label use "CloseDialog" lang key
* 'content' => '', // Override text of content, if empty default content use "ConfirmBtnCommonContent" lang key * 'content' => '', // Override text of content, if empty default content use "ConfirmBtnCommonContent" lang key
* 'modal' => true, // true|false to display dialog as a modal (with dark background) * 'modal' => true, // true|false to display dialog as a modal (with dark background)
* 'isDropDown' => false, // true|false to display dialog as a dropdown list (css dropdown-item with dark background) * 'isDropDown' => false, // true|false to display dialog as a dropdown list (css dropdown-item with dark background)
* ], * ],
* ] * ]
* // phpcs:enable * // phpcs:enable
* @return string html button * @return string html button

1
htdocs/langs/en_US/admin.lang
View File

@@ -2757,3 +2757,4 @@ GlobalParameters=Global parameters
SpecificParameters=Specific parameters SpecificParameters=Specific parameters
YouAreUsingTheAdvancedPermissionsMode=You are using the advanced permission mode. Granularity of permissions is higher. Go to Home - Setup - Security to go back to the simple mode. YouAreUsingTheAdvancedPermissionsMode=You are using the advanced permission mode. Granularity of permissions is higher. Go to Home - Setup - Security to go back to the simple mode.
YouAreUsingTheSimplePermissionsMode=You are using the simple permission mode. Go to Home - Setup - Security to switch to advanced mode if you need more granularity on permissions. YouAreUsingTheSimplePermissionsMode=You are using the simple permission mode. Go to Home - Setup - Security to switch to advanced mode if you need more granularity on permissions.
GoodiesButtonTitle=Visit Our Merch & Gifts Store

3
htdocs/theme/eldy/global.inc.php
View File

@@ -4441,6 +4441,9 @@ td.border, div.tagtable div div.border {
.borderbottom { .borderbottom {
border-bottom: 1px solid var(--colortopbordertitle1); border-bottom: 1px solid var(--colortopbordertitle1);
} }
.noborderall {
border: none !important;
}
table.noborder { table.noborder {
background: var(--colorbacktabcard1); background: var(--colorbacktabcard1);

3
htdocs/theme/md/style.css.php
View File

@@ -4481,6 +4481,9 @@ td.border, div.tagtable div div.border {
.borderbottom { .borderbottom {
border-bottom: 1px solid var(--colortopbordertitle1); border-bottom: 1px solid var(--colortopbordertitle1);
} }
.noborderall {
border: none !important;
}
.fichehalfright table.noborder { .fichehalfright table.noborder {
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;