From ae03dd241857f54ad592b2f25df84e77bc8b09f0 Mon Sep 17 00:00:00 2001 From: Marne Date: Thu, 8 Nov 2018 15:40:29 +0100 Subject: [PATCH 01/43] -Ajout du message notifiant que l'identification se fait avec l'adresse mail -Ajout du lien vers la page d'accueil --- app/view/toolbar.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/view/toolbar.html b/app/view/toolbar.html index afe6167..ddaefa7 100644 --- a/app/view/toolbar.html +++ b/app/view/toolbar.html @@ -7,6 +7,7 @@
+

{{ _("Le site de dons à changé. À présent, utilisez votre adresse e-mail comme identifiant.") }}

@@ -16,7 +17,7 @@
- {{ _("Réinitialiser votre mot de passe") }} + {{ _("Mot de passe oublié ?") }}
@@ -84,6 +85,9 @@
- +
-- GitLab From 7bf3d6ae90c53b8375de1ce808f064e5005fcaa7 Mon Sep 17 00:00:00 2001 From: Marne Date: Mon, 5 Nov 2018 18:16:56 +0100 Subject: [PATCH 20/43] Mise en page de la modale --- www/static/css/custom.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/static/css/custom.css b/www/static/css/custom.css index f3d1e31..e8436a1 100644 --- a/www/static/css/custom.css +++ b/www/static/css/custom.css @@ -8,6 +8,9 @@ p a { color: #3B68B0; text-decoration: underline; } +.addressmodal { + padding-left:15px; +} .panel-heading { padding-left: 2em; @@ -237,6 +240,9 @@ transform: rotate(-90deg); #subtitle { margin:0 5px; } +.addressmodal { + padding-left:15px; +} /* Problèmes de css à répercuter plus tard */ .col-md- { /* marge gauche arbitraire qui semblait destinée à centrer : .col-md-offset-1 { margin-left: 8.33333333%;} dans bootstrap.css ligne 2086 */ -- GitLab From b1a1f0cb853eeec657f971b73695e6dbef41b5aa Mon Sep 17 00:00:00 2001 From: Marne Date: Mon, 5 Nov 2018 18:21:49 +0100 Subject: [PATCH 21/43] Corrections modale --- app/view/user/perso.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index f4a2e7e..942053f 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -434,7 +434,7 @@
- {{ _("Un pi-shirt - Taille : @atailles[@taille]", un pibag et piplôme) }} + {{ _("Un pi-shirt - Taille : @atailles[@taille], un pibag et piplôme") }}
@@ -444,14 +444,14 @@
- {{ _("Un hoopie - Taille : @atailles[@taille_h]", un pi-shirt - Taille : @atailles[@taille]", un pibag et piplôme) }} + {{ _("Un hoopie - Taille : @atailles[@taille_h], un pi-shirt - Taille : @atailles[@taille], un pibag et piplôme") }}
- +
-- GitLab From 998f53fa969bb31c31931889dc7917b6de18f4cf Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 11:38:57 +0100 Subject: [PATCH 22/43] Page maintenance --- app/view/campaign/home.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/view/campaign/home.html b/app/view/campaign/home.html index 9116230..724e15e 100644 --- a/app/view/campaign/home.html +++ b/app/view/campaign/home.html @@ -1,4 +1,6 @@ - +

Désolé ! Le site de dons est en maintenance :( +Merci de votre soutien <3

+ -- GitLab From 4029a5e0450622c41383a0920a69fb9a4c98bc35 Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 11:49:03 +0100 Subject: [PATCH 23/43] Page de maintenance --- app/view/campaign/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/view/campaign/home.html b/app/view/campaign/home.html index 724e15e..95d5409 100644 --- a/app/view/campaign/home.html +++ b/app/view/campaign/home.html @@ -1,4 +1,4 @@ -

Désolé ! Le site de dons est en maintenance :( +

Désolé !
Le site de dons est en maintenance :(
Merci de votre soutien <3

+ -- GitLab From 127b1edd7607d17edae0739504008358831bc76a Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:06:08 +0100 Subject: [PATCH 27/43] retrait de la taille du t-shirt non reconnue --- app/view/user/perso.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index 942053f..f66d2d6 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -444,7 +444,7 @@
- {{ _("Un hoopie - Taille : @atailles[@taille_h], un pi-shirt - Taille : @atailles[@taille], un pibag et piplôme") }} + {{ _("Un hoopie - Taille : @atailles[@taille_h], un pi-shirt, un pibag et piplôme") }}
-- GitLab From 61714dc54114346ed370d2638dd82971b15da07f Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:08:18 +0100 Subject: [PATCH 28/43] Retrait de toutes les tailles --- app/view/user/perso.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index f66d2d6..2e62426 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -434,7 +434,7 @@
- {{ _("Un pi-shirt - Taille : @atailles[@taille], un pibag et piplôme") }} + {{ _("Un pi-shirt, un pibag et piplôme") }}
@@ -444,7 +444,7 @@
- {{ _("Un hoopie - Taille : @atailles[@taille_h], un pi-shirt, un pibag et piplôme") }} + {{ _("Un hoopie, un pi-shirt, un pibag et piplôme") }}
-- GitLab From de4b6f63ac46a1064b7a22f0d4259f3504005cb0 Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:13:43 +0100 Subject: [PATCH 29/43] Update perso.html --- app/view/user/perso.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index 2e62426..633aad4 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -424,7 +424,7 @@
- {{ _("Un pibag et un piplôme") }} + {{ _("Un pibag") }}
@@ -434,7 +434,7 @@
- {{ _("Un pi-shirt, un pibag et piplôme") }} + {{ _("Un pi-shirt - Taille : @atailles[@taille]") }}
@@ -444,7 +444,7 @@
- {{ _("Un hoopie, un pi-shirt, un pibag et piplôme") }} + {{ _("Un hoopie - Taille : @atailles[@taille_h]") }}
-- GitLab From 94f9e7b90c612d94bc03954f3e7d3d693eb6d24b Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:16:14 +0100 Subject: [PATCH 30/43] Update perso.html --- app/view/user/perso.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index 633aad4..ded2e59 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -434,7 +434,7 @@
- {{ _("Un pi-shirt - Taille : @atailles[@taille]") }} + {{ _("Un pi-shirt") }}
@@ -444,7 +444,7 @@
- {{ _("Un hoopie - Taille : @atailles[@taille_h]") }} + {{ _("Un hoopie") }}
-- GitLab From d6583e3f1d641afd844a44a9fbc33ed9020635da Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:33:32 +0100 Subject: [PATCH 31/43] Message ajouter une adresse --- app/view/user/perso.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index ded2e59..b5b1ee5 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -370,6 +370,9 @@ + +

Veuillez ajouter une adresse postale ici

+
-- GitLab From 05ca71ee0786b0d0f972bfeaa91a707fb8d3d541 Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:36:57 +0100 Subject: [PATCH 32/43] Test sans adresses --- app/view/user/perso.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index b5b1ee5..cb98402 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -370,10 +370,10 @@
- +

Veuillez ajouter une adresse postale ici

 - +
-- GitLab From ed772891a6b4edb9066c2eef1a582dc31780ba9a Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:40:43 +0100 Subject: [PATCH 33/43] Update perso.html --- app/view/user/perso.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index cb98402..1e10916 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -371,7 +371,9 @@
-

Veuillez ajouter une adresse postale ici

+
+

Veuillez ajouter une adresse postale ici

+
-- GitLab From f5e3f54594782f898a80e9190f18a9838a72a36a Mon Sep 17 00:00:00 2001 From: Marne Date: Tue, 6 Nov 2018 13:42:37 +0100 Subject: [PATCH 34/43] Check dans le cas ou il n'y a pas d'adresse --- app/view/user/perso.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/view/user/perso.html b/app/view/user/perso.html index 1e10916..ac1c5c7 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -370,12 +370,12 @@
- +

Veuillez ajouter une adresse postale ici

 - +
-- GitLab From 1b14a947c68396f78f4015368688702663ccd0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Oudin?= Date: Tue, 6 Nov 2018 22:46:57 +0100 Subject: [PATCH 35/43] Fix template. Now counterparts should work. --- app/controller/perso.php | 6 +++--- app/view/user/perso.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controller/perso.php b/app/controller/perso.php index c644539..ab9d67e 100644 --- a/app/controller/perso.php +++ b/app/controller/perso.php @@ -390,13 +390,13 @@ class Perso extends Controller $db->query("INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status,commentaire) VALUES ('".$f3->get('SESSION.id')."',NOW(),'piplome','".\Utils::asl($piplome_id)."','".\Utils::asl($adresse_id)."',1, '".\Utils::asl($commentaire)."')"); break; case 'pibag': - $db->query("INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status) VALUES ('".$f3->get('SESSION.id')."',NOW(),'pibag','','".\Utils::asl($adresse_id)."',1, '".\Utils::asl($commentaire)."')"); + $db->query("INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status,commentaire) VALUES ('".$f3->get('SESSION.id')."',NOW(),'pibag','','".\Utils::asl($adresse_id)."',1, '".\Utils::asl($commentaire)."')"); break; case 'pishirt': - $db->query("INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status) VALUES ('".$f3->get('SESSION.id')."',NOW(),'pishirt','".\Utils::asl($taille)."','".\Utils::asl($adresse_id)."',1, '".\Utils::asl($commentaire)."')"); + $db->query("INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status,commentaire) VALUES ('".$f3->get('SESSION.id')."',NOW(),'pishirt','".\Utils::asl($taille)."','".\Utils::asl($adresse_id)."',1, '".\Utils::asl($commentaire)."')"); break; case 'hoopie': - $db->query("INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status) VALUES ('".$f3->get('SESSION.id')."',NOW(),'hoodie','".\Utils::asl($taille_h)."','".\Utils::asl($adresse_id)."',1, '".\Utils::asl($commentaire)."')"); + $db->query("INSERT INTO contreparties (user_id,datec,quoi,taille,adresse_id,status,commentaire) VALUES ('".$f3->get('SESSION.id')."',NOW(),'hoodie','".\Utils::asl($taille_h)."','".\Utils::asl($adresse_id)."',1, '".\Utils::asl($commentaire)."')"); } } // Puis diminution du cumul de la valeur des contreparties diff --git a/app/view/user/perso.html b/app/view/user/perso.html index ac1c5c7..f2313a4 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -461,7 +461,7 @@
- + Close -- GitLab From 8e08817dca4de0e6af44176c68ecf2dc2641f7e9 Mon Sep 17 00:00:00 2001 From: okhin Date: Thu, 8 Nov 2018 11:40:07 +0100 Subject: [PATCH 36/43] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1565508..5844e91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,6 +83,7 @@ job deploy: environment: production variables: PHINX_ENVIRONMENT: "production" + PROD_HOME: "$PROD_HOME" script: - chmod a+x ci/install.sh - ./ci/install.sh -- GitLab From 793de42dacc723955b380e2363929b7137fe6c11 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 8 Nov 2018 16:12:03 +0100 Subject: [PATCH 37/43] Migrate database to remove alias and keep only one address per user --- .../20181108145741_une_seule_adresse.php | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 db/migrations/20181108145741_une_seule_adresse.php diff --git a/db/migrations/20181108145741_une_seule_adresse.php b/db/migrations/20181108145741_une_seule_adresse.php new file mode 100644 index 0000000..cfd0d8e --- /dev/null +++ b/db/migrations/20181108145741_une_seule_adresse.php @@ -0,0 +1,58 @@ + user_id index + $table = $this->table('adresses'); + $table->removeIndex(['alias', 'user_id']) + ->save(); + + // Deleting all addresses, to be sure we don't have doubles + $this->execute('TRUNCATE TABLE adresses;'); + + // Add a unique index on user_id + $table->addIndex(['user_id'], ['unique' => true]) + ->removeColumn('alias') + ->save(); + + } + + public function down() { + $table = $this->table('adresses'); + $table->addColumn('alias', 'string') + ->removeIndex(['user_id']) + ->save(); + $table->addIndex(['alias', 'user_id'], ['unique' => true]) + ->save(); + } +} -- GitLab From b84284d061eb4a04e1caefbbda23de8d0fab4cd6 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 8 Nov 2018 16:29:05 +0100 Subject: [PATCH 38/43] Removing the default field --- .../20181108152608_remove_address_defaut.php | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 db/migrations/20181108152608_remove_address_defaut.php diff --git a/db/migrations/20181108152608_remove_address_defaut.php b/db/migrations/20181108152608_remove_address_defaut.php new file mode 100644 index 0000000..a80e3bb --- /dev/null +++ b/db/migrations/20181108152608_remove_address_defaut.php @@ -0,0 +1,46 @@ +table('adresses'); + $table->removeColumn('defaut') + ->save(); + } + + public function down() + { + $table = $this->table('adresses'); + $table->addColumn('defaut', 'boolean') + ->save(); + } +} -- GitLab From 86670dba5b87c6c53a4c56a91ea785d3ba81f035 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 8 Nov 2018 16:40:54 +0100 Subject: [PATCH 39/43] Remove default (and derived functions) and alias from the addresses --- db/seeds/AddressSeeder.php | 30 ----- phinx.yml | 2 +- src/LQDN/Command/AddressCreateCommand.php | 16 +-- src/LQDN/Command/AddressUpdateCommand.php | 81 ------------- src/LQDN/Finder/AddressFinder.php | 8 +- src/LQDN/Handler/AddressHandler.php | 108 ++---------------- tests/functional/Finder/AddressFinderTest.php | 18 ++- .../functional/Handler/AddressHandlerTest.php | 28 +---- 8 files changed, 22 insertions(+), 269 deletions(-) delete mode 100644 src/LQDN/Command/AddressUpdateCommand.php diff --git a/db/seeds/AddressSeeder.php b/db/seeds/AddressSeeder.php index 0d52807..73885b3 100644 --- a/db/seeds/AddressSeeder.php +++ b/db/seeds/AddressSeeder.php @@ -24,38 +24,10 @@ class AddressSeeder extends AbstractSeed 'ville' => 'Paris', 'etat' => null, 'pays' => 'France', - 'alias' => 'Main', 'user_id' => 1, - 'defaut' => true, ), array( 'id' => 2, - 'nom' => 'Second address', - 'adresse' => '2 rue Ménars', - 'adresse2' => null, - 'codepostal' => 75002, - 'ville' => 'Paris', - 'etat' => null, - 'pays' => 'France', - 'alias' => 'Second address', - 'user_id' => 1, - 'defaut' => false, - ), - array( - 'id' => 4, - 'nom' => 'Third address', - 'adresse' => '3 rue Ménars', - 'adresse2' => null, - 'codepostal' => 75003, - 'ville' => 'Paris', - 'etat' => null, - 'pays' => 'France', - 'alias' => 'Third address', - 'user_id' => 1, - 'defaut' => false, - ), - array( - 'id' => 5, 'nom' => 'Bob address', 'adresse' => '4 rue Ménars', 'adresse2' => null, @@ -63,9 +35,7 @@ class AddressSeeder extends AbstractSeed 'ville' => 'Paris', 'etat' => null, 'pays' => 'France', - 'alias' => 'Third address', 'user_id' => 2, - 'defaut' => false, ), ); diff --git a/phinx.yml b/phinx.yml index 10928b5..160c783 100644 --- a/phinx.yml +++ b/phinx.yml @@ -17,7 +17,7 @@ environments: development: adapter: mysql host: localhost - name: soutien + name: don user: soutien pass: 'soutien' port: 3306 diff --git a/src/LQDN/Command/AddressCreateCommand.php b/src/LQDN/Command/AddressCreateCommand.php index 302c9da..fb81cdc 100644 --- a/src/LQDN/Command/AddressCreateCommand.php +++ b/src/LQDN/Command/AddressCreateCommand.php @@ -7,27 +7,23 @@ class AddressCreateCommand private $addressId; private $userId; private $name; - private $alias; private $address; private $address2; private $postalCode; private $city; private $country; private $state; - private $isDefault; - public function __construct($userId, $name, $alias, $address, $address2, $postalCode, $city, $country, $state, $isDefault) + public function __construct($userId, $name, $address, $address2, $postalCode, $city, $country, $state) { $this->userId = $userId; $this->name = $name; - $this->alias = $alias; $this->address = $address; $this->address2 = $address2; $this->postalCode = $postalCode; $this->city = $city; $this->country = $country; $this->state = $state; - $this->isDefault = $isDefault; } public function getUserId() @@ -40,11 +36,6 @@ class AddressCreateCommand return $this->name; } - public function getAlias() - { - return $this->alias; - } - public function getAddress() { return $this->address; @@ -74,9 +65,4 @@ class AddressCreateCommand { return $this->state; } - - public function isDefault() - { - return $this->isDefault; - } } diff --git a/src/LQDN/Command/AddressUpdateCommand.php b/src/LQDN/Command/AddressUpdateCommand.php deleted file mode 100644 index 560032a..0000000 --- a/src/LQDN/Command/AddressUpdateCommand.php +++ /dev/null @@ -1,81 +0,0 @@ -addressId = $addressId; - $this->userId = $userId; - $this->alias = $alias; - $this->address = $address; - $this->address2 = $address2; - $this->postalCode = $postalCode; - $this->city = $city; - $this->country = $country; - $this->state = $state; - $this->isDefault = $isDefault; - } - - public function getAddressId() - { - return $this->addressId; - } - - public function getUserId() - { - return $this->userId; - } - - public function getAlias() - { - return $this->alias; - } - - public function getAddress() - { - return $this->address; - } - - public function getAddress2() - { - return $this->address2; - } - - public function getPostalCode() - { - return $this->postalCode; - } - - public function getCity() - { - return $this->city; - } - - public function getCountry() - { - return $this->country; - } - - public function getState() - { - return $this->state; - } - - public function isDefault() - { - return $this->isDefault; - } -} diff --git a/src/LQDN/Finder/AddressFinder.php b/src/LQDN/Finder/AddressFinder.php index 22a0d8c..eea114f 100644 --- a/src/LQDN/Finder/AddressFinder.php +++ b/src/LQDN/Finder/AddressFinder.php @@ -23,12 +23,8 @@ class AddressFinder public function findByUserId($userId) { $userId = (int) $userId; - $addresses = []; $stmt = $this->connection->executeQuery('SELECT * FROM adresses WHERE user_id = :user_id', ['user_id' => $userId]); - while ($address = $stmt->fetch()) { - $addresses[$address['id']] = $address; - } - - return $addresses; + $addresse = $stmt->fetch(); + return $addresse; } } diff --git a/src/LQDN/Handler/AddressHandler.php b/src/LQDN/Handler/AddressHandler.php index 81029be..c4dda1d 100644 --- a/src/LQDN/Handler/AddressHandler.php +++ b/src/LQDN/Handler/AddressHandler.php @@ -19,9 +19,7 @@ class AddressHandler } /** - * Delete an address. If there's a default adress, we should replace it in - * dons and contreparties. If there's none and the adress is used - * in contreparties, we should raise an error. + * Delete an address. * * @param AddressDeleteCommand $command */ @@ -33,63 +31,12 @@ class AddressHandler $addressId = $command->getAddressId(); // Let's check if the address is used if ($this->addressUsed($addressId) == true) { - // First lets' check if there is a default Address we could use - $default = $this->getDefaultAddress($user_id); - $params = ['id' => $command->getAddressId(), - 'default_id' => $default]; - - if ($default != '' and $default != $addressId) { - // We have a default address which is not the current one - $this->connection->executeUpdate("UPDATE dons SET adresse_id = :default_id WHERE adresse_id = :id", $params); - $this->connection->executeUpdate("UPDATE contreparties SET adresse_id= :default_id WHERE adresse_id = :id", $params); - } else { - // We do not have a default address and the address is used somehow - throw new AddressUsedException(); - }; + // The address is used somehow + throw new AddressUsedException(); }; $this->connection->executeUpdate("DELETE FROM adresses WHERE id = :id", ['id' => $addressId]); } - /** - * Update an address. - * - * @param AddressUpdateCommand $command - */ - public function handleAddressUpdateCommand(AddressUpdateCommand $command) - { - $userId = $command->getUserId(); - if ($isDefault = $command->isDefault()) { - $this->undefaultAddresses($userId); - } - $query = <<connection->prepare($query); - $stmt->bindValue('alias', $command->getAlias()); - $stmt->bindValue('address', $command->getAddress()); - $stmt->bindValue('address2', $command->getAddress2()); - $stmt->bindValue('postal_code', $command->getPostalCode()); - $stmt->bindValue('city', $command->getCity()); - $stmt->bindValue('country', $command->getCountry()); - $stmt->bindValue('state', $command->getState()); - $stmt->bindValue('default', $command->isDefault()); - $stmt->bindValue('address_id', $command->getAddressId()); - $stmt->bindValue('user_id', $command->getUserId()); - $stmt->execute(); - } - /** * Create an address. * @@ -98,64 +45,24 @@ EOF; public function handleAddressCreateCommand(AddressCreateCommand $command) { $userId = $command->getUserId(); - $alias = $command->getAlias(); - if ($this->addressExists($userId, $alias)) { - throw new AddressAlreadyExistsException(); - } - - if ($isDefault = $command->isDefault()) { - $this->undefaultAddresses($userId); - } $query =<<connection->prepare($query); $stmt->bindValue('user_id', $command->getUserId()); $stmt->bindValue('name', $command->getName()); - $stmt->bindValue('alias', $command->getAlias()); $stmt->bindValue('address', $command->getAddress()); $stmt->bindValue('address2', $command->getAddress2()); $stmt->bindValue('postal_code', $command->getPostalCode()); $stmt->bindValue('city', $command->getCity()); $stmt->bindValue('state', $command->getState()); $stmt->bindValue('country', $command->getCountry()); - $stmt->bindValue('default', $isDefault); $stmt->execute(); } - /** - * Undefault addresses of a given user. - * - * @param int $userId - */ - private function undefaultAddresses($userId) - { - $this->connection->executeUpdate("UPDATE adresses SET defaut = FALSE WHERE user_id = :user_id", [ - 'user_id' => $userId, - ]); - } - - /** - * Get the default address of a given user. - * - * @param int $userId - * - * @return int - */ - private function getDefaultAddress($userId) - { - return (int) $this->connection->fetchColumn( - "SELECT id FROM adresses WHERE user_id = :user_id AND defaut = TRUE", - [ - 'user_id' => $userId, - ], - 0 - ); - } - /** * Check if an address already exists. * @@ -164,13 +71,12 @@ EOF; * * @return bool */ - private function addressExists($userId, $alias) + private function addressExists($userId) { return (bool) $this->connection->fetchColumn( - "SELECT 1 FROM adresses WHERE user_id = :user_id AND alias = :alias", + "SELECT 1 FROM adresses WHERE user_id = :user_id", [ 'user_id' => $userId, - 'alias' => $alias, ], 0 ); diff --git a/tests/functional/Finder/AddressFinderTest.php b/tests/functional/Finder/AddressFinderTest.php index 9bc2143..e9a1b2f 100644 --- a/tests/functional/Finder/AddressFinderTest.php +++ b/tests/functional/Finder/AddressFinderTest.php @@ -8,23 +8,21 @@ class AddressFinderTest extends FunctionalTest { public function testFindByUserId() { - $addresses = $this->container['address_finder']->findByUserId(1); - $this->assertCount(3, $addresses); + $addresse = $this->container['address_finder']->findByUserId(1); + $this->assertCount(9, $addresse); - // Check the third address which have an id of 4 + // Check the address have an ID of 1 $expectedAddress = [ - 'id' => '4', - 'nom' => 'Third address', - 'adresse' => '3 rue Ménars', + 'id' => '1', + 'nom' => 'Main', + 'adresse' => '1 rue Ménars', 'adresse2' => null, - 'codepostal' => '75003', + 'codepostal' => '75001', 'ville' => 'Paris', 'etat' => null, 'pays' => 'France', - 'alias' => 'Third address', 'user_id' => '1', - 'defaut' => '0', ]; - $this->assertEquals($expectedAddress, $addresses[4]); + $this->assertEquals($expectedAddress, $addresse); } } diff --git a/tests/functional/Handler/AddressHandlerTest.php b/tests/functional/Handler/AddressHandlerTest.php index bb581b1..84393be 100644 --- a/tests/functional/Handler/AddressHandlerTest.php +++ b/tests/functional/Handler/AddressHandlerTest.php @@ -27,25 +27,18 @@ class AddressHandlerTest extends FunctionalTest $this->assertFalse($this->addressExists(2)); } - public function testAddressUpdate() + public function testAddressCreate() { $this->assertTrue($this->addressExists(1)); - $this->assertTrue($this->isDefaultAddress(1)); - $this->assertTrue($this->addressExists(2)); - $this->assertFalse($this->isDefaultAddress(2)); - - $this->container['command_handler']->handle(new AddressUpdateCommand(2, 1, 'updated', '6 rue Ménars', '', 75002, 'Paris', 'France', 'IDF', true)); - $this->assertFalse($this->isDefaultAddress(1)); - $this->assertTrue($this->isDefaultAddress(2)); + $this->container['command_handler']->handle(new AddressCreateCommand(1, 1, '6 rue Ménars', '', 75002, 'Paris', 'France', 'IDF')); } public function testAddressCreateWithSpecialChars() { $this->assertTrue($this->addressExists(1)); - $this->assertTrue($this->isDefaultAddress(1)); - $this->container['command_handler']->handle(new AddressCreateCommand(1, 'New address', 'updated', '6 rue Ménars', '', 22000, 'Saint Brieuc', 'France', 'Côtes d\'Armor', true)); + $this->container['command_handler']->handle(new AddressCreateCommand(1, 'New address', '6 rue Ménars', '', 22000, 'Saint Brieuc', 'France', 'Côtes d\'Armor')); $expectedAddress = [ 'nom' => 'New address', @@ -55,15 +48,12 @@ class AddressHandlerTest extends FunctionalTest 'ville' => 'Saint Brieuc', 'etat' => 'Côtes d\'Armor', 'pays' => 'France', - 'alias' => 'updated', 'user_id' => '1', - 'defaut' => '1', ]; $latestAddress = $this->getLatestAddress(); unset($latestAddress['id']); - $this->assertFalse($this->isDefaultAddress(1)); $this->assertSame($expectedAddress, $latestAddress); } @@ -79,18 +69,6 @@ class AddressHandlerTest extends FunctionalTest return (bool) $this->container['db']->fetchColumn("SELECT 1 FROM adresses WHERE id = $id"); } - /** - * Check if an address is marked as default. - * - * @param int $id - * - * @return bool - */ - private function isDefaultAddress($id) - { - return (bool) $this->container['db']->fetchColumn("SELECT 1 FROM adresses WHERE id = $id and defaut=true"); - } - /** * Retrieve latest address. * -- GitLab From 980fb2275c213e2d78c81ddece929960000fe758 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 8 Nov 2018 18:11:19 +0100 Subject: [PATCH 40/43] Fixing the frontend for the adresses --- app/controller/perso.php | 29 ++------ app/view/user/contreparties.html | 6 ++ app/view/user/infos.html | 62 ++++------------ app/view/user/perso.html | 123 ++++++++++++++++++------------- 4 files changed, 98 insertions(+), 122 deletions(-) diff --git a/app/controller/perso.php b/app/controller/perso.php index ab9d67e..a86dacc 100644 --- a/app/controller/perso.php +++ b/app/controller/perso.php @@ -72,8 +72,8 @@ class Perso extends Controller foreach ($result->fetchAll(\PDO::FETCH_ASSOC) as $row) { $pdfs[$row['pdf']] = $row; } - $addresses = $f3->get('container')['address_finder']->findByUserId((int) $data['id']); - $f3->set('adresses', $addresses); + $addresse = $f3->get('container')['address_finder']->findByUserId((int) $data['id']); + $f3->set('adresse', $addresse); $f3->set('pdfs', $pdfs); } @@ -292,7 +292,6 @@ class Perso extends Controller $f3->error('401'); } - // Let's get the email adress of the user switch ($f3->get('action')) { case 'ADD': try { @@ -300,14 +299,12 @@ class Perso extends Controller new AddressCreateCommand( \Utils::asl($f3->get('SESSION.id')), \Utils::asl($f3->get('nom')), - \Utils::asl($f3->get('alias')), \Utils::asl($f3->get('adresse')), \Utils::asl($f3->get('adresse2')), \Utils::asl($f3->get('codepostal')), \Utils::asl($f3->get('ville')), \Utils::asl($f3->get('pays')), - \Utils::asl($f3->get('state')), - $f3->exists('defaut') + \Utils::asl($f3->get('state')) ) ); } catch (AddressAlreadyExistsException $e) { @@ -315,22 +312,6 @@ class Perso extends Controller $f3->error('403'); } break; - case 'UPDATE': - $f3->get('container')['command_handler']->handle( - new AddressUpdateCommand( - \Utils::asl($f3->get('id')), - \Utils::asl($f3->get('SESSION.id')), - \Utils::asl($f3->get('alias')), - \Utils::asl($f3->get('adresse')), - \Utils::asl($f3->get('adresse2')), - \Utils::asl($f3->get('codepostal')), - \Utils::asl($f3->get('ville')), - \Utils::asl($f3->get('pays')), - \Utils::asl($f3->get('state')), - $f3->exists('defaut') - ) - ); - break; case 'DELETE': try { $f3->get('container')['command_handler']->handle( @@ -340,7 +321,7 @@ class Perso extends Controller ) ); } catch (AddressUsedException $e) { - $f3->set("error", _("Cette adresse est utilisée et il vous n'avez pas définit d'adresse par défault.")); + $f3->set("error", _("Cette adresse est utilisée pour une de vos contreparties")); $f3->error('403'); }; break; @@ -430,7 +411,7 @@ class Perso extends Controller FROM dons INNER JOIN users ON users.id = dons.user_id LEFT OUTER JOIN adresses ON adresses.user_id = users.id - WHERE users.id=".$f3->get('SESSION.id')." AND adresses.defaut IS true AND dons.id=".\Utils::asl($id).";"; + WHERE users.id=".$f3->get('SESSION.id')." AND dons.id=".\Utils::asl($id).";"; $result = $db->query($query); $logger->write($query); $don = $result->fetch(\PDO::FETCH_ASSOC); diff --git a/app/view/user/contreparties.html b/app/view/user/contreparties.html index 60fe7a5..5e3a6f0 100644 --- a/app/view/user/contreparties.html +++ b/app/view/user/contreparties.html @@ -32,7 +32,13 @@ {{ @contrepartie.nom }}
{{ @contrepartie.adresse }}
+ + {{ @contrepartie.adresse2 }}
+ {{ @contrepartie.codepostal }} {{ @contrepartie.ville }}
+ + {{ @contrepartie.state }}
+ {{ @contrepartie.pays }} diff --git a/app/view/user/infos.html b/app/view/user/infos.html index e71a120..4dab9c2 100644 --- a/app/view/user/infos.html +++ b/app/view/user/infos.html @@ -20,65 +20,36 @@
-

{{ _("Vos adresses :) }}

- +

{{ _("Votre adresse postale :) }}

- -

-

- +

-

+

-

+

-

+

-

+

+ +

+

-

+

-

+

- -

-
- -
- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

- +

@@ -173,13 +144,10 @@

-

- + Expédier à : {{@adresse.nom}} {{@adresse.adresse}}

- + disabled//>

{{ @error }}

diff --git a/app/view/user/perso.html b/app/view/user/perso.html index f2313a4..08011ca 100644 --- a/app/view/user/perso.html +++ b/app/view/user/perso.html @@ -69,68 +69,54 @@ @@ -370,26 +356,24 @@
- -
-

Veuillez ajouter une adresse postale ici

-
- - + +
- - +

{{ _("Envoyer à l'adresse :")}} {{ @adresse.nom }} - {{ @adresse.adresse }} {{@adresse.adresse2 }}

+
+ + +
+

Veuillez ajouter une adresse postale ici

+
+ +
- + disabled>
- @@ -405,11 +389,17 @@

{{ _("Envoyer à l'adresse :") }}

- {{ @adresses[@GET['adresse_id']].nom }}
- {{ @adresses[@GET['adresse_id']].adresse }}
- {{ @adresses[@GET['adresse_id']].adresse2 }}
- {{ @adresses[@GET['adresse_id']].codepostal }}  - {{ @adresses[@GET['adresse_id']].ville }} + {{ @adresse.nom }}
+ {{ @adresse.adresse }}
+ + {{ @adresse.adresse2 }}
+ + {{ @adresse.codepostal }}  + {{ @adresse.ville }} + + {{ @adresse.state }}  + + {{ @adresse.pays }}

{{ _("Récapitulatif :") }}

    @@ -439,7 +429,17 @@
- {{ _("Un pi-shirt") }} + {{ _("Un pi-shirt") }} ({{@atailles[@GET['taille']]}}) +
+ + + +
  • +
    + +
    +
    + {{ _("Un hoopie") }} ({{@atailles[@GET['taille_h']]}})
    • @@ -470,4 +470,25 @@ +     + + +     + + +
    + + +
    + + + + + Close + +
    +
    + + +     -- GitLab From 3e8bb2dc5445fd8e0319f084019d0a23d7884611 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 8 Nov 2018 18:23:47 +0100 Subject: [PATCH 41/43] Adding a HOME for dev --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6ca9ad..9602c7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,7 @@ job install: environment: preprod variables: PHINX_ENVIRONMENT: "development" + PROD_HOME: "/home/don/don/" script: - chmod a+x ci/install.sh - ./ci/install.sh -- GitLab From 852c3f13d9d5a64ffb90618b59851524a151a016 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 8 Nov 2018 18:28:29 +0100 Subject: [PATCH 42/43] Reverting phinx.yml to correct values --- phinx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phinx.yml b/phinx.yml index 160c783..bfef42f 100644 --- a/phinx.yml +++ b/phinx.yml @@ -17,9 +17,9 @@ environments: development: adapter: mysql host: localhost - name: don + name: soutien user: soutien - pass: 'soutien' + pass: 'password' port: 3306 charset: utf8 -- GitLab From e87549e16e20f263608ed4f849362ef50d7c16e2 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 8 Nov 2018 18:35:42 +0100 Subject: [PATCH 43/43] Same --- phinx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phinx.yml b/phinx.yml index bfef42f..10928b5 100644 --- a/phinx.yml +++ b/phinx.yml @@ -19,7 +19,7 @@ environments: host: localhost name: soutien user: soutien - pass: 'password' + pass: 'soutien' port: 3306 charset: utf8 -- GitLab