Commit Graph

474 Commits

Author SHA1 Message Date
Laurent Destailleur
8ced29cb00 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-11 21:32:41 +01:00
Laurent Destailleur
f4b0fa917e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-11 21:08:13 +01:00
Laurent Destailleur
4f350d878c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-11 21:07:43 +01:00
Laurent Destailleur
356accd6ee Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:05:09 +01:00
hystepik
4e0ea65c43 Fix #23466 : fix public payement pages ko and ok 2023-01-09 15:37:10 +01:00
ptibogxiv
805bf64428
Fix php 8 error 2023-01-08 15:00:58 +01:00
Laurent Destailleur
7d433e43fa Add hooks on payment pages 2022-12-31 16:24:32 +01:00
Laurent Destailleur
ea42fc7605 Clean code, fix warnings 2022-12-30 18:43:43 +01:00
Laurent Destailleur
194df584b9 Fix log 2022-10-31 18:16:24 +01:00
Laurent Destailleur
fdc5cc6d6e Add more log in payment process 2022-10-31 17:47:21 +01:00
Laurent Destailleur
41a07f5e7d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-29 12:51:51 +02:00
Laurent Destailleur
4b7655b784 Fix log 2022-10-27 02:21:04 +02:00
Laurent Destailleur
fde8d2865f Add a line into log 2022-10-27 02:06:02 +02:00
stickler-ci
3cd11fefe9 Fixing style errors. 2022-10-22 17:43:17 +00:00
ptibogxiv
6c87982838
Fix newpayment.php with stripeconnect 2022-10-22 19:42:44 +02:00
Laurent Destailleur
4cbd19e6bd Debug attendee registration 2022-10-19 00:01:18 +02:00
Laurent Destailleur
2101611bd5 Fix title of emails sents on payment 2022-10-18 23:33:30 +02:00
Laurent Destailleur
8d82307956 Fix title of emails sents on payment 2022-10-18 23:33:22 +02:00
Laurent Destailleur
0db1863429 Fix title of emails sents on payment 2022-10-18 23:31:32 +02:00
Laurent Destailleur
2bfc60587e Fix title of emails sents on payment 2022-10-18 23:28:47 +02:00
Laurent Destailleur
2484fefa4d Fix deprecated 2022-10-16 21:01:05 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Alexandre SPANGARO
a7a39cba97 Use isModEnabled 2022-09-25 21:59:46 +02:00
lmarcouiller
b0d2aa6d9b Fix : php 8.1 warnings 2022-09-23 16:05:11 +02:00
Laurent Destailleur
2f2349d738 Fix warnings 2022-09-21 03:27:51 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
9f3ed07e87 Trans 2022-08-23 11:00:28 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Laurent Destailleur
9e55377f0a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-10 13:10:52 +02:00
ptibogxiv
d872b9c2c7
Fix correct fix of paymentok.php
this line was deleted by error
2022-08-02 21:05:33 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
ef8da5f34c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-02 20:27:08 +02:00
ptibogxiv
af4d8ef53e
FIX validation paymentok.php if advance rights 2022-07-30 15:32:18 +02:00
Yoan Mollard
6a8882b60d Bugfix: regression, keep newamount equal to amount for the payment
Follows 759900bcce
2022-06-30 00:39:13 +02:00
stickler-ci
f4c7c03dc1 Fixing style errors. 2022-06-29 14:38:43 +00:00
Yoan Mollard
759900bcce No longer allow to edit amount in the payment step
If amount is editable, edition has been done in the previous screen in
public/members/new.php
It also allows the possibility to prevent the visitor from doing a >0
payment if this is not wanted.
2022-06-29 00:27:18 +02:00
Yoan Mollard
ea0c710104 dopayment string fix 2022-06-29 00:23:27 +02:00
Yoan Mollard
6053f3e5f8 Internationalize invoice lines for new memberships 2022-06-27 00:27:00 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +02:00
Laurent Destailleur
763c86144e Fix add invoice to email 2022-05-04 15:51:24 +02:00
Laurent Destailleur
8f7e162406 Fix css 2022-05-04 15:27:23 +02:00
Laurent Destailleur
c55da219d9 FIX sending email on payment of registration of event 2022-05-03 20:35:28 +02:00
Laurent Destailleur
207373d37d FIX sending email on payment of registration of event 2022-05-03 20:07:21 +02:00