lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
108,518 Commits 43 Branches 150 Tags 886 MiB
0fd2e91ccc
Commit Graph

1870 Commits

Author SHA1 Message Date
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
402d90554a Clean code 2021-06-04 10:04:56 +02:00
Nicolas
e46faacac1 FIX : Add process payment with online link order 2021-06-02 18:11:47 +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
12d10adc17 Merge branch 'dev_EventOrganizer_suggest' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-05-21 16:02:22 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
stickler-ci
6f050fc23a Fixing style errors. 2021-05-20 15:48:04 +00:00
Dorian Vabre
83555da795 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 17:26:07 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Dorian Vabre
ab4ae85eb8 fix: getpost exportagenda apha to alpha 2021-05-20 16:33:04 +02:00
Dorian Vabre
df81ac8622 wip 2021-05-20 16:30:49 +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
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +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
7d0c3dcf6d transition done from cookies to session 2021-05-10 15:50:29 +02:00
Dorian Vabre
d71dc37a75 fix 2021-05-10 15:39:39 +02:00
Dorian Vabre
ee4e8dd99f cookies to session transition 2021-05-10 15:37:25 +02:00
Dorian Vabre
c5dc20b9dc opti 2021-05-10 15:31:52 +02:00
Dorian Vabre
0e62edfd42 fix error on fetching thirdparty when there is none 2021-05-10 12:47:09 +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
058bef1a79 clean viewandvote page 2021-05-07 17:20:36 +02:00
Dorian Vabre
05bbb3dbf6 improved welcome msg on suggestbooth/conf pages 2021-05-07 16:39:03 +02:00
Dorian Vabre
c48234409b added copyright 2021-05-07 16:15:13 +02:00
Dorian Vabre
d344ce5e08 clean viewandvote page 2021-05-07 15:59:25 +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
6111f43946 security fix, id was encoded where it should not be encoded 2021-05-07 14:49:00 +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
daraelmin
6504f96188
Copyright 2021-05-07 00:43:01 +02:00
stickler-ci
949e797390 Fixing style errors. 2021-05-06 22:31:41 +00:00
daraelmin
912995a558
Create new.php 2021-05-07 00:28:03 +02:00
daraelmin
9af05f3c6e
Update new.php 2021-05-07 00:25:38 +02:00
daraelmin
2e2b6af98e
Update new.php 2021-05-07 00:23:46 +02:00
daraelmin
82bf9cd3e9
Fix public new member form use adh type amount 2021-05-07 00:13:49 +02:00
Dorian Vabre
166e15633b factorisation 2021-05-06 17:30:11 +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
Dorian Vabre
295c63468b wip vote page 2021-05-06 16:32:39 +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
Dorian Vabre
2f7dd4e807 wip vote page 2021-05-06 14:53:23 +02:00
Dorian Vabre
a00c9c44c3 now adding contact to conforbooth, not only to thirdparty 2021-05-06 14:26:41 +02:00
Dorian Vabre
9c20e92e17 country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change 2021-05-06 14:06:53 +02:00
Dorian Vabre
abeb1c644c country now only required when paying a booth, dates of start and end required 2021-05-06 13:50:13 +02:00
Dorian Vabre
4d8d94bfbf fixes: show only correspond button on specific page, id no longer encoded in hidden parameter 2021-05-06 12:13:49 +02:00
Dorian Vabre
c56c7afa89 update on specifications on suggesting a booth/conf since its now two separated pages 2021-05-06 11:59:24 +02:00
Dorian Vabre
df78aaff88 now 2 distinct pages to suggest a conf or a booth 2021-05-06 11:49:00 +02:00
Dorian Vabre
10c9e9b77c wip 2021-05-06 11:31:23 +02:00
Dorian Vabre
a68a7c1f67 wip 2021-05-06 11:27:48 +02:00
Dorian Vabre
4c50d210dd creation of the 3 main pages 2021-05-06 11:26:42 +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
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +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
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
15e65729f6 put company under email in the form 2021-04-27 17:19:13 +02:00
Dorian Vabre
54b5a43006 wip 2021-04-27 17:06:25 +02:00
Dorian Vabre
5203a417fe select array OK for event type 2021-04-27 16:31:14 +02:00
Dorian Vabre
f2f1eaa95e wip 2021-04-27 16:01:01 +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
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
b24b297a40 adaptation of the payment for the booth location case 2021-04-27 12:30:49 +02:00
Dorian Vabre
151819b7ad added payment redirection to pay a booth, or status update for free booth/conference 2021-04-27 11:22:40 +02:00
Dorian Vabre
bfadcfc4bb added red star on label and note, that are required 2021-04-27 10:49:10 +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
Dorian Vabre
99589fd693 added fk_project in $facture 2021-04-27 09:57:27 +02:00
Laurent Destailleur
5bb2531364 Enhance ticket module 2021-04-27 02:52:24 +02:00
daraelmin
db92de2a22
Draft and resiliated member could (re)validate 2021-04-27 02:36:47 +02:00
Laurent Destailleur
27aa7cdb48 Fix bad merge 2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +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
Dorian Vabre
a3628954b2 fix for the supplier code 2021-04-26 17:46:30 +02:00
Dorian Vabre
c8440a6283 fix on form dates 2021-04-26 16:17:42 +02:00
Dorian Vabre
a716973757 form completed, tags added to thirdparty 2021-04-26 15:44:08 +02:00
Dorian Vabre
1b4b93bc6a thirdparty/contact creation seems ok 2021-04-26 14:28:37 +02:00
Dorian Vabre
de63c93ad4 wip on creating the contact 2021-04-26 12:09:39 +02:00
Dorian Vabre
bced3d60dd added required name to the form 2021-04-26 11:11:23 +02:00
Dorian Vabre
45531d0f1a index suggestion page form added, needs to be improved to show only necessary fields 2021-04-26 10:39:22 +02:00
Dorian Vabre
1b7854e698 added security to suggestion page index.php (securekey and id encoded) 2021-04-26 10:15:28 +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
stickler-ci
e7a4699bd9 Fixing style errors. 2021-04-22 17:26:46 +00:00
Indelog
196ebbb8e8 Fix : empty email on public membership form 
We can validate the public membership form whith an empty email when
`$conf->global->ADHERENT_MAIL_REQUIRED` is set. This fix it.
 2021-04-22 19:18:47 +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
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
daraelmin
be9986f47b
Missing $ 2021-04-21 21:23:14 +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
b9408d6c71 email sending added in paymentok 2021-04-21 16:43:57 +02:00
Dorian Vabre
e81637b608 wip on getting the existing attendee 2021-04-21 16:37:02 +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
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
daraelmin
5fe9815570
Update paymentok.php 2021-04-20 23:54:33 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +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
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
3b17a0d66a wip on paymentok page 2021-04-20 10:42:50 +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
7405813ad0 now displays only buttons if the corresponding boolean is checked 2021-04-20 10:24:36 +02:00
Dorian Vabre
f82d1d246d cleanup on the index registration page 2021-04-20 09:45:32 +02:00
Laurent Destailleur
5181e88f83
Merge pull request #17275 from DorianVabre/dev_EventOrganizer 
Dev event organizer: changes on the fields required on the conference attendee subscription page
 2021-04-19 21:50:22 +02:00
