Clean code of setup of shipment module

htdocs/admin/confexped.php

@@ -1,147 +0,0 @@
-<?php
-/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2011-2016 Juanjo Menent		<jmenent@2byte.es>ù
- * Copyright (C) 2015      Claudio Aschieri     <c.aschieri@19.coop>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/admin/confexped.php
- *		\ingroup    produit
- *		\brief      Page to setup sending module
- */
-
-// Load Dolibarr environment
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'sendings', 'deliveries'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-
-
-/*
- * Actions
- */
-
-// Shipment note
-if (isModEnabled('expedition') && empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) {
-	// This option should always be set to on when module is on.
-	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);
-}
-/*
-if ($action == 'activate_sending')
-{
-	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1",'chaine',0,'',$conf->entity);
-	header("Location: confexped.php");
-	exit;
-}
-if ($action == 'disable_sending')
-{
-	dolibarr_del_const($db, "MAIN_SUBMODULE_EXPEDITION",$conf->entity);
-	header("Location: confexped.php");
-	exit;
-}
-*/
-
-// Delivery note
-if ($action == 'activate_delivery') {
-	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity); // We must also enable this
-	dolibarr_set_const($db, "MAIN_SUBMODULE_DELIVERY", "1", 'chaine', 0, '', $conf->entity);
-	header("Location: confexped.php");
-	exit;
-} elseif ($action == 'disable_delivery') {
-	dolibarr_del_const($db, "MAIN_SUBMODULE_DELIVERY", $conf->entity);
-	header("Location: confexped.php");
-	exit;
-}
-
-
-/*
- * View
- */
-
-$dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/";
-$form = new Form($db);
-
-llxHeader("", $langs->trans("SendingsSetup"));
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup');
-print '<br>';
-$head = expedition_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'shipment');
-
-// Miscellaneous parameters
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Feature").'</td>';
-print '<td width="20">&nbsp;</td>';
-print '<td class="center">'.$langs->trans("Status").'</td>';
-print '</tr>'."\n";
-
-// expedition activation/desactivation
-print "<tr>";
-print '<td>'.$langs->trans("SendingsAbility").'</td>';
-print '<td>';
-print '</td>';
-print '<td class="center">';
-print '<span class="opacitymedium">'.img_picto($langs->trans("Required"), 'switch_on').'</span>';
-/*if (empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-{
-	print '<a href="confexped.php?action=activate_sending&token='.newToken().'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-}
-else
-{
-	print '<a href="confexped.php?action=disable_sending&token='.newToken().'">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-}*/
-print "</td>";
-print '</tr>';
-
-// Delivery note activate/deactivate Bon de livraison activation/desactivation
-print '<tr>';
-print '<td>';
-print $langs->trans("DeliveriesOrderAbility");
-print '<br>'.info_admin($langs->trans("NoNeedForDeliveryReceipts"), 0, 1);
-print '</td>';
-print '<td>';
-print '</td>';
-print '<td class="center">';
-
-if (empty($conf->global->MAIN_SUBMODULE_DELIVERY)) {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_delivery&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-} else {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_delivery&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
-}
-
-print "</td>";
-print '</tr>';
-print '</table>';
-
-print '</div>';
-
-// End of page
-llxFooter();
-$db->close();

htdocs/admin/delivery.php

@@ -56,6 +56,39 @@ $type = 'delivery';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
+
+// Shipment note
+if (isModEnabled('expedition') && empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) {
+	// This option should always be set to on when module is on.
+	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);
+}
+/*
+ if ($action == 'activate_sending')
+ {
+ dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1",'chaine',0,'',$conf->entity);
+ header("Location: confexped.php");
+ exit;
+ }
+ if ($action == 'disable_sending')
+ {
+ dolibarr_del_const($db, "MAIN_SUBMODULE_EXPEDITION",$conf->entity);
+ header("Location: confexped.php");
+ exit;
+ }
+ */
+
+// Delivery note
+if ($action == 'activate_delivery') {
+	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity); // We must also enable this
+	dolibarr_set_const($db, "MAIN_SUBMODULE_DELIVERY", "1", 'chaine', 0, '', $conf->entity);
+	header("Location: delivery.php");
+	exit;
+} elseif ($action == 'disable_delivery') {
+	dolibarr_del_const($db, "MAIN_SUBMODULE_DELIVERY", $conf->entity);
+	header("Location: delivery.php");
+	exit;
+}
+
 if ($action == 'updateMask') {
 	$maskconstdelivery = GETPOST('maskconstdelivery', 'alpha');
 	$maskdelivery = GETPOST('maskdelivery', 'alpha');
@@ -160,6 +193,7 @@ if ($action == 'setmod') {
 }
 
 
+
 /*
  * View
  */
@@ -178,6 +212,21 @@ $head = expedition_admin_prepare_head();
 print dol_get_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 
+print '<br>';
+print '<div class="inline-block valignmiddle">'.$langs->trans("DeliveriesOrderAbility").'</div>';
+if (empty($conf->global->MAIN_SUBMODULE_DELIVERY)) {
+	print ' <a class="inline-block valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=activate_delivery&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+} else {
+	print ' <a class="inline-block valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=disable_delivery&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+}
+
+print '<br><span class="opacitymedium">'.info_admin($langs->trans("NoNeedForDeliveryReceipts"), 0, 1).'</span>';
+print '<br>';
+print '<br>';
+
+
+
+if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY)) {
 	// Delivery numbering model
 
 	print load_fiche_titre($langs->trans("DeliveryOrderNumberingModules"), '', '');
@@ -406,12 +455,15 @@ foreach ($dirmodels as $reldir) {
 	}
 
 	print '</table>';
-/*
+
- *  Autres Options
+	// Other Options
- */
 	print "<br>";
 	print load_fiche_titre($langs->trans("OtherOptions"), '', '');
 
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
+
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Parameter").'</td>';
@@ -427,9 +479,6 @@ foreach ($substitutionarray as $key => $val) {
 	}
 	$htmltext .= '</i>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
 	print '<tr class="oddeven"><td colspan="2">';
 	print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 	$variablename = 'DELIVERY_FREE_TEXT';
@@ -441,12 +490,17 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 		print $doleditor->Create();
 	}
 	print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 	print "</td></tr>\n";
-print '</form>';
 
 	print '</table>';
 
+	print '<div class="center">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
 // End of page
 llxFooter();
 $db->close();

htdocs/core/modules/modExpedition.class.php

@@ -70,7 +70,7 @@ class modExpedition extends DolibarrModules
 							);
 
 		// Config pages
-		$this->config_page_url = array("confexped.php");
+		$this->config_page_url = array("expedition.php");
 
 		// Dependencies
 		$this->depends = array("modCommande");