Skip to content

Commit e41e0b4

Browse files
eldyeldy
committed
Reorganize options
1 parent 1d88813 commit e41e0b4

File tree

2 files changed

+111
-80
lines changed

2 files changed

+111
-80
lines changed

‎admin/setup_other.php‎

Lines changed: 108 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -313,60 +313,13 @@
313313

314314
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
315315
print '<table class="noborder centpercent">';
316+
316317
print '<tr class="liste_titre">';
317-
print '<td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td>';
318+
print '<td class="titlefieldmiddle">'.$langs->trans("SubscriptionFormAndDashboard").'</td><td></td>';
318319
print '<td><div class="float">'.$langs->trans("Examples").'</div><div class="floatright">';
319320
print '</div></td>';
320321
print "</tr>\n";
321322

322-
print '<tr class="oddeven"><td>'.$langs->trans("SellYourSaasStatusUrl").'</td>';
323-
print '<td>';
324-
print '<input class="minwidth300" type="text" name="SELLYOURSAAS_STATUS_URL" value="'.getDolGlobalString('SELLYOURSAAS_STATUS_URL').'">';
325-
print '</td>';
326-
print '<td><span class="opacitymedium small">https://status.mysaasdomainname.com</span></td>';
327-
print '</tr>';
328-
329-
print '<tr class="oddeven"><td>';
330-
print $form->textwithpicto($langs->trans("SELLYOURSAAS_MAIN_FAQ_URL"), $langs->trans("SELLYOURSAAS_MAIN_FAQ_URLHelp"));
331-
print '</td>';
332-
print '<td>';
333-
print '<input class="minwidth300" type="text" name="SELLYOURSAAS_MAIN_FAQ_URL" value="'.getDolGlobalString('SELLYOURSAAS_MAIN_FAQ_URL').'">';
334-
print '</td>';
335-
print '<td></td>';
336-
print '</tr>';
337-
338-
// SELLYOURSAAS_EXTCSS
339-
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_EXTCSS").'</td>';
340-
print '<td>';
341-
print '<input class="maxwidth200" type="text" name="SELLYOURSAAS_EXTCSS" value="'.getDolGlobalString('SELLYOURSAAS_EXTCSS', '').'">';
342-
print '</td>';
343-
print '<td><span class="opacitymedium small">dist/css/myaccount.css, https://adomain.com/acssfile.css</span></td>';
344-
print '</tr>';
345-
346-
// SELLYOURSAAS_CSS
347-
print '<tr class="oddeven"><td>'.$langs->trans("CSSForCustomerAndRegisterPages").'</td>';
348-
print '<td>';
349-
print '<textarea name="SELLYOURSAAS_CSS" class="quatrevingtpercent" rows="3">'.getDolGlobalString('SELLYOURSAAS_CSS').'</textarea>';
350-
print '</td>';
351-
print '<td></td>';
352-
print '</tr>';
353-
354-
// SELLYOURSAAS_ENABLE_OPTINMESSAGES
355-
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ENABLE_OPTINMESSAGES").'</td>';
356-
print '<td>';
357-
if ($conf->use_javascript_ajax) {
358-
print ajax_constantonoff('SELLYOURSAAS_ENABLE_OPTINMESSAGES', array(), null, 0, 0, 0);
359-
} else {
360-
if (!getDolGlobalString('SELLYOURSAAS_ENABLE_OPTINMESSAGES')) {
361-
print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_SELLYOURSAAS_ENABLE_OPTINMESSAGES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
362-
} else {
363-
print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_SELLYOURSAAS_ENABLE_OPTINMESSAGES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
364-
}
365-
}
366-
print '</td>';
367-
print '<td><span class="opacitymedium small">Set to yes to add a checkbox on register and customer dashboard page to accept "Commercial offers".</td>';
368-
print '</tr>';
369-
370323

371324
foreach ($arrayofsuffixfound as $service => $suffix) {
372325
print '<!-- Edit SELLYOURSAAS_LOGO[|_SMALL|MINI] suffix = '.$suffix.' -->'."\n";
@@ -411,53 +364,67 @@
411364
print '</td></tr>';
412365
}
413366

