Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
100,555 Commits 36 Branches 189 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

75 Commits

Author SHA1 Message Date
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
3eea92c6e6 Clean code 2021-06-13 20:36:12 +02:00
Dorian Vabre
0dce9ee359 now using correct email templates after booth/conf suggestion 2021-05-10 10:22:45 +02:00
Dorian Vabre
d86b393d60 useless line removed 2021-05-10 09:54:26 +02:00
Dorian Vabre
c48234409b added copyright 2021-05-07 16:15:13 +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
Dorian Vabre
d1fe595c09 fix on the clear ids 2021-04-29 10:00:49 +02:00
Dorian Vabre
df28491524 every id is now clear in url + in the hash of the securekey 2021-04-29 09:40:47 +02:00
Dorian Vabre
f2f1eaa95e wip 2021-04-27 16:01:01 +02:00
Dorian Vabre
7405725198 added security check at beginning of /project/index page (according to the security I added in the previous commits) 2021-04-27 14:11:46 +02:00
Dorian Vabre
79dce3ad05 typo in comment 2021-04-27 14:06:40 +02:00
Dorian Vabre
fab12bc5e5 removed the indicated id of conf when on the subscription page for security (now showing label instead) 2021-04-27 14:04:08 +02:00
Dorian Vabre
a508cdbf59 every dol_encode for securekey replaced with dol_hash (dol_encode kept for encoding ids 2021-04-27 14:01:44 +02:00
Dorian Vabre
99589fd693 added fk_project in $facture 2021-04-27 09:57:27 +02:00
stickler-ci
7f9f67e7ef Fixing style errors. 2021-04-23 15:12:34 +00:00
Dorian Vabre
f8479b4a57 fixed invoice validation, payment, and attendee validation 2021-04-23 16:37:39 +02:00
Dorian Vabre
eb96d5bd58 added comments 2021-04-22 15:27:16 +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
Dorian Vabre
e6318eb4f4 style 2021-04-22 12:06:33 +02:00
Dorian Vabre
e05c318fd8 various modifications on the way existing attendees and thirdparties are handled at registration 2021-04-22 11:45:00 +02:00
Dorian Vabre
22dab0e0af fix on creating attendee 2021-04-21 17:26:46 +02:00
Dorian Vabre
1700ac937a wip on looking for existing attendees instead of creating them each time 2021-04-21 17:25:28 +02:00
Dorian Vabre
e81637b608 wip on getting the existing attendee 2021-04-21 16:37:02 +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
Dorian Vabre
780b3f4714 target:blank added for the link to the registration pag 2021-04-21 13:41:30 +02:00
Dorian Vabre
7a65a1768a wip on mail content 2021-04-21 11:57:03 +02:00
Dorian Vabre
790ff0c64c mail template working, but info in it not replaced by values 2021-04-21 10:48:37 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +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
d0d0e0390b wip on mail 2021-04-20 12:28:34 +02:00
Dorian Vabre
529909c3d1 wip on sending mails 2021-04-20 11:35:31 +02:00
Dorian Vabre
5c490ca57e security added to subscriptionok page 2021-04-20 10:56:45 +02:00
Dorian Vabre
b43e85dbf4 added global dolibarr_main_instance_unique_id in attendeesubscription page 2021-04-20 10:27:32 +02:00
Dorian Vabre
ac8ddd8831 removed redundant fetch 2021-04-19 16:52:08 +02:00
Dorian Vabre
0325f02368 timestamp converted to get date of start and end on the invoice 2021-04-19 10:09:19 +02:00
Dorian Vabre
701b53773b added description of the line in the invoice, problem with dates that are int 2021-04-19 09:54:29 +02:00
Dorian Vabre
e525311142 now using the invoice id as ref in url passed to newpayment page, for conference subscriptions 2021-04-16 14:54:07 +02:00
Dorian Vabre
2d79133228 now using ht instead or ttc 2021-04-16 12:15:23 +02:00
Dorian Vabre
5a445d92de vat ok 2021-04-16 12:10:02 +02:00
Dorian Vabre
71befd15f9 typo v2 2021-04-15 17:10:11 +02:00
Dorian Vabre
ed857481a2 typo 2021-04-15 17:09:26 +02:00
Dorian Vabre
db6ca73882 deletion of vardumps and correction in the invoice creation 2021-04-15 17:00:53 +02:00
Dorian Vabre
2cbe5b188e wip invoice 2021-04-15 16:57:41 +02:00
Dorian Vabre
ae69cc93be wip on payment page 2021-04-15 16:16:45 +02:00
Dorian Vabre
880d763abe wip on payment page 2021-04-15 11:55:28 +02:00
Dorian Vabre
dd7c09582f payment page structure ok, still need to confirm the attendee after the payment 2021-04-15 10:45:44 +02:00
Dorian Vabre
caf74fe1cb pull problem corrected 2021-04-14 16:20:05 +02:00