Laurent Destailleur
5a5fa1edbb
Fix regression amount was always empty.
2021-05-27 11:57:17 +02:00
Laurent Destailleur
531dee31fd
Fix securekey
2021-05-27 11:16:23 +02:00
Laurent Destailleur
b7601cb662
Merge pull request #17496 from daraelmin/daraelmin-patch-4
...
Fix amnt can be paid for member as membersubscription
2021-05-06 16:47:41 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment
...
new: working on conference or booth object and event type #FoundationFunding
2021-05-06 16:31:30 +02:00
daraelmin
d840593ed7
Fix amnt can be paid for member as membersubscription
2021-05-04 23:19:19 +02:00
NextGestion
6f85cab6c4
Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership
2021-05-04 10:55:19 +01:00
daraelmin
0610ca89c1
camelCase for amountByType
2021-05-01 20:45:57 +02:00
daraelmin
031d258b32
Update newpayment.php
2021-05-01 20:17:29 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment
2021-04-29 10:31:43 +02:00
Laurent Destailleur
0d30bc5dc3
Merge pull request #17366 from daraelmin/daraelmin-patch-laterenew
...
Fix #17318 false renew date
2021-04-27 21:26:56 +02:00
daraelmin
5b74676e54
fix infinite loop
2021-04-27 20:14:03 +02:00
Laurent Destailleur
e6d2bad6e0
Update paymentok.php
2021-04-27 19:46:26 +02:00
Dorian Vabre
d034446205
not giving the invoiceref anymore in the url from newpayment to paymentok, since it was already in ref= anyway
2021-04-27 10:08:32 +02:00
daraelmin
db92de2a22
Draft and resiliated member could (re)validate
2021-04-27 02:36:47 +02:00
daraelmin
25e3beb3ee
$object::STATUS_RESILIATE
2021-04-27 01:55:51 +02:00
Laurent Destailleur
819a5bd0bd
Merge pull request #17373 from indelog/public_donationpaiement
...
Add : register donation payment when public payment
2021-04-26 22:46:48 +02:00
Laurent Destailleur
f0eef3a6de
Merge pull request #17375 from indelog/fix_adhpayextid
...
Fix : missig ext_payment_id on adh public pay
2021-04-26 22:40:15 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
stickler-ci
7f9f67e7ef
Fixing style errors.
2021-04-23 15:12:34 +00:00
Dorian Vabre
f65fa98c37
indent fix, validation and mail sending put into else block to avoid errors
2021-04-23 16:46:09 +02:00
Dorian Vabre
f8479b4a57
fixed invoice validation, payment, and attendee validation
2021-04-23 16:37:39 +02:00
Dorian Vabre
1511bf811c
now getting the amount of the invoice in the newpayment page
2021-04-23 12:22:03 +02:00
Dorian Vabre
b441c600bb
fixing error introduced in a previous commit
2021-04-23 10:32:28 +02:00
Dorian Vabre
4589813d3f
added thirdparty fetch before mail sending to get its name
2021-04-23 09:46:02 +02:00
Indelog
78a6284bd2
Fix : missig ext_payment_id on adh public pay
...
When pay a mebership contibution whit public link the payment add add in
database don't have a "ext_payment_id". This fix it.
2021-04-22 18:01:52 +02:00
stickler-ci
d6954b2826
Fixing style errors.
2021-04-22 14:56:15 +00:00
Indelog
eb52f5daa0
Add : register donation payment when public payment
...
- When we paid a donation whit public link, create the associated payment and
put its status to payed if all the promised amount is it.
- Set the amount to pay on public page depending to the rest to pay for
the don.
2021-04-22 16:32:05 +02:00
Dorian Vabre
f832434ce3
removing mistake from last commit: source is already given in urlok
2021-04-22 16:17:22 +02:00
Dorian Vabre
804547997b
removed obsolete post information and now giving the source in the url
2021-04-22 15:52:45 +02:00
Dorian Vabre
467595ce60
an already subscribed attendee will not be redirected to a payment page, now
2021-04-22 14:53:32 +02:00
daraelmin
be9986f47b
Missing $
2021-04-21 21:23:14 +02:00
Dorian Vabre
b9408d6c71
email sending added in paymentok
2021-04-21 16:43:57 +02:00
Dorian Vabre
ebf2466d7b
no more redirection to subscriptionok after paymentok successful
2021-04-21 15:36:07 +02:00
Dorian Vabre
8e7043eca6
conforbooth class included in paymentok page
2021-04-21 15:31:14 +02:00
Dorian Vabre
4d20079c49
fix: the ref passed in url is now attendee s one, not invoice s
2021-04-21 15:20:08 +02:00
Dorian Vabre
f059cbe89c
ref passed in url no longer crypted (useless) and correctly passed through POST at submit
2021-04-21 14:50:50 +02:00
Dorian Vabre
9809179aa4
securekey added to newpayment page, correction in the invoice line created
2021-04-21 14:19:07 +02:00
daraelmin
5fe9815570
Update paymentok.php
2021-04-20 23:54:33 +02:00
Dorian Vabre
5ad64640c2
removal of var_dump
2021-04-20 16:26:11 +02:00
Dorian Vabre
a500d83c0b
linked invoice and attendee
2021-04-20 16:09:22 +02:00
Dorian Vabre
b70e477f47
removal of the mail sending (not functional yet) in the subscriptionok page, it will be moved to the paymentok after payment or the attendeesubscription if no payment has to be done
2021-04-20 14:49:11 +02:00
Dorian Vabre
2cde31d17c
creation of ATT and BOO payment event
2021-04-20 14:39:41 +02:00
Dorian Vabre
d0d0e0390b
wip on mail
2021-04-20 12:28:34 +02:00
Dorian Vabre
3b17a0d66a
wip on paymentok page
2021-04-20 10:42:50 +02:00
Dorian Vabre
7405813ad0
now displays only buttons if the corresponding boolean is checked
2021-04-20 10:24:36 +02:00
Dorian Vabre
18d16d9509
moved attendee validation after the payment method search
2021-04-19 16:26:45 +02:00
Dorian Vabre
8a43dac46d
now giving the invoice id to the payment validation page so it can validate the payment
2021-04-19 15:21:16 +02:00
NextGestion
da0067ff6c
Fixing error
2021-04-19 13:51:50 +01:00
NextGestion
ea97cf5baf
Change translate file
2021-04-19 13:46:21 +01:00
NextGestion
f396160bb8
Fixing error.
2021-04-19 13:39:50 +01:00
