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

430 Commits

Author SHA1 Message Date
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
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
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
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
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
202243d8a3 Fix payment link for renewal with a unique secure key 2021-04-12 17:19:58 +02:00
Laurent Destailleur
be800e07f2 Use urlencode even on security key 2021-04-10 15:27:44 +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
Laurent Destailleur
e4b01b7ffc FIX #yogosha5791 2021-03-31 13:01:49 +02: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
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
d1af419d02 More log to debug payment errors 2021-01-21 11:50:15 +01:00
Laurent Destailleur
c112c807ac Fix action after payment on member registration 2020-12-18 19:53:33 +01:00
Laurent Destailleur
dc9ac9d298 Fix missing error message 2020-12-18 16:31:32 +01:00
Laurent Destailleur
b3e03c6991 Fix css for public pages 2020-11-14 18:11:46 +01:00
Laurent Destailleur
0962c79c3e Update link poweredby 2020-11-09 14:45:40 +01:00
Laurent Destailleur
26b8e8d2bf More logs 2020-11-08 18:52:26 +01:00
Laurent Destailleur
1a818635b3 Add nofollow on some links 2020-11-07 13:01:35 +01:00
Laurent Destailleur
b386faebd8 Add noopenenr on links to dolibarr website 2020-11-07 12:49:38 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
c918acaadc Doc 2020-10-26 19:37:30 +01:00
CHABANE HADJER
e7e8a91b13
Adding Payzen payment module hooks. 2020-10-26 16:38:11 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
9d6e3be5d1 Fix #yogosha4463 2020-09-26 05:20:33 +02:00
Laurent Destailleur
e2b0c4bc41 css 2020-09-26 02:27:27 +02:00
Laurent Destailleur
becf91904f css 2020-09-24 08:55:33 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
970995d728 Clean code. Replace num_paiement with num_payment everywhere. 2020-09-14 01:03:51 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
180a49601b Use CSS to define size of logo on public pages. 2020-08-27 11:01:41 +02:00
Laurent Destailleur
cb0a9868d7 Space 2020-08-04 15:16:11 +02:00
Laurent Destailleur
07f420d58e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
 2020-08-04 15:03:51 +02:00
Laurent Destailleur
5d20f47473 FIX page for confirmation of payments is empty 2020-08-04 15:00:03 +02:00
Laurent Destailleur
5cf9bfcb5f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:32:54 +02:00
Laurent Destailleur
2cc7e88f8e clean code 2020-07-10 02:32:22 +02:00
Laurent Destailleur
96c583b84e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:28:34 +02:00
Laurent Destailleur
7fdccf4eb8 Fix error in stripe payment if no country defined 2020-07-10 02:28:00 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
b76828df9f Fix use of newtoken() 2020-07-06 09:39:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule 2020-05-21 02:02:54 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
293034dd89 css 2020-04-28 19:47:31 +02:00
Laurent Destailleur
a7815e0aac css 2020-04-28 19:44:32 +02:00
Laurent Destailleur
4d22baabfe CSS 2020-04-28 19:40:25 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
2bf36bff6d Fix restore dir at good place 2020-04-13 04:19:25 +02:00
Laurent Destailleur
3740d59848 Look and feel v12 2020-04-13 04:14:28 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
54d9f6a703 Deprecated comment 2020-03-14 16:35:16 +01:00
Laurent Destailleur
29843165ec Use the header and footer of public pages for the payment ok and ko page 2020-03-13 03:28:13 +01:00
Laurent Destailleur
35fae3ec5d NEW Upgrade Stripe library to 6.43.1 2020-03-13 03:07:28 +01:00
Laurent Destailleur
e1c7222172 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-09 20:39:05 +01:00
Jean Traullé
f7dda657b1
Fix Call to a member function getMessage() on null 
Because we are not in the exception block, $e is necessarily undefined.
Thus replacing $e->getMessage(); by value of $paymentintent->status.
 2020-03-06 17:46:45 +01:00
Laurent Destailleur
d49534e646
Merge pull request #12546 from ptibogxiv/patch-285 
Upgrade Stripe - minimal stripe update for compatibility
 2020-01-29 23:04:25 +01:00
Laurent Destailleur
90d255d3c4 Look and feel v11 2020-01-27 13:43:03 +01:00
Laurent Destailleur
c4ac1469df Look and feel v11 2020-01-27 13:42:31 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
5d7fa55759 css 2020-01-24 17:48:24 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
1b84ff634f Doc 2020-01-23 11:07:02 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
fc894d7a20 Fix for stripe connect 2020-01-22 13:53:20 +01:00
Laurent Destailleur
012e916c4b Fix tag 2020-01-05 19:59:14 +01:00
Laurent Destailleur
d077a1ca60 Fix add second in fulltag to avoid pb of idempotency when submitting 
page in same minutes with a different amount.
 2020-01-05 19:42:18 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined. 
More log to track payment errors.
 2020-01-01 12:47:01 +01:00
Laurent Destailleur
f8c15a14cf Add try catch 2019-12-31 19:11:36 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
4ed44140e7
Merge branch 'develop' into patch-285 2019-12-01 11:01:40 +01:00
ptibogxiv
16d08bd903
Update newpayment.php 2019-11-28 22:19:52 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Laurent Destailleur
d1c49c7021 Fix trans 2019-11-08 10:24:03 +01:00
Laurent Destailleur
bc2a949bab New Add option to disable idempotency when using Stripe payments. 2019-10-31 16:47:27 +01:00
Frédéric FRANCE
20f97807ce
clean indent 2019-10-27 10:07:47 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
f0122a5766 Fix phpcs 2019-10-03 16:54:33 +02:00
Laurent Destailleur
78751fe0ad
Update newpayment.php 2019-10-03 15:54:52 +02:00
Yash Kothari
9ade323648
#11966 bug fix 
Stripe : take into account down payments or deposits
 2019-10-02 13:23:55 +05:30
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
7e923f6c1f Fix remove test code and chen paymentintent is not null 2019-09-13 18:51:03 +02:00
Laurent Destailleur
b4831f9670 Code comment 2019-09-13 17:26:07 +02:00
Laurent Destailleur
9df4f0601d Clean address line to be on 1 line 2019-09-13 11:18:08 +02:00
Laurent Destailleur
9eb736b110 FIX stripe payment when there is a quote into address 2019-09-13 10:12:43 +02:00
Laurent Destailleur
6d20a656bb FIX CSRF check when using stripe old payment methods 2019-09-11 18:44:10 +02:00
Laurent Destailleur
7cb68d6438 NEW Default for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION 2019-08-25 18:02:10 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
814c405021 Add link to retry payment if error 2019-08-01 03:54:54 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
406375bfc4 Fix error management 2019-07-29 01:17:53 +02:00
Laurent Destailleur
3112f2b1c5 Fix error level 2019-07-29 01:13:49 +02:00
Laurent Destailleur
9ca4d65965 Fix stripe error management 2019-07-29 01:12:03 +02:00
Laurent Destailleur
a63a6a5853 FIX Online payment 2019-07-28 23:49:05 +02:00