 Guillaume Bourgeois
|
50705f4d01
|
Merge branch 'refactoring' into dev
# Conflicts:
# backend/controllers/CommandeController.php
# backend/web/js/lechatdesnoisettes.js
# common/models/Commande.php
# producer/controllers/CommandeController.php
# producer/views/commande/_form.php
# producer/views/order/history.php
|
6 years ago |
|
Guillaume Bourgeois
|
01018b2a0c
|
Renommage/traduction du contenu de la base de données lié au refactoring
|
6 years ago |
|
Guillaume Bourgeois
|
f165b67878
|
Intégration dernières modifs de la prod
Gestion des commandes annulées, bouton payer/rembourser désactivé lors du clic, montant du crédit débité arrondi lors de l'affichage au client.
|
6 years ago |
|
Guillaume Bourgeois
|
3276d412f9
|
Adaptations backend/producer-admin/billing
|
6 years ago |
|
Guillaume Bourgeois
|
6b8eb8329c
|
Adaptations backend/producer-admin
|
6 years ago |
|
Guillaume Bourgeois
|
435dcdc038
|
Adaptations backend/development
|
6 years ago |
|
Guillaume Bourgeois
|
85e2bc3706
|
Adaptations backend/stats
|
6 years ago |
|
Guillaume Bourgeois
|
a004ff1aac
|
Adaptations backend/producer/billing
|
6 years ago |
|
Guillaume Bourgeois
|
959ae2e0d5
|
Adaptations backend/communicate
|
6 years ago |
|
Guillaume Bourgeois
|
db88b40908
|
Adaptations frontend/site/producer
|
6 years ago |
|
Guillaume Bourgeois
|
6d37d1bab5
|
Adaptations backend/point-sale
|
6 years ago |
|
Guillaume Bourgeois
|
0898a6a98a
|
Adaptations backend/product
|
6 years ago |
|
Guillaume Bourgeois
|
731edb9e1c
|
Adaptations producer/subscription
|
6 years ago |
|
Guillaume Bourgeois
|
7a847ab5fe
|
Adaptations producer/order/index
|
6 years ago |
|
Guillaume Bourgeois
|
869ed9a647
|
Adaptations producer/order
|
6 years ago |
|
Guillaume Bourgeois
|
315057ba32
|
Adaptations producer/site/bookmarks
|
6 years ago |
|
Guillaume Bourgeois
|
b07be5ae07
|
Adaptations producer/site/index
|
6 years ago |
|
Guillaume Bourgeois
|
705950b5ab
|
Adaptations diverses (ex: "nom" > "name")
|
6 years ago |
|
Guillaume Bourgeois
|
71ddab7c74
|
Adaptations frontend/user/update
|
6 years ago |
|
Guillaume Bourgeois
|
78bfb0943f
|
Adaptations frontend/site/signup
|
6 years ago |
|
Guillaume Bourgeois
|
fe5172acd5
|
Héritage de ActiveRecordCommon pour les modèles utilisant les fonctions de recherche searchAll, searchOne etc.
|
6 years ago |
|
Guillaume Bourgeois
|
f85706a3d9
|
Adaptations frontend/site/login
|
6 years ago |
|
Guillaume Bourgeois
|
522917c42b
|
Adaptations frontend/site/producers
|
6 years ago |
|
Guillaume Bourgeois
|
4e95fd8940
|
Adaptations frontend/site/index
|
6 years ago |
|
Guillaume Bourgeois
|
00a9cca6c1
|
Oubli modif : User::STATUS_BOULANGER devient User::STATUS_PRODUCER
|
6 years ago |
|
Guillaume Bourgeois
|
4063d2b576
|
La méthode "getId()" de User devient "getCurrentId()" car "getId()" est déjà utilisé dans l'interface IdentityInterface
La méthode "getStatus()" a également été modifiée en "getCurrentStatus()" pour une meilleure homogénéité.
|
6 years ago |
|
Guillaume Bourgeois
|
d9b2a36b49
|
Init tests
|
6 years ago |
|
Guillaume Bourgeois
|
8078809b18
|
Migration traduction base de données
|
6 years ago |
|
Guillaume Bourgeois
|
bc913808e0
|
Refactoring/traduction css producer
|
6 years ago |
|
Guillaume Bourgeois
|
f8c8ee2ce1
|
Refactoring/traduction css frontend
|
6 years ago |
|
Guillaume Bourgeois
|
098e0d0b40
|
Refactoring/traduction css backend
|
6 years ago |
|
Guillaume Bourgeois
|
2a4ab2e3ab
|
Refactoring/traduction vues producer/views/site
|
6 years ago |
|
Guillaume Bourgeois
|
10ec3b5bd1
|
Refactoring/traduction vues producer/views/layouts
|
6 years ago |
|
Guillaume Bourgeois
|
fa52c9096c
|
Refactoring/traduction vues producer/views/order
|
6 years ago |
|
Guillaume Bourgeois
|
0afbb93536
|
Refactoring/traduction vues frontend/views/site
|
6 years ago |
|
Guillaume Bourgeois
|
a32b959537
|
Refactoring/traduction vues frontend/views/layouts
|
6 years ago |
|
Guillaume Bourgeois
|
8a111de06b
|
Refactoring/traduction vues backend/views/user
|
6 years ago |
|
Guillaume Bourgeois
|
5703dd9f34
|
Refactoring/traduction vues backend/views/stats
|
6 years ago |
|
Guillaume Bourgeois
|
ec8308b144
|
Refactoring/traduction vues backend/views/site
|
6 years ago |
|
Guillaume Bourgeois
|
4559eda0bf
|
Refactoring/traduction vues backend/views/layouts
|
6 years ago |
|
Guillaume Bourgeois
|
e2357dfbb9
|
Refactoring/traduction vues backend/views/product
|
6 years ago |
|
Guillaume Bourgeois
|
d532ce37f8
|
Refactoring/traduction vues backend/views/producer-admin
|
6 years ago |
|
Guillaume Bourgeois
|
6a332cc360
|
Refactoring/traduction vues backend/views/producer
|
6 years ago |
|
Guillaume Bourgeois
|
6f28ada1f6
|
Refactoring/traduction vues backend/views/development
|
6 years ago |
|
Guillaume Bourgeois
|
e507985b82
|
Refactoring/traduction vues backend/views/communicate
|
6 years ago |
|
Guillaume Bourgeois
|
04a2cb9f31
|
Refactoring/traduction vues backend/views/subscription
|
6 years ago |
|
Guillaume Bourgeois
|
89133dd43f
|
Refactoring/traduction vues 'order'
|
6 years ago |
|
Guillaume Bourgeois
|
e12bceb343
|
Merge branch 'fix/commandes_annulee' into dev
|
6 years ago |
|
Guillaume Bourgeois
|
07f55e82c1
|
Réactivation d'une commande lors d'une modification.
Adaptation du formulaire (boutons du bas) de modification en fonction de l'état annulé ou non de la commande.
|
6 years ago |
|
Guillaume Bourgeois
|
b3c6609df2
|
Afficher les commandes annulées dans l'historique client
|
6 years ago |