Laurent Destailleur
cc25a45767
Merge branch 'develop' into daraelmin-patch-2 2021-04-19 21:40:25 +02:00
Laurent Destailleur
9acf0e880e Fix ident 2021-04-19 21:37:33 +02:00
Laurent Destailleur
5649998870
Merge pull request #17303 from daraelmin/daraelmin-patch-newmemberform 
Fix new member form use getpost instead FORCEXXX
 2021-04-19 21:35:23 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Dorian Vabre
128dcb2e2b public registration page for booths and conferences created, wip 2021-04-19 17:26:01 +02:00
Dorian Vabre
ac8ddd8831 removed redundant fetch 2021-04-19 16:52:08 +02:00
Dorian Vabre
18d16d9509 moved attendee validation after the payment method search 2021-04-19 16:26:45 +02:00
Dorian Vabre
1b947a6e9a added index page for the booth/conference registration 2021-04-19 16:17:11 +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
stickler-ci
6f32b2edda Fixing style errors. 2021-04-19 13:23:36 +00:00
NextGestion
263e110ca3 Enhance module Member 2021-04-19 13:19:32 +01: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
daraelmin
17c2b4f0e8
Fix warning wrong date format for new member form 
Fix warning wrong date format for new member form when new membre submit no birthdate
 2021-04-17 23:58:00 +02:00
