lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10192 from AurelGDN/develop

Browse Source 
New: TakePOS +add Temporary ticket
This commit is contained in:
Laurent Destailleur 2018-12-16 17:44:18 +01:00 committed by GitHub
commit c06e4ecd68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 334 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

446
htdocs/takepos/invoice.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2018 Andreu Bisquerra <jove@bisquerra.com> /**
* Copyright (C) 2018 Andreu Bisquerra <jove@bisquerra.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -15,46 +16,55 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language // if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language // if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); // if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); if (!defined('NOCSRFCHECK')) { define('NOCSRFCHECK', '1'); }
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); if (!defined('NOTOKENRENEWAL')) { define('NOTOKENRENEWAL', '1'); }
if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); if (!defined('NOREQUIREMENU')) { define('NOREQUIREMENU', '1'); }
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); if (!defined('NOREQUIREHTML')) { define('NOREQUIREHTML', '1'); }
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (!defined('NOREQUIREAJAX')) { define('NOREQUIREAJAX', '1'); }
require '../main.inc.php';
require '../main.inc.php'; // Load $user and permissions // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
$langs->loadLangs(array("bills", "cashdesk")); require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
$id = GETPOST('id','int'); require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
$action = GETPOST('action','alpha');
$idproduct = GETPOST('idproduct','int'); $langs->loadLangs(
$place = GETPOST('place','int'); array(
"bills",
"cashdesk"
)
);
$id = GETPOST('id', 'int');
$action = GETPOST('action', 'alpha');
$idproduct = GETPOST('idproduct', 'int');
$place = GETPOST('place', 'int');
$number = GETPOST('number'); $number = GETPOST('number');
$idline = GETPOST('idline'); $idline = GETPOST('idline');
$desc = GETPOST('desc','alpha'); $desc = GETPOST('desc', 'alpha');
$pay = GETPOST('pay'); $pay = GETPOST('pay');
$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS-".$place.")'"; $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS-".$place.")'";
$resql = $db->query($sql); $resql = $db->query($sql);
$row = $db->fetch_array ($resql); $row = $db->fetch_array($resql);
$placeid=$row[0]; $placeid = $row[0];
if (! $placeid) $placeid=0; // not necesary
else{ if (!$placeid) { $placeid = 0; // not necesary
$invoice = new Facture($db); } else
$invoice->fetch($placeid); {
$invoice = new Facture($db);
$invoice->fetch($placeid);
} }
/* /*
* Actions * Actions
*/ */
if ($action == 'valid' && $user->rights->facture->creer){ if ($action == 'valid' && $user->rights->facture->creer)
{
if ($pay=="cash") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH; if ($pay=="cash") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
else if ($pay=="card") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB; else if ($pay=="card") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
else if ($pay=="cheque") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE; else if ($pay=="cheque") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
@ -68,19 +78,23 @@ if ($action == 'valid' && $user->rights->facture->creer){
$payment->datepaye=$now; $payment->datepaye=$now;
$payment->bank_account=$bankaccount; $payment->bank_account=$bankaccount;
$payment->amounts[$invoice->id]=$invoice->total_ttc; $payment->amounts[$invoice->id]=$invoice->total_ttc;
if ($pay=="cash") $payment->paiementid=4;
if ($pay=="cash") $payment->paiementid=4;
else if ($pay=="card") $payment->paiementid=6; else if ($pay=="card") $payment->paiementid=6;
else if ($pay=="cheque") $payment->paiementid=7; else if ($pay=="cheque") $payment->paiementid=7;
$payment->num_paiement=$invoice->ref; $payment->num_paiement=$invoice->ref;
$payment->create($user);
$payment->create($user);
$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', ''); $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
$invoice->set_paid($user);
$invoice->set_paid($user);
} }
if (($action=="addline" || $action=="freezone") and $placeid==0) if (($action=="addline" || $action=="freezone") && $placeid==0)
{ {
// $place is id of POS, $placeid is id of invoice // $place is id of POS, $placeid is id of invoice
if ($placeid==0) { if ($placeid==0)
{
$invoice = new Facture($db); $invoice = new Facture($db);
$invoice->socid=$conf->global->CASHDESK_ID_THIRDPARTY; $invoice->socid=$conf->global->CASHDESK_ID_THIRDPARTY;
$invoice->date=dol_now(); $invoice->date=dol_now();
@ -94,105 +108,176 @@ if (($action=="addline" || $action=="freezone") and $placeid==0)
} }
} }
if ($action=="addline"){ if ($action == "addline") {
$prod = new Product($db); $prod = new Product($db);
$prod->fetch($idproduct); $prod->fetch($idproduct);
$invoice->addline($prod->description, $prod->price, 1, $prod->tva_tx, $prod->localtax1_tx, $prod->localtax2_tx, $idproduct, $prod->remise_percent, '', 0, 0, 0, '', $prod->price_base_type, $prod->price_ttc, $prod->type, - 1, 0, '', 0, 0, null, 0, '', 0, 100, '', null, 0); $invoice->addline($prod->description, $prod->price, 1, $prod->tva_tx, $prod->localtax1_tx, $prod->localtax2_tx, $idproduct, $prod->remise_percent, '', 0, 0, 0, '', $prod->price_base_type, $prod->price_ttc, $prod->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', null, 0);
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
if ($action=="freezone"){ if ($action == "freezone") {
$invoice->addline($desc, $number, 1, $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS, 0, 0, 0, 0, '', 0, 0, 0, '', 'TTC', $number, 0, - 1, 0, '', 0, 0, null, 0, '', 0, 100, '', null, 0); $invoice->addline($desc, $number, 1, $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS, 0, 0, 0, 0, '', 0, 0, 0, '', 'TTC', $number, 0, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', null, 0);
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
if ($action=="deleteline"){ if ($action == "deleteline") {
if ($idline>0 and $placeid>0){ //If exist invoice and line, to avoid errors if deleted from other device or no line selected if ($idline > 0 and $placeid > 0) { //If exist invoice and line, to avoid errors if deleted from other device or no line selected
$invoice->deleteline($idline); $invoice->deleteline($idline);
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
else if ($placeid>0){ //If exist invoice, but no line selected, proced to delete last line else
$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture='$placeid' order by rowid DESC"; if ($placeid > 0) { //If exist invoice, but no line selected, proced to delete last line
$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "facturedet where fk_facture='$placeid' order by rowid DESC";
$resql = $db->query($sql); $resql = $db->query($sql);
$row = $db->fetch_array ($resql); $row = $db->fetch_array($resql);
$deletelineid=$row[0]; $deletelineid = $row[0];
$invoice->deleteline($deletelineid); $invoice->deleteline($deletelineid);
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
} }
if ($action=="updateqty"){ if ($action == "updateqty") {
foreach ($invoice->lines as $line){ foreach($invoice->lines as $line)
if ($line->id==$idline) $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, {
$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
$line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, }
$line->fk_unit);
} }
$invoice->fetch($placeid);
$invoice->fetch($placeid);
} }
if ($action=="updateprice"){ if ($action == "updateprice") {
foreach ($invoice->lines as $line){ foreach($invoice->lines as $line)
if ($line->id==$idline) $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, {
$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
$line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, }
$line->fk_unit);
} }
$invoice->fetch($placeid);
$invoice->fetch($placeid);
} }
if ($action=="updatereduction"){ if ($action == "updatereduction") {
foreach ($invoice->lines as $line){ foreach($invoice->lines as $line)
if ($line->id==$idline) $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, {
$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
$line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, }
$line->fk_unit);
} }
$invoice->fetch($placeid);
$invoice->fetch($placeid);
} }
if ($action=="order" and $placeid!=0){ if ($action == "order" and $placeid != 0) {
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$headerorder='<html><br><b>'.$langs->trans('Place').' '.$place.'<br><table width="65%"><thead><tr><th align="left">'.$langs->trans("Label").'</th><th align="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
$footerorder='</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>'; $headerorder = '<html><br><b>' . $langs->trans('Place') . ' ' . $place . '<br><table width="65%"><thead><tr><th align="left">' . $langs->trans("Label") . '</th><th align="right">' . $langs->trans("Qty") . '</th></tr></thead><tbody>';
$order_receipt_printer1=""; $footerorder = '</tbody></table>' . dol_print_date(dol_now(), 'dayhour') . '<br></html>';
$order_receipt_printer2=""; $order_receipt_printer1 = "";
$catsprinter1 = explode(';',$conf->global->TAKEPOS_PRINTED_CATEGORIES_1); $order_receipt_printer2 = "";
$catsprinter2 = explode(';',$conf->global->TAKEPOS_PRINTED_CATEGORIES_2); $catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
foreach ($invoice->lines as $line){ $catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
if ($line->special_code=="3") continue; foreach($invoice->lines as $line)
$c = new Categorie($db); {
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id'); if ($line->special_code == "3") { continue;
$result = array_intersect($catsprinter1, $existing); }
$count=count($result); $c = new Categorie($db);
if ($count>0){ $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$sql="UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=$line->rowid"; $result = array_intersect($catsprinter1, $existing);
$db->query($sql); $count = count($result);
$order_receipt_printer1.='<tr>'.$line->product_label.'<td align="right">'.$line->qty.'</td></tr>'; if ($count > 0) {
} $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
$db->query($sql);
$order_receipt_printer1.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>';
}
} }
foreach ($invoice->lines as $line){
if ($line->special_code=="3") continue; foreach($invoice->lines as $line)
$c = new Categorie($db); {
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id'); if ($line->special_code == "3") { continue;
$result = array_intersect($catsprinter2, $existing); }
$count=count($result); $c = new Categorie($db);
if ($count>0){ $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$sql="UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=$line->rowid"; $result = array_intersect($catsprinter2, $existing);
$db->query($sql); $count = count($result);
$order_receipt_printer2.='<tr>'.$line->product_label.'<td align="right">'.$line->qty.'</td></tr>'; if ($count > 0) {
} $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
$db->query($sql);
$order_receipt_printer2.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>';
}
} }
$invoice->fetch($placeid);
$invoice->fetch($placeid);
}
// temporary ticket feature
if ($action == "temp" and $placeid != 0) {
include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
// issues with special characters with jPosBoxprinting ->javascript, stringCleanCharts() temporarily fix them until to find a more elegant solution.
function stringCleanCharts($text)
{
$utf8 = array(
'/[áàâãªä]/u' => 'a',
'/[ÁÀÂÃÄ]/u' => 'A',
'/[ÍÌÎÏ]/u' => 'I',
'/[íìîï]/u' => 'i',
'/[éèêë]/u' => 'e',
'/[ÉÈÊË]/u' => 'E',
'/[óòôõºö]/u' => 'o',
'/[ÓÒÔÕÖ]/u' => 'O',
'/[úùûü]/u' => 'u',
'/[ÚÙÛÜ]/u' => 'U',
'/ç/' => 'c',
'/Ç/' => 'C',
'/ñ/' => 'n',
'/Ñ/' => 'N',
'/–/' => '-',
'/[’‘‹›‚\']/u' => ' ',
'/[“”«»„]/u' => ' ',
'/ /' => ' ',
);
return preg_replace(array_keys($utf8), array_values($utf8), $text);
}
$mysocname = stringCleanCharts($mysoc->name);
$mysocaddress = stringCleanCharts($mysoc->address);
$mysoctown = stringCleanCharts($mysoc->town);
$mysoczip = stringCleanCharts($mysoc->zip);
$mysocphone = stringCleanCharts($mysoc->phone);
$mysocurl = stringCleanCharts($mysoc->url);
$header_soc = '<html><center><font size="4"><b>' . $mysocname . '</b><br>' . $mysocaddress . '<br>' . $mysoczip . ' ' . $mysoctown . '</font></center><br>' . $langs->trans("Phone") . ': ' . $mysocphone . '<br>' . $mysocurl;
$header_ticket = '<br><br>' . $langs->trans("Temporary ticket") . '<br>' . $langs->trans("date") . ':<br>' . dol_print_date(dol_now(), 'dayhour') . '<br>' . $langs->trans('Place') . ' ' . $place . '<br><br><br><div width="100%" style="border-top-style: double;"></div>';
$body_ticket = '<table width="100%"><thead><tr><th align="left">' . $langs->trans("Label") . '</th><th align="left">' . $langs->trans("Qty") . '</th><th align="left">' . $langs->trans("Price") . '</th><th align="left">' . $langs->trans("TotalTTC") . '</th></tr></thead>';
$footer_ticket = '<br><br>' . $langs->trans("Cashier") . ': ' . $user->firstname . '<br><center>' . $langs->trans("Thanks for your coming !") . '</center></html>';
$ticket_printer1 = "";
$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
foreach($invoice->lines as $line)
{
if ($line->special_code == "3") { continue;
}
$c = new Categorie($db);
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$result = array_intersect($catsprinter1, $existing);
$count = count($result);
if ($count > 0) {
$sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
$db->query($sql);
$ticket_printer1.= '<tbody><tr><td align="left">' . $line->product_label . '</td><td align="left">' . $line->qty . '</td><td align="left">' . $line->total_ttc / $line->qty . '</td><td align="left">' . $line->total_ttc . '</td></tr></tbody>';
$ticket_total = '</table><div width="100%" style="border-top-style: double;"></div><table align="right"><tr><th>' . $langs->trans("TotalHT") . ': ' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</th></tr><tr><th>' . $langs->trans("TotalVAT") . ': ' . price($invoice->total_tva, 1, '', 1, -1, -1, $conf->currency) . '</th></tr><tr><th>' . $langs->trans("TotalTTC") . ': ' . price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency) . '</th></tr></tbody></table>';
}
}
$invoice->fetch($placeid);
} }
?> ?>
<style> <style>
.selected { .selected {
color: red; color: red;
} }
.order { .order {
color: limegreen; color: limegreen;
} }
</style> </style>
<script language="javascript"> <script language="javascript">
@ -200,51 +285,89 @@ var selectedline=0;
var selectedtext=""; var selectedtext="";
$(document).ready(function(){ $(document).ready(function(){
$('table tbody tr').click(function(){ $('table tbody tr').click(function(){
$('table tbody tr').removeClass("selected"); $('table tbody tr').removeClass("selected");
$(this).addClass("selected"); $(this).addClass("selected");
if (selectedline==this.id) return; // If is already selected if (selectedline==this.id) return; // If is already selected
else selectedline=this.id; else selectedline=this.id;
selectedtext=$('#'+selectedline).find("td:first").html(); selectedtext=$('#'+selectedline).find("td:first").html();
}); });
<?php if ($action=="order" and $order_receipt_printer1!=""){
?>
$.ajax({
type: "POST",
url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER;?>:8111/print',
data: '<?php print $headerorder.$order_receipt_printer1.$footerorder; ?>'
});
<?php <?php
if ($action == "order" and $order_receipt_printer1 != "") {
?>
$.ajax({
type: "POST",
url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
data: '<?php
print $headerorder . $order_receipt_printer1 . $footerorder; ?>'
});
<?php
} }
if ($action=="order" and $order_receipt_printer2!=""){
?> if ($action == "order" and $order_receipt_printer2 != "") {
$.ajax({ ?>
type: "POST", $.ajax({
url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER;?>:8111/print2', type: "POST",
data: '<?php print $headerorder.$order_receipt_printer2.$footerorder; ?>' url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print2',
}); data: '<?php
print $headerorder . $order_receipt_printer2 . $footerorder; ?>'
});
<?php
}
if ($action == "search") {
?>
$('#search').focus();
<?php
}
?>
});
$(document).ready(function(){
$('table tbody tr').click(function(){
$('table tbody tr').removeClass("selected");
$(this).addClass("selected");
if (selectedline==this.id) return; // If is already selected
else selectedline=this.id;
selectedtext=$('#'+selectedline).find("td:first").html();
});
<?php <?php
if ($action == "temp" and $ticket_printer1 != "") {
?>
$.ajax({
type: "POST",
url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
data: '<?php
print $header_soc . $header_ticket . $body_ticket . $ticket_printer1 . $ticket_total . $footer_ticket; ?>'
});
<?php
} }
if ($action=="search"){
?> if ($action == "search") {
$('#search').focus(); ?>
<?php $('#search').focus();
<?php
} }
?> ?>
}); });
function Print(id){ function Print(id){
$.colorbox({href:"receipt.php?facid="+id, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("PrintTicket");?>"}); $.colorbox({href:"receipt.php?facid="+id, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php
echo $langs->trans("PrintTicket"); ?>"});
} }
function TakeposPrinting(id){ function TakeposPrinting(id){
var receipt; var receipt;
$.get("receipt.php?facid="+id, function(data, status){ $.get("receipt.php?facid="+id, function(data, status){
receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, ''); receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER;?>:8111/print', url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
data: receipt data: receipt
}); });
}); });
} }
</script> </script>
@ -252,23 +375,31 @@ function TakeposPrinting(id){
print '<div class="div-table-responsive-no-min invoice">'; print '<div class="div-table-responsive-no-min invoice">';
print '<table id="tablelines" class="noborder noshadow" width="100%">'; print '<table id="tablelines" class="noborder noshadow" width="100%">';
print '<tr class="liste_titre nodrag nodrop">'; print '<tr class="liste_titre nodrag nodrop">';
print '<td class="linecoldescription">'.$langs->trans('Description').'</td>'; print '<td class="linecoldescription">' . $langs->trans('Description') . '</td>';
print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>'; print '<td class="linecolqty" align="right">' . $langs->trans('Qty') . '</td>';
print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>'; print '<td class="linecolht" align="right">' . $langs->trans('TotalHTShort') . '</td>';
print "</tr>\n"; print "</tr>\n";
if ($placeid>0) foreach ($invoice->lines as $line)
{ if ($placeid > 0) {
print '<tr class="drag drop oddeven'; foreach($invoice->lines as $line)
if ($line->special_code=="3") print ' order'; {
print '" id="'.$line->rowid.'">'; print '<tr class="drag drop oddeven';
print '<td>'.$line->product_label.$line->desc.'</td>'; if ($line->special_code == "3") { print ' order';
print '<td align="right">'.$line->qty.'</td>'; }
print '<td align="right">'.price($line->total_ttc).'</td>'; print '" id="' . $line->rowid . '">';
print '</tr>'; print '<td>' . $line->product_label . $line->desc . '</td>';
print '<td align="right">' . $line->qty . '</td>';
print '<td align="right">' . price($line->total_ttc) . '</td>';
print '</tr>';
}
} }
print '</table>'; print '</table>';
print '<p style="font-size:120%;" align="right"><b>'.$langs->trans('TotalTTC'); print '<p style="font-size:120%;" align="right"><b>'.$langs->trans('TotalTTC');
if($conf->global->TAKEPOS_BAR_RESTAURANT) print " ".$langs->trans('Place')." ".$place; if($conf->global->TAKEPOS_BAR_RESTAURANT) print " ".$langs->trans('Place')." ".$place;
print ': '.price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'&nbsp;</b></p>'; print ': '.price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'&nbsp;</b></p>';
//if ($invoice->socid != $conf->global->CASHDESK_ID_THIRDPARTY){ //if ($invoice->socid != $conf->global->CASHDESK_ID_THIRDPARTY){
@ -284,9 +415,32 @@ if ($action=="valid"){
if ($conf->global->TAKEPOSCONNECTOR) print '<center><button type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>'; if ($conf->global->TAKEPOSCONNECTOR) print '<center><button type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
else print '<center><button type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>'; else print '<center><button type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
} }
if ($action=="search"){ print ': ' . price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency) . '&nbsp;</b></p>';
print '<center>
<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder='.$langs->trans('Search').' // if ($invoice->socid != $conf->global->CASHDESK_ID_THIRDPARTY){
$soc = new Societe($db);
if ($invoice->socid > 0) { $soc->fetch($invoice->socid);
} else { $soc->fetch($conf->global->CASHDESK_ID_THIRDPARTY);
}
print '<p style="font-size:120%;" align="right">';
print $langs->trans("Customer") . ': ' . $soc->name;
print '</p>';
// }
if ($action == "valid") {
print '<p style="font-size:120%;" align="center"><b>' . $invoice->facnumber . " " . $langs->trans('BillShortStatusValidated') . '</b></p>';
if ($conf->global->TAKEPOSCONNECTOR) { print '<center><button type="button" onclick="TakeposPrinting(' . $placeid . ');">' . $langs->trans('PrintTicket') . '</button><center>';
} else { print '<center><button type="button" onclick="Print(' . $placeid . ');">' . $langs->trans('PrintTicket') . '</button><center>';
}
}
if ($action == "search") {
print '<center>
<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search') . '
</center>'; </center>';
} }
print '</div>'; print '</div>';

