Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

374 Commits

Author SHA1 Message Date
ptibogxiv
c620c64391 Fix currency display charge.php 2018-09-13 11:06:18 +02:00
ptibogxiv
ef4659c518 add capture option in payment function 
Conflicts:
	htdocs/stripe/class/stripe.class.php
 2018-09-12 19:47:04 +02:00
Laurent Destailleur
72f359fdc7 Revert "add capture option in payment function" 
This reverts commit 849b7154a7.
 2018-09-12 19:40:43 +02:00
Laurent Destailleur
ed2d215e19 Merge pull request #9467 from ptibogxiv/patch-59 
update status display in charge list
 2018-09-12 18:56:03 +02:00
Laurent Destailleur
71e4378bd2 Update charge.php 
Charges can be done on different stripe account, even if doli thirdparty is same (if thirdparty has changed it stripe account). So keeping it in list seems usefull.
 2018-09-12 18:51:03 +02:00
Laurent Destailleur
9efa3816c3 Update charge.php 2018-09-12 18:47:00 +02:00
Laurent Destailleur
23096354e0 Merge pull request #9463 from ptibogxiv/patch-57 
add capture option in payment function
 2018-09-12 18:38:10 +02:00
Laurent Destailleur
88192d1bae Merge pull request #9456 from frederic34/stripeuser 
add stripe user for actions
 2018-09-12 18:37:31 +02:00
ptibogxiv
79dd5e84d2 V8 style 2018-09-12 18:21:06 +02:00
Laurent Destailleur
88e76b6127 Revert "V8 style" 2018-09-12 18:19:12 +02:00
Laurent Destailleur
71e8d4c728 Merge pull request #9453 from ptibogxiv/patch-56 
V8 style
 2018-09-12 18:18:45 +02:00
ptibogxiv
30c393d2da better display/link of informations 2018-09-12 11:28:43 +02:00
ptibogxiv
26a8b5ba4d Update status display in charge list 2018-09-11 12:30:24 +02:00
ptibogxiv
7f3f0f3643 Fix status display in transaction.php 2018-09-11 12:10:48 +02:00
ptibogxiv
849b7154a7 add capture option in payment function 2018-09-11 10:59:25 +02:00
Frédéric FRANCE
a8cfc6be3f add stripe user for actions 2018-09-10 20:57:45 +02:00
Frédéric FRANCE
5f1b3fbc12 add stripe user for actions 2018-09-10 20:18:16 +02:00
ptibogxiv
ccc415204e V8 style 2018-09-10 16:46:16 +02:00
ptibogxiv
ff44e65c38 update api changelog 
2018-09-06 introduce no change for dolibarr with 2018-08-23
 2018-09-10 12:31:34 +02:00
Philippe Grand
c32c67ca57 Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00
Philippe GRAND
42565e722e Standardize and update code 2018-09-04 13:37:00 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Laurent Destailleur
d2afffaeca Fix phpcs 2018-09-02 17:53:31 +02:00
Laurent Destailleur
e081e8443b Merge pull request #9204 from ptibogxiv/patch-32 
Fix payment in connect mode
 2018-09-02 17:25:27 +02:00
Laurent Destailleur
3cc268c840 Update stripe.class.php 2018-09-02 17:23:38 +02:00
Laurent Destailleur
7ca45cd117 Update stripe.class.php 2018-09-02 17:22:45 +02:00
Laurent Destailleur
4cca4ce020 Update stripe.class.php 2018-09-02 17:21:45 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Laurent Destailleur
0bf967ab10 Fix setup 2018-09-01 17:50:13 +02:00
Laurent Destailleur
5f2eeb552a Fix setup of email 2018-09-01 17:48:35 +02:00
Philippe GRAND
0e5d4206c9 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 12:47:34 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
9f33d586ff Merge pull request #9346 from frederic34/patch-16 
Create index.html
 2018-09-01 12:34:10 +02:00
Laurent Destailleur
f0fc99ee4c FIX Force stripe api version to avoid trouble if we update stripe api 2018-09-01 12:01:01 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Frédéric FRANCE
302179c739 Create index.html 2018-08-30 08:10:51 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
ptibogxiv
25be9f5989 fix if null 2018-08-29 13:19:03 +02:00
ptibogxiv
289dfc7fbe update API version 
We need to downgrade this change to V8 because some breaks occur if Stripe API is updated in dashboard to 2018-08-23
 2018-08-28 13:37:17 +02:00
ptibogxiv
90de2698c3 Fix for new stripe API 2018-08-23 
Fix break of change API
 2018-08-28 13:34:59 +02:00
Laurent Destailleur
7219bac0b2 Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Philippe GRAND
a36061079b Update and standardize code 2018-08-22 11:11:59 +02:00
Laurent Destailleur
85eed6cf80 Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Philippe GRAND
a31ad5af3d standardize code 2018-08-17 17:55:00 +02:00
Laurent Destailleur
5c712a6cd3 Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
a0a6afc224 return comment 2018-08-14 12:23:10 +02:00
ptibogxiv
4d34725b23 Define introduce principal entity 
define which entity must be use as principal with no fee and everything else (cf stripe API)
 2018-08-12 19:42:07 +02:00