daraelmin
b96d3cebda
Update new.php 2021-04-17 14:51:05 +02:00
daraelmin
16dfde1128
Update new.php 2021-04-17 14:39:14 +02:00
stickler-ci
d23e746609 Fixing style errors. 2021-04-17 12:29:23 +00:00
daraelmin
d6085fb68a
Update new.php 2021-04-17 14:29:02 +02:00
stickler-ci
fcbea36605 Fixing style errors. 2021-04-17 12:21:40 +00:00
daraelmin
17f84c4edc
Fix new member form use getpost instead FORCEXXX 
## Fix use FORCETYPE, FORCECOUNTRYCODE, FORCEMORPHY even if GETPOST bas value
## Fix code style : typeid is note type
## Fix reset amount when $amount is set by script or by hook
## Fix some code style
 2021-04-17 14:18:42 +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
Laurent Destailleur
ce1a257522 Fix remove a setup that should not exists. Info is already into a table 2021-04-15 13:53:24 +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
Dorian Vabre
c58414c0ca merging with dev_EventOrganization after the changes on it 2021-04-14 16:04:36 +02:00
stickler-ci
6f0f527a89 Fixing style errors. 2021-04-14 14:04:33 +00:00
Dorian Vabre
3d5e439d92 company name is now required if price is set 2021-04-14 15:55:59 +02:00
Dorian Vabre
2f3f2509b2 wip on asking for the company name only if price is set v2 2021-04-14 15:54:21 +02:00
Dorian Vabre
6238ff0321 wip on asking for the company name only if price is set 2021-04-14 15:52:46 +02:00
Dorian Vabre
55afc59db2 removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice 2021-04-14 14:33:11 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer 
Dev event organizer: public registration page to a conference
 2021-04-13 15:31:40 +02:00
Dorian Vabre
339596f134 ref add in redirection url to payment page 2021-04-13 15:30:28 +02:00
Dorian Vabre
a3e75c587c adding amount and source to redirection url to newpayment 2021-04-13 15:07:15 +02:00
Dorian Vabre
633a3d39c6 wip on adding taxes and price to invoice 2021-04-13 14:32:17 +02:00
Dorian Vabre
db8dfb219c addition of the subscriptionok page when the subscription price is not set or 0 2021-04-13 14:10:20 +02:00
Dorian Vabre
fa47106ed7 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment 2021-04-13 12:21:27 +02:00
Dorian Vabre
0c6431efd5 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer 2021-04-13 12:10:15 +02:00
Dorian Vabre
3c265b2a5b fixing style error 2021-04-13 12:09:53 +02:00
stickler-ci
839edb5abe Fixing style errors. 2021-04-13 10:06:42 +00:00
Dorian Vabre
14e64f4a33 security changes: encryption is now with instead of hard coded keys 2021-04-13 11:57:36 +02:00
Dorian Vabre
149aa8e81b email is now used as name, if name is empty 2021-04-13 11:31:22 +02:00
Dorian Vabre
0b4149cb91 removal of subscriptionok page, bad branch 2021-04-13 10:43:23 +02:00
Dorian Vabre
caeb357aab security improvement by adding id to securekey before encryption 2021-04-13 10:40:33 +02:00
Dorian Vabre
7644174c4a subscriptionok page addition 2021-04-12 17:29:44 +02:00
Laurent Destailleur
202243d8a3 Fix payment link for renewal with a unique secure key 2021-04-12 17:19:58 +02:00
Dorian Vabre
d9513da8de email now required in the attendee_subscription page, company name no longer required. Check on existing third party now depends on the email. todo: what if the name is empty? 2021-04-12 17:05:09 +02:00
Dorian Vabre
e1fb368d3a wip 2021-04-12 16:50:56 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer 
new: working on conference or booth object and event type #FoundationFunding
 2021-04-12 16:06:13 +02:00
