Commit Graph

  • *
  • |\
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • |\ \
  • * \ \
  • |\ \ \
  • | | |/
  • | |/|
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | * |
  • | * |
  • | * |
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | * |
  • | * |
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • | * |
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • | * |
  • | * |
  • | * |
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • | * |
  • * | |
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • | | * |
  • | | |\ \
  • | |/ / /
  • |/| / /
  • | |/ /
  • | * |
  • | * |
  • | * |
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • | * |
  • * | |
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • | | |/ /
  • | |/| /
  • | |_|/
  • |/| |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | * |
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • | * |
  • | * |
  • | * |
  • 6781918 (HEAD -> master) Merge branch 'develop' by Guillaume Bourgeois 2024-04-18 16:03:22 +0200
  • 42b98f8 (develop) Ajout méthode OrderShopStore::isFirstOrder() by Guillaume Bourgeois 2024-04-18 09:33:50 +0200
  • 2fa10e0 Merge branch 'develop' by Guillaume Bourgeois 2024-04-18 07:59:46 +0200
  • 0f6935f Gestion vente en vrac by Guillaume Bourgeois 2024-04-15 09:42:17 +0200
  • d91e04b Merge branch 'develop' by Guillaume Bourgeois 2024-03-14 16:44:05 +0100
  • 9b6b444 [Boutique] Réduction déjà utilisée sur Marché proposée sur Retrait journée by Guillaume Bourgeois 2024-03-14 16:42:36 +0100
  • 1147d86 Merge branch 'develop' by Guillaume Bourgeois 2024-02-22 11:35:12 +0100
  • dee2fee Vrac : ajustements by Guillaume Bourgeois 2024-02-22 11:17:29 +0100
  • bc1c165 Merge branch 'develop' by Guillaume Bourgeois 2024-02-21 14:43:27 +0100
  • 43616b5 ReductionCartRepositoryQuery : ajout filterByType() by Guillaume Bourgeois 2024-02-21 14:43:07 +0100
  • 0b9f494 Merge branch 'develop' by Guillaume Bourgeois 2024-02-21 14:27:20 +0100
  • 864f8db ProductFamilySolver : getFirstProductOnline() by Guillaume Bourgeois 2024-02-20 12:10:57 +0100
  • 9f59672 Merge branch 'develop' by Guillaume Bourgeois 2024-01-22 10:15:39 +0100
  • ae75e54 Refactoring OrderPayment : editable by Guillaume Bourgeois 2024-01-18 09:40:54 +0100
  • 94b2d62 Merge branch 'develop' by Guillaume Bourgeois 2023-12-19 08:22:10 +0100
  • f72eae0 [Administration] Statistiques : problème calcul statistiques by Guillaume Bourgeois 2023-12-18 09:56:40 +0100
  • 055fa1f Merge branch 'develop' by Guillaume Bourgeois 2023-12-15 09:43:15 +0100
  • 92ea462 Statistic : correctif by Guillaume 2023-12-11 09:53:37 +0100
  • b4da6dc Merge branch 'develop' by Guillaume Bourgeois 2023-12-08 16:30:15 +0100
  • 4053218 Ajout méthode OrderShopStore by Guillaume Bourgeois 2023-12-06 15:03:51 +0100
  • 9bba245 UserMerchant : ajustement traduction by Guillaume Bourgeois 2023-12-06 11:45:41 +0100
  • 87bd261 Merge branch 'develop' by Guillaume Bourgeois 2023-12-05 10:39:52 +0100
  • bd57daa [Administration] Correctif select2 ajax by Guillaume Bourgeois 2023-12-05 10:34:29 +0100
  • 5b7918e Merge branch 'develop' by Guillaume Bourgeois 2023-11-26 17:51:06 +0100
  • 69a1cd3 twig : getMerchantCurrentSlug() by Guillaume Bourgeois 2023-11-26 12:13:41 +0100
  • cf3cbf1 Merge branch 'develop' by Guillaume Bourgeois 2023-11-24 18:12:17 +0100
  • 688da04 Visitor : optimisation filtre par cookie by Guillaume Bourgeois 2023-11-24 18:11:31 +0100
  • 179cb53 Merge branch 'develop' by Guillaume Bourgeois 2023-11-24 09:36:41 +0100
  • 18a8c4f [Admin] ReductionCatalog : suppression optimisation by Guillaume Bourgeois 2023-11-24 09:35:47 +0100
  • 1b512a4 [Admin] ReductionCatalog : problème optimisation by Guillaume Bourgeois 2023-11-24 09:01:20 +0100
  • 9e5b4eb Merge branch 'develop' by Guillaume Bourgeois 2023-11-23 14:52:47 +0100
  • 165f67a Correctif by Guillaume Bourgeois 2023-11-21 14:39:00 +0100
  • b1b05b0 Merge branch 'develop' by Guillaume Bourgeois 2023-11-20 08:00:37 +0100
  • 590c6df Optimisation : ajax select2 by Guillaume Bourgeois 2023-11-19 15:32:10 +0100
  • ef72c7f Merge branch 'develop' by Guillaume Bourgeois 2023-11-18 10:28:36 +0100
  • 8b0cd0a ReductionCart : divers by Guillaume Bourgeois 2023-11-17 09:59:34 +0100
  • 2be1888 Merge branch 'develop' by Guillaume Bourgeois 2023-07-24 14:01:05 +0200
  • 4cd567c OrderShopStore : ajout filter isDeliveryHome & isDeliveryPointSale by Guillaume Bourgeois 2023-07-24 13:44:03 +0200
  • e476ba4 Merge branch 'develop' by Guillaume Bourgeois 2023-07-19 16:04:29 +0200
  • 705e192 ProductFamilySolver : ajout méthode hasOrganicStrictLabel by Guillaume Bourgeois 2023-07-19 15:54:57 +0200
  • 92a63dc Merge branch 'develop' by Guillaume Bourgeois 2023-07-14 09:58:53 +0200
  • 5420aa7 [Backend] Anciens clients Vesoul : prendre en compte commandes Vesoul by Guillaume Bourgeois 2023-07-14 09:05:28 +0200
  • 52470fe Merge branch 'develop' by Guillaume Bourgeois 2023-07-04 16:18:49 +0200
  • 4025a5b Divers mineurs by Guillaume Bourgeois 2023-07-04 14:07:21 +0200
  • c745e64 Merge branch 'master' of https://forge.laclic.fr/Laclic/CaracoleBundle by Guillaume Bourgeois 2023-06-12 11:16:45 +0200
  • 7d3ebbd Merge branch 'develop' by Guillaume Bourgeois 2023-06-12 11:16:44 +0200
  • ed59b31 Merge branch 'develop' by Guillaume 2023-06-09 15:22:39 +0200
  • 5e9add1 Ajustement UserMerchantBuilder by Guillaume 2023-06-09 10:10:53 +0200
  • 0b14452 ProductFamilyModel : initProducts() by Guillaume 2023-06-08 17:53:14 +0200
  • 45bbb0d MerchantResolver.php by Guillaume 2023-06-08 11:46:56 +0200
  • 75b00a5 Merge branch 'master' of https://forge.laclic.fr/Laclic/CaracoleBundle by Guillaume 2023-06-07 10:23:22 +0200
  • d0600d2 Merge branch 'develop' by Guillaume 2023-06-07 10:21:00 +0200
  • acf52fa Correctif AdminControllerTrait.php by Guillaume Bourgeois 2023-06-06 09:12:03 +0200
  • 6d69708 ProductFamilyStore : ajout getOneByTitle() by Guillaume Bourgeois 2023-06-05 10:18:29 +0200
  • 04dab44 Divers by Guillaume Bourgeois 2023-05-26 12:10:22 +0200
  • faa1a69 Merge branch 'develop' by Guillaume Bourgeois 2023-04-27 11:36:13 +0200
  • b495603 Template newsletters.html.twig by Guillaume Bourgeois 2023-04-27 11:25:25 +0200
  • 8cad742 AddressFactory : suppression setMerchant() by Guillaume Bourgeois 2023-04-27 10:40:30 +0200
  • 5d930e2 Merge branch 'develop' by Guillaume Bourgeois 2023-04-11 09:00:51 +0200
  • 4527b4c ProductFamilyStore::getOrganic() : filtre strict sur les labels AB et Nature Progrès by Guillaume Bourgeois 2023-04-04 10:00:43 +0200
  • 7a337a7 Merge branch 'develop' by Guillaume Bourgeois 2023-03-27 15:28:48 +0200
  • 0026efb Correctif variable cycleType non définie by Guillaume Bourgeois 2023-03-23 09:21:46 +0100
  • 2f2d009 Add OrderShopSolver::countValidComplementaryOrderShops() by Guillaume 2023-02-22 10:03:18 +0100
  • 62a726b Suppression commande by Guillaume 2023-02-13 12:30:09 +0100
  • b9b7335 Erreur 500 : An exception has been thrown during the rendering of a template ("A new entity was found through the relationship 'App\Entity\Order\OrderShop#section' that was not configured to cascade persist operations for entity: Marché. To solve this iss #891 by Guillaume 2023-02-06 17:55:29 +0100
  • e39b91c Merge branch 'develop' by Guillaume Bourgeois 2023-02-06 11:48:37 +0100
  • e33fadf [Frontend] Rayons : prix produits incohérents quand produits déjà vendus #867 by Guillaume Bourgeois 2023-01-31 14:54:27 +0100
  • 687b95d Merge branch 'develop' by Guillaume Bourgeois 2023-01-23 09:01:30 +0100
  • caa9368 OrderShopRepositoryQuery : ajout joinDistribution() dans filterByDistributions() by Guillaume Bourgeois 2023-01-16 10:36:14 +0100
  • 855f94d Merge branch 'master' of https://forge.laclic.fr/Laclic/CaracoleBundle by Guillaume Bourgeois 2022-12-06 15:47:16 +0100
  • 352c246 Merge branch 'develop' by Guillaume Bourgeois 2022-12-06 15:47:15 +0100
  • 9ae3420 Merge branch 'develop' by Fabien Normand 2022-12-06 15:24:15 +0100
  • 7e51ba5 [Place du Local] [ERREUR 500] The EntityManager is closed. #713 by Guillaume Bourgeois 2022-11-30 13:35:03 +0100
  • 9bba757 [Place du Local] [ERREUR 500] Ce produit est introuvable #669 by Guillaume Bourgeois 2022-11-30 11:16:50 +0100
  • f5156a6 [Place du Local] [ERREUR 500] Vous devez être connecté pour gérer vos favoris #699 by Guillaume Bourgeois 2022-11-30 10:51:40 +0100
  • a811e2c [Backend] Paramètres > Section : labels dates de fermeture des commandes #712 by Guillaume Bourgeois 2022-11-30 10:39:47 +0100
  • 80e03ff Merge branch 'develop' by Guillaume Bourgeois 2022-11-22 11:25:29 +0100
  • 51bc530 ProductFamilySolver by Guillaume Bourgeois 2022-11-22 11:25:11 +0100
  • 1bf8d79 Merge branch 'master' of https://forge.laclic.fr/Laclic/CaracoleBundle by Guillaume Bourgeois 2022-11-22 08:59:30 +0100
  • 16fd153 Merge branch 'develop' by Guillaume Bourgeois 2022-11-22 08:59:29 +0100
  • 37a5a18 Augmentation maxResultPerPage #684 by Fabien Normand 2022-11-21 15:15:56 +0100
  • 09e767f [Frontend] Rayons : cache http by Guillaume Bourgeois 2022-11-21 14:57:00 +0100
  • 5dcbe13 [Backend] Product : Ajout prix avec réduction liste produit by Fabien Normand 2022-11-17 16:27:10 +0100
  • a2fd691 [Backend] Optimistation de FieldDefinition #169 by Fabien Normand 2022-11-17 14:34:07 +0100
  • 2faa943 [Backend] Optimistation de FieldDefinition #169 by Fabien Normand 2022-11-17 13:38:20 +0100
  • a5f5b4f Test pour réduction requete #624 by Fabien Normand 2022-11-17 11:42:32 +0100
  • e020771 ProductFamilySectionPropertySolver : correctif comparaison objet Section by Guillaume Bourgeois 2022-11-17 07:36:56 +0100
  • 1d1ce7d [Frontend] Home : optimisations / cache by Guillaume Bourgeois 2022-11-16 15:06:45 +0100
  • a59b0a5 [Frontend] Produits > liste : prendre en compte la disponibilité des produits pour le calcul du meilleur prix #636 by Guillaume Bourgeois 2022-11-11 11:17:50 +0100
  • 1a4a3c1 Erreur 500 : Argument 2 passed to Lc\SovBundle\Field\Filter\FilterManager::applyFilter() must be an instance of EasyCorp\Bundle\EasyAdminBundle\Dto\FieldDto, null given #623 by Guillaume Bourgeois 2022-11-11 10:04:56 +0100
  • 4bfe1f3 Erreur 500 : Argument 1 passed to Lc\SovBundle\Repository\AbstractStore::getOneById() must be of the type int, string given by Guillaume Bourgeois 2022-11-10 09:30:31 +0100
  • 5fb4352 Merge branch 'develop' by Fabien Normand 2022-11-07 15:53:57 +0100
  • 1415497 Ajout de traduction #627 by Fabien Normand 2022-11-07 15:53:34 +0100
  • c2311e3 Merge branch 'master' of https://forge.laclic.fr/Laclic/CaracoleBundle by Fabien Normand 2022-11-07 15:32:13 +0100
  • e9390f2 Merge branch 'develop' by Fabien Normand 2022-11-07 15:32:12 +0100
  • 7b703e4 [Backend] Produit correcitf affichage prix + Réduc prix de vente souhaité by Fabien Normand 2022-11-02 13:08:38 +0100
  • e1a5230 Merge branch 'develop' by Guillaume Bourgeois 2022-10-25 08:33:31 +0200
  • 996c127 ProductFamilyRepositoryQuery : suppression addSelect des QualityLabels (toujours le problème des données non chargées) by Guillaume Bourgeois 2022-10-18 09:19:03 +0200
  • 15f9bb2 [Backend] Tickets : enlever filtre section #562 by Guillaume Bourgeois 2022-10-18 08:17:31 +0200
  • 70f67ac Adaptations VisitorBuilder #515 by Guillaume Bourgeois 2022-10-18 08:15:17 +0200