Commit graph

454 commits

Author SHA1 Message Date
Alexis Gousseau
591079f264 add order on products table - issue #21 2023-07-26 09:56:16 +02:00
Vincent BRIDIER
a07d87b3d1 Merge branch '9-ts-1262' into 'develop'
Resolve "ts-1262"

See merge request ldc-web/projets/boutique-cnc-sable!37
2023-07-24 09:33:48 +00:00
Nicolas Demangeat
b47e04cf26 change navbar toggler icon color to dark 2023-07-24 09:26:54 +00:00
Vincent BRIDIER
253433c7f7 Merge branch '20-ts-1275' into 'develop'
Resolve "ts-1275"

See merge request ldc-web/projets/boutique-cnc-sable!36
2023-07-21 14:23:10 +00:00
Nicolas Demangeat
e6a1c17e89 create new css rules for contact page and refactor views 2023-07-12 10:49:12 +02:00
Nicolas Demangeat
7e1c243705 update blade responsiv 2023-07-11 16:24:22 +02:00
Nicolas Demangeat
1cf5819ed4 delet class name in blade to align items left 2023-07-11 15:20:18 +02:00
Vincent BRIDIER
35b35296b3 Merge branch '22-ts-1260' into 'develop'
Resolve "ts-1260"

See merge request ldc-web/projets/boutique-cnc-sable!35
2023-07-11 11:31:26 +00:00
Nicolas Demangeat
b5067b9197 move the Cart destroy to the confirmOrder method and refactor .env 2023-07-11 13:23:27 +02:00
Vincent BRIDIER
496f789df1 Merge branch 'issue-18' into 'develop'
Reminder mail

Closes #18

See merge request ldc-web/projets/boutique-cnc-sable!31
2023-07-10 15:09:06 +00:00
noah.lancien
44f72a3259 Reminder mail 2023-07-10 15:09:06 +00:00
Vincent BRIDIER
0bb06e657b Merge branch 'first-or-fail' into 'develop'
Replace first by firstOrFail to get the first shop

See merge request ldc-web/projets/boutique-cnc-sable!34
2023-07-10 13:44:17 +00:00
Noah Lancien
17152c9285 Replace first by firstOrFail to get the first shop 2023-07-10 15:31:10 +02:00
Vincent BRIDIER
5ac79ec223 Merge branch 'issue-15' into 'develop'
Changed text when the weight is fixed

Closes #15

See merge request ldc-web/projets/boutique-cnc-sable!27
2023-07-03 09:55:45 +00:00
noah.lancien
4056846e3a Changed text when the weight is fixed 2023-07-03 09:55:45 +00:00
Vincent BRIDIER
9339397b62 Merge branch 'issue-16' into 'develop'
redirect btn account - issue #16

Closes #16

See merge request ldc-web/projets/boutique-cnc-sable!29
2023-06-30 14:39:57 +00:00
Alexis Gousseau
f207fa444f redirect btn account - issue #16 2023-06-30 16:37:42 +02:00
Vincent BRIDIER
a7d5d1ced2 Merge branch '11-ts-1266' into 'develop'
Resolve "ts-1266"

Closes #11

See merge request ldc-web/projets/boutique-cnc-sable!28
2023-06-30 14:19:29 +00:00
nicolas.demangeat
0bf505f065 add css rules to display or not the product description in home page 2023-06-30 14:19:29 +00:00
Vincent BRIDIER
210da9f000 Merge branch '17-ts-1272' into 'develop'
Resolve "ts-1272"

Closes #17

See merge request ldc-web/projets/boutique-cnc-sable!30
2023-06-30 14:14:20 +00:00
Nicolas Demangeat
8a37cae0cd change route name for charte de confidentialite 2023-06-30 14:13:01 +00:00
Vincent BRIDIER
a0c12c4c76 Merge branch '9-ts-1262' into 'develop'
change navbar items color

Closes #9

See merge request ldc-web/projets/boutique-cnc-sable!26
2023-06-30 12:33:54 +00:00
Nicolas Demangeat
1759a0e6f8 change navbar items color 2023-06-30 11:43:19 +00:00
Vincent BRIDIER
37a66626c2 Merge branch '13-ts-1273' into 'develop'
Resolve "ts-1273"

Closes #13

