Skip to content

Commit 9882652

Browse files
eldyeldy
committed
* NEW Reorganize menu for reseller and module providers
1 parent c00b6e5 commit 9882652

File tree

4 files changed

+163
-127
lines changed

4 files changed

+163
-127
lines changed

‎ChangeLog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
## Unreleased
55

6+
* NEW Reorganize menu for reseller and module providers
67
* NEW Add option SELLYOURSAAS_DASHBOARD_OFF to disallow login/access to dashboard
78
* NEW Add warning on support page if contact info are not complete
89
* NEW Add badge with number of deployment server on tab title of deployment servers.

‎langs/en_US/sellyoursaas.lang‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,11 @@ CommandToPutInstancesOnOffline=Command to put all instances online/offline
363363
CommandToMoveInstanceOnAnotherDeploymentServer=Command to move several or all instances into another deployment server
364364
InstanceWasDeployed=Instance has been deployed
365365
YourPaymentModeWillExpireFixItSoon=Your payment mode has expired or is about to expire. Please <a href="%s">update your payment mode</a> to avoid any interruption of service.
366+
ResellerArea=Reseller Area
366367
YouAreAReseller=You are a reseller
368+
ModuleProviderArea=Module provider area
369+
MyResellerTools=My reseller tools
370+
MyModuleProviderTools=My module provider tools
367371
YourURLToCreateNewInstance=To have new users being linked to your account and appear in your dashboard, you or they must use the following URL to register
368372
YourCommissionsAppearsInMenu=Your commissions (current rate <strong>%s%%</strong>) are visible into menu %s
369373
InvoicingSuspended=Billing suspended
@@ -958,4 +962,6 @@ DashboardServiceIsTemporarlyOffline=Dashboard access is temporarly offline for m
958962
PleaseGoBackInFewHours=Please go back in few hours...
959963
SubscriptionFormAndDashboard=Subscription form and customers/resellers dashboard
960964
SaveAndPay=Save and pay
961-
ModulesToIgnoreForAutoUpgrade=Modules to ignore for auto-upgrade
965+
ModulesToIgnoreForAutoUpgrade=Modules to ignore for auto-upgrade
966+
PleaseFillContactInfoFirst=Please fill your contact information first
967+
GoToYourResellerMenuTogetInformation=Go to menu "%s" for more information

‎myaccount/index.php‎

Lines changed: 130 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -2474,6 +2474,10 @@
24742474
<li class="nav-item'.(($mode == 'mycustomerinstances' || $mode == 'mycustomerbilling') ? ' active' : '').' dropdown">
24752475
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-suitcase"></i> '.$langs->trans("ResellerArea").'</a>
24762476
<ul class="dropdown-menu">';
2477+
// My reseller tools
2478+
print '<li><a class="dropdown-item" href="'.$_SERVER["PHP_SELF"].'?mode=myresellertools"><i class="fa fa-tools pictofixedwidth"></i> '.$langs->trans("MyResellerTools").'</a></li>';
2479+
// Divider
2480+
print '<li class="dropdown-divider"></li>';
24772481
// My customers instance
24782482
print '<li><a class="dropdown-item" href="'.$_SERVER["PHP_SELF"].'?mode=mycustomerinstances"><i class="fa fa-server pictofixedwidth"></i> '.$langs->trans("MyCustomersInstances").'</a></li>';
24792483
// Divider
@@ -2491,6 +2495,10 @@
24912495
<li class="nav-item'.(($mode == 'mymodulecustomerinstances' || $mode == 'mymodulecustomerbilling') ? ' active' : '').' dropdown">
24922496
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-suitcase"></i> '.$langs->trans("ModuleProviderArea").'</a>
24932497
<ul class="dropdown-menu">';
2498+
// My module provider tools
2499+
print '<li><a class="dropdown-item" href="'.$_SERVER["PHP_SELF"].'?mode=mymoduleprovidertools"><i class="fa fa-tools pictofixedwidth"></i> '.$langs->trans("MyModuleProviderTools").'</a></li>';
2500+
// Divider
2501+
print '<li class="dropdown-divider"></li>';
24942502
// Module provider stats
24952503
print '<li><a class="dropdown-item" href="'.$_SERVER["PHP_SELF"].'?mode=mymodulecustomerinstances"><i class="fa fa-server pictofixedwidth"></i> '.$langs->trans("MyModuleCustomersInstances").'</a></li>';
24962504
// Divider
@@ -2842,141 +2850,145 @@
28422850
}
28432851

