Commit Graph

526 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00: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
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
ptibogxiv
5783f9b7c2
fix lang for other payment mode available 2020-01-28 17:33:50 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
ptibogxiv
63d9e3c01e
fix list stripe charge.php
payment intent use table_element so need double terms for more compatibility
2020-01-27 15:11:22 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +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
999e363446
Update charge.php 2020-01-22 13:52:37 +01:00
ptibogxiv
b4758295e1
fix stripe/charge.php for connect mode with payment intent 2020-01-21 10:59:57 +01:00
Laurent Destailleur
6f97d163f9 Fix: the stripe_account is not filled 2019-12-23 22:41:34 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside
Fix var not defined
2019-12-22 13:19:14 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
9aac612ed9 Fix sql error 2019-12-15 17:46:56 +01:00
Laurent Destailleur
a3736399da Fix to select correct record with compatibility with old record 2019-12-15 17:44:05 +01:00
Laurent Destailleur
cb71d5a7bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
2019-12-03 13:58:15 +01:00
Laurent Destailleur
5835d49ae1
Merge pull request #12613 from ptibogxiv/patch-288
Fix title of transactions list
2019-12-03 13:22:02 +01:00
ptibogxiv
636da4518f
Fix title of transactions list 2019-12-03 11:22:00 +01:00
ptibogxiv
15715aa12c
FIX not fee in payout list 2019-12-02 23:53:01 +01:00
stickler-ci
4bd4719aa6 Fixing style errors. 2019-12-01 10:03:29 +00:00
Laurent Destailleur
4ed44140e7
Merge branch 'develop' into patch-285 2019-12-01 11:01:40 +01:00
ptibogxiv
753439efee
Update stripe.php 2019-11-28 23:23:08 +01:00
ptibogxiv
b9c0f961c9
Update stripe.class.php 2019-11-28 22:17:49 +01:00
ptibogxiv
f6bc48e6d7
FIX minimal stripe update for compatibility
cf https://stripe.com/guides/important-update-for-connect
2019-11-28 22:13:11 +01:00
Laurent Destailleur
5eb24ba240 Fix phpcs 2019-11-26 11:55:34 +01:00
Laurent Destailleur
953ba8e323 Trans 2019-11-26 09:36:32 +01:00
Laurent Destailleur
cd6e81c46f Choice of a parameter is lost when saving 2019-11-26 09:34:42 +01:00
Laurent Destailleur
1b53375371 Look and feel v11 2019-11-19 21:21:15 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Laurent Destailleur
ec0d5602f8 Fix log 2019-11-13 02:05:11 +01:00
Laurent Destailleur
0a607d697f More log 2019-11-11 00:34:05 +01: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
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
1c8e9fffbe
Update payout.php 2019-11-04 20:26:52 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Scrutinizer Auto-Fixer
50f55cac35 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-02 00:17:45 +00:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
349175580a Can force Stripe API version from setup 2019-10-31 16:53:55 +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
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
71227e43fa Debug stripe deprecated page 2019-10-12 04:51:41 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
0434e898d3 Add todo 2019-09-23 19:22:07 +02:00
Laurent Destailleur
4a0305cdf8 Fix debug file 2019-09-23 19:21:18 +02:00
Laurent Destailleur
64fc735340 Fix length of fields to card saved with setupintent 2019-09-23 18:12:58 +02:00
Laurent Destailleur
243e31df2c Better error management for using SCA stripe 2019-09-23 16:50:32 +02:00
Laurent Destailleur
d5877e9c36 FIX Bad currency var used in stripe for connect 2019-09-23 11:36:45 +02:00
Laurent Destailleur
bf9f25fd74 Ehance getPaymentIntent to use it for offline payment 2019-09-23 11:35:11 +02:00
Laurent Destailleur
3faca1dbd1 Enhancement for SCA 2019-09-22 21:09:01 +02:00
Laurent Destailleur
421631f2be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-15 15:53:45 +02:00
Laurent Destailleur
ab07da02c4 Fix scrutinizer 2019-09-15 15:53:04 +02:00
Laurent Destailleur
8e83615533 Add method getSetupIntent 2019-09-13 18:52:35 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
a168c989f8
Update stripe.class.php 2019-09-06 23:29:27 +02:00
ptibogxiv
9601f846ce
Update stripe.class.php 2019-09-05 11:11:48 +02:00
Alexandre SPANGARO
20e2180de4 Fix travis 2019-08-26 13:54:46 +02:00
Laurent Destailleur
134c116021
Merge pull request #11715 from ptibogxiv/patch-226
NEW :  Platforme compliance with Stripe Connect
2019-08-22 12:54:09 +02:00
Laurent Destailleur
5983f08d73
Update stripe.class.php 2019-08-22 12:52:30 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
ptibogxiv
074ea37664
Update stripe.class.php 2019-08-21 17:09:26 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
2019-08-10 01:57:43 +02:00
Laurent Destailleur
babeb52986
Merge pull request #11624 from ptibogxiv/patch-208
Fix update stripe api for more compliance to API
2019-08-10 01:39:31 +02:00
Laurent Destailleur
5dc2fd8ca0
Merge pull request #11621 from ptibogxiv/patch-205
Fix application_fee_amount
2019-08-10 01:38:30 +02:00
Laurent Destailleur
0cb1210acc
Merge pull request #11622 from ptibogxiv/patch-206
Fix table in admin stripe.php
2019-08-10 01:33:57 +02:00
Laurent Destailleur
46a5c05b75
Merge pull request #11623 from ptibogxiv/patch-207
FIX round for application fee in stripe
2019-08-10 01:25:07 +02:00
ptibogxiv
05ac4eec52
Update charge.php 2019-08-06 00:16:18 +02:00
ptibogxiv
4633af3f5d
Update charge.php 2019-08-03 21:19:47 +02:00
ptibogxiv
07cc21a113
Fix display payment intent in stripe's charge list 2019-08-03 20:35:53 +02:00
ptibogxiv
d30ce126e0
Fix update stripe api for more compliance to API 2019-08-03 13:00:52 +02:00
ptibogxiv
13eef54392
Fix round for application fee in stripe 2019-08-03 12:31:13 +02:00
ptibogxiv
2d34a0c4c1
Fix table in admin stripe.php 2019-08-02 14:48:45 +02:00
ptibogxiv
3a0c1954d6
Fix application_fee_amount
need fix in v10 too
2019-08-02 13:23:15 +02:00
Laurent Destailleur
cd07596b27
Merge pull request #11565 from ptibogxiv/patch-199
Fix application_fee name stripe.class.php
2019-07-30 21:34:19 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
ptibogxiv
d2bc3ac1ef
FIX stripe webhook ID constant set 2019-07-29 18:34:21 +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
9ca4d65965 Fix stripe error management 2019-07-29 01:12:03 +02:00
Laurent Destailleur
4e26eefe6e Fix field not mandatory 2019-07-28 22:57:07 +02:00
ptibogxiv
e464e2e1b8
Fix application_fee name stripe.class.php
stripe changes name without change API :/