19
htdocs/takepos/receipt.php
View File

@ -46,12 +46,14 @@ $object->fetch($facid);
<body> <body>
<center> <center>
<font size="4"> <font size="4">
<?php echo $mysoc->name; ?> <?php echo '<b>'.$mysoc->name.'</b>';?>
</font> </font>
</center> </center>
<br> <br>
<p align="left"> <p align="left">
<?php print dol_nl2br(dol_format_address($mysoc)); ?> <?php print dol_nl2br(dol_format_address($mysoc)).'<br>'.$langs->trans("Phone").': '.$mysoc->phone;
?>
</p> </p>
<p align="right"> <p align="right">
<?php <?php
@ -62,11 +64,12 @@ print $object->ref;
</p> </p>
<br> <br>
<table width="100%"> <table width="100%" style="border-top-style: double;">
<thead> <thead>
<tr> <tr>
<th align="center"><?php print $langs->trans("Label"); ?></th> <th align="center"><?php print $langs->trans("Label"); ?></th>
<th align="right"><?php print $langs->trans("Qty"); ?></th> <th align="right"><?php print $langs->trans("Qty"); ?></th>
<th align="right"><?php print $langs->trans("Price"); ?></th>
<th align="right"><?php print $langs->trans("TotalTTC"); ?></th> <th align="right"><?php print $langs->trans("TotalTTC"); ?></th>
</tr> </tr>
</thead> </thead>
@ -78,6 +81,7 @@ print $object->ref;
<tr> <tr>
<td><?php echo $line->product_label;?></td> <td><?php echo $line->product_label;?></td>
<td align="right"><?php echo $line->qty;?></td> <td align="right"><?php echo $line->qty;?></td>
<td align="right"><?php echo $line->total_ttc/$line->qty;?></td>
<td align="right"><?php echo price($line->total_ttc);?></td> <td align="right"><?php echo price($line->total_ttc);?></td>
</tr> </tr>
<?php <?php
@ -98,6 +102,15 @@ print $object->ref;
<th align="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td align="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td> <th align="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td align="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
</tr> </tr>
</table> </table>
<div style="border-top-style: double;">
<br>
<br>
<br>
<?php
echo $langs->trans("Cashier: ");
echo $user->firstname.'<br>'.$mysoc->url.'<br>';
echo '<center>'.$langs->trans("Thanks for your coming !").'</center>';
?>
<script type="text/javascript"> <script type="text/javascript">
window.print(); window.print();

