lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

310 Commits

Author SHA1 Message Date
Laurent Destailleur
b386faebd8 Add noopenenr on links to dolibarr website 2020-11-07 12:49: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
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
c918acaadc Doc 2020-10-26 19:37:30 +01:00
CHABANE HADJER
e7e8a91b13
Adding Payzen payment module hooks. 2020-10-26 16:38:11 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
9d6e3be5d1 Fix #yogosha4463 2020-09-26 05:20:33 +02:00
Laurent Destailleur
e2b0c4bc41 css 2020-09-26 02:27:27 +02:00
Laurent Destailleur
becf91904f css 2020-09-24 08:55:33 +02:00
Laurent Destailleur
180a49601b Use CSS to define size of logo on public pages. 2020-08-27 11:01:41 +02:00
Laurent Destailleur
5cf9bfcb5f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:32:54 +02:00
Laurent Destailleur
2cc7e88f8e clean code 2020-07-10 02:32:22 +02:00
Laurent Destailleur
96c583b84e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:28:34 +02:00
Laurent Destailleur
7fdccf4eb8 Fix error in stripe payment if no country defined 2020-07-10 02:28:00 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
b76828df9f Fix use of newtoken() 2020-07-06 09:39:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule 2020-05-21 02:02:54 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
293034dd89 css 2020-04-28 19:47:31 +02:00
Laurent Destailleur
a7815e0aac css 2020-04-28 19:44:32 +02:00
Laurent Destailleur
4d22baabfe CSS 2020-04-28 19:40:25 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
2bf36bff6d Fix restore dir at good place 2020-04-13 04:19:25 +02:00
Laurent Destailleur
3740d59848 Look and feel v12 2020-04-13 04:14:28 +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
54d9f6a703 Deprecated comment 2020-03-14 16:35:16 +01:00
Laurent Destailleur
35fae3ec5d NEW Upgrade Stripe library to 6.43.1 2020-03-13 03:07:28 +01:00
Laurent Destailleur
e1c7222172 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-09 20:39:05 +01:00
Jean Traullé
f7dda657b1
Fix Call to a member function getMessage() on null 
Because we are not in the exception block, $e is necessarily undefined.
Thus replacing $e->getMessage(); by value of $paymentintent->status.
 2020-03-06 17:46:45 +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
90d255d3c4 Look and feel v11 2020-01-27 13:43:03 +01:00
Laurent Destailleur
c4ac1469df Look and feel v11 2020-01-27 13:42:31 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
5d7fa55759 css 2020-01-24 17:48:24 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
1b84ff634f Doc 2020-01-23 11:07:02 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
fc894d7a20 Fix for stripe connect 2020-01-22 13:53:20 +01:00
Laurent Destailleur
012e916c4b Fix tag 2020-01-05 19:59:14 +01:00
Laurent Destailleur
d077a1ca60 Fix add second in fulltag to avoid pb of idempotency when submitting 
page in same minutes with a different amount.
 2020-01-05 19:42:18 +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
