From 35373147622a1d9b880481f23f61ec82e6594dbc Mon Sep 17 00:00:00 2001
From: Noizette <unset-email>
Date: Fri, 21 Jul 2023 23:28:54 +0200
Subject: [PATCH] First steps in update to 1.3.0

---
 {www/admin => admin}/_facture_common.php   |  4 ++--
 {www/admin => admin}/_inc.php              |  6 +++---
 {www/admin => admin}/aide.php              |  0
 {www/admin => admin}/client.php            |  0
 {www/admin => admin}/client_modifier.php   |  0
 {www/admin => admin}/client_supprimer.php  |  0
 {www/admin => admin}/clients.php           |  0
 {www/admin => admin}/config.php            |  0
 {www/admin => admin}/facture.php           |  0
 {www/admin => admin}/facture_ajouter.php   |  2 +-
 {www/admin => admin}/facture_modifier.php  |  2 +-
 {www/admin => admin}/facture_supprimer.php |  0
 {www/admin => admin}/index.php             |  0
 {www/admin => admin}/pdf.php               |  2 +-
 install.php                                |  6 +++---
 lib/Facture.php                            | 14 +++++++-------
 garradin_plugin.ini => plugin.ini          |  9 ++++-----
 upgrade.php                                | 22 +++++++++++-----------
 18 files changed, 33 insertions(+), 34 deletions(-)
 rename {www/admin => admin}/_facture_common.php (99%)
 rename {www/admin => admin}/_inc.php (96%)
 rename {www/admin => admin}/aide.php (100%)
 rename {www/admin => admin}/client.php (100%)
 rename {www/admin => admin}/client_modifier.php (100%)
 rename {www/admin => admin}/client_supprimer.php (100%)
 rename {www/admin => admin}/clients.php (100%)
 rename {www/admin => admin}/config.php (100%)
 rename {www/admin => admin}/facture.php (100%)
 rename {www/admin => admin}/facture_ajouter.php (66%)
 rename {www/admin => admin}/facture_modifier.php (58%)
 rename {www/admin => admin}/facture_supprimer.php (100%)
 rename {www/admin => admin}/index.php (100%)
 rename {www/admin => admin}/pdf.php (99%)
 rename garradin_plugin.ini => plugin.ini (72%)

diff --git a/www/admin/_facture_common.php b/admin/_facture_common.php
similarity index 99%
rename from www/admin/_facture_common.php
rename to admin/_facture_common.php
index cd3f03e..32b951c 100644
--- a/www/admin/_facture_common.php
+++ b/admin/_facture_common.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Garradin;
+namespace Paheko;
 
 require_once __DIR__ . '/_inc.php';
 
@@ -12,7 +12,7 @@ if (!isset($target) || !in_array( $target, ['new', 'edit'])) {
 
 $session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE);
 
-use Garradin\DB;
+use Paheko\DB;
 use stdClass;
 use const \Garradin\Plugin\Facturation\PATTERNS_LIST;
 
diff --git a/www/admin/_inc.php b/admin/_inc.php
similarity index 96%
rename from www/admin/_inc.php
rename to admin/_inc.php
index 5db92d0..01cbd47 100644
--- a/www/admin/_inc.php
+++ b/admin/_inc.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Garradin\Plugin\Facturation;
+namespace Paheko\Plugin\Facturation;
 
-use Garradin\Config;
-use Garradin\Utils;
+use Paheko\Config;
+use Paheko\Utils;
 
 define('DEVIS', 0);
 define('FACT', 1);
diff --git a/www/admin/aide.php b/admin/aide.php
similarity index 100%
rename from www/admin/aide.php
rename to admin/aide.php
diff --git a/www/admin/client.php b/admin/client.php
similarity index 100%
rename from www/admin/client.php
rename to admin/client.php
diff --git a/www/admin/client_modifier.php b/admin/client_modifier.php
similarity index 100%
rename from www/admin/client_modifier.php
rename to admin/client_modifier.php
diff --git a/www/admin/client_supprimer.php b/admin/client_supprimer.php
similarity index 100%
rename from www/admin/client_supprimer.php
rename to admin/client_supprimer.php
diff --git a/www/admin/clients.php b/admin/clients.php
similarity index 100%
rename from www/admin/clients.php
rename to admin/clients.php
diff --git a/www/admin/config.php b/admin/config.php
similarity index 100%
rename from www/admin/config.php
rename to admin/config.php
diff --git a/www/admin/facture.php b/admin/facture.php
similarity index 100%
rename from www/admin/facture.php
rename to admin/facture.php
diff --git a/www/admin/facture_ajouter.php b/admin/facture_ajouter.php
similarity index 66%
rename from www/admin/facture_ajouter.php
rename to admin/facture_ajouter.php
index 0c8bee7..f2adf47 100644
--- a/www/admin/facture_ajouter.php
+++ b/admin/facture_ajouter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Garradin;
+namespace Paheko;
 
 $target = 'new';
 $csrf_key = 'ajout_facture';
diff --git a/www/admin/facture_modifier.php b/admin/facture_modifier.php
similarity index 58%
rename from www/admin/facture_modifier.php
rename to admin/facture_modifier.php
index 1f77b69..1e193a0 100644
--- a/www/admin/facture_modifier.php
+++ b/admin/facture_modifier.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Garradin;
+namespace Paheko;
 
 $target = 'edit';
 $csrf_key = 'modifier_facture';