24
htdocs/takepos/takepos.php
View File

@ -292,6 +292,12 @@ function TakeposPrintingOrder(){
}); });
} }
function TakeposPrintingTemp(){
$("#poslines").load("invoice.php?action=temp&place="+place, function() {
$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
});
}
function OpenDrawer(){ function OpenDrawer(){
$.ajax({ $.ajax({
type: "POST", type: "POST",
@ -347,14 +353,23 @@ $menus[$r++]=array('title'=>$langs->trans("ValidateBill"),
'action'=>'CloseBill();'); 'action'=>'CloseBill();');
$menus[$r++]=array('title'=>$langs->trans("Logout"), $menus[$r++]=array('title'=>$langs->trans("Logout"),
'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';'); 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
//BAR RESTAURANT specified menu
if($conf->global->TAKEPOS_BAR_RESTAURANT){ if($conf->global->TAKEPOS_BAR_RESTAURANT){
$menus[$r++]=array('title'=>$langs->trans("Floors"), $menus[$r++]=array('title'=>$langs->trans("Floors"),
'action'=>'Floors();'); 'action'=>'Floors();');
if ($conf->global->TAKEPOS_ORDER_PRINTERS){ if ($conf->global->TAKEPOS_ORDER_PRINTERS){
$menus[$r++]=array('title'=>$langs->trans("Order"), $menus[$r++]=array('title'=>$langs->trans("Order"),
'action'=>'TakeposPrintingOrder();'); 'action'=>'TakeposPrintingOrder();');}
}
//add temp ticket button
if ($conf->global->TAKEPOS_ORDER_PRINTERS){
$menus[$r++]=array('title'=>$langs->trans("Temporary ticket"),
'action'=>'TakeposPrintingTemp();');}
} }
if ($conf->global->TAKEPOSCONNECTOR){ if ($conf->global->TAKEPOSCONNECTOR){
$menus[$r++]=array('title'=>$langs->trans("DOL_OPEN_DRAWER"), $menus[$r++]=array('title'=>$langs->trans("DOL_OPEN_DRAWER"),
'action'=>'OpenDrawer();'); 'action'=>'OpenDrawer();');
@ -410,6 +425,3 @@ while ($count<32)
llxFooter(); llxFooter();
$db->close(); $db->close();