Laurent Destailleur
edb4cf4130
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
README.md
htdocs/filefunc.inc.php
2021-06-19 20:05:25 +02:00
Laurent Destailleur
5d6b26ddb7
Fix css
2021-06-19 19:45:13 +02:00
Laurent Destailleur
693ac3eab6
Code comment
2021-06-10 16:38:09 +02:00
Laurent Destailleur
facf594b2d
FIX Date of invoice generated from membership must be current date
2021-06-08 16:01:26 +02:00
Laurent Destailleur
5d063ab880
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-05 01:11:16 +02:00
Laurent Destailleur
f0118183c8
Clean code
2021-06-05 01:11:05 +02:00
Laurent Destailleur
246cb09ba5
Update newpayment.php
2021-06-05 00:56:28 +02:00
Laurent Destailleur
420bf440ef
Update newpayment.php
2021-06-05 00:53:07 +02:00
daraelmin
c94946b934
Fix #17743 - token was hashed with membersubscription
...
#Fix #17743 - token was hashed with membersubscription
for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
2021-06-04 23:14:31 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest
...
new: working on conference or booth object and event type #FoundationFunding
2021-06-04 13:12:32 +02:00
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
Dorian Vabre
307ab92bc0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest
2021-05-20 16:13:42 +02:00
Dorian Vabre
f6956d6a62
using validate() function instead of settStatut(1) to validate an attendee
2021-05-10 15:58:54 +02:00
Dorian Vabre
0dce9ee359
now using correct email templates after booth/conf suggestion
2021-05-10 10:22:45 +02:00
Dorian Vabre
c48234409b
added copyright
2021-05-07 16:15:13 +02:00
Dorian Vabre
dfd3742d91
fix on label on payment page
2021-05-07 15:33:00 +02:00
Dorian Vabre
dbde0f0b02
fix on status change when a booth is paid
2021-05-07 15:05:37 +02:00
Dorian Vabre
5bb100de29
conforbooth class required in paymentok to confirm the booth
2021-05-07 13:02:34 +02:00
Dorian Vabre
27cffbddf3
vote page ok
2021-05-07 12:21:15 +02:00
Dorian Vabre
2e7d5e6d46
Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-05-06 16:48:30 +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
8fc45da56e
Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-04-27 15:01:59 +02:00
Dorian Vabre
b24b297a40
adaptation of the payment for the booth location case
2021-04-27 12:30:49 +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