diff --git a/www/admin/facture_supprimer.php b/admin/facture_supprimer.php
similarity index 100%
rename from www/admin/facture_supprimer.php
rename to admin/facture_supprimer.php
diff --git a/www/admin/index.php b/admin/index.php
similarity index 100%
rename from www/admin/index.php
rename to admin/index.php
diff --git a/www/admin/pdf.php b/admin/pdf.php
similarity index 99%
rename from www/admin/pdf.php
rename to admin/pdf.php
index 0e69b08..d1c0c0d 100644
--- a/www/admin/pdf.php
+++ b/admin/pdf.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Garradin;
+namespace Paheko;
 
 require_once __DIR__ . '/_inc.php';
 $session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
diff --git a/install.php b/install.php
index 8ed3d95..7ae8274 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
-namespace Garradin;
-use Garradin\Entities\Files\File;
-use Garradin\Plugin\Facturation\Facture;
+namespace Paheko;
+use Paheko\Entities\Files\File;
+use Paheko\Plugin\Facturation\Facture;
 
 $db = DB::getInstance();
 
diff --git a/lib/Facture.php b/lib/Facture.php
index bc6cfc3..30002df 100644
--- a/lib/Facture.php
+++ b/lib/Facture.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Garradin\Plugin\Facturation;
+namespace Paheko\Plugin\Facturation;
 
 use DateTime;
-use Garradin\Config;
-use Garradin\DB;
-use Garradin\DynamicList;
-use Garradin\UserException;
-use Garradin\Utils;
-use Garradin\Services\Services_User;
+use Paheko\Config;
+use Paheko\DB;
+use Paheko\DynamicList;
+use Paheko\UserException;
+use Paheko\Utils;
+use Paheko\Services\Services_User;
 
 class Facture
 {
diff --git a/garradin_plugin.ini b/plugin.ini
similarity index 72%
rename from garradin_plugin.ini
rename to plugin.ini
index dc58520..845bb29 100644
--- a/garradin_plugin.ini
+++ b/plugin.ini
@@ -1,8 +1,7 @@
-nom="Facturation"
+name="Facturation"
 description="Permet d'éditer des factures, devis et reçus à ses membres ainsi qu'à une base de clients supplémentaire."
-auteur="zou"
+author="zou"
 url="https://gitlab.com/noizette/garradin-plugin-facturation/"
-version="0.7.4"
+version="0.8.0"
 menu=true
-config=1
-min_version="1.1.0"
+min_version="1.2.0"
\ No newline at end of file
diff --git a/upgrade.php b/upgrade.php
index b83f80e..9a38d0d 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Garradin;
-use Garradin\Plugin\Facturation\Facture;
-use Garradin\Entities\Files\File;
+namespace Paheko;
+use Paheko\Plugin\Facturation\Facture;
+use Paheko\Entities\Files\File;
 
 define('DEVIS', 0);
 define('FACT', 1);
@@ -11,11 +11,11 @@ define('COTIS', 3);
 
 $db = DB::getInstance();
 $facture = new Facture;
-$infos = $plugin->getInfos();
+$version = $plugin->get('version');
 
 
 // 0.2.0 - Stock le contenu en json plutôt qu'en serialized
-if (version_compare($infos->version, '0.2.0', '<'))
+if (version_compare($version, '0.2.0', '<'))
 {
 	$r = (array) DB::getInstance()->get('SELECT * FROM plugin_facturation_factures');
 	
@@ -26,7 +26,7 @@ if (version_compare($infos->version, '0.2.0', '<'))
 }
 
 // 0.3.0 - Migration Facturation\Config vers la table plugins
-if (version_compare($infos->version, '0.3.0', '<'))
+if (version_compare($version, '0.3.0', '<'))
 {
 	$conf = $db->getAssoc('SELECT cle, valeur FROM plugin_facturation_config ORDER BY cle;');
 	foreach($conf as $k=>$v)
@@ -40,7 +40,7 @@ if (version_compare($infos->version, '0.3.0', '<'))
 }
 
 // 0.4.0 - 
-if (version_compare($infos->version, '0.4.0', '<'))
+if (version_compare($version, '0.4.0', '<'))
 {
 	$db->exec(<<<EOT
 		CREATE TABLE IF NOT EXISTS plugin_facturation_paiement
@@ -85,7 +85,7 @@ EOT
 }
 
 // 0.6.0 - 
-if (version_compare($infos->version, '0.6.0', '<'))
+if (version_compare($version, '0.6.0', '<'))
 {
 	$r = $db->first('SELECT id, total FROM plugin_facturation_factures;');
 	if (strpos($r->total,'.'))
@@ -145,7 +145,7 @@ EOT
 }
 
 // 0.6.2 - 
-if (version_compare($infos->version, '0.6.2', '<'))
+if (version_compare($version, '0.6.2', '<'))
 {
 	$db->exec(<<<EOT
 	    INSERT OR IGNORE INTO plugin_facturation_paiement
@@ -195,13 +195,13 @@ EOT
 }
 
 // 0.7.1 - Ajout clé config TTC/HT
-if (version_compare($infos->version, '0.7.1', '<'))
+if (version_compare($version, '0.7.1', '<'))
 {
 	$plugin->setConfig('ttc', false);
 }
 
 // 0.7.4 - Signal menu item
-if (version_compare($infos->version, '0.7.4', '<'))
+if (version_compare($version, '0.7.4', '<'))
 {
 	$plugin->registerSignal('menu.item', [Facture::class, 'menuItem']);
 }
\ No newline at end of file