414-
// SELLYOURSAAS_ACCEPT_DISCOUNTCODE
415-
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ACCEPT_DISCOUNTCODE").'</td>';
367+
// SELLYOURSAAS_EXTCSS
368+
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_EXTCSS").'</td>';
416369
print '<td>';
417-
if ($conf->use_javascript_ajax) {
418-
print ajax_constantonoff('SELLYOURSAAS_ACCEPT_DISCOUNTCODE', array(), null, 0, 0, 0);
419-
} else {
420-
if (!getDolGlobalString('SELLYOURSAAS_ACCEPT_DISCOUNTCODE')) {
421-
print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_SELLYOURSAAS_ACCEPT_DISCOUNTCODE">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
422-
} else {
423-
print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_SELLYOURSAAS_ACCEPT_DISCOUNTCODE">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
424-
}
425-
}
370+
print '<input class="maxwidth200" type="text" name="SELLYOURSAAS_EXTCSS" value="'.getDolGlobalString('SELLYOURSAAS_EXTCSS', '').'">';
426371
print '</td>';
427-
print '<td><span class="opacitymedium small">Set to yes to add a field "Discount code" on the "Enter payment mode" page. Available discounts can be defined on services with type "Application".</td>';
372+
print '<td><span class="opacitymedium small">dist/css/myaccount.css, https://adomain.com/acssfile.css</span></td>';
428373
print '</tr>';
429374