16d08bd903
Update newpayment.php 2019-11-28 22:19:52 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Laurent Destailleur
d1c49c7021 Fix trans 2019-11-08 10:24:03 +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
20f97807ce
clean indent 2019-10-27 10:07:47 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
f0122a5766 Fix phpcs 2019-10-03 16:54:33 +02:00
Laurent Destailleur
78751fe0ad
Update newpayment.php 2019-10-03 15:54:52 +02:00
Yash Kothari
9ade323648
#11966 bug fix 
Stripe : take into account down payments or deposits
 2019-10-02 13:23:55 +05:30
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
7e923f6c1f Fix remove test code and chen paymentintent is not null 2019-09-13 18:51:03 +02:00
Laurent Destailleur
b4831f9670 Code comment 2019-09-13 17:26:07 +02:00
Laurent Destailleur
9df4f0601d Clean address line to be on 1 line 2019-09-13 11:18:08 +02:00
Laurent Destailleur
9eb736b110 FIX stripe payment when there is a quote into address 2019-09-13 10:12:43 +02:00
Laurent Destailleur
6d20a656bb FIX CSRF check when using stripe old payment methods 2019-09-11 18:44:10 +02:00
Laurent Destailleur
7cb68d6438 NEW Default for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION 2019-08-25 18:02:10 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
814c405021 Add link to retry payment if error 2019-08-01 03:54:54 +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
406375bfc4 Fix error management 2019-07-29 01:17:53 +02:00
Laurent Destailleur
3112f2b1c5 Fix error level 2019-07-29 01:13:49 +02:00
Laurent Destailleur
9ca4d65965 Fix stripe error management 2019-07-29 01:12:03 +02:00
Laurent Destailleur
a63a6a5853 FIX Online payment 2019-07-28 23:49:05 +02:00
Laurent Destailleur
03aa8c4b83 Better log 2019-07-19 03:29:43 +02:00
Laurent Destailleur
2926bf4158 code comment 2019-06-28 12:35:25 +02:00
Laurent Destailleur
a7d7d44f87 FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
Laurent Destailleur
b6266953e9 FIX Management of vat info in stripe 2019-06-21 19:58:28 +02:00
Laurent Destailleur
1520ca9646 Fix buttons for payments 2019-06-07 13:51:53 +02:00
Laurent Destailleur
9314bb4667 Fix missing statement descriptor 2019-06-07 13:07:19 +02:00
Laurent Destailleur
9511a66681 Integrate the new Stripe checkout with STRIPE_USE_NEW_CHECKOUT=1 2019-06-07 12:41:37 +02:00
Laurent Destailleur
dc479a5377 FIX Create stripe intent only if Stripe was selected. This reduce also 
duplicate code.
FIX Free payment when using paymentintent architecture.
 2019-06-07 11:29:59 +02:00
Laurent Destailleur
b5b5e1f6db More completepaybox integration with HMAC 2019-05-26 14:37:31 +02:00
Laurent Destailleur
e46481d837 Fix phpcs 2019-05-18 17:03:21 +02:00
Laurent Destailleur
a850c7aede Fix if setup not complete 2019-05-18 02:22:23 +02:00
Laurent Destailleur
ae3a20d6ff FIX compatibility with intent payment_modes 2019-05-17 00:10:44 +02:00
Laurent Destailleur
52c1f42734 Debug payment with stripe Intent 2019-05-16 23:11:49 +02:00
ptibogxiv
140cc93490
Update newpayment.php 2019-05-03 15:41:15 +02:00
ptibogxiv
65b21f3c37
Fix JS for payment intent 2019-05-03 15:14:20 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3 Work on stripe payment using intent with option 
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
 2019-05-02 21:54:28 +02:00
Laurent Destailleur
acfc251253 Fix idempotency key 2019-04-30 03:09:54 +02:00
Laurent Destailleur
653790fb5d Clean code 2019-04-26 03:11:46 +02:00
Laurent Destailleur
b90613c6c4 Start debug IPN. Removed duplicate code. We will have to use existing 
code to not loose features.
 2019-04-24 20:21:03 +02:00
Laurent Destailleur
8d28506595 Better code 2019-04-24 19:25:04 +02:00
Laurent Destailleur
f8c381f069 Fix label for API 2019-02-19 2019-04-24 12:02:03 +02:00
Laurent Destailleur
b97a9d1ef3 NEW Add more complete error messages in log on stripe payments 2019-04-03 17:53:24 +02:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
ee3dd016e7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-27 14:47:23 +01:00
Laurent Destailleur
10e3badb0a Fix closing tr 2019-02-27 14:46:23 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Laurent Destailleur
df5dbd4110 Fix bad ip 2019-02-14 21:10:49 +01:00
Laurent Destailleur
456a76cb11 Fix suffix 2019-02-12 01:11:37 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
7c82b416ae
fix phpcs public/payment/newpayment.php 2019-02-05 20:56:34 +01:00
Laurent Destailleur
d49dd8d593 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 15:16:44 +01:00
Laurent Destailleur
fbed22050d fix syntax error 2019-02-05 14:33:36 +01:00
Laurent Destailleur
4de122d1d4 Fix date format 2019-02-05 14:33:03 +01:00
Laurent Destailleur
e3d0cb1637 Fix css 2019-02-05 14:32:23 +01:00
Laurent Destailleur
541f6e537e Fix link to pay membership renewal 2019-02-05 14:05:39 +01:00
Laurent Destailleur
e5827f77cb Fix link to pay membership renewal 2019-02-05 14:03:35 +01:00
Laurent Destailleur
6d09c85231 Fix missing button 2019-02-05 14:01:32 +01:00
Laurent Destailleur
d6501d996c Missing trans 2019-02-05 13:56:55 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +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
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
1e79781cba Clean parameters 2019-01-08 11:54:08 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
ptibogxiv
e8bdb580ab
Fix trans 2018-11-29 14:00:27 +01:00
Laurent Destailleur
163bc3784e
Merge pull request #10076 from ptibogxiv/patch-96 
Fix retrieve Donation newpayment.php
 2018-11-29 11:14:33 +01:00