Dorian Vabre
ebd5f29231 invoice OK except price, wip on the payment page 2021-04-12 15:44:25 +02:00
Dorian Vabre
58abeb1e1e Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment 2021-04-12 10:02:04 +02:00
Laurent Destailleur
be800e07f2 Use urlencode even on security key 2021-04-10 15:27:44 +02:00
Dorian Vabre
eef5b9514d wip 2021-04-09 16:55:54 +02:00
stickler-ci
2b58bc904b Fixing style errors. 2021-04-09 14:36:02 +00:00
Dorian Vabre
a58e0ac8ac nouveau fichier : public/eventorganization/attendee_subscription.php 2021-04-09 16:25:40 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
daraelmin
071b50debf Copyright 2021-04-09 02:51:05 +02:00
daraelmin
9ee80be23f fix code style errors 2021-04-09 02:40:21 +02:00
stickler-ci
dce5c6be8f Fixing style errors. 2021-04-09 00:28:07 +00:00
daraelmin
f2a49ef72f New option amount by member type 2021-04-09 02:23:22 +02:00
stickler-ci
0b1e3ce7e4 Fixing style errors. 2021-04-08 12:15:35 +00:00
Günter Lukas
11700f2162 Fix Ticket-Module public interface: uppercase/lowercaser in e-mail should be ignored #17186 2021-04-08 13:52:29 +02:00
Dorian Vabre
999be03f8d fix: new member public page firstname test 2021-04-07 12:36:30 +02:00
Laurent Destailleur
e4b01b7ffc FIX #yogosha5791 2021-03-31 13:01:49 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
211c5b53eb NEW Can set if a ticket group is visible on public interface or not. 2021-03-24 13:16:17 +01:00
Laurent Destailleur
4015f5952e Look and feel v14 2021-03-24 12:51:14 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
fc2308d810 Fix trans 2021-03-20 21:38:01 +01:00
Laurent Destailleur
b3b68d65f2
Merge pull request #16866 from frederic34/patch-17 
fix doxygen
 2021-03-20 11:16:51 +01:00
Laurent Destailleur
824d73d935
Merge pull request #16867 from frederic34/patch-18 
fix doxygen
 2021-03-20 11:16:35 +01:00
Frédéric FRANCE
283cf9b8d2
Create index.html 2021-03-20 10:08:57 +01:00
Frédéric FRANCE
1552c16dd3
fix doxygen 2021-03-20 10:08:22 +01:00
Frédéric FRANCE
a872f6ebd3
fix doxygen 2021-03-20 10:06:59 +01:00
Laurent Destailleur
7bbcf4aa00 FIX #16629 2021-03-15 11:23:08 +01:00
Laurent Destailleur
5a806c1ece FIX #16629 2021-03-15 11:21:14 +01:00
Regis Houssin
4f4829ea70 FIX missing user get rights 2021-03-08 11:33:37 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
3cfcad284b Fix unsubscribe to MLs 2021-03-05 17:48:55 +01:00
Laurent Destailleur
1cd822bd75 Fix DOS attack on emailings wrappers 2021-03-05 14:54:17 +01:00
Frédéric FRANCE
883faf6f43
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-02 08:13:33 +01:00
Laurent Destailleur
d6b81b21f1 fix phpcs 2021-03-02 03:03:41 +01:00
Laurent Destailleur
592dacd849 Fix phpcs 2021-03-02 02:45:39 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Frédéric FRANCE
b54d9751f5
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-01 21:19:39 +01:00
Laurent Destailleur
d4512c48cd Fix regression 2021-03-01 21:11:55 +01:00
Frédéric FRANCE
a5974bcf57
fix merge 2021-03-01 21:10:06 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Laurent Destailleur
a68721c5b4 Fix missing translation 2021-03-01 10:58:06 +01:00
Laurent Destailleur
c80151717e Fix set of payment 2021-03-01 10:45:37 +01:00
Laurent Destailleur
0796bc45b1 Fix amount for some language on public payment page 2021-03-01 10:39:27 +01:00
Laurent Destailleur
0a0c7fdeb1 FIX hourglass and hide button to pay 2021-02-28 21:15:40 +01:00
Frédéric FRANCE
df6650241d
code syntax public dir 2021-02-26 18:58:34 +01:00
Laurent Destailleur
f7c119e48c Fix json decode 2021-02-24 13:02:36 +01:00
Laurent Destailleur
22208b622f WIP Add lead 2021-02-24 12:55:24 +01:00