28442852

2845-
// Show resellection section
2846-
if ($mythirdpartyaccount->isareseller && !in_array($mode, array('mymodulecustomerinstances', 'mymodulecustomerbilling'))) {
2853+
// Show reseller section
2854+
if ($mythirdpartyaccount->isareseller && in_array($mode, array('dashboard', 'myresellertools'))) {
28472855
print '
28482856
<!-- Info reseller -->
28492857
<div class="note note-info">
28502858
<h4 class="block"><span class="fa fa-briefcase"></span> '.$langs->trans("YouAreAReseller").'.</h4>
28512859
';
2852-
print '<span class="opacitymedium">'.$langs->trans("YourURLToCreateNewInstance").':</span><br>';
28532860

2854-
$sellyoursaasaccounturl = getDolGlobalString('SELLYOURSAAS_ACCOUNT_URL');
2855-
$sellyoursaasaccounturl = preg_replace('/'.preg_quote(getDomainFromURL(getDolGlobalString('SELLYOURSAAS_ACCOUNT_URL'), 1), '/').'/', getDomainFromURL($_SERVER["SERVER_NAME"], 1), $sellyoursaasaccounturl);
2861+
if (in_array($mode, array('myresellertools'))) {
2862+
print '<span class="opacitymedium">'.$langs->trans("YourURLToCreateNewInstance").':</span><br>';
28562863

2857-
$urlforpartner = $sellyoursaasaccounturl.'/register.php?partner='.$mythirdpartyaccount->id.'&partnerkey='.md5($mythirdpartyaccount->name_alias);
2858-
print '<input type="text" class="quatrevingtpercent" id="urlforpartner" name="urlforpartner" value="'.$urlforpartner.'" spellcheck="false">';
2859-
print ajax_autoselect("urlforpartner");
2864+
$sellyoursaasaccounturl = getDolGlobalString('SELLYOURSAAS_ACCOUNT_URL');
2865+
$sellyoursaasaccounturl = preg_replace('/'.preg_quote(getDomainFromURL(getDolGlobalString('SELLYOURSAAS_ACCOUNT_URL'), 1), '/').'/', getDomainFromURL($_SERVER["SERVER_NAME"], 1), $sellyoursaasaccounturl);
28602866

2861-
print '<script type="text/javascript" language="javascript">
2862-
jQuery(document).ready(function() {
2863-
jQuery("#spanmorereselleroptions").click(function() {
2864-
console.log("Click on spanmorereselleroptions");
2865-
jQuery("#divmorereselleroptions").toggle();
2866-
});
2867-
jQuery("#divmorereselleroptions").toggle();
2868-
});
2869-
</script>';
2867+
$urlforpartner = $sellyoursaasaccounturl.'/register.php?partner='.$mythirdpartyaccount->id.'&partnerkey='.md5($mythirdpartyaccount->name_alias);
2868+
print '<input type="text" class="quatrevingtpercent" id="urlforpartner" name="urlforpartner" value="'.$urlforpartner.'" spellcheck="false">';
2869+
print ajax_autoselect("urlforpartner");
28702870

2871-
print '<br><a class="small" id="spanmorereselleroptions" href="#" style="color: #888">'.$langs->trans("OtherOptionsAndParameters").'... <span class="fa fa-angle-down"></span></a><br>';
2872-
print '<div id="divmorereselleroptions" style="display: hidden" class="small">';
2873-
if (is_array($arrayofplans) && count($arrayofplans) > 1) {
2874-
print '&plan=XXX : ';
2875-
print '<span class="opacitymedium">'.$langs->trans("ToForcePlan").', '.$langs->trans("whereXXXcanbe").' '.join(', ', $arrayofplanscode).'</span><br>';
2876-
}
2877-
print '&extcss=mycssurl : <span class="opacitymedium">'.$langs->trans("YouCanUseCSSParameter").'. '.$langs->trans("AnExampleIsAvailableWith").' &extcss='.$sellyoursaasaccounturl.'/dist/css/alt-myaccount-example.css</span><br>';
2878-
print '&disablecustomeremail=1 : <span class="opacitymedium">'.$langs->trans("ToDisableEmailThatConfirmsRegistration").'</span>';
2879-
2880-
print '</div>';
2881-
2882-
if (getDolGlobalInt("SELLYOURSAAS_RESELLER_ALLOW_CUSTOM_PRICE")) {
2883-
print '<br>';
2884-
print '<span class="opacitymedium small">'.$langs->trans("ForcePricesOfInstances").'</span>';
2885-
print '<form action="'.$_SERVER["PHP_SELF"].'" name="modifyresellerprices" method="POST" >';
2886-
print '<input type="hidden" name="action" value="updateforcepriceinstance">';
2887-
print '<input type="hidden" name="token" value="'.newToken().'">';
2888-
print '<div class="div-table-responsive">';
2889-
print '<table class="noborder small centpercent background-white padding">';
2890-
print '<tr class="liste_titre"><th>';
2891-
print $langs->trans("Label");
2892-
print '</th>';
2893-
print '<th>';
2894-
print $langs->trans("FixPrice");
2895-
print ' ('.$langs->trans("HT").')';
2896-
print '</th>';
2897-
print '<th>';
2898-
print $langs->trans("PricePerUsers");
2899-
print ' ('.$langs->trans("HT").')';
2900-
print '</th>';
2901-
for ($i=0; $i < $maxcptoptions; $i++) {
2871+
print '<script type="text/javascript" language="javascript">
2872+
jQuery(document).ready(function() {
2873+
jQuery("#spanmorereselleroptions").click(function() {
2874+
console.log("Click on spanmorereselleroptions");
2875+
jQuery("#divmorereselleroptions").toggle();
2876+
});
2877+
jQuery("#divmorereselleroptions").toggle();
2878+
});
2879+
</script>';
2880+
2881+
print '<br><a class="small" id="spanmorereselleroptions" href="#" style="color: #888">'.$langs->trans("OtherOptionsAndParameters").'... <span class="fa fa-angle-down"></span></a><br>';
2882+
print '<div id="divmorereselleroptions" style="display: hidden" class="small">';
2883+
if (is_array($arrayofplans) && count($arrayofplans) > 1) {
2884+
print '&plan=XXX : ';
2885+
print '<span class="opacitymedium">'.$langs->trans("ToForcePlan").', '.$langs->trans("whereXXXcanbe").' '.join(', ', $arrayofplanscode).'</span><br>';
2886+
}
2887+
print '&extcss=mycssurl : <span class="opacitymedium">'.$langs->trans("YouCanUseCSSParameter").'. '.$langs->trans("AnExampleIsAvailableWith").' &extcss='.$sellyoursaasaccounturl.'/dist/css/alt-myaccount-example.css</span><br>';
2888+
print '&disablecustomeremail=1 : <span class="opacitymedium">'.$langs->trans("ToDisableEmailThatConfirmsRegistration").'</span>';
2889+
2890+
print '</div>';
2891+
2892+
if (getDolGlobalInt("SELLYOURSAAS_RESELLER_ALLOW_CUSTOM_PRICE")) {
2893+
print '<br>';
2894+
print '<span class="opacitymedium small">'.$langs->trans("ForcePricesOfInstances").'</span>';
2895+
print '<form action="'.$_SERVER["PHP_SELF"].'" name="modifyresellerprices" method="POST" >';
2896+
print '<input type="hidden" name="action" value="updateforcepriceinstance">';
2897+
print '<input type="hidden" name="token" value="'.newToken().'">';
2898+
print '<div class="div-table-responsive">';
2899+
print '<table class="noborder small centpercent background-white padding">';
2900+
print '<tr class="liste_titre"><th>';
2901+
print $langs->trans("Label");
2902+
print '</th>';
29022903
print '<th>';
2903-
print $langs->trans("OptionForcePrice", $i+1);
2904+
print $langs->trans("FixPrice");
2905+
print ' ('.$langs->trans("HT").')';
29042906
print '</th>';
2905-
}
2906-
print '<th>';
2907-
print '</th>';
2908-
print '</tr>';
2909-
2910-
// Ajout Options price change
2911-
foreach ($arrayofplansmodifyprice as $key => $value) {
2912-
print '<tr class="field_'.$key.' oddeven">';
2913-
print '<td class="maxwidth150 tdoverflowmax200" title="'.dol_escape_htmltag($value['label']).'">';
2914-
print $value["label"];
2915-
print '</td> ';
2916-
if ($action == 'editproperty' && $key == $propertykey) {
2917-
print '<input type="hidden" name="priceproductid" value="'.$key.'">';
2918-
print '<td>';
2919-
print '<input class="flat field_price maxwidth50" type="text" id="field_price_'.$mythirdpartyaccount->id."_".$key.'" name="field_price_'.$mythirdpartyaccount->id."_".$key.'" value="'.(price(getDolGlobalString("SELLYOURSAAS_RESELLER_FIX_PRICE_".$mythirdpartyaccount->id."_".$key) ?: $value["price"]).'"><span>').$langs->getCurrencySymbol($conf->currency).'<span>';
2920-
print '</td>';
2921-
print '<td>';
2922-
if (isset($value["priceuser"])) {
2923-
print '<input class="flat field_price maxwidth50" type="text" id="field_priceuser_'.$mythirdpartyaccount->id."_".$key.'" name="field_priceuser_'.$mythirdpartyaccount->id."_".$key.'"value="'.(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_PER_USER_".$mythirdpartyaccount->id."_".$key) ?: $value["priceuser"]).'"><span>').$langs->getCurrencySymbol($conf->currency).'</span>';
2924-
}
2925-
print '</td>';
2926-
if (isset($value["options"])) {
2927-
foreach ($value["options"] as $id => $data) {
2928-
print '<td>';
2929-
print '<input class="flat field_price maxwidth50" type="text" id="field_price_option_'.$id.'_'.$mythirdpartyaccount->id."_".$key.'" name="field_price_option_'.$id.'_'.$mythirdpartyaccount->id."_".$key.'"value="'.(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_OPTION_".$id."_".$mythirdpartyaccount->id."_".$key) ?: $data["price"]).'"><span>').$langs->getCurrencySymbol($conf->currency).'</span>';
2930-
print '</td>';
2931-
}
2932-
} else {
2933-
for ($i=0; $i < $maxcptoptions; $i++) {
2934-
print '<td></td>';
2907+
print '<th>';
2908+
print $langs->trans("PricePerUsers");
2909+
print ' ('.$langs->trans("HT").')';
2910+
print '</th>';
2911+
for ($i=0; $i < $maxcptoptions; $i++) {
2912+
print '<th>';
2913+
print $langs->trans("OptionForcePrice", $i+1);
2914+
print '</th>';
2915+
}
2916+
print '<th>';
2917+
print '</th>';
2918+
print '</tr>';
2919+
2920+
// Ajout Options price change
2921+
foreach ($arrayofplansmodifyprice as $key => $value) {
2922+
print '<tr class="field_'.$key.' oddeven">';
2923+
print '<td class="maxwidth150 tdoverflowmax200" title="'.dol_escape_htmltag($value['label']).'">';
2924+
print $value["label"];
2925+
print '</td> ';
2926+
if ($action == 'editproperty' && $key == $propertykey) {
2927+
print '<input type="hidden" name="priceproductid" value="'.$key.'">';
2928+
print '<td>';
2929+
print '<input class="flat field_price maxwidth50" type="text" id="field_price_'.$mythirdpartyaccount->id."_".$key.'" name="field_price_'.$mythirdpartyaccount->id."_".$key.'" value="'.(price(getDolGlobalString("SELLYOURSAAS_RESELLER_FIX_PRICE_".$mythirdpartyaccount->id."_".$key) ?: $value["price"]).'"><span>').$langs->getCurrencySymbol($conf->currency).'<span>';
2930+
print '</td>';
2931+
print '<td>';
2932+
if (isset($value["priceuser"])) {
2933+
print '<input class="flat field_price maxwidth50" type="text" id="field_priceuser_'.$mythirdpartyaccount->id."_".$key.'" name="field_priceuser_'.$mythirdpartyaccount->id."_".$key.'"value="'.(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_PER_USER_".$mythirdpartyaccount->id."_".$key) ?: $value["priceuser"]).'"><span>').$langs->getCurrencySymbol($conf->currency).'</span>';
29352934
}
2936-
}
2937-
print '<td class="center maxwidth100">';
2938-
print '<input class="button smallpaddingimp btn green-haze btn-circle" type="submit" name="edit" value="'.$langs->trans("Save").'" style="margin: 2px;">';
2939-
print '<input class="button button-cancel smallpaddingimp btn green-haze btn-circle" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
2940-
print '</td>';
2941-
} else {
2942-
print '<td>';
2943-
print '<span>';
2944-
print dol_escape_htmltag(price(getDolGlobalString("SELLYOURSAAS_RESELLER_FIX_PRICE_".$mythirdpartyaccount->id."_".$key) ?: $value["price"])).$langs->getCurrencySymbol($conf->currency).'&nbsp;';
2945-
print '</span>';
2946-
print '</td>';
2947-
print '<td>';
2948-
if (isset($value["priceuser"])) {
2949-
print dol_escape_htmltag(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_PER_USER_".$mythirdpartyaccount->id."_".$key) ?: $value["priceuser"])).$langs->getCurrencySymbol($conf->currency);
2950-
}
2951-
print '</td>';
2952-
if (isset($value["options"])) {
2953-
foreach ($value["options"] as $id => $data) {
2954-
print '<td>';
2955-
print dol_escape_htmltag(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_OPTION_".$id."_".$mythirdpartyaccount->id."_".$key) ?: $data["price"])).$langs->getCurrencySymbol($conf->currency);
2956-
print '</td>';
2935+
print '</td>';
2936+
if (isset($value["options"])) {
2937+
foreach ($value["options"] as $id => $data) {
2938+
print '<td>';
2939+
print '<input class="flat field_price maxwidth50" type="text" id="field_price_option_'.$id.'_'.$mythirdpartyaccount->id."_".$key.'" name="field_price_option_'.$id.'_'.$mythirdpartyaccount->id."_".$key.'"value="'.(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_OPTION_".$id."_".$mythirdpartyaccount->id."_".$key) ?: $data["price"]).'"><span>').$langs->getCurrencySymbol($conf->currency).'</span>';
2940+
print '</td>';
2941+
}
2942+
} else {
2943+
for ($i=0; $i < $maxcptoptions; $i++) {
2944+
print '<td></td>';
2945+
}
29572946
}
2947+
print '<td class="center maxwidth100">';
2948+
print '<input class="button smallpaddingimp btn green-haze btn-circle" type="submit" name="edit" value="'.$langs->trans("Save").'" style="margin: 2px;">';
2949+
print '<input class="button button-cancel smallpaddingimp btn green-haze btn-circle" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
2950+
print '</td>';
29582951
} else {
2959-
for ($i=0; $i < $maxcptoptions; $i++) {
2960-
print '<td></td>';
2952+
print '<td>';
2953+
print '<span>';
2954+
print dol_escape_htmltag(price(getDolGlobalString("SELLYOURSAAS_RESELLER_FIX_PRICE_".$mythirdpartyaccount->id."_".$key) ?: $value["price"])).$langs->getCurrencySymbol($conf->currency).'&nbsp;';
2955+
print '</span>';
2956+
print '</td>';
2957+
print '<td>';
2958+
if (isset($value["priceuser"])) {
2959+
print dol_escape_htmltag(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_PER_USER_".$mythirdpartyaccount->id."_".$key) ?: $value["priceuser"])).$langs->getCurrencySymbol($conf->currency);
29612960
}
2961+
print '</td>';
2962+
if (isset($value["options"])) {
2963+
foreach ($value["options"] as $id => $data) {
2964+
print '<td>';
2965+
print dol_escape_htmltag(price(getDolGlobalString("SELLYOURSAAS_RESELLER_PRICE_OPTION_".$id."_".$mythirdpartyaccount->id."_".$key) ?: $data["price"])).$langs->getCurrencySymbol($conf->currency);
2966+
print '</td>';
2967+
}
2968+
} else {
2969+
for ($i=0; $i < $maxcptoptions; $i++) {
2970+
print '<td></td>';
2971+
}
2972+
}
2973+
print '<td class="center">';
2974+
print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editproperty&token='.newToken().'&propertykey='.urlencode($key).'">'.img_edit().'</a>';
2975+
print '<a class="resetfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=resetproperty&token='.newToken().'&propertykey='.urlencode($key).'" title="'.dol_escape_htmltag($langs->trans("ResetToRecommendedValue")).'">'.img_picto('', 'eraser', 'class="paddingrightonly" style="color: #444;"').'</a>';
2976+
print '</td>';
29622977
}
2963-
print '<td class="center">';
2964-
print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editproperty&token='.newToken().'&propertykey='.urlencode($key).'">'.img_edit().'</a>';
2965-
print '<a class="resetfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=resetproperty&token='.newToken().'&propertykey='.urlencode($key).'" title="'.dol_escape_htmltag($langs->trans("ResetToRecommendedValue")).'">'.img_picto('', 'eraser', 'class="paddingrightonly" style="color: #444;"').'</a>';
2966-
print '</td>';
2978+
print '</tr>';
29672979
}
2968-
print '</tr>';
2980+
print '</table></div>';
2981+
2982+
print '</form>';
29692983
}
2970-
print '</table></div>';
29712984

2972-
print '</form>';
2985+
print '<br>';
2986+
$urformycustomerinstances = '<strong>'.$langs->transnoentitiesnoconv("MyCustomersBilling").'</strong>';
2987+
print str_replace('{s1}', $urformycustomerinstances, $langs->trans("YourCommissionsAppearsInMenu", $mythirdpartyaccount->array_options['options_commission'], '{s1}'));
2988+
} else {
2989+
print '<span class="opacitymedium">'.$langs->trans("GoToYourResellerMenuTogetInformation", $langs->transnoentitiesnoconv("ResellerArea")).'.</span><br>';
29732990
}
29742991

2975-
print '<br>';
2976-
$urformycustomerinstances = '<strong>'.$langs->transnoentitiesnoconv("MyCustomersBilling").'</strong>';
2977-
print str_replace('{s1}', $urformycustomerinstances, $langs->trans("YourCommissionsAppearsInMenu", $mythirdpartyaccount->array_options['options_commission'], '{s1}'));
2978-
2979-
29802992
print '
29812993
</div>
29822994
';
@@ -2989,7 +3001,7 @@
29893001

29903002

29913003
// Show module provider section
2992-
if (!empty($mythirdpartyaccount->context['isamoduleprovider']) && !in_array($mode, array('mycustomerinstances', 'mycustomerbilling'))) {
3004+
if (!empty($mythirdpartyaccount->context['isamoduleprovider']) && in_array($mode, array('mymoduleprovidertools'))) {
29933005
print '
29943006
<!-- Info module provider -->
29953007
<div class="note note-info">
@@ -3115,8 +3127,9 @@
31153127

31163128

31173129
// Show warnings
3118-
3119-
if (empty($welcomecid) && ! in_array($action, array('instanceverification', 'autoupgrade'))) {
3130+
if (empty($welcomecid)
3131+
&& !in_array($mode, array('myresellertools', 'mycustomerinstances', 'mycustomerbilling', 'mymoduleprovidertools', 'mymodulecustomerinstances', 'mymodulecustomerbilling'))
3132+
&& !in_array($action, array('instanceverification', 'autoupgrade'))) {
31203133
// Show warnings on invoice dispute
31213134
$sql = 'SELECT f.rowid, f.ref, f.datef, f.datec, f.date_lim_reglement as date_due, f.dispute_status, fe.invoicepaymentdisputed';
31223135
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facture_extrafields as fe';

0 commit comments

Comments
 (0)