Philippe GRAND
8722ccef82 fix typo error 2018-11-26 14:35:29 +01:00
ptibogxiv
d401974028
Fix retrieve Donation newpayment.php 2018-11-24 15:33:48 +01:00
Laurent Destailleur
b5d1a34080
Update newpayment.php 2018-11-24 11:08:05 +01:00
ptibogxiv
e8ba8814cd
Update newpayment.php 2018-11-23 12:45:37 +01:00
ptibogxiv
6a232a8754
Update newpayment.php 2018-11-23 12:27:24 +01:00
ptibogxiv
1cc6763950
Fix order billed online payment 2018-11-23 11:40:38 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Laurent Destailleur
1e635cff1b Fix new stripe API 2018-10-12 21:00:33 +02:00
Laurent Destailleur
d8edb1f6b8 Fix regression in online payment 2018-10-12 20:28:26 +02:00
Laurent Destailleur
6a363fd1ab API Stripe 2018-09-24 2018-10-12 19:26:00 +02:00
Laurent Destailleur
fcf62744d7 Add ref in description 2018-10-10 16:23:00 +02:00
Laurent Destailleur
1204fb1e74 Fix online payments use id instead of ref into TAG 2018-10-10 16:16:17 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
b1289632e0 CSS 2018-10-10 01:27:31 +02:00
Laurent Destailleur
506ba30d5a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-06 20:54:14 +02:00
Laurent Destailleur
3e49935eac Fix online payment 2018-10-06 15:48:47 +02:00
Laurent Destailleur
5045bbc3bd
Update newpayment.php 2018-10-06 12:44:06 +02:00
Laurent Destailleur
835ca4e4a5
Update newpayment.php 2018-10-06 12:42:14 +02:00
ptibogxiv
0e83863d45
Add save or not source functionnality 2018-10-04 20:32:49 +02:00
ptibogxiv
f5966e6303
Update newpayment.php 2018-10-04 19:29:52 +02:00
Laurent Destailleur
571bc86836
Update newpayment.php 2018-10-04 19:03:18 +02:00
ptibogxiv
762abf7060
Update newpayment.php 2018-10-04 10:59:06 +02:00
ptibogxiv
d36dda37e6
Fix metadata for charge.php 
Fix for dol_id, dol_type
 2018-10-04 10:56:29 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
ae36469166 FIX #9337 2018-09-01 12:28:36 +02:00
ptibogxiv
d2859276b5
add logo with multicompany 
this fix push entity to viewimage.php
 2018-08-30 02:35:42 +02:00
Frédéric FRANCE
2bb4c30aac
remove superfluous space 2018-08-14 15:59:15 +02:00
Laurent Destailleur
fa4a12be41
Merge pull request #9208 from ptibogxiv/patch-33 
fix connect mode for v8 release
 2018-08-13 23:56:42 +02:00
ptibogxiv
e926efe022
fix connect mode for v8 release 2018-08-06 12:39:50 +02:00
Philippe GRAND
094fc6b699 Standardize 2018-08-06 11:53:33 +02:00