Commit Graph

65086 Commits

Author SHA1 Message Date
ptibogxiv
bbff580fb3
integration of fee's platform 2018-03-10 14:45:07 +01:00
ptibogxiv
dd15dc56dd
Update and fix
prepare integration for more callback support
2018-03-10 14:34:10 +01:00
ptibogxiv
bfa7478568
FIX compatibility for multicompany (stripeconnect or not)
TODO: more test and create fee with stripe callback
2018-03-09 14:40:20 +01:00
ptibogxiv
a2fd2bc3f3
FIX entity
TO DO: save stripe account in multicompany mode and without stripe connect in theadmin of stripe module because stripe doesn't send custom field for all request
RISK: confusion and error in payment and transfert bank without this
2018-03-09 00:03:44 +01:00
ptibogxiv
51398ad060
FIX dolibarr version 2018-03-08 23:27:20 +01:00
ptibogxiv
3d411f09fc
Update actions_stripe.class.php 2018-03-08 23:13:37 +01:00
ptibogxiv
264112ab59
NEW actions on card.php for company and member 2018-03-08 23:07:58 +01:00
ptibogxiv
432aa50812
Update ipn.php 2018-03-08 20:08:43 +01:00
ptibogxiv
415332c22a
ADD IPN/Webhook for stripe
TODO: optimise code and uncustomize of ptibogxiv.net but good and fonctionnal for test
2018-03-08 20:05:40 +01:00
Laurent Destailleur
936aef70a1
Merge branch 'develop' into ptibogxiv-stripe 2018-03-08 16:29:27 +01:00
Laurent Destailleur
47b03068ac
Merge pull request #8300 from hregis/develop_dict
Fix: regression, restore primary key
2018-03-08 16:22:23 +01:00
Laurent Destailleur
0b316c3980 Attach invoice on email subscription confirmation 2018-03-08 15:01:34 +01:00
Regis Houssin
73a63c1abc Fix: syntax error 2018-03-08 11:57:38 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
ptibogxiv
7774b49beb
Fix paymentmodes.php 2018-03-08 10:03:36 +01:00
Regis Houssin
fd9c79fa7f Fix: use getEntity if no rowid to compare 2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
ptibogxiv
e2bd0198d1
Fix class call 2018-03-08 02:26:57 +01:00
ptibogxiv
5c04c2886c
Delete because replace by paymentmodes.php 2018-03-08 02:09:27 +01:00
ptibogxiv
c3e211f3f7
Delete gateway.php 2018-03-08 02:08:43 +01:00
ptibogxiv
197ce2fc3d
Fix set default 2018-03-08 02:08:14 +01:00
ptibogxiv
a0b587acc0
NEW introduce stripe.class.php
TODO: more powerful saving infos ?
2018-03-07 20:04:13 +01:00
Laurent Destailleur
e5bb6030eb Fix phpcs 2018-03-07 19:33:43 +01:00
Laurent Destailleur
8c128a2985 Stripe has drop PHP 5.3 2018-03-07 19:28:04 +01:00
Laurent Destailleur
8c03fdd51f NEW Upgrade of Stripe lib to 6.4.1 2018-03-07 19:26:06 +01:00
Laurent Destailleur
b9f1695b34 NEW Upgrade of Stripe lib to 6.4.1 2018-03-07 19:25:05 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Laurent Destailleur
65c689cc81 Clean code 2018-03-07 18:32:47 +01:00
Laurent Destailleur
3287c03e67 Fix data on thirdparty tooltip 2018-03-07 18:32:25 +01:00
Laurent Destailleur
78cbd92e98 Fix init data on table of payment mode 2018-03-07 18:30:39 +01:00
ptibogxiv
7edec37b28
FIx call stripe.class.php 2018-03-07 17:27:45 +01:00
ptibogxiv
1ba6de7ec7
FIX call stripe.class.php 2018-03-07 17:26:49 +01:00
Laurent Destailleur
6761a59acd Intorduce dolDecodeBlockedData 2018-03-07 17:22:38 +01:00
ptibogxiv
d791b014a5
update comment and class 2018-03-07 16:17:25 +01:00
ptibogxiv
39749a0a2c
NEW function and update comment 2018-03-07 16:13:49 +01:00
Laurent Destailleur
94140b04ca FIX Missing primary key on payment modes 2018-03-07 15:28:50 +01:00
Laurent Destailleur
05c1150477 Fix bad links 2018-03-07 15:13:22 +01:00
Laurent Destailleur
a597dc8b11
Merge pull request #8281 from ptibogxiv/patch-10
NEW: add link to stripe's info in bank menu
2018-03-07 15:09:46 +01:00
Laurent Destailleur
1419eaf15f Debug last stripe PR 2018-03-07 15:05:49 +01:00
Laurent Destailleur
e242dbad88 Debug stripe 2018-03-07 14:44:32 +01:00
Laurent Destailleur
64b0d1d390 Fix by adding a redirect to avoid the order2billing being done twice. 2018-03-07 14:33:29 +01:00
Laurent Destailleur
913be91ac7
Merge pull request #8279 from ptibogxiv/develop
New add a stripeconnect mode + add webhook key
2018-03-07 14:17:15 +01:00
Laurent Destailleur
c1497b065c CSS 2018-03-07 14:13:55 +01:00
Laurent Destailleur
62a339e582 Minor fix in multicurrency for supplier prices 2018-03-07 14:13:46 +01:00
Laurent Destailleur
3ebf01e0c6
Update .travis.yml 2018-03-07 13:21:07 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-03-07 13:12:23 +01:00
Laurent Destailleur
d07cd8c04b
Update 7.0.0-8.0.0.sql 2018-03-07 13:11:18 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Laurent Destailleur
f8d8c5c658 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:04:27 +01:00