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

phpcbf fix

Browse Source
This commit is contained in:
aurelien goudeneche 2018-12-07 17:02:06 +01:00 committed by GitHub
parent b9ca32a7f2
commit fb0b208df7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 314 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
htdocs/takepos/invoice.php
View File

@ -1,35 +1,40 @@
<?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 *
* it under the terms of the GNU General Public License as published by * This program is free software; you can redistribute it and/or modify
* the Free Software Foundation; either version 3 of the License, or * it under the terms of the GNU General Public License as published by
* (at your option) any later version. * the Free Software Foundation; either version 3 of the License, or
* * (at your option) any later version.
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * This program is distributed in the hope that it will be useful,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. * You should have received a copy of the GNU General Public License
*/ * 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
@ -38,10 +43,12 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
$langs->loadLangs(array( $langs->loadLangs(
array(
"bills", "bills",
"cashdesk" "cashdesk"
)); )
);
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$action = GETPOST('action', 'alpha'); $action = GETPOST('action', 'alpha');
$idproduct = GETPOST('idproduct', 'int'); $idproduct = GETPOST('idproduct', 'int');
@ -55,29 +62,30 @@ $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 if (!$placeid) { $placeid = 0; // not necesary
else } else
{ {
$invoice = new Facture($db); $invoice = new Facture($db);
$invoice->fetch($placeid); $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
else if ($pay == "card") { $bankaccount = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
if ($pay == "card") $bankaccount = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; } else
else if ($pay == "cheque") { $bankaccount = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
if ($pay == "cheque") $bankaccount = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE; }
$now = dol_now(); $now = dol_now();
$invoice = new Facture($db); $invoice = new Facture($db);
$invoice->fetch($placeid); $invoice->fetch($placeid);
if (!empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK != "1") $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE); if (!empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK != "1") { $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE);
else $invoice->validate($user); } else { $invoice->validate($user);
}
// Add the payment // Add the payment
@ -85,24 +93,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 } else
if ($pay == "card") $payment->paiementid = 6; if ($pay == "card") { $payment->paiementid = 6;
else } else
if ($pay == "cheque") $payment->paiementid = 7; if ($pay == "cheque") { $payment->paiementid = 7;
}
$payment->num_paiement = $invoice->facnumber; $payment->num_paiement = $invoice->facnumber;
$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") and $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();
@ -113,32 +120,27 @@ if (($action == "addline" || $action == "freezone") and $placeid == 0)
$sql = "UPDATE " . MAIN_DB_PREFIX . "facture set facnumber='(PROV-POS-" . $place . ")' where rowid=" . $placeid; $sql = "UPDATE " . MAIN_DB_PREFIX . "facture set facnumber='(PROV-POS-" . $place . ")' where rowid=" . $placeid;
$db->query($sql); $db->query($sql);
} }
} }
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 else
if ($placeid > 0) if ($placeid > 0) { //If exist invoice, but no line selected, proced to delete last line
{ //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"; $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);
@ -146,57 +148,56 @@ if ($action == "deleteline")
$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, $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); 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);
}
} }
$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, $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); 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);
}
} }
$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, $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); 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);
}
} }
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
if ($action == "order" and $placeid != 0) if ($action == "order" and $placeid != 0) {
{ include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
require_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>'; $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>'; $footerorder = '</tbody></table>' . dol_print_date(dol_now(), 'dayhour') . '<br /></html>';
$order_receipt_printer1 = ""; $order_receipt_printer1 = "";
$order_receipt_printer2 = ""; $order_receipt_printer2 = "";
$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1); $catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2); $catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->special_code == "3") continue; if ($line->special_code == "3") { continue;
}
$c = new Categorie($db); $c = new Categorie($db);
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id'); $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$result = array_intersect($catsprinter1, $existing); $result = array_intersect($catsprinter1, $existing);
$count = count($result); $count = count($result);
if ($count > 0) if ($count > 0) {
{
$sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid"; $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
$db->query($sql); $db->query($sql);
$order_receipt_printer1.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>'; $order_receipt_printer1.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>';
@ -205,13 +206,13 @@ if ($action == "order" and $placeid != 0)
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->special_code == "3") continue; if ($line->special_code == "3") { continue;
}
$c = new Categorie($db); $c = new Categorie($db);
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id'); $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$result = array_intersect($catsprinter2, $existing); $result = array_intersect($catsprinter2, $existing);
$count = count($result); $count = count($result);
if ($count > 0) if ($count > 0) {
{
$sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid"; $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
$db->query($sql); $db->query($sql);
$order_receipt_printer2.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>'; $order_receipt_printer2.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>';
@ -219,17 +220,16 @@ if ($action == "order" and $placeid != 0)
} }
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
// temporary ticket feature // temporary ticket feature
if ($action == "temp" and $placeid != 0) if ($action == "temp" and $placeid != 0) {
{ include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
require_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. // issues with special characters with jPosBoxprinting ->javascript, stringCleanCharts() temporarily fix them until to find a more elegant solution.
function StringCleanCharts($text) function stringCleanCharts($text)
{ {
$utf8 = array( $utf8 = array(
'/[áàâãªä]/u' => 'a', '/[áàâãªä]/u' => 'a',
@ -251,30 +251,30 @@ if ($action == "temp" and $placeid != 0)
'/[“”«»„]/u' => ' ', '/[“”«»„]/u' => ' ',
'/ /' => ' ', '/ /' => ' ',
); );
return preg_replace(array_keys($utf8) , array_values($utf8) , $text); return preg_replace(array_keys($utf8), array_values($utf8), $text);
} }
$mysocname = StringCleanCharts($mysoc->name); $mysocname = stringCleanCharts($mysoc->name);
$mysocaddress = StringCleanCharts($mysoc->address); $mysocaddress = stringCleanCharts($mysoc->address);
$mysoctown = StringCleanCharts($mysoc->town); $mysoctown = stringCleanCharts($mysoc->town);
$mysoczip = StringCleanCharts($mysoc->zip); $mysoczip = stringCleanCharts($mysoc->zip);
$mysocphone = StringCleanCharts($mysoc->phone); $mysocphone = stringCleanCharts($mysoc->phone);
$mysocurl = StringCleanCharts($mysoc->url); $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_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>'; $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>'; $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>'; $footer_ticket = '<br /><br />' . $langs->trans("Cashier") . ': ' . $user->firstname . '<br /><center>' . $langs->trans("Thanks for your coming !") . '</center></html>';
$ticket_printer1 = ""; $ticket_printer1 = "";
$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1); $catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->special_code == "3") continue; if ($line->special_code == "3") { continue;
}
$c = new Categorie($db); $c = new Categorie($db);
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id'); $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$result = array_intersect($catsprinter1, $existing); $result = array_intersect($catsprinter1, $existing);
$count = count($result); $count = count($result);
if ($count > 0) if ($count > 0) {
{
$sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid"; $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
$db->query($sql); $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_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>';
@ -283,7 +283,7 @@ if ($action == "temp" and $placeid != 0)
} }
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
?> ?>
<style> <style>
@ -307,9 +307,8 @@ $(document).ready(function(){
}); });
<?php <?php
if ($action == "order" and $order_receipt_printer1 != "") if ($action == "order" and $order_receipt_printer1 != "") {
{ ?>
?>
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'http://<?php url: 'http://<?php
@ -317,12 +316,11 @@ if ($action == "order" and $order_receipt_printer1 != "")
data: '<?php data: '<?php
print $headerorder . $order_receipt_printer1 . $footerorder; ?>' print $headerorder . $order_receipt_printer1 . $footerorder; ?>'
}); });
<?php <?php
} }
if ($action == "order" and $order_receipt_printer2 != "") if ($action == "order" and $order_receipt_printer2 != "") {
{ ?>
?>
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'http://<?php url: 'http://<?php
@ -330,15 +328,14 @@ if ($action == "order" and $order_receipt_printer2 != "")
data: '<?php data: '<?php
print $headerorder . $order_receipt_printer2 . $footerorder; ?>' print $headerorder . $order_receipt_printer2 . $footerorder; ?>'
}); });
<?php <?php
} }
if ($action == "search") if ($action == "search") {
{ ?>
?>
$('#search').focus(); $('#search').focus();
<?php <?php
} }
?> ?>
}); });
@ -353,9 +350,8 @@ $(document).ready(function(){
}); });
<?php <?php
if ($action == "temp" and $ticket_printer1 != "") if ($action == "temp" and $ticket_printer1 != "") {
{ ?>
?>
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'http://<?php url: 'http://<?php
@ -363,22 +359,21 @@ if ($action == "temp" and $ticket_printer1 != "")
data: '<?php data: '<?php
print $header_soc . $header_ticket . $body_ticket . $ticket_printer1 . $ticket_total . $footer_ticket; ?>' print $header_soc . $header_ticket . $body_ticket . $ticket_printer1 . $ticket_total . $footer_ticket; ?>'
}); });
<?php <?php
} }
if ($action == "search") if ($action == "search") {
{ ?>
?>
$('#search').focus(); $('#search').focus();
<?php <?php
} }
?> ?>
}); });
function Print(id){ function Print(id){
$.colorbox({href:"receipt.php?facid="+id, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php $.colorbox({href:"receipt.php?facid="+id, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php
echo $langs->trans("PrintTicket"); ?>"}); echo $langs->trans("PrintTicket"); ?>"});
} }
function TakeposPrinting(id){ function TakeposPrinting(id){
@ -388,7 +383,7 @@ function TakeposPrinting(id){
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'http://<?php url: 'http://<?php
print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print', print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
data: receipt data: receipt
}); });
}); });
@ -403,48 +398,51 @@ 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) if ($placeid > 0) {
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
print '<tr class="drag drop oddeven'; print '<tr class="drag drop oddeven';
if ($line->special_code == "3") print ' order'; if ($line->special_code == "3") { print ' order';
}
print '" id="' . $line->rowid . '">'; print '" id="' . $line->rowid . '">';
print '<td>' . $line->product_label . $line->desc . '</td>'; print '<td>' . $line->product_label . $line->desc . '</td>';
print '<td align="right">' . $line->qty . '</td>'; print '<td align="right">' . $line->qty . '</td>';
print '<td align="right">' . price($line->total_ttc) . '</td>'; print '<td align="right">' . price($line->total_ttc) . '</td>';
print '</tr>'; 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){
$soc = new Societe($db); $soc = new Societe($db);
if ($invoice->socid > 0) $soc->fetch($invoice->socid); if ($invoice->socid > 0) { $soc->fetch($invoice->socid);
else $soc->fetch($conf->global->CASHDESK_ID_THIRDPARTY); } else { $soc->fetch($conf->global->CASHDESK_ID_THIRDPARTY);
}
print '<p style="font-size:120%;" align="right">'; print '<p style="font-size:120%;" align="right">';
print $langs->trans("Customer") . ': ' . $soc->name; print $langs->trans("Customer") . ': ' . $soc->name;
print '</p>'; print '</p>';
// } // }
if ($action == "valid") if ($action == "valid") {
{
print '<p style="font-size:120%;" align="center"><b>' . $invoice->facnumber . " " . $langs->trans('BillShortStatusValidated') . '</b></p>'; 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>'; 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") if ($action == "search") {
{
print '<center> print '<center>
<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search') . ' <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>';