application_fee_amount for amount application_fee for %
2019-07-26 14:16:28 +02:00
Laurent Destailleur
efe27d335b Fix param 2019-07-19 03:53:34 +02:00
Laurent Destailleur
5b9d9deb47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-19 03:46:40 +02:00
Laurent Destailleur
03aa8c4b83 Better log 2019-07-19 03:29:43 +02:00
Laurent Destailleur
8857d0acf5
Keep save_payment_method to true.
Keep it to true because i see no reason to not save the credit card on Stripe side.
2019-07-19 03:18:53 +02:00
ptibogxiv
4235f0b352
Update stripe.class.php 2019-07-18 10:05:54 +02:00
ptibogxiv
8a5aad3433
Update stripe.class.php 2019-07-18 10:00:57 +02:00
ptibogxiv
27a0c046df
Update stripe.class.php 2019-07-18 09:58:26 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
Laurent Destailleur
a7d7d44f87 FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
Laurent Destailleur
c3b8582076 Fix use of deprecated function 2019-06-19 15:55:18 +02:00
Laurent Destailleur
a6d4475aff Fix scrutinizer 2019-06-17 18:24:45 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
Laurent Destailleur
eb0d04f304 Code comment 2019-06-07 11:24:35 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
8bcc7cb370 Fix creation of duplicate payment intents 2019-05-17 00:26:39 +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
5e06a2497d
Fix list of webhook for stripe 2019-05-10 00:39:34 +02:00
Laurent Destailleur
3100844374
Merge pull request #11100 from ptibogxiv/patch-161
FIX : https in stripe webhook/ipn url
2019-05-09 15:37:08 +02:00
Laurent Destailleur
5317d0432d Fix bad link 2019-05-08 18:32:26 +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
ptibogxiv
d09de303d2
Update stripe.php 2019-05-02 14:38:18 +02:00
ptibogxiv
4a83036a8e
Update stripe.php 2019-05-02 13:38:47 +02:00
ptibogxiv
b2d54662a1
FIX : https in stripe webhook/ipn url 2019-05-02 13:34:34 +02:00
Laurent Destailleur
f2ecdac454 Fix idempotency_key
Conflicts:
	htdocs/stripe/class/stripe.class.php