See merge request ldc-web/projets/boutique-cnc-sable!25
2023-06-30 10:58:21 +00:00
Nicolas Demangeat
78cfa12fbd change placeholder display for password confirmation and postal code 2023-06-30 10:56:56 +00:00
Vincent BRIDIER
bacec961a3 Merge branch 'issue-10' into 'develop'
Removed pce display from vue component

Closes #10

See merge request ldc-web/projets/boutique-cnc-sable!20
2023-06-30 10:42:00 +00:00
Vincent BRIDIER
9935384a3e Merge branch 'issue-12' into 'develop'
Products can now be published/unpublished from the index list

Closes #12

See merge request ldc-web/projets/boutique-cnc-sable!22
2023-06-30 10:41:14 +00:00
Vincent BRIDIER
2f3438d60e Merge branch 'issue-14' into 'develop'
Removed displayed map in contact page

Closes #14

See merge request ldc-web/projets/boutique-cnc-sable!23
2023-06-30 10:39:15 +00:00
Noah Lancien
c4efaf070a Removed all informations about first shop in the contact page 2023-06-30 12:37:08 +02:00
Vincent BRIDIER
c68f505113 Merge branch 'issue-8' into 'develop'
set filters products to sticky - issue #8

Closes #8

See merge request ldc-web/projets/boutique-cnc-sable!21
2023-06-30 10:32:05 +00:00
Vincent BRIDIER
4b6dfef6f5 Merge branch 'view-bug-fix' into 'develop'
bug fix display gammes-de-produit page

See merge request ldc-web/projets/boutique-cnc-sable!24
2023-06-30 10:22:35 +00:00
Nicolas Demangeat
7dc41488cd bug fix display gammes-de-produit page 2023-06-30 10:16:48 +00:00
Noah Lancien
45978561cb Removed displayed map in contact page 2023-06-30 11:16:12 +02:00
Noah Lancien
c568e5a9a2 Products can now be published/unpublished from the index list 2023-06-30 11:05:54 +02:00
Alexis Gousseau
3623192d7e set filters products to sticky - issue #8 2023-06-30 10:21:57 +02:00
Noah Lancien
7f10bc6e3e Removed pce display from vue component 2023-06-30 10:15:57 +02:00
Vincent BRIDIER
4694942f5d Merge branch 'fix_boolean_ts1453' into 'develop'
fix boolean store and update after upgrading to validation request.

See merge request ldc-web/projets/boutique-cnc-sable!18
2023-06-05 14:56:00 +00:00
Olivier Legat
cd3f3e8bd3 fix boolean store and update after upgrading to validation request. also remove min 3 for servings field 2023-04-04 17:26:10 +02:00
Vincent BRIDIER
22c29d3a87
Fix nutrisciore homepage 2023-04-03 12:44:09 +02:00
Vincent BRIDIER
1a2e310a75
Fix nutrisciore homepage 2023-04-03 12:37:54 +02:00
Vincent BRIDIER
7892e82ecb Merge branch 'ts-1417' into 'develop'
ts-1417 - #6 - update available product

Closes #6

See merge request ldc-web/projets/boutique-cnc-sable!16
2023-04-03 10:15:09 +00:00
Vincent BRIDIER
11c9a94cfe Update is available product model method 2023-04-03 10:13:57 +00:00
Sebastien Hattry
274406ccc0 Add date end in the condition 2023-03-31 15:14:01 +00:00
Sebastien Hattry
7a9ab1564d Change repositorie URL 2023-03-31 14:06:05 +00:00
Vincent BRIDIER
fb5374d561 Merge branch 'ts-1437' into 'develop'
ts-1437 - #5 - update validation product

Closes #5

See merge request ldc-web/projets/boutique-cnc-sable!17
2023-03-31 07:40:43 +00:00
Vincent BRIDIER
dcea1f0dec Merge branch 'ticket1400-show_prix_barres' into 'develop'
activate prix barres

See merge request ldc-web/projets/boutique-cnc-sable!15
2023-03-31 07:27:36 +00:00
Alexis Gousseau
006a29736c ts-1437 - #5 - update validation product 2023-03-30 15:44:50 +02:00
Alexis Gousseau
68859350ec ts-1417 - #6 - update available product 2023-03-30 15:34:57 +02:00
Vincent BRIDIER
59718fe784 update ci + add issue templates 2023-03-29 15:58:45 +00:00
Olivier Legat
b2a13a2043
activate prix barres 2023-03-15 10:45:53 +01:00