430-
// Allow SEPA
431-
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ENABLE_SEPA").'</td>';
375+
// SELLYOURSAAS_CSS
376+
print '<tr class="oddeven"><td>'.$langs->trans("CSSForCustomerAndRegisterPages").'</td>';
377+
print '<td>';
378+
print '<textarea name="SELLYOURSAAS_CSS" class="quatrevingtpercent" rows="3">'.getDolGlobalString('SELLYOURSAAS_CSS').'</textarea>';
379+
print '</td>';
380+
print '<td></td>';
381+
print '</tr>';
382+
383+
384+
// SELLYOURSAAS_ENABLE_OPTINMESSAGES
385+
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ENABLE_OPTINMESSAGES").'</td>';
432386
print '<td>';
433387
if ($conf->use_javascript_ajax) {
434-
print ajax_constantonoff('SELLYOURSAAS_ENABLE_SEPA', array(), null, 0, 0, 1);
388+
print ajax_constantonoff('SELLYOURSAAS_ENABLE_OPTINMESSAGES', array(), null, 0, 0, 0);
435389
} else {
436-
if (!getDolGlobalString('SELLYOURSAAS_ENABLE_SEPA')) {
437-
print '<a href="'.$_SERVER['PHP_SELF'].'?action=SELLYOURSAAS_ENABLE_SEPA">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
390+
if (!getDolGlobalString('SELLYOURSAAS_ENABLE_OPTINMESSAGES')) {
391+
print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_SELLYOURSAAS_ENABLE_OPTINMESSAGES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
438392
} else {
439-
print '<a href="'.$_SERVER['PHP_SELF'].'?action=SELLYOURSAAS_ENABLE_SEPA">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
393+
print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_SELLYOURSAAS_ENABLE_OPTINMESSAGES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
440394
}
441395
}
442396
print '</td>';
443-
print '<td><span class="opacitymedium small">Set to yes to add Sepa as a Payment method.</td>';
397+
print '<td><span class="opacitymedium small">Set to yes to add a checkbox on register and customer dashboard page to accept "Commercial offers".</td>';
444398
print '</tr>';
445399

446-
// Allow SEPA Payment for ?
447-
if (getDolGlobalString('SELLYOURSAAS_ENABLE_SEPA')) {
448-
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ENABLE_SEPA_FOR_THIRDPARTYID").'</td>';
449-
print '<td>';
450-
print '<input class="maxwidth200" type="text" name="SELLYOURSAAS_ENABLE_SEPA_FOR_THIRDPARTYID" value="'.getDolGlobalString('SELLYOURSAAS_ENABLE_SEPA_FOR_THIRDPARTYID', '').'">';
451-
print '</td>';
452-
print '<td><span class="opacitymedium small">12345,12346,... (keep empty to allow for everybody)</span></td>';
453-
print '</tr>';
454-
}
400+
401+
print '<tr class="oddeven"><td>'.$langs->trans("SellYourSaasStatusUrl").'</td>';
402+
print '<td>';
403+
print '<input class="minwidth300" type="text" name="SELLYOURSAAS_STATUS_URL" value="'.getDolGlobalString('SELLYOURSAAS_STATUS_URL').'">';
404+
print '</td>';
405+
print '<td><span class="opacitymedium small">https://status.mysaasdomainname.com</span></td>';
406+
print '</tr>';
407+
408+
print '<tr class="oddeven"><td>';
409+
print $form->textwithpicto($langs->trans("SELLYOURSAAS_MAIN_FAQ_URL"), $langs->trans("SELLYOURSAAS_MAIN_FAQ_URLHelp"));
410+
print '</td>';
411+
print '<td>';
412+
print '<input class="minwidth300" type="text" name="SELLYOURSAAS_MAIN_FAQ_URL" value="'.getDolGlobalString('SELLYOURSAAS_MAIN_FAQ_URL').'">';
413+
print '</td>';
414+
print '<td></td>';
415+
print '</tr>';
416+
417+
print '<tr class="liste_titre">';
418+
print '<td class="titlefieldmiddle">'.$langs->trans("Payments").'</td><td></td>';
419+
print '<td><div class="float"></div><div class="floatright">';
420+
print '</div></td>';
421+
print "</tr>\n";
455422

456423
// Activate free payment mode
457424
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE").'</td>';
458425
print '<td>';
459426
if ($conf->use_javascript_ajax) {
460-
print ajax_constantonoff('SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE', array(), null, 0, 0, 0);
427+
print ajax_constantonoff('SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE', array(), null, 0, 0, 1);
461428
} else {
462429
if (!getDolGlobalString('SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE')) {
463430
print '<a href="'.$_SERVER['PHP_SELF'].'?action=SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -469,13 +436,34 @@
469436
print '<td><span class="opacitymedium small">Set to yes to enable the free mode.</td>';
470437
print '</tr>';
471438

439+
440+
if (!getDolGlobalString("SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE")) {
441+
// SELLYOURSAAS_ACCEPT_DISCOUNTCODE
442+
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ACCEPT_DISCOUNTCODE").'</td>';
443+
print '<td>';
444+
if ($conf->use_javascript_ajax) {
445+
print ajax_constantonoff('SELLYOURSAAS_ACCEPT_DISCOUNTCODE', array(), null, 0, 0, 0);
446+
} else {
447+
if (!getDolGlobalString('SELLYOURSAAS_ACCEPT_DISCOUNTCODE')) {
448+
print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_SELLYOURSAAS_ACCEPT_DISCOUNTCODE">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
449+
} else {
450+
print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_SELLYOURSAAS_ACCEPT_DISCOUNTCODE">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
451+
}
452+
}
453+
print '</td>';
454+
print '<td><span class="opacitymedium small">Set to yes to add a field "Discount code" on the "Enter payment mode" page. Available discounts can be defined on services with type "Application".</td>';
455+
print '</tr>';
456+
}
457+
458+
472459
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_MAX_MONTHLY_AMOUNT_OF_INVOICE").'</td>';
473460
print '<td>';
474461
print '<input class="maxwidth50" type="text" name="SELLYOURSAAS_MAX_MONTHLY_AMOUNT_OF_INVOICE" value="'.getDolGlobalString('SELLYOURSAAS_MAX_MONTHLY_AMOUNT_OF_INVOICE', '').'">';
475462
print '</td>';
476463
print '<td><span class="opacitymedium small">0=No limit</span></td>';
477464
print '</tr>';
478465

466+
479467
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_INVOICE_FORCE_DATE_VALIDATION").'</td>';
480468
print '<td>';
481469
if ($conf->use_javascript_ajax) {
@@ -491,6 +479,41 @@
491479
print '<td></td>';
492480
print '</tr>';
493481

482+
483+
// Allow SEPA
484+
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ENABLE_SEPA").'</td>';
485+
print '<td>';
486+
if ($conf->use_javascript_ajax) {
487+
print ajax_constantonoff('SELLYOURSAAS_ENABLE_SEPA', array(), null, 0, 0, 1);
488+
} else {
489+
if (!getDolGlobalString('SELLYOURSAAS_ENABLE_SEPA')) {
490+
print '<a href="'.$_SERVER['PHP_SELF'].'?action=SELLYOURSAAS_ENABLE_SEPA">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
491+
} else {
492+
print '<a href="'.$_SERVER['PHP_SELF'].'?action=SELLYOURSAAS_ENABLE_SEPA">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
493+
}
494+
}
495+
print '</td>';
496+
print '<td><span class="opacitymedium small">Set to yes to add Sepa as a Payment method.</td>';
497+
print '</tr>';
498+
499+
// Allow SEPA Payment for ?
500+
if (getDolGlobalString('SELLYOURSAAS_ENABLE_SEPA')) {
501+
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ENABLE_SEPA_FOR_THIRDPARTYID").'</td>';
502+
print '<td>';
503+
print '<input class="maxwidth200" type="text" name="SELLYOURSAAS_ENABLE_SEPA_FOR_THIRDPARTYID" value="'.getDolGlobalString('SELLYOURSAAS_ENABLE_SEPA_FOR_THIRDPARTYID', '').'">';
504+
print '</td>';
505+
print '<td><span class="opacitymedium small">12345,12346,... (keep empty to allow for everybody)</span></td>';
506+
print '</tr>';
507+
}
508+
509+
510+
print '<tr class="liste_titre">';
511+
print '<td class="titlefieldmiddle">'.$langs->trans("Fees").'</td><td></td>';
512+
print '<td><div class="float"></div><div class="floatright">';
513+
print '</div></td>';
514+
print "</tr>\n";
515+
516+
494517
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_INFRA_COST").'</td>';
495518
print '<td>';
496519
print '<input class="maxwidth50" type="text" name="SELLYOURSAAS_INFRA_COST" value="'.getDolGlobalString('SELLYOURSAAS_INFRA_COST', 0).'">';
@@ -505,6 +528,13 @@
505528
print '<td><span class="opacitymedium small">0.02</span></td>';
506529
print '</tr>';
507530

531+
532+
print '<tr class="liste_titre">';
533+
print '<td class="titlefieldmiddle">'.$langs->trans("Cancellation").'</td><td></td>';
534+
print '<td><div class="float"></div><div class="floatright">';
535+
print '</div></td>';
536+
print "</tr>\n";
537+
508538
print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_ASK_DESTROY_REASON").'</td>';
509539
print '<td>';
510540
if ($conf->use_javascript_ajax) {

‎langs/en_US/sellyoursaas.lang‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ BeforeAskForSupport=Before doing your request, you should complete the mandatory
777777
BeforeAskForSupport2=Click here to fill mandatory information.
778778
SELLYOURSAAS_ENABLE_SEPA_FOR_THIRDPARTYID=List of customers ID with SEPA payment enabled
779779
SELLYOURSAAS_ENABLE_SEPA=Enable SEPA payment
780-
SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE=Enable free payment mode
780+
SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE=Enable the mode with no payment required
781781
ConfirmDestruction=Confirm destruction
782782
SELLYOURSAAS_ASK_DESTROY_REASON=Add a question on the reason of cancelation when a user try to delete its instance
783783
SELLYOURSAAS_SUPPORT_URL=External URL for ticket/help desk service
@@ -955,4 +955,5 @@ SupplierModule=Module
955955
YouAreAModuleProvider=You are a module provider
956956
YouAreTheProviderOfTheFollowingModules=You provides the following modules
957957
DashboardServiceIsTemporarlyOffline=Dashboard access is temporarly offline for maintenance purpose.
958-
PleaseGoBackInFewHours=Please go back in few hours...
958+
PleaseGoBackInFewHours=Please go back in few hours...
959+
SubscriptionFormAndDashboard=Subscription form and customers/resellers dashboard

0 commit comments

Comments
 (0)