Commit Graph

105 Commits

Author SHA1 Message Date
Laurent Destailleur
ff10a2ab5a New: show the name of place and floor on main takepos page 2019-03-27 20:13:12 +01:00
Laurent Destailleur
579525ec48 New Can define nb of categories and products for pagination on TakePOS 2019-03-27 19:36:47 +01:00
Laurent Destailleur
8998e4c6a3 Fix add of a table in floor for Bar and Restaurant 2019-03-27 18:40:02 +01:00
Laurent Destailleur
6e643e90cf Translation 2019-03-27 18:00:44 +01:00
Laurent Destailleur
9d133dae12 Removed verbose log 2019-03-27 17:50:57 +01:00
Laurent Destailleur
3930464b84 Clean code and debug TakePOS module 2019-03-27 17:50:23 +01:00
Laurent Destailleur
e064a954d2 Fix avoid error 500 when searching product with no criteria 2019-03-27 15:55:18 +01:00
Laurent Destailleur
11e4411400 TakePOS Can enter payment in several times and with different modes 2019-03-27 15:42:53 +01:00
Laurent Destailleur
ec0733d202 Use color on the amount of the payment page of TakePOS module
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
2019-03-27 12:40:32 +01:00
Laurent Destailleur
f902f7beeb Update takepos.php 2019-03-26 20:10:48 +01:00
Laurent Destailleur
7ff51df8f3 Update takepos.php 2019-03-26 20:09:54 +01:00
David Beniamine
32303bbe48 SQL modifications for multicompany compatibility
Thanks to hregis
2019-03-25 16:49:33 +01:00
David Beniamine
833da30af1 Use any dolibarr enabled paiement mode 2019-03-24 21:01:42 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
0ef6fd36f9 Merge and clean TakePOS CSS 2019-03-15 00:49:44 +01:00
Laurent Destailleur
6aa9a5f13a Fix link to backoffice 2019-03-14 23:36:55 +01:00
Regis Houssin
56104e6d89 FIX regression 2019-03-14 17:58:32 +01:00
Regis Houssin
a40cba194f FIX wrong url 2019-03-14 17:24:42 +01:00
Regis Houssin
daa940d75b FIX multiple bugs for show products/categories 2019-03-14 16:35:36 +01:00
andreubisquerra
b1e9a0fe38 Add Order Notes to TakePOS 2019-03-03 12:50:36 +01:00
Laurent Destailleur
bcf1d57456 Fix default page is not always index.php 2019-02-27 04:21:12 +01:00
andreubisquerra
57ee8b7991 Fix no JPG images in TakePOS and other image improvements. 2019-02-24 21:15:11 +01:00
andreubisquerra
8cc2662f01 Update TakePOS in Dolibarr 9 2019-02-14 20:59:32 +01:00
andreubisquerra
3f9b37d3d4 Fix TakePOS categories bug 2019-02-13 22:29:55 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
8dd64b0dc1 Update takepos.php 2019-02-03 19:15:41 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
andreubisquerra
8b1b8bb7a3 CSS improvements and Takepos setup check 2019-02-02 23:57:38 +01:00
Frédéric FRANCE
f5b2cf75f2 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
7fc00001d5 Merge pull request #10470 from frederic34/patch-2
remove psr2 else if warning
2019-02-01 15:34:23 +01:00
Laurent Destailleur
75252283c0 Merge branch 'develop' into master 2019-02-01 15:33:36 +01:00
Frédéric FRANCE
b89b0e683a remove psr2 else if warning 2019-01-31 18:32:39 +01:00
Frédéric FRANCE
ff39491f15 wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
andreubisquerra
e0af2a3597 Subcategories 2019-01-27 21:49:48 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +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
andreubisquerra
bec25fb45c Remove absolut divs and add Dolistore POS category link to TakePOS 2019-01-27 01:28:32 +01:00
andreubisquerra
5b3559418f Bills and coins pad, or Num pad in TakePOS 2019-01-23 20:59:34 +01:00
Regis Houssin
0a36a487c4 FIX remove unused option 2019-01-21 18:43:12 +01:00
Regis Houssin
406f26b9d2 FIX JSON.parse not needeed and missing simple quote escaping 2019-01-21 16:48:14 +01:00
Josep Lluís
88a2b73ae7 FIX: only show products with status for sell
On TakePos, only show products with status=1 (for sell)
2019-01-11 20:09:38 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
andreubisquerra
bce696ee36 Improve responsive design in TakePOS 2018-12-17 22:43:02 +01:00
aurelien goudeneche
94a19cde4b Add temporary Ticket
update
2018-12-07 01:20:59 +01:00
aurelien goudeneche
c66297a713 add temporary Ticket button 2018-12-07 01:07:25 +01:00
aurelien goudeneche
04dfc5dc8c New: TakePOS +add Temporary ticket
New: TakePOS  +add Temporary ticket with verbose invoice data (more exhaustive than the existing order printing)
                           +add some little invoice printing layouts improvements (Unit Price, Misc company  Info, Cashier name, Table Border) 

Temporary ticket is usefull in some restaurant when a customer ask for a bill from his table before to check it  out. The waiter usually don't how the customer will pay (card,cash,cheque).
Works with  the Andreu Bisquerra's java TakePOSconnector  like  the existing orderprinting so it doesn't affect the ulterior payment validation process and printing from CashDesk.
This feature needs the BAR/RESTAURANT order/printing to be enabled.
2018-12-07 00:40:00 +01:00