Commit Graph

1116 Commits

Author SHA1 Message Date
Laurent Destailleur
74f350daa4 Fix error message not complete 2022-11-02 00:36:08 +01:00
Laurent Destailleur
75d784a6eb Fix price on takepos thumb must include vat 2022-11-01 23:23:42 +01:00
stickler-ci
764ddd4636 Fixing style errors. 2022-10-28 10:44:04 +00:00
andreubisquerra
59cd9b35eb
CSS Header Scroll 2022-10-28 12:37:35 +02:00
andreubisquerra
db1de27be6
Header Scroll index.php 2022-10-28 12:36:48 +02:00
andreubisquerra
6b1e4dbf6b
Index Add price 2022-10-19 22:05:01 +02:00
andreubisquerra
bdc979eaad
pos.css.php Add price 2022-10-19 22:03:26 +02:00
andreubisquerra
d9aaf3e4d3
ajax.php Add price 2022-10-19 22:02:04 +02:00
andreubisquerra
190fc69bfa
Add product list in phone devices 2022-10-16 21:04:52 +02:00
andreubisquerra
a555a3c402
Add product list in phone devices 2022-10-16 21:03:14 +02:00
Laurent Destailleur
eb0f898b01 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-13 01:10:31 +02:00
Laurent Destailleur
7ebda11ad0 Fix search in TakePOS 2022-10-11 22:08:26 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6
Use isModEnabled
2022-10-04 18:01:59 +02:00
Laurent Destailleur
f50c2af105
Merge pull request #22468 from ptibogxiv/patch-49
Fix token error
2022-10-04 17:13:49 +02:00
Laurent Destailleur
dfc4543be2 Fix warning 2022-10-02 13:52:14 +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
8952530fad
Merge pull request #22184 from fboitel/fboitel-dev-scrutinizer-10/09/2022
Fix scrutinizer 1
2022-09-25 17:17:48 +02:00
jove@bisquerra.com
87cfff3690 TakePOS Possibility to select subcategories to print on orders. 2022-09-24 13:02:15 +02:00
Laurent Destailleur
f9e247bd77 Fix warning 2022-09-22 21:18:35 +02:00
Laurent Destailleur
d02ec266d4 Code comment 2022-09-17 14:08:21 +02:00
Laurent Destailleur
35d8320328 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-14 17:26:20 +02:00
Laurent Destailleur
45c9e6064e FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 12:47:00 +02:00
Laurent Destailleur
cad8b1ee7e Fix autoadd in basket after a search (only if search on barcode) 2022-09-12 12:32:35 +02:00
Laurent Destailleur
4566342d59 FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 11:47:06 +02:00
Faustin
034da214c0 scrutinizer in takepos/send.php : string[] implicitely converted to a boolean 2022-09-10 14:14:15 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Laurent Destailleur
8de1b9c3c8
Merge pull request #22156 from dolibit-ut/patch-546
Update pay.php
2022-09-09 15:58:32 +02:00
Laurent Destailleur
3a005b3af0
Merge pull request #22157 from dolibit-ut/patch-547
Update invoice.php
2022-09-09 15:58:17 +02:00
UT from dolibit
3bd74e4188
Update index.php 2022-09-08 20:20:57 +02:00
UT from dolibit
ec6d490c99
Update invoice.php 2022-09-08 20:16:22 +02:00
UT from dolibit
376825b3dd
Update pay.php 2022-09-08 20:12:52 +02:00
Frédéric France
63195e0ca3 fix license 2022-09-07 20:21:01 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +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
6a1b33b5ad
Update index.php 2022-08-31 14:55:53 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-08-30 19:38:35 +02:00
Alexandre SPANGARO
149fa48573 PHP8 Warnings 2022-08-30 16:29:27 +02:00
Alexandre SPANGARO
b66ac59163 PHP8 Warnings 2022-08-30 16:29:22 +02:00
Laurent Destailleur
1b1ebdd636
Merge branch '16.0' into 16p1 2022-08-29 01:05:47 +02:00
Laurent Destailleur
1c2e21a3ed
Update receipt.php 2022-08-29 01:03:23 +02:00
Alexandre SPANGARO
4470a78c6e PHP8 Warnings 2022-08-28 05:17:43 +02:00
Alexandre SPANGARO
375f400565 PHP8 Warnings 2022-08-27 08:28:39 +02:00
Alexandre SPANGARO
4543aeeff0 PHP8 Warnings 2022-08-27 08:19:49 +02:00
Alexandre SPANGARO
612bedb039 PHP8 Warnings 2022-08-27 08:19:39 +02:00
Alexandre SPANGARO
e36cc581ee PHP8 Warnings 2022-08-27 08:19:33 +02:00
Alexandre SPANGARO
b1662d535e Class css 2022-08-27 06:35:47 +02:00
Alexandre SPANGARO
ad788abdb8 Review Use Ajax constantonoff 2022-08-27 06:35:19 +02:00
Alexandre SPANGARO
f5e19ea1b9 PHP8 Warnings 2022-08-27 06:33:33 +02:00
Alexandre SPANGARO
d88647f574 Page name in description 2022-08-27 05:39:27 +02:00
Alexandre SPANGARO
c2d87ad75c TakePos - Use isModEnabled 2022-08-26 17:03:20 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
6f34072a27
Merge pull request #21806 from frederic34/patch-5
fix php8 warnings
2022-08-22 10:50:59 +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
Laurent Destailleur
8e15f95890 Fix missing llxHeader() 2022-08-22 00:04:04 +02:00
ptibogxiv
c582f060ec
Fix hook in takepos.pay.php 2022-08-21 12:28:00 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
Laurent Destailleur
8557257a37
Merge pull request #21720 from altairisfr/takepospay
NEW : TakePOS - add hook to complete payment
2022-08-12 00:12:33 +02:00
Christophe Battarel
1faa9d8231 add hook to complete payment 2022-08-11 16:29:55 +02:00
Christophe Battarel
c14d7a93f9 NEW : add margin infos to takepos invoice lines 2022-08-11 16:01:29 +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
Laurent Destailleur
514b216864
Merge pull request #21588 from altairisfr/termname
NEW : TAKEPOS - setup terminal name
2022-08-03 18:34:16 +02:00
Laurent Destailleur
42e0e1b978
Merge pull request #21580 from altairisfr/takeposhook
TAKEPOS : better hook management
2022-08-03 18:24:13 +02:00
Christophe Battarel
4b3fdcc9f6 use getDolGlobal... 2022-07-28 17:36:58 +02:00
Christophe Battarel
0fe441bc2a use getDolGlobal... 2022-07-28 17:29:09 +02:00
ptibogxiv
524c2e932c
NEW display currency in takepos menu 2022-07-28 13:35:43 +02:00
Christophe Battarel
fd6838776f NEW : TAKEPOS - setup terminal name 2022-07-27 11:09:02 +02:00
Christophe Battarel
3e930f92b8 add reshook test 2022-07-26 15:47:03 +02:00
Christophe Battarel
0c416a1e38 better hook management 2022-07-26 15:38:50 +02:00
jove@bisquerra.com
46f7c8cad5 Eliminate double checking if it is sent to the kitchen 2022-07-11 20:37:42 +02:00
Laurent Destailleur
e48fa05f9c
Merge pull request #21175 from altairis-melina/parameters
NEW : TAKEPOS-Add setup parameters
2022-07-11 01:54:27 +02:00
Laurent Destailleur
a7515cb620
Merge pull request #21227 from ptibogxiv/patch-454
NEW support of Stripe Terminal with Takepos
2022-07-10 19:34:39 +02:00
Laurent Destailleur
ca42be7478 Fix error management 2022-07-07 22:46:06 +02:00
Laurent Destailleur
f6a39383d3 Fix error management 2022-07-07 22:35:56 +02:00
Frédéric France
889856d55f use getDolGlobalString 2022-06-21 23:39:31 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +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
Laurent Destailleur
58ac0f61a5
Merge pull request #21161 from altairis-melina/freezone
NEW : TAKEPOS - Use constant TAKEPOS_CHANGE_PRICE_HT for freezone
2022-06-12 19:07:28 +02:00
stickler-ci
fb3f2698ae Fixing style errors. 2022-06-09 08:46:46 +00:00
melina
9ad5553c47 Add setup parameters 2022-06-08 17:56:11 +02:00
Laurent Destailleur
ec52502089 CSS Makes clear you have to click OK. 2022-06-08 02:55:45 +02:00
melina
1cf8b3421f add constant for freezone 2022-06-07 17:46:17 +02:00
andreubisquerra
9343e1d503
TakePOS without bank accounts index.php 2022-06-06 06:46:42 +02:00
andreubisquerra
a53e3ca3f3
TakePOS without bank accounts invoice.php 2022-06-06 06:45:25 +02:00
andreubisquerra
1f09151a25
TakePOS without bank account pay.php 2022-06-06 06:44:15 +02:00
Laurent Destailleur
bfd5ed3281 Trans 2022-06-03 02:31:09 +02:00
andreubisquerra
0489e51cc0
Avoid AutoPrint in TakePOS history 2022-05-31 08:39:48 +02:00
Laurent Destailleur
536f888ba2 Fix search hook in takepos 2022-05-24 12:59:27 +02:00
Laurent Destailleur
b8764c4804 Doc 2022-05-24 12:48:48 +02:00
Laurent Destailleur
5534284d9b css 2022-05-24 12:36:11 +02:00
Christophe Battarel
179716ac00 add constant to hide stock on cart 2022-05-17 09:17:36 +02:00
Laurent Destailleur
3271522971
Merge pull request #20790 from altairis-melina/empty_search
NEW : TakePos - Empty search results when emptying search term
2022-05-10 11:42:00 +02:00
Laurent Destailleur
bfa19bc065
Merge pull request #20797 from altairis-melina/hookaddline
add hook for takepos addline
2022-05-10 11:41:22 +02:00
melina
0ac89a5eae test reshook 2022-05-09 08:23:26 +02:00