Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
120,062 Commits 36 Branches 190 Tags
2c0f92bccfabac0a678173f1b8ce7024dab65ed1
Commit Graph

106 Commits

Author SHA1 Message Date
Laurent Destailleur
395312737b Merge pull request #22406 from aspangaro/17p6 
Use isModEnabled
 2022-10-04 18:01:59 +02:00
ptibogxiv
9727fac3d9 Fix token error 2022-10-01 14:23:48 +02:00
Alexandre SPANGARO
abcd68071e Use isModEnabled 2022-09-25 22:00:20 +02:00
Laurent Destailleur
45c9e6064e FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 12:47:00 +02:00
Laurent Destailleur
4566342d59 FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 11:47:06 +02:00
Laurent Destailleur
7a277d9560 Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
UT from dolibit
376825b3dd Update pay.php 2022-09-08 20:12:52 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Laurent Destailleur
1b1ebdd636 Merge branch '16.0' into 16p1 2022-08-29 01:05:47 +02:00
Alexandre SPANGARO
4543aeeff0 PHP8 Warnings 2022-08-27 08:19:49 +02:00
Alexandre SPANGARO
c2d87ad75c TakePos - Use isModEnabled 2022-08-26 17:03:20 +02:00
Laurent Destailleur
301d14d58e Merge pull request #21824 from ptibogxiv/patch-40 
Fix hook in takepos/pay.php
 2022-08-22 10:42:26 +02:00
Laurent Destailleur
0258da808c FIX MVC and missing http header in TakePOS 2022-08-22 01:56:19 +02:00
ptibogxiv
c582f060ec Fix hook in takepos.pay.php 2022-08-21 12:28:00 +02:00
Christophe Battarel
1faa9d8231 add hook to complete payment 2022-08-11 16:29:55 +02:00
ptibogxiv
852dc909aa NEW add hook un takepos/pay.php 
add hook for new payment method
 2022-08-04 14:46:20 +02:00
ptibogxiv
87f98b5bcb Update pay.php 2022-06-12 21:44:17 +02:00
ptibogxiv
627f346933 Update pay.php 2022-06-12 21:40:21 +02:00
ptibogxiv
348fb8e9f2 Stripe Terminal 2022-06-12 21:34:35 +02:00
andreubisquerra
1f09151a25 TakePOS without bank account pay.php 2022-06-06 06:44:15 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-23 20:22:10 +00:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lvessiller
ab4da186c5 FIX 2 columns for total labels 2021-10-12 15:52:59 +02:00
Laurent Destailleur
605aea62ca FIX TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT #18957 2021-10-12 15:25:44 +02:00
lvessiller
1788508963 FIX payment style and html5 tags 2021-10-12 14:11:19 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Laurent Destailleur
dbf7a9a0d0 FIX payment using wrong type in takepos when too many payment mode 2021-09-24 11:48:43 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Dinclaux
807b4bf93e Fix cash payment in some cases. Make pay requests language independant and rely on payment method code. 2021-09-07 22:42:17 +11:00
andreubisquerra
49b53e04f4 Customer Display total on pay 2021-08-08 19:13:31 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Laurent Destailleur
6b0092c30a Several minor bugfixes. Hide option TAKEPOS_NUMPAD_USE_PAYMENT_ICON. 2020-12-04 00:58:51 +01:00
Laurent Destailleur
1f58b49aea No xml inside HTML 2020-12-03 14:31:39 +01:00
teleassist
f6adb6ae55 Update pay.php 
Always show labels with payment icons
 2020-12-03 10:12:03 +01:00
stickler-ci
87ee62c2ff Fixing style errors. 2020-12-02 08:54:33 +00:00
teleassist
dd2d5259de Add icons labels for payment buttons 
Add labels to icons when TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS is set
 2020-12-02 09:46:53 +01:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
ptibogxiv
078459fc44 New display currency in takepos payment 
to do in next PR (payment with multicurrency in other currency that principal)
 2020-10-04 23:35:19 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
ptibogxiv
ff621cb146 Update pay.php 2020-08-24 12:27:19 +02:00
ptibogxiv
9da4946955 Fix for better code 2020-08-24 12:26:40 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
jove@bisquerra.com
3be723f3a1 NEW: Delayed payment in TakePOS 2020-08-11 07:49:54 +02:00
Laurent Destailleur
bb74804b74 NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT 2020-06-29 17:58:04 +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