Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

588 Commits

Author SHA1 Message Date
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