2019-04-30 03:12:03 +02:00
Laurent Destailleur
f50210ef39 Fix idempotency_key 2019-04-30 03:07:20 +02:00
Laurent Destailleur
9380254f76 Prepare for Manual confirmation quickstart 2019-04-26 10:48:38 +02:00
Laurent Destailleur
22b8a67e55 A more complete function 2019-04-26 05:19:11 +02:00
Laurent Destailleur
a7362ca055 More examples 2019-04-26 05:05:33 +02:00
Laurent Destailleur
f81a1a3e85 Complete examples 2019-04-26 03:50:05 +02:00
Laurent Destailleur
653790fb5d Clean code 2019-04-26 03:11:46 +02:00
Laurent Destailleur
85059eeedb Debug method getPaymentIntent 2019-04-26 02:05:57 +02:00
Laurent Destailleur
2e277d643d Stabilize code to prepare beta freeze. 2019-04-24 21:26:58 +02:00
Laurent Destailleur
77f92a5da3
Update stripe.php 2019-04-24 21:12:43 +02:00
Laurent Destailleur
8007b222d0
Merge branch 'develop' into patch-153 2019-04-24 21:10:27 +02:00
Laurent Destailleur
79c37f2226 Fix link for endpoint 2019-04-24 18:47:11 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
5a0d2bbcb4
Merge pull request #10634 from ptibogxiv/patch-120
Update stripe version api for payment intent
2019-04-24 18:08:04 +02:00
ptibogxiv
c485cc7a89
Update stripe.php 2019-04-24 15:41:08 +02:00
ptibogxiv
99e56f9cfa
Update stripe.php 2019-04-24 14:53:31 +02:00
ptibogxiv
6d06f128e7
Update stripe.php 2019-04-24 13:51:41 +02:00
ptibogxiv
57ce70bbc9
NEW enhancement management of webhooks
active / inactive and sync only needed events
2019-04-24 13:08:13 +02:00
Laurent Destailleur
f8c381f069 Fix label for API 2019-02-19 2019-04-24 12:02:03 +02:00
Philippe GRAND
8ae6cba6d9 update with html5 compliant code 2019-03-17 10:17:47 +01:00
ptibogxiv
9da734569d
Update config.php 2019-03-15 12:34:21 +01:00
Laurent Destailleur
f2de44ce51 Clean code 2019-03-11 01:11:39 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Laurent Destailleur
62dbf15ba1
Merge pull request #10633 from ptibogxiv/patch-119
NEW options for alternative method
2019-02-27 02:02:53 +01:00
ptibogxiv
12e3e2c7c8
UPDATE support maximal fee in connect mode 2019-02-26 12:33:03 +01:00
Laurent Destailleur
8a9339a059 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/facture/class/api_invoices.class.php
2019-02-25 15:16:23 +01:00
Laurent Destailleur
8234c09412 Try some fixes 2019-02-25 15:15:17 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Laurent Destailleur
58caf27744 Fix phpcs 2019-02-24 20:30:06 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
c000f03e56
replace html code by html5 in stripe 2019-02-23 19:55:06 +01:00
Frédéric FRANCE
452633e877
replace html code by html5 in supplier_proposal 2019-02-23 19:43:28 +01:00
ptibogxiv
6ba5708814
disable online payment warehouse 2019-02-23 19:26:52 +01:00
Laurent Destailleur
6f922ad316
Merge pull request #10653 from ptibogxiv/patch-124
Fix stripe payment list of transaction
2019-02-23 14:12:40 +01:00
Laurent Destailleur
b8df685186
Update payment.php 2019-02-23 14:11:53 +01:00