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 |
|
Laurent Destailleur
|
03aa8c4b83
|
Better log
|
2019-07-19 03:29:43 +02:00 |
|
Laurent Destailleur
|
2926bf4158
|
code comment
|
2019-06-28 12:35:25 +02:00 |
|
Laurent Destailleur
|
a7d7d44f87
|
FIX Management of vat info in stripe
|
2019-06-21 19:59:16 +02:00 |
|
Laurent Destailleur
|
b6266953e9
|
FIX Management of vat info in stripe
|
2019-06-21 19:58:28 +02:00 |
|
Laurent Destailleur
|
1520ca9646
|
Fix buttons for payments
|
2019-06-07 13:51:53 +02:00 |
|
Laurent Destailleur
|
9314bb4667
|
Fix missing statement descriptor
|
2019-06-07 13:07:19 +02:00 |
|
Laurent Destailleur
|
9511a66681
|
Integrate the new Stripe checkout with STRIPE_USE_NEW_CHECKOUT=1
|
2019-06-07 12:41:37 +02:00 |
|
Laurent Destailleur
|
dc479a5377
|
FIX Create stripe intent only if Stripe was selected. This reduce also
duplicate code.
FIX Free payment when using paymentintent architecture.
|
2019-06-07 11:29:59 +02:00 |
|
Laurent Destailleur
|
b5b5e1f6db
|
More completepaybox integration with HMAC
|
2019-05-26 14:37:31 +02:00 |
|
Laurent Destailleur
|
e46481d837
|
Fix phpcs
|
2019-05-18 17:03:21 +02:00 |
|
Laurent Destailleur
|
a850c7aede
|
Fix if setup not complete
|
2019-05-18 02:22:23 +02:00 |
|
Laurent Destailleur
|
ae3a20d6ff
|
FIX compatibility with intent payment_modes
|
2019-05-17 00:10:44 +02:00 |
|
Laurent Destailleur
|
52c1f42734
|
Debug payment with stripe Intent
|
2019-05-16 23:11:49 +02:00 |
|
ptibogxiv
|
140cc93490
|
Update newpayment.php
|
2019-05-03 15:41:15 +02:00 |
|
ptibogxiv
|
65b21f3c37
|
Fix JS for payment intent
|
2019-05-03 15:14:20 +02:00 |
|
Laurent Destailleur
|
eab49d4300
|
NEW Update Stripe library to 6.34.3
|
2019-05-03 02:22:27 +02:00 |
|
Laurent Destailleur
|
10d853cdb3
|
Work on stripe payment using intent with option
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
|
2019-05-02 21:54:28 +02:00 |
|
Laurent Destailleur
|
acfc251253
|
Fix idempotency key
|
2019-04-30 03:09:54 +02:00 |
|
Laurent Destailleur
|
653790fb5d
|
Clean code
|
2019-04-26 03:11:46 +02:00 |
|
Laurent Destailleur
|
b90613c6c4
|
Start debug IPN. Removed duplicate code. We will have to use existing
code to not loose features.
|
2019-04-24 20:21:03 +02:00 |
|
Laurent Destailleur
|
8d28506595
|
Better code
|
2019-04-24 19:25:04 +02:00 |
|
Laurent Destailleur
|
f8c381f069
|
Fix label for API 2019-02-19
|
2019-04-24 12:02:03 +02:00 |
|
Laurent Destailleur
|
b97a9d1ef3
|
NEW Add more complete error messages in log on stripe payments
|
2019-04-03 17:53:24 +02:00 |
|
Laurent Destailleur
|
3bffa69f1d
|
Remove deprecated code
|
2019-02-27 15:23:56 +01:00 |
|
Laurent Destailleur
|
ee3dd016e7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-27 14:47:23 +01:00 |
|
Laurent Destailleur
|
10e3badb0a
|
Fix closing tr
|
2019-02-27 14:46:23 +01:00 |
|
Laurent Destailleur
|
e4698fb6a5
|
Merge
|
2019-02-18 19:14:25 +01:00 |
|
Laurent Destailleur
|
df5dbd4110
|
Fix bad ip
|
2019-02-14 21:10:49 +01:00 |
|
Laurent Destailleur
|
456a76cb11
|
Fix suffix
|
2019-02-12 01:11:37 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
7c82b416ae
|
fix phpcs public/payment/newpayment.php
|
2019-02-05 20:56:34 +01:00 |
|
Laurent Destailleur
|
d49dd8d593
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 15:16:44 +01:00 |
|
Laurent Destailleur
|
fbed22050d
|
fix syntax error
|
2019-02-05 14:33:36 +01:00 |
|
Laurent Destailleur
|
4de122d1d4
|
Fix date format
|
2019-02-05 14:33:03 +01:00 |
|
Laurent Destailleur
|
e3d0cb1637
|
Fix css
|
2019-02-05 14:32:23 +01:00 |
|
Laurent Destailleur
|
541f6e537e
|
Fix link to pay membership renewal
|
2019-02-05 14:05:39 +01:00 |
|
Laurent Destailleur
|
e5827f77cb
|
Fix link to pay membership renewal
|
2019-02-05 14:03:35 +01:00 |
|
Laurent Destailleur
|
6d09c85231
|
Fix missing button
|
2019-02-05 14:01:32 +01:00 |
|
Laurent Destailleur
|
d6501d996c
|
Missing trans
|
2019-02-05 13:56:55 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Frédéric FRANCE
|
77747ac2a3
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-28 16:35:12 +01:00 |
|
Laurent Destailleur
|
273c396fb9
|
Fix bad function
|
2019-01-28 02:47:03 +01:00 |
|
Laurent Destailleur
|
31f4513a7e
|
Fix bad function
|
2019-01-28 02:46:31 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
1e79781cba
|
Clean parameters
|
2019-01-08 11:54:08 +01:00 |
|
Laurent Destailleur
|
6d84036f66
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
|
2018-12-01 19:23:06 +01:00 |
|
Juanjo Menent
|
7d4553179d
|
Fix #9929
|
2018-12-01 15:48:46 +01:00 |
|
ptibogxiv
|
e8bdb580ab
|
Fix trans
|
2018-11-29 14:00:27 +01:00 |
|
Laurent Destailleur
|
163bc3784e
|
Merge pull request #10076 from ptibogxiv/patch-96
Fix retrieve Donation newpayment.php
|
2018-11-29 11:14:33 +01:00 |
|
Philippe GRAND
|
8722ccef82
|
fix typo error
|
2018-11-26 14:35:29 +01:00 |
|
ptibogxiv
|
d401974028
|
Fix retrieve Donation newpayment.php
|
2018-11-24 15:33:48 +01:00 |
|
Laurent Destailleur
|
b5d1a34080
|
Update newpayment.php
|
2018-11-24 11:08:05 +01:00 |
|
ptibogxiv
|
e8ba8814cd
|
Update newpayment.php
|
2018-11-23 12:45:37 +01:00 |
|
ptibogxiv
|
6a232a8754
|
Update newpayment.php
|
2018-11-23 12:27:24 +01:00 |
|