Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

410 Commits

Author SHA1 Message Date
Laurent Destailleur
fab57e163e Fix phpcs 2018-09-21 14:52:06 +02:00
Frédéric FRANCE
b064b580b4 remove superfluous spaces 2018-09-21 12:19:59 +02:00
Laurent Destailleur
90b327af1d Merge pull request #9584 from ptibogxiv/patch-54 
fix link with connect transaction.php
 2018-09-21 09:59:57 +02:00
ptibogxiv
60cb83cf25 Update transaction.php 2018-09-21 09:55:24 +02:00
ptibogxiv
d09b74abe5 Update transaction.php 2018-09-21 09:54:07 +02:00
ptibogxiv
933f253c86 Update transaction.php 2018-09-21 09:52:27 +02:00
ptibogxiv
61d0aa66a5 Update transaction.php 2018-09-21 09:52:08 +02:00
ptibogxiv
d544f0598b fix link in connect mode 2018-09-21 09:50:31 +02:00
ptibogxiv
d0fafe8f0f fix link with connect transaction.php 2018-09-21 09:49:13 +02:00
Laurent Destailleur
4ab6155b07 Merge pull request #9545 from ptibogxiv/patch-64 
Fix link display
 2018-09-20 19:27:00 +02:00
ptibogxiv
1a841b48ae Update transaction.php 2018-09-19 20:15:12 +02:00
ptibogxiv
203a2291ba Update transaction.php 2018-09-19 19:05:46 +02:00
ptibogxiv
7e0bad97eb Update transaction.php 2018-09-19 18:59:32 +02:00
Laurent Destailleur
8c67e338eb Merge pull request #9546 from frederic34/patch-26 
clean stripe payment
 2018-09-18 14:58:55 +02:00
ptibogxiv
0770d8e56e Update transaction.php 2018-09-16 23:14:22 +02:00
ptibogxiv
3c5a9326e1 Update transaction.php 2018-09-16 23:13:24 +02:00
Frédéric FRANCE
9cf6c6aeb4 clean stripe payment 2018-09-16 23:02:37 +02:00
ptibogxiv
38b23d2be4 Update charge.php 2018-09-16 22:55:50 +02:00
ptibogxiv
35f2f5f48c Update transaction.php 2018-09-16 22:41:17 +02:00
ptibogxiv
7f4378870c Fix link display 2018-09-16 22:39:38 +02:00
ptibogxiv
8c32ffd2e2 fix html 2018-09-16 22:36:58 +02:00
Laurent Destailleur
2527127859 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 09:50:30 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
856b1e7f40 Fix phpcs 2018-09-15 23:58:02 +02:00
Frédéric FRANCE
c86e734299 remove superfluous space 2018-09-15 21:06:33 +02:00
Laurent Destailleur
c587de4a3d Merge branch 'develop' into stripetransac 2018-09-15 17:27:04 +02:00
Laurent Destailleur
1749c07ffe Merge pull request #9496 from ptibogxiv/patch-61 
Fix currency display in transaction.php
 2018-09-15 17:07:27 +02:00
Laurent Destailleur
69a577f58d Update transaction.php 2018-09-15 17:07:18 +02:00
ptibogxiv
e0eb43909d fix var 2018-09-14 17:57:47 +02:00
ptibogxiv
e9fb2387b0 link to stripe customer 2018-09-14 17:46:02 +02:00
ptibogxiv
bf38f1a80f fix url in connect mode 2018-09-14 15:27:43 +02:00
ptibogxiv
5dcbfe0e56 fix $servicestatus 2018-09-14 11:18:37 +02:00
Frédéric FRANCE
79cb1f5699 clean code 2018-09-13 13:57:01 +02:00
ptibogxiv
c36ee72de0 Update transaction.php 2018-09-13 11:32:52 +02:00
ptibogxiv
fad2502525 Update transaction.php 2018-09-13 11:31:39 +02:00
ptibogxiv
2ed0a72db5 Fix currency display in transaction.php 2018-09-13 11:10:58 +02:00
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