Commit Graph

159 Commits

Author SHA1 Message Date
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
6e2a9dc0c9 Fix error management in Stripe 2020-09-24 21:54:21 +02:00
Laurent Destailleur
ad1d60740b Fix string 2020-09-20 18:05:49 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
7cbc621f6b css 2020-09-14 19:00:18 +02:00
Laurent Destailleur
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
f6555a9077 Look and feel v12 2020-09-14 14:46:38 +02:00
Laurent Destailleur
550cec06a4 Look and feel v12 2020-09-14 14:41:11 +02:00
Laurent Destailleur
837697b234 Try to merge manually PR #12500 2020-09-05 14:14:56 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
d4ae8b81e4 Card examples 2020-02-03 20:49:21 +01: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
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01: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
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
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
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01: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
ab07da02c4 Fix scrutinizer 2019-09-15 15:53:04 +02:00
ptibogxiv
2d34a0c4c1
Fix table in admin stripe.php 2019-08-02 14:48:45 +02:00
ptibogxiv
d2bc3ac1ef
FIX stripe webhook ID constant set 2019-07-29 18:34:21 +02:00
Laurent Destailleur
4e26eefe6e Fix field not mandatory 2019-07-28 22:57:07 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
ptibogxiv
5e06a2497d
Fix list of webhook for stripe 2019-05-10 00:39:34 +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
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
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
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
ptibogxiv
6ba5708814
disable online payment warehouse 2019-02-23 19:26:52 +01:00
ptibogxiv
0428e026c9
Update stripe.php 2019-02-21 15:08:19 +01:00
ptibogxiv
0af6426f8c
Update stripe.php 2019-02-19 23:36:59 +01:00
ptibogxiv
0a3e0bc268
Update stripe.php 2019-02-19 22:56:07 +01:00
ptibogxiv
ea6e397d18
Update stripe.php 2019-02-19 22:28:26 +01:00
ptibogxiv
8e55802e92
Update stripe.php 2019-02-19 19:40:47 +01:00
ptibogxiv
97620e91c9
add link to webhook 2019-02-19 16:31:39 +01:00
ptibogxiv
d3627c1438
NEW options for alternative method
payment request api (ex apple pay) and sepa direct debit
2019-02-19 15:49:54 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Frédéric FRANCE
67f8942895
Form::select_comptes return void 2019-02-15 10:35:44 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01: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
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
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
de5281e587 standerdize 2018-08-05 10:56:39 +02:00
Laurent Destailleur
002181190c Fix option not used 2018-06-06 15:28:50 +02:00
Frédéric FRANCE
812b182680
loadlangs 2018-05-26 17:04:23 +02:00
ptibogxiv
3acd1b536b
Update stripe.php 2018-04-17 10:15:14 +02:00
ptibogxiv
8db9d19521
ADD minimal amount to require 3Dsecure if it's possible 2018-04-17 10:14:36 +02:00
Laurent Destailleur
3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/stripe/admin/stripe.php
2018-04-13 00:45:39 +02:00
Laurent Destailleur
2bbde44f63 FIX #8580 2018-04-12 23:54:53 +02:00
Laurent Destailleur
8fa3cf7c6a Fix setup 2018-03-12 13:39:32 +01:00
Laurent Destailleur
5b0dd0e31b Try to fix regression 2018-03-11 01:23:06 +01:00
Laurent Destailleur
3a8c216ab6
Merge branch 'develop' into ptibogxiv-stripe 2018-03-10 22:05:18 +01:00
ptibogxiv
3ea6a9fa5f
Update stripe.php 2018-03-10 15:05:04 +01:00
ptibogxiv
6b43477c39
Update stripe.php 2018-03-10 14:48:07 +01:00
ptibogxiv
5403e7a347
Update stripe.php 2018-03-10 14:46:37 +01:00
ptibogxiv
bbff580fb3
integration of fee's platform 2018-03-10 14:45:07 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Laurent Destailleur
936aef70a1
Merge branch 'develop' into ptibogxiv-stripe 2018-03-08 16:29:27 +01:00
ptibogxiv
39749a0a2c
NEW function and update comment 2018-03-07 16:13:49 +01:00
Laurent Destailleur
e242dbad88 Debug stripe 2018-03-07 14:44:32 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
ptibogxiv
b8f88ea315
ADD stock decrement 2018-03-06 20:45:05 +01:00
ptibogxiv
382fe4f13c
FIX group account settings
transfert bank settinds to account setting et let only general common online payment settings
2018-03-06 16:29:43 +01:00
ptibogxiv
c133b04abf
ADD banktransfer account for stripe webhook 2018-03-06 13:16:12 +01:00
ptibogxiv
212dc9bca1
Introduce StripeConnect Addon
As multicompany module, i submit to push my already fonctionnal stripeconnect module for a marketplace mode
2018-03-05 16:48:38 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned)
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
d8b2d1f8c2 Add example of test credit card 2018-03-04 12:11:28 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
1a78e2a055 Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
Laurent Destailleur
591834a807 Add a message on payment forms 2017-09-09 09:54:42 +02:00
Laurent Destailleur
c31febc4e0 Fix bad var 2017-08-31 03:41:04 +02:00
Laurent Destailleur
9146bb336e Work on merging all payment modes in one page 2017-08-31 03:34:57 +02:00
Laurent Destailleur
f2aa0ea488 Look and feel v6 2017-05-15 10:39:14 +02:00
Laurent Destailleur
b3245fb455 NEW Include an hourglass icon when we click on online payment button 2017-05-15 10:27:21 +02:00