diff --git a/site/layouts/form_search.php b/site/layouts/form_search.php
index 4658a14d..a6bf697c 100644
--- a/site/layouts/form_search.php
+++ b/site/layouts/form_search.php
@@ -15,13 +15,15 @@
$checkedAll = '';
$checkedFilter = '';
-$js = 'jQuery(document).ready(function(){'."\n";
+$js = ' '. "\n";
+$js .= 'jQuery(document).ready(function(){'."\n";
$js .= ' jQuery("#'.$d['id'].$d['paramname'].'").keyup(function(event){'."\n";
$js .= ' if(event.keyCode == 13){'."\n";
$js .= ' jQuery("#'.$d['id'].$d['paramname'].'Btn'.'").click();'."\n";
$js .= ' }'."\n";
$js .= ' });'."\n";
$js .= '});'."\n";
+$js .= ' '. "\n";
$document = JFactory::getDocument();
$document->addScriptDeclaration($js);
diff --git a/site/layouts/order.bak.php b/site/layouts/order.bak.php
new file mode 100644
index 00000000..d7d20cf6
--- /dev/null
+++ b/site/layouts/order.bak.php
@@ -0,0 +1,828 @@
+get( 'store_title', '' );
+$store_logo = $d['params']->get( 'store_logo', '' );
+$store_info = $d['params']->get( 'store_info', '' );
+$store_info = PhocacartRenderFront::renderArticle($store_info, $d['format']);
+//$invoice_prefix = $d['params']->get( 'invoice_prefix', '');
+//$invoice_number_format = $d['params']->get( 'invoice_number_format', '');
+//$invoice_number_chars = $d['params']->get( 'invoice_number_chars', 12);
+$invoice_tp = $d['params']->get( 'invoice_terms_payment', '');
+$display_discount_price_product = $d['params']->get( 'display_discount_price_product', 1);
+
+$store_title_pos = $d['params']->get( 'store_title_pos', '' );
+$store_logo_pos = $d['params']->get( 'store_logo_pos', '' );
+$store_info_pos = $d['params']->get( 'store_info_pos', '' );
+$store_info_footer_pos = $d['params']->get( 'store_info_footer_pos', '' );
+
+// Used in Phoca PDF Phocacart plugin because of converting the TCPDF QR code into html
+//$pdf_invoice_qr_code = $d['params']->get( 'pdf_invoice_qr_code', '' );
+$pdf_invoice_signature_image = $d['params']->get( 'pdf_invoice_signature_image', '' );
+$pdf_invoice_qr_information = $d['params']->get( 'pdf_invoice_qr_information', '' );
+$invoice_global_top_desc = $d['params']->get( 'invoice_global_top_desc', 0 );// Article ID
+$invoice_global_middle_desc = $d['params']->get( 'invoice_global_middle_desc', 0 );
+$invoice_global_bottom_desc = $d['params']->get( 'invoice_global_bottom_desc', 0 );
+/*
+ * FORMAT
+ */
+// FORMAT - HTML
+$box = 'class="ph-idnr-box"';
+$table = 'class="ph-idnr-box-in"';
+$pho1 = $pho12 = 'class="pho1"';
+$pho2 = $pho22 = 'class="pho2"';
+$pho3 = $pho32 = 'class="pho3"';
+$pho4 = $pho42 = 'class="pho4"';
+$pho5 = $pho52 = 'class="pho5"';
+$pho6 = $pho62 = 'class="pho6"';
+$pho7 = $pho72 = 'class="pho7"';
+$pho6Sep = $pho6Sep2 = 'class="pho6 ph-idnr-sep"';
+$pho7Sep = $pho7Sep2 = 'class="pho7 ph-idnr-sep"';
+$pho8 = $pho82 = 'class="pho8"';
+$pho9 = $pho92 = 'class="pho9"';
+$pho10 = $pho102 = 'class="pho10"';
+$pho11 = $pho112 = 'class="pho11"';
+$pho12 = $pho122 = 'class="pho12"';
+$sep = $sep2 = 'class="ph-idnr-sep"';
+$bBox = 'class="ph-idnr-billing-box"';
+$bBoxIn = 'class="ph-idnr-billing-box-in"';
+$sBox = 'class="ph-idnr-shipping-box"';
+$sBoxIn = 'class="ph-idnr-shipping-box-in"';
+$boxIn = 'class="ph-idnr-box-in"';
+$hProduct = 'class="ph-idnr-header-product"';
+$bProduct = 'class="ph-idnr-body-product"';
+$sepH = 'class="ph-idnr-sep-horizontal"';
+$totalF = 'class="ph-idnr-total"';
+$toPayS = 'class="ph-idnr-to-pay"';
+$toPaySV = 'class="ph-idnr-to-pay-value"';
+$bDesc = 'class="ph-idnr-body-desc"';
+$hrSmall = 'class="ph-idnr-hr-small"';
+$bQrInfo = '';
+$firstRow = '';
+
+
+// POS RECEIPT
+$pR = false;
+
+if ($d['format'] == 'raw' && $d['type'] == 4) {
+ $pR = true;
+ $oPr = array();
+ $pP = new PhocacartPosPrint(0);
+
+
+}
+
+if ($d['format'] == 'pdf') {
+ // FORMAT PDF
+ $box = '';
+ $table = 'style="width: 100%; font-size: 80%;padding:3px;margin-top:-200px"';
+ $pho1 = 'style="width: 8.3333%;"';
+ $pho2 = 'style="width: 8.3333%;"';
+ $pho3 = 'style="width: 8.3333%;"';
+ $pho4 = 'style="width: 8.3333%;"';
+ $pho5 = 'style="width: 8.3333%;"';
+ $pho6 = 'style="width: 8.3333%;"';
+ $pho7 = 'style="width: 8.3333%;"';
+ $pho6Sep = 'style="width: 3%;"';
+ $pho7Sep = 'style="width: 3%;"';
+ $pho8 = 'style="width: 8.3333%;"';
+ $pho9 = 'style="width: 8.3333%;"';
+ $pho10 = 'style="width: 8.3333%;"';
+ $pho11 = 'style="width: 8.3333%;"';
+ $pho12 = 'style="width: 8.3333%;"';
+ $sep = 'style="width: 3%;"';
+
+ $pho12 = 'style="width: 9%;"';
+ $pho22 = 'style="width: 9%;"';
+ $pho32 = 'style="width: 9%;"';
+ $pho42 = 'style="width: 9%;"';
+ $pho52 = 'style="width: 9%;"';
+ $pho62 = 'style="width: 9%;"';
+ $pho72 = 'style="width: 9%;"';
+ $pho6Sep2 = 'style="width: 5%;"';
+ $pho7Sep2 = 'style="width: 5%;"';
+ $pho82 = 'style="width: 9%;"';
+ $pho92 = 'style="width: 9%;"';
+ $pho102 = 'style="width: 9%;"';
+ $pho112 = 'style="width: 9%;"';
+ $pho122 = 'style="width: 9%;"';
+ $seps2 = 'style="width: 10%;"';
+
+
+ $bBox = 'style="border: 1pt solid #dddddd;"';
+ $bBoxIn = 'style=""';
+ $sBox = 'style="border: 1pt solid #dddddd;"';
+ $sBoxIn = 'style=""';
+ //$boxIn = 'style="width: 100%; font-family: sans-serif, arial; font-size: 60%;padding:3px 1px;"';
+ $boxIn = 'style="width: 100%; font-size: 60%;padding:1px 1px;"';
+ $hProduct = 'style="white-space:nowrap;font-weight: bold;background-color: #dddddd;"';
+ $bProduct = 'style="white-space:nowrap;"';
+ $sepH = 'style="border-top: 1pt solid #dddddd;"';
+ $totalF = 'style=""';
+ $toPayS = 'style="background-color: #eeeeee;padding: 20px;"';
+ $toPaySV = 'style="background-color: #eeeeee;padding: 20px;text-align:right;"';
+ $firstRow = 'style="font-size:0pt;"';
+
+ $bDesc = 'style="padding: 2px 0px 0px 0px;margin:0;font-size:60%;"';
+ $hrSmall = 'style="font-size:30%;"';
+ $bQrInfo = 'style="font-size: 70%"';
+
+} else if ($d['format'] == 'mail') {
+
+ // FORMAT EMAIL
+ $box = '';
+ //$table = 'style="width: 100%; font-family: sans-serif, arial; font-size: 90%;"';
+ $table = 'style="width: 100%; font-size: 90%;"';
+ $pho1 = 'style="width: 8.3333%;"';
+ $pho2 = 'style="width: 8.3333%;"';
+ $pho3 = 'style="width: 8.3333%;"';
+ $pho4 = 'style="width: 8.3333%;"';
+ $pho5 = 'style="width: 8.3333%;"';
+ $pho6 = 'style="width: 8.3333%;"';
+ $pho7 = 'style="width: 8.3333%;"';
+ $pho6Sep = 'style="width: 3%;"';
+ $pho7Sep = 'style="width: 3%;"';
+ $pho8 = 'style="width: 8.3333%;"';
+ $pho9 = 'style="width: 8.3333%;"';
+ $pho10 = 'style="width: 8.3333%;"';
+ $pho11 = 'style="width: 8.3333%;"';
+ $pho12 = 'style="width: 8.3333%;"';
+ $sep = 'style="width: 3%;"';
+
+ $pho12 = 'style="width: 9%;"';
+ $pho22 = 'style="width: 9%;"';
+ $pho32 = 'style="width: 9%;"';
+ $pho42 = 'style="width: 9%;"';
+ $pho52 = 'style="width: 9%;"';
+ $pho62 = 'style="width: 9%;"';
+ $pho72 = 'style="width: 9%;"';
+ $pho6Sep2 = 'style="width: 5%;"';
+ $pho7Sep2 = 'style="width: 5%;"';
+ $pho82 = 'style="width: 9%;"';
+ $pho92 = 'style="width: 9%;"';
+ $pho102 = 'style="width: 9%;"';
+ $pho112 = 'style="width: 9%;"';
+ $pho122 = 'style="width: 9%;"';
+ $seps2 = 'style="width: 10%;"';
+
+ $bBox = 'style="border: 1px solid #ddd;padding: 10px;"';
+ $bBoxIn = 'style=""';
+ $sBox = 'style="border: 1px solid #ddd;padding: 10px;"';
+ $sBoxIn = 'style=""';
+ //$boxIn = 'style="width: 100%; font-family: sans-serif, arial; font-size: 90%;"';
+ $boxIn = 'style="width: 100%; font-size: 90%;"';
+ $hProduct = 'style="white-space:nowrap;padding: 5px;font-weight: bold;background: #ddd;"';
+ $bProduct = 'style="white-space:nowrap;padding: 5px;"';
+ $sepH = 'style="border-top: 1px solid #ddd;"';
+ $totalF = 'style=""';
+ $toPayS = 'style="background-color: #eeeeee;padding: 20px;"';
+ $toPaySV = 'style="background-color: #eeeeee;padding: 20px;text-align:right;"';
+ $firstRow = '';
+
+}
+
+
+// -----------
+// R E N D E R
+// -----------
+$o = array();
+$o[] = '';
+
+
+// -----------
+// 1. PART
+// -----------
+$o[] = '
';
+
+$o[] = '';
+$o[] = '| | | | | ';
+$o[] = ' | | | | ';
+$o[] = ' | | | | ';
+$o[] = '
';
+
+
+// -----------
+// HEADER LEFT
+// -----------
+$o[] = '';
+if ($store_title != '') {
+ $o[] = ''.$store_title.'';
+}
+if ($store_logo != '') {
+ $o[] = '';
+}
+if ($store_info != '') {
+ $o[] = ''.$store_info.' ';
+}
+$o[] = ' | ';
+
+$o[] = ' | ';
+
+
+// -----------
+// HEADER RIGHT
+// -----------
+$o[] = '';
+if ($d['type'] == 1) {
+ $o[] = ''.JText::_('COM_PHOCACART_ORDER').'';
+ $o[] = ''.JText::_('COM_PHOCACART_ORDER_NR').': '.PhocacartOrder::getOrderNumber($d['common']->id, $d['common']->date, $d['common']->order_number).' ';
+ $o[] = ''.JText::_('COM_PHOCACART_ORDER_DATE').': '.JHtml::date($d['common']->date, 'DATE_FORMAT_LC4').' ';
+} else if ($d['type'] == 2) {
+
+ $o[] = ''.JText::_('COM_PHOCACART_INVOICE').'';
+ $o[] = ''.JText::_('COM_PHOCACART_INVOICE_NR').': '.PhocacartOrder::getInvoiceNumber($d['common']->id, $d['common']->date, $d['common']->invoice_number).' ';
+ $o[] = ''.JText::_('COM_PHOCACART_INVOICE_DATE').': '.JHtml::date($d['common']->invoice_date, 'DATE_FORMAT_LC4').' ';
+ $o[] = ''.JText::_('COM_PHOCACART_INVOICE_DUE_DATE').': '.PhocacartOrder::getInvoiceDueDate($d['common']->id, $d['common']->date, $d['common']->invoice_due_date, 'DATE_FORMAT_LC4').' ';
+ $o[] = ''.JText::_('COM_PHOCACART_PAYMENT_REFERENCE_NUMBER').': '.PhocacartOrder::getPaymentReferenceNumber($d['common']->id, $d['common']->date, $d['common']->invoice_prn).' ';
+
+} else if ($d['type'] == 3) {
+ $o[] = ''.JText::_('COM_PHOCACART_DELIVERY_NOTE').'';
+ $o[] = ''.JText::_('COM_PHOCACART_ORDER_NR').': '.PhocacartOrder::getOrderNumber($d['common']->id, $d['common']->date, $d['common']->order_number).' ';
+ $o[] = ''.JText::_('COM_PHOCACART_ORDER_DATE').': '.JHtml::date($d['common']->date, 'DATE_FORMAT_LC4').' ';
+
+}
+
+$o[] = ' ';
+if (isset($d['common']->paymenttitle) && $d['common']->paymenttitle != '') {
+ $o[] = ''.JText::_('COM_PHOCACART_PAYMENT').': '.$d['common']->paymenttitle.' ';
+}
+
+if ($d['type'] == 2 && $invoice_tp != '') {
+ $o[] = ''.JText::_('COM_PHOCACART_TERMS_OF_PAYMENT').': '.$invoice_tp.' ';
+}
+
+if (isset($d['common']->shippingtitle) && $d['common']->shippingtitle != '') {
+ $o[] = ''.JText::_('COM_PHOCACART_SHIPPING').': '.$d['common']->shippingtitle.' ';
+}
+
+$o[] = ' |
';
+
+$o[] = '| |
';
+
+
+// POS HEADER
+if ($pR) {
+ $oPr[] = $pP->printImage($store_logo_pos);
+}
+if ($pR) {
+ $storeTitlePos = array();
+ if ($store_title_pos != '') {
+ $storeTitlePos = explode("\n", $store_title_pos);
+ }
+ $oPr[] = $pP->printFeed(1);
+ $oPr[] = $pP->printLine($storeTitlePos, 'pDoubleSizeCenter');
+ $oPr[] = $pP->printFeed(1);
+}
+if ($pR) {
+ $storeInfoPos = array();
+ if ($store_info_pos != '') {
+ $storeInfoPos = explode("\n", $store_info_pos);
+ }
+ $oPr[] = $pP->printLine($storeInfoPos, 'pCenter');
+}
+
+
+
+
+// -----------
+// BILLING AND SHIPPING HEADER
+// -----------
+$o[] = '| '.JText::_('COM_PHOCACART_BILLING_ADDRESS').' | ';
+$o[] = ' | ';
+$o[] = ''.JText::_('COM_PHOCACART_SHIPPING_ADDRESS').' |
';
+
+
+// -----------
+// BILLING
+// -----------
+$ob = array();
+
+if (!empty($d['bas']['b'])) {
+ $v = $d['bas']['b'];
+ if ($v['company'] != '') { $ob[] = ''.$v['company'].'
';}
+ $name = array();
+ if ($v['name_degree'] != '') { $name[] = $v['name_degree'];}
+ if ($v['name_first'] != '') { $name[] = $v['name_first'];}
+ if ($v['name_first'] != '') { $name[] = $v['name_middle'];}
+ if ($v['name_first'] != '') { $name[] = $v['name_last'];}
+ if (!empty($name)) {$ob[] = '' . implode("\n", $name).'
';}
+ if ($v['address_1'] != '') { $ob[] = $v['address_1'].'
';}
+ if ($v['address_2'] != '') { $ob[] = $v['address_2'].'
';}
+ $city = array();
+ if ($v['zip'] != '') { $city[] = $v['zip'];}
+ if ($v['city'] != '') { $city[] = $v['city'];}
+ if (!empty($city)) {$ob[] = implode("\n", $city).'
';}
+ //echo '
';
+ if (!empty($v['regiontitle'])) {$ob[] = $v['regiontitle'].'
';}
+ if (!empty($v['countrytitle'])) {$ob[] = $v['countrytitle'].'
';}
+ //echo '
';
+ if ($v['vat_1'] != '') { $ob[] = '
'.JText::_('COM_PHOCACART_VAT1').': '. $v['vat_1'].'
';}
+ if ($v['vat_2'] != '') { $ob[] = JText::_('COM_PHOCACART_VAT2').': '.$v['vat_2'].'
';}
+
+
+}
+
+
+// -----------
+// SHIPPING
+// -----------
+$os = array();
+if (!empty($d['bas']['s'])) {
+ $v = $d['bas']['s'];
+ if ($v['company'] != '') { $os[] = ''.$v['company'].'
';}
+ $name = array();
+ if ($v['name_degree'] != '') { $name[] = $v['name_degree'];}
+ if ($v['name_first'] != '') { $name[] = $v['name_first'];}
+ if ($v['name_first'] != '') { $name[] = $v['name_middle'];}
+ if ($v['name_first'] != '') { $name[] = $v['name_last'];}
+ if (!empty($name)) {$os[] = '' . implode("\n", $name).'
';}
+ if ($v['address_1'] != '') { $os[] = $v['address_1'].'
';}
+ if ($v['address_2'] != '') { $os[] = $v['address_2'].'
';}
+ $city = array();
+ if ($v['zip'] != '') { $city[] = $v['zip'];}
+ if ($v['city'] != '') { $city[] = $v['city'];}
+ if (!empty($city)) {$os[] = implode("\n", $city).'
';}
+ //echo '
';
+ if (!empty($v['regiontitle'])) {$os[] = $v['regiontitle'].'
';}
+ if (!empty($v['countrytitle'])) {$os[] = $v['countrytitle'].'
';}
+ //echo '
';
+ if ($v['vat_1'] != '') { $os[] = '
'.JText::_('COM_PHOCACART_VAT1').': '. $v['vat_1'].'
';}
+ if ($v['vat_2'] != '') { $os[] = JText::_('COM_PHOCACART_VAT2').': '.$v['vat_2'].'
';}
+}
+
+
+// BILLING OUTPUT
+$o[] = '';
+$o[] = implode("\n", $ob);
+$o[] = ' | ';
+$o[] = ' | ';
+
+
+// SHIPPING OUTPUT
+$o[] = '';
+if ((isset($d['bas']['b']['ba_sa']) && $d['bas']['b']['ba_sa'] == 1) || (isset($d['bas']['s']['ba_sa']) && $d['bas']['s']['ba_sa'] == 1)) {
+ $o[] = implode("\n", $ob);
+} else {
+ $o[] = implode("\n", $os);
+}
+$o[] = ' |
';
+//$o[] = '| |
';
+$o[] = '
';
+
+
+// -----------------------
+// INVOICE TOP DESCRIPTION
+// -----------------------
+$hrSmallTop = 0;
+if ($d['type'] == 2) {
+ if ((int)$invoice_global_top_desc > 0) {
+ $invoice_global_top_desc_article = PhocacartRenderFront::renderArticle((int)$invoice_global_top_desc);
+ if ($invoice_global_top_desc_article != '') {
+ $o[] = '
';
+ $hrSmallTop = 1;
+ $invoice_global_top_desc_article = PhocacartPdf::skipStartAndLastTag($invoice_global_top_desc_article, 'p');
+ //$o[] = '
'.$invoice_global_top_desc_article.'
';
+ $o[] = '
| '.$invoice_global_top_desc_article.' |
';
+ }
+ }
+ if ($d['common']->invoice_spec_top_desc != '') {
+ $o[] = $hrSmallTop == 1 ? '' : '
';
+ $invoice_spec_top_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_top_desc, 'p');
+ //$o[] = '
'.$invoice_spec_top_desc_article.'
';
+ $o[] = '
| '.$invoice_spec_top_desc_article.' |
';
+ }
+}
+
+
+// -----------
+// 2. PART
+// -----------
+$o[] = '
';
+$o[] = '';
+$o[] = '| | | | | ';
+$o[] = ' | | | | ';
+$o[] = ' | | | | ';
+$o[] = '
';
+
+
+$dDiscount = 0; // Display Discount (Coupon, cnetto)
+$cTitle = 3; // Colspan Title
+
+
+$p = array();
+if (!empty($d['products'])) {
+
+ // Prepare header and body
+ foreach ($d['products'] as $k => $v) {
+ if ($v->damount > 0) {
+ $dDiscount = 1;
+ $cTitle = 2;
+ }
+ }
+
+ if ($d['type'] == 3) {
+ $cTitle = 10;
+ }
+
+ $p[] = '';
+ $p[] = '| '.JText::_('COM_PHOCACART_SKU').' | ';
+ $p[] = ''.JText::_('COM_PHOCACART_ITEM').' | ';
+ $p[] = ''.JText::_('COM_PHOCACART_QTY').' | ';
+
+ if ($d['type'] != 3) {
+ $p[] = ''.JText::_('COM_PHOCACART_PRICE_UNIT').' | ';
+ if ($dDiscount == 1) {
+ $p[] = ''.JText::_('COM_PHOCACART_DISCOUNT').' | ';
+ }
+ $p[] = ''.JText::_('COM_PHOCACART_PRICE_EXCL_TAX').' | ';
+ $p[] = ''.JText::_('COM_PHOCACART_TAX').' | ';
+ $p[] = ''.JText::_('COM_PHOCACART_PRICE_INCL_TAX').' | ';
+ }
+ $p[] = '
';
+
+ if ($pR) { $oPr[] = $pP->printSeparator(); }
+
+ foreach($d['products'] as $k => $v) {
+
+ // $codes = PhocacartProduct::getProductCodes((int)$v->product_id);
+ // echo $codes['isbn']; getting codes like isbn, ean, jpn, serial_number from product
+ // codes are the latest stored in database not codes which were valid in date of order
+ $p[] = '';
+ $p[] = '| '.$v->sku.' | ';
+ $p[] = ''.$v->title.' | ';
+
+ if ($pR) { $oPr[] = $pP->printLineColumns(array($v->sku, $v->title), 1); }
+
+ $p[] = ''.$v->quantity.' | ';
+
+
+ $netto = (int)$v->quantity * $v->netto;
+ $nettoUnit = $v->netto;
+ $tax = (int)$v->quantity * $v->tax;
+ $brutto = (int)$v->quantity * $v->brutto;
+ if ($d['type'] != 3) {
+ $p[] = ''.$d['price']->getPriceFormat($v->netto).' | ';
+
+ /*if ($dDiscount == 1) {
+ if ($v->dtype == 0) {
+ $dAmount = $v->netto - $v->dnetto;
+ if ($dAmount > 0 && $v->dnetto > 0) {
+ $dAmount = '- '. $d['price']->getPriceFormat($dAmount);
+ } else {
+ $dAmount = '';
+ }
+ } else if ($v->dtype == 1) {
+ if ($v->damount > 0) {
+ $dAmount = $v->damount . ' %';
+ } else {
+ $dAmount = '';
+ }
+ }
+ $p[] = ''.$dAmount.' | ';
+ }
+
+ if ($v->dnetto > 0 ) {
+ $netto = (int)$v->quantity * $v->dnetto;
+ } else {
+ $netto = (int)$v->quantity * $v->netto;
+ }*/
+
+ $p[] = ''.$d['price']->getPriceFormat($netto).' | ';
+ /*
+ if ($v->dtax > 0) {
+ $tax = (int)$v->quantity * $v->dtax;
+ } else {
+ $tax = (int)$v->quantity * $v->tax;
+ }*/
+
+ $p[] = ''.$d['price']->getPriceFormat($tax).' | ';
+ /*
+ if ($v->dbrutto > 0) {
+ $brutto = (int)$v->quantity * $v->dbrutto;
+ } else {
+ $brutto = (int)$v->quantity * $v->brutto;
+ }*/
+
+ $p[] = ''.$d['price']->getPriceFormat($brutto).' | ';
+
+ }
+ $p[] = '
';
+
+
+
+
+ if (!empty($v->attributes)) {
+ $p[] = '';
+ $p[] = ' | ';
+ $p[] = '';
+ foreach ($v->attributes as $k2 => $v2) {
+ $p[] = '- '.$v2->attribute_title .' '.$v2->option_title.'
';
+
+ if ($pR) { $oPr[] = $pP->printLineColumns(array(' - ' .$v2->attribute_title .' '.$v2->option_title)); }
+
+ }
+ $p[] = ' | ';
+ $p[] = ' | ';
+ $p[] = '
';
+ }
+
+ if ($pR) {
+ $brutto = (int)$v->quantity * $v->brutto;
+ $oPr[] = $pP->printLineColumns(array((int)$v->quantity . ' x ' . $d['price']->getPriceFormat($v->brutto), $d['price']->getPriceFormat($brutto)));
+ }
+
+ $lastSaleNettoUnit = array();
+ $lastSaleNetto = array();
+ $lastSaleTax = array();
+ $lastSaleBrutto = array();
+ if (!empty($d['discounts'][$v->product_id_key]) && $d['type'] != 3) {
+
+ $lastSaleNettoUnit[$v->product_id_key] = $nettoUnit;
+ $lastSaleNetto[$v->product_id_key] = $netto;
+ $lastSaleTax[$v->product_id_key] = $tax;
+ $lastSaleBrutto[$v->product_id_key] = $brutto;
+
+
+ foreach($d['discounts'][$v->product_id_key] as $k3 => $v3) {
+
+ $nettoUnit3 = $v3->netto;
+ $netto3 = (int)$v->quantity * $v3->netto;
+ $tax3 = (int)$v->quantity * $v3->tax;
+ $brutto3 = (int)$v->quantity * $v3->brutto;
+
+ $saleNettoUnit = $lastSaleNettoUnit[$v->product_id_key] - $nettoUnit3;
+ $saleNetto = $lastSaleNetto[$v->product_id_key] - $netto3;
+ $saleTax = $lastSaleTax[$v->product_id_key] - $tax3;
+ $saleBrutto = $lastSaleBrutto[$v->product_id_key] - $brutto3;
+
+ $lastSaleNettoUnit[$v->product_id_key] = $nettoUnit3;
+ $lastSaleNetto[$v->product_id_key] = $netto3;
+ $lastSaleTax[$v->product_id_key] = $tax3;
+ $lastSaleBrutto[$v->product_id_key] = $brutto3;
+
+ if ($display_discount_price_product == 2) {
+
+ $p[] = '';
+ $p[] = ' | ';
+ $p[] = ''.$v3->title.' | ';
+ $p[] = ' | ';
+ $p[] = ''.$d['price']->getPriceFormat($saleNettoUnit, 1).' | ';
+ $p[] = ''.$d['price']->getPriceFormat($saleNetto, 1).' | ';
+ $p[] = ''.$d['price']->getPriceFormat($saleTax, 1).' | ';
+ $p[] = ''.$d['price']->getPriceFormat($saleBrutto, 1).' | ';
+ $p[] = '
';
+
+ if ($pR) {
+ $oPr[] = $pP->printLineColumns(array($v3->title, $d['price']->getPriceFormat($saleBrutto, 1)));
+ }
+ } else if ($display_discount_price_product == 1) {
+
+ $p[] = '';
+ $p[] = ' | ';
+ $p[] = ''.$v3->title.' | ';
+ $p[] = ' | ';
+ $p[] = ''.$d['price']->getPriceFormat($nettoUnit3).' | ';
+ $p[] = ''.$d['price']->getPriceFormat($netto3).' | ';
+ $p[] = ''.$d['price']->getPriceFormat($tax3).' | ';
+ $p[] = ''.$d['price']->getPriceFormat($brutto3).' | ';
+ $p[] = '
';
+
+ if ($pR) {
+ $oPr[] = $pP->printLineColumns(array($v3->title, $d['price']->getPriceFormat($brutto3)));
+ }
+ }
+
+ }
+ }
+
+ }
+
+ if ($pR) { $oPr[] = $pP->printSeparator(); }
+
+}
+
+$o[] = implode("\n", $p);
+
+
+
+$o[] = '| |
';
+
+
+// -----------
+// TOTAL
+// -----------
+$t = array();
+$toPay = 0;
+
+if (!empty($d['total'])) {
+ foreach($d['total'] as $k => $v) {
+
+ if($v->amount == 0 && $v->amount_currency == 0 && $v->type != 'brutto') {
+ // Don't display coupon if null
+
+ } else if ($v->type == 'netto') {
+ $t[] = '';
+ $t[] = ' | ';
+ $t[] = ''.$v->title.' | ';
+ $t[] = ''.$d['price']->getPriceFormat($v->amount).' | ';
+ $t[] = '
';
+
+ if ($pR) { $oPr[] = $pP->printLineColumns(array($v->title, $d['price']->getPriceFormat($v->amount))); }
+
+ } else if ($v->type == 'brutto') {
+
+ // Brutto or Brutto currency
+ $amount = (isset($v->amount_currency) && $v->amount_currency > 0) ? $d['price']->getPriceFormat($v->amount_currency, 0, 1) : $d['price']->getPriceFormat($v->amount);
+
+ $t[] = '';
+ $t[] = ' | ';
+ $t[] = ''.$v->title.' | ';
+ $t[] = ''.$amount.' | ';
+ $t[] = '
';
+
+
+ if ($pR) {
+ $oPr[] = $pP->printSeparator();
+ $oPr[] = $pP->printLineColumns(array($v->title, $amount), 0, 'pDoubleSize');
+ $oPr[] = $pP->printFeed(2);
+ }
+
+ } else if ($v->type == 'rounding') {
+
+ // Rounding or rounding currency
+ $amount = (isset($v->amount_currency) && $v->amount_currency > 0) ? $d['price']->getPriceFormat($v->amount_currency, 0, 1) : $d['price']->getPriceFormat($v->amount);
+
+ $t[] = '';
+ $t[] = ' | ';
+ $t[] = ''.$v->title.' | ';
+ $t[] = ''.$amount.' | ';
+ $t[] = '
';
+
+ if ($pR) { $oPr[] = $pP->printLineColumns(array($v->title, $amount)); }
+
+
+ } else {
+ $t[] = '';
+ $t[] = ' | ';
+ $t[] = ''.$v->title.' | ';
+ $t[] = ''.$d['price']->getPriceFormat($v->amount).' | ';
+ $t[] = '
';
+
+ if ($pR) { $oPr[] = $pP->printLineColumns(array($v->title, $d['price']->getPriceFormat($v->amount))); }
+ }
+
+ if ($v->type == 'brutto' && $d['type'] == 2) {
+ $toPay = $v->amount;
+ }
+ }
+}
+
+if ($d['type'] != 3) {
+ $o[] = implode("\n", $t);
+}
+
+
+$o[] = '| |
';
+
+// -----------
+// TO PAY
+// -----------
+if ($toPay > 0) {
+ $o[] = '';
+ $o[] = '| | ';
+ $o[] = ''.JText::_('COM_PHOCACART_TO_PAY').' | ';
+ $o[] = ''.$d['price']->getPriceFormat($toPay).' | ';
+ $o[] = '
';
+}
+
+
+$o[] = '
';// End box in
+
+
+// -----------------------
+// INVOICE MIDDLE DESCRIPTION
+// -----------------------
+$hrSmallMiddle = 0;
+if ($d['type'] == 2) {
+ if ((int)$invoice_global_middle_desc > 0) {
+ $invoice_global_middle_desc_article = PhocacartRenderFront::renderArticle((int)$invoice_global_middle_desc);
+ if ($invoice_global_middle_desc_article != '') {
+ $o[] = '
';
+ $hrSmallMiddle = 1;
+ $invoice_global_middle_desc_article = PhocacartPdf::skipStartAndLastTag($invoice_global_middle_desc_article, 'p');
+ //$o[] = '
'.$invoice_global_middle_desc_article.'
';
+ $o[] = '
| '.$invoice_global_middle_desc_article.' |
';
+ }
+ }
+ if ($d['common']->invoice_spec_middle_desc != '') {
+ $o[] = $hrSmallMiddle == 1 ? '' : '
';
+ $invoice_spec_middle_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_middle_desc, 'p');
+ //$o[] = '
'.$invoice_spec_middle_desc_article.'
';
+ $o[] = '
| '.$invoice_spec_middle_desc_article.' |
';
+ }
+}
+
+
+// -----------------------
+// INVOICE QR CODE, STAMP IMAGE
+// -----------------------
+if ($d['format'] == 'pdf' && $d['type'] == 2 && ($d['qrcode'] != '' || $pdf_invoice_signature_image != '')) {
+ $o[] = '
';
+ $o[] = '
';// End box in
+ $o[] = '';
+
+
+ if ($pdf_invoice_qr_information != '') {
+ $o[] = ''.$pdf_invoice_qr_information . '
';
+ }
+
+ if ($d['qrcode'] != '') {
+ $o[] = '{phocapdfqrcode|'.urlencode($d['qrcode']).'}';
+ }
+ $o[] = ' | ';
+ if ($pdf_invoice_signature_image != '') {
+ $o[] = '.'/'.$pdf_invoice_signature_image.') ';
+ }
+ $o[] = ' |
';
+ $o[] = '
';
+}
+
+// -----------------------
+// INVOICE BOTTOM DESCRIPTION
+// -----------------------
+$hrSmallBottom = 0;
+if ($d['type'] == 2) {
+ if ((int)$invoice_global_bottom_desc > 0) {
+ $invoice_global_bottom_desc_article = PhocacartRenderFront::renderArticle((int)$invoice_global_bottom_desc);
+ if ($invoice_global_bottom_desc_article != '') {
+ $o[] = '
';
+ $hrSmallBottom = 1;
+ $invoice_global_bottom_desc_article = PhocacartPdf::skipStartAndLastTag($invoice_global_bottom_desc_article, 'p');
+ //$o[] = '
'.$invoice_global_bottom_desc_article.'
';
+ $o[] = '
| '.$invoice_global_bottom_desc_article.' |
';
+ }
+ }
+ if ($d['common']->invoice_spec_bottom_desc != '') {
+ $o[] = $hrSmallBottom == 1 ? '' : '
';
+ $invoice_spec_bottom_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_bottom_desc, 'p');
+ //$o[] = '
'.$invoice_spec_bottom_desc_article.'
';
+ $o[] = '
| '.$invoice_spec_bottom_desc_article.' |
';
+ }
+}
+
+
+
+$o[] = '
';
+ $invoice_spec_top_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_top_desc, 'p');
+ //$o[] = ''.$invoice_spec_top_desc_article.'
';
+ $o[] = '| '.$invoice_spec_top_desc_article.' |
';
+ } else if ((int)$invoice_global_top_desc > 0) {
$invoice_global_top_desc_article = PhocacartRenderFront::renderArticle((int)$invoice_global_top_desc);
if ($invoice_global_top_desc_article != '') {
$o[] = '
';
@@ -412,12 +419,6 @@
$o[] = '
| '.$invoice_global_top_desc_article.' |
';
}
}
- if ($d['common']->invoice_spec_top_desc != '') {
- $o[] = $hrSmallTop == 1 ? '' : '
';
- $invoice_spec_top_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_top_desc, 'p');
- //$o[] = '
'.$invoice_spec_top_desc_article.'
';
- $o[] = '
| '.$invoice_spec_top_desc_article.' |
';
- }
}
@@ -726,7 +727,13 @@
// -----------------------
$hrSmallMiddle = 0;
if ($d['type'] == 2) {
- if ((int)$invoice_global_middle_desc > 0) {
+
+ if ($d['common']->invoice_spec_middle_desc != '') {
+ $o[] = $hrSmallMiddle == 1 ? '' : '
';
+ $invoice_spec_middle_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_middle_desc, 'p');
+ //$o[] = '
'.$invoice_spec_middle_desc_article.'
';
+ $o[] = '
| '.$invoice_spec_middle_desc_article.' |
';
+ } else if ((int)$invoice_global_middle_desc > 0) {
$invoice_global_middle_desc_article = PhocacartRenderFront::renderArticle((int)$invoice_global_middle_desc);
if ($invoice_global_middle_desc_article != '') {
$o[] = '
';
@@ -736,12 +743,6 @@
$o[] = '
| '.$invoice_global_middle_desc_article.' |
';
}
}
- if ($d['common']->invoice_spec_middle_desc != '') {
- $o[] = $hrSmallMiddle == 1 ? '' : '
';
- $invoice_spec_middle_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_middle_desc, 'p');
- //$o[] = '
'.$invoice_spec_middle_desc_article.'
';
- $o[] = '
| '.$invoice_spec_middle_desc_article.' |
';
- }
}
@@ -773,7 +774,13 @@
// -----------------------
$hrSmallBottom = 0;
if ($d['type'] == 2) {
- if ((int)$invoice_global_bottom_desc > 0) {
+
+ if ($d['common']->invoice_spec_bottom_desc != '') {
+ $o[] = $hrSmallBottom == 1 ? '' : '
';
+ $invoice_spec_bottom_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_bottom_desc, 'p');
+ //$o[] = '
'.$invoice_spec_bottom_desc_article.'
';
+ $o[] = '
| '.$invoice_spec_bottom_desc_article.' |
';
+ } else if ((int)$invoice_global_bottom_desc > 0) {
$invoice_global_bottom_desc_article = PhocacartRenderFront::renderArticle((int)$invoice_global_bottom_desc);
if ($invoice_global_bottom_desc_article != '') {
$o[] = '
';
@@ -783,12 +790,6 @@
$o[] = '
| '.$invoice_global_bottom_desc_article.' |
';
}
}
- if ($d['common']->invoice_spec_bottom_desc != '') {
- $o[] = $hrSmallBottom == 1 ? '' : '
';
- $invoice_spec_bottom_desc_article = PhocacartPdf::skipStartAndLastTag($d['common']->invoice_spec_bottom_desc, 'p');
- //$o[] = '
'.$invoice_spec_bottom_desc_article.'
';
- $o[] = '
| '.$invoice_spec_bottom_desc_article.' |
';
- }
}
@@ -799,6 +800,16 @@
// POS FOOTER
if ($pR) {
+
+
+ if (isset($d['common']->amount_tendered) && $d['common']->amount_tendered > 0 && isset($d['common']->amount_change) && ($d['common']->amount_change > 0 || $d['common']->amount_change == 0)) {
+ //$oPr[] = $pP->printLine(array(JText::_('COM_PHOCACART_RECEIPT_AMOUNT_TENDERED').': '.$d['price']->getPriceFormat($d['common']->amount_tendered)), 'pLeft');
+ //$oPr[] = $pP->printLine(array(JText::_('COM_PHOCACART_RECEIPT_AMOUNT_CHANGED').': '.$d['price']->getPriceFormat($d['common']->amount_change)), 'pLeft');
+ $oPr[] = $pP->printLineColumns(array(JText::_('COM_PHOCACART_RECEIPT_AMOUNT_TENDERED').': ', $d['price']->getPriceFormat($d['common']->amount_tendered)));
+ $oPr[] = $pP->printLineColumns(array(JText::_('COM_PHOCACART_RECEIPT_AMOUNT_CHANGED').': ', $d['price']->getPriceFormat($d['common']->amount_change)));
+ $oPr[] = $pP->printFeed(1);
+ }
+
$oPr[] = $pP->printLine(array(JText::_('COM_PHOCACART_RECEIPT_NR').': '.PhocacartOrder::getReceiptNumber($d['common']->id, $d['common']->date, $d['common']->receipt_number)), 'pLeft');
$oPr[] = $pP->printLine(array(JText::_('COM_PHOCACART_PURCHASE_DATE').': '.JHtml::date($d['common']->date, 'DATE_FORMAT_LC5')), 'pLeft');
diff --git a/site/models/category.php b/site/models/category.php
index 5ded910e..3a2aef62 100644
--- a/site/models/category.php
+++ b/site/models/category.php
@@ -130,8 +130,9 @@ protected function getItemListQuery($categoryId, $count = 0) {
$wheres[] = " c.type IN (0,1)";// type: common, onlineshop, pos
if ($this->getState('filter.language')) {
- $wheres[] = ' a.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+ $lang = JFactory::getLanguage()->getTag();
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('a.language', $lang);
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
$itemOrdering = $this->getItemOrdering();
@@ -237,7 +238,8 @@ protected function getCategoriesQuery($categoryId, $subcategories = FALSE) {
$wheres[] = " c.type IN (0,1)";// type: common, onlineshop, pos
if ($this->getState('filter.language')) {
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+ $lang = JFactory::getLanguage()->getTag();
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
if ($subcategories) {
diff --git a/site/models/item.php b/site/models/item.php
index 6fb79331..dbefab03 100644
--- a/site/models/item.php
+++ b/site/models/item.php
@@ -91,8 +91,9 @@ private function getItemQueryOrdering($ordering, $catid, $direction) {
$wheres[] = " (gc.group_id IN (".$userGroups.") OR gc.group_id IS NULL)";
if ($this->getState('filter.language')) {
- $wheres[] = ' a.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+ $lang = JFactory::getLanguage()->getTag();
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('a.language', $lang);
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
if ($p['hide_products_out_of_stock'] == 1) {
@@ -206,8 +207,9 @@ function getCategoryQuery($itemId, $catId) {
$wheres[] = " c.type IN (0,1)";// type: common, onlineshop, pos
if ($this->getState('filter.language')) {
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+ $lang = JFactory::getLanguage()->getTag();
+ //$wheres[] = PhocacartUtilsSettings::getLangQuery('a.language', $lang);
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
if ((int)$catId > 0) {
diff --git a/site/models/items.php b/site/models/items.php
index 5afe7bc2..90b447b2 100644
--- a/site/models/items.php
+++ b/site/models/items.php
@@ -133,8 +133,9 @@ protected function getItemListQuery($count = 0) {
if ($this->getState('filter.language')) {
- $wheres[] = ' a.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+ $lang = JFactory::getLanguage()->getTag();
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('a.language', $lang);
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
$itemOrdering = $this->getItemOrdering();
@@ -312,7 +313,8 @@ protected function getCategoriesQuery( $categoryId, $subcategories = FALSE ) {
$wheres[] = " (gc.group_id IN (".$userGroups.") OR gc.group_id IS NULL)";
if ($this->getState('filter.language')) {
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+ $lang = JFactory::getLanguage()->getTag();
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
if ($subcategories) {
diff --git a/site/models/pos.php b/site/models/pos.php
index 54bdf325..d42a8092 100644
--- a/site/models/pos.php
+++ b/site/models/pos.php
@@ -251,8 +251,11 @@ protected function getItemListQuery($count = 0) {
$wheres[] = ' c.published = 1';
$wheres[] = ' c.type IN (0,2)';// default categories or pos categories only
if ($this->getState('filter.language')) {
- $wheres[] = ' a.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+
+
+ $lang = JFactory::getLanguage()->getTag();
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('a.language', $lang);
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
$itemOrdering = $this->getItemOrdering();
@@ -657,7 +660,9 @@ protected function getCategoriesQuery( $categoryId, $subcategories = FALSE ) {
$wheres[] = " (gc.group_id IN (".$userGroups.") OR gc.group_id IS NULL)";
if ($this->getState('filter.language')) {
- $wheres[] = ' c.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')';
+ $lang = JFactory::getLanguage()->getTag();
+
+ $wheres[] = PhocacartUtilsSettings::getLangQuery('c.language', $lang);
}
if ($subcategories) {
diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php
index d71051ec..ec64621b 100644
--- a/site/views/category/tmpl/default.php
+++ b/site/views/category/tmpl/default.php
@@ -424,11 +424,7 @@
echo $icon['addtocart'];
}
- if ($this->t['cv_display_description'] == 1 && $v->description != '') {
- echo '
';
- echo JHtml::_('content.prepare', $v->description);
- echo '
';// end desc
- }
+
// REVIEW - STAR RATING
if ((int)$this->t['display_star_rating'] > 0) {
@@ -439,6 +435,12 @@
echo $layoutR->render($d);
}
+ if ($this->t['cv_display_description'] == 1 && $v->description != '') {
+ echo '
';
+ echo JHtml::_('content.prepare', $v->description);
+ echo '
';// end desc
+ }
+
// VIEW PRODUCT BUTTON
echo '
';
@@ -526,11 +528,7 @@
//echo '
';// end caption
- if ($this->t['cv_display_description'] == 1 && $v->description != '') {
- echo '
';
- echo JHtml::_('content.prepare', $v->description);
- echo '
';// end desc
- }
+
// REVIEW - STAR RATING
if ((int)$this->t['display_star_rating'] > 0) {
@@ -541,6 +539,12 @@
echo $layoutR->render($d);
}
+ if ($this->t['cv_display_description'] == 1 && $v->description != '') {
+ echo '
';
+ echo JHtml::_('content.prepare', $v->description);
+ echo '
';// end desc
+ }
+
echo '
';
// :L: PRICE
diff --git a/site/views/checkout/tmpl/default_payment.php b/site/views/checkout/tmpl/default_payment.php
index a5de0732..a6e5a788 100644
--- a/site/views/checkout/tmpl/default_payment.php
+++ b/site/views/checkout/tmpl/default_payment.php
@@ -105,7 +105,7 @@
$checked = 'checked="checked"';
}
- $priceI = $price->getPriceItemsPayment($v->cost, $v->calculation_type, $total[0], $v->taxid, $v->taxrate, $v->taxcalculationtype, $v->taxtitle, 0, 1, '');
+ $priceI = $price->getPriceItemsPayment($v->cost, $v->cost_additional, $v->calculation_type, $total[0], $v->taxid, $v->taxrate, $v->taxcalculationtype, $v->taxtitle, 0, 1, '');
echo '
';
echo '
';
@@ -122,6 +122,8 @@
echo '
';
+
+
if ($this->t['display_payment_desc'] && $v->description != '') {
echo '
'.JHtml::_('content.prepare', $v->description).'
';
}
@@ -154,6 +156,12 @@
echo '
'.$priceI['bruttotxt'].'
';
echo '
'.$priceI['bruttoformat'].'
';
}
+
+ if ($priceI['costinfo'] != '') {
+ echo '
';
+ echo '
'.$priceI['costinfo'].'
';
+
+ }
}
echo '
';
diff --git a/site/views/checkout/tmpl/default_shipping.php b/site/views/checkout/tmpl/default_shipping.php
index 9f5e5e11..07e2049c 100644
--- a/site/views/checkout/tmpl/default_shipping.php
+++ b/site/views/checkout/tmpl/default_shipping.php
@@ -81,7 +81,7 @@
echo '
';
- if ($this->t['shippingmethod']['image'] != '') {
+ if (isset($this->t['shippingmethod']['image']) && $this->t['shippingmethod']['image'] != '') {
echo '
';
}
@@ -143,7 +143,7 @@
$checked = 'checked="checked"';
}
- $priceI = $price->getPriceItemsShipping($v->cost, $v->calculation_type, $total[0], $v->taxid, $v->taxrate, $v->taxcalculationtype, $v->taxtitle, 0, 1, '');
+ $priceI = $price->getPriceItemsShipping($v->cost, $v->cost_additional, $v->calculation_type, $total[0], $v->taxid, $v->taxrate, $v->taxcalculationtype, $v->taxtitle, 0, 1, '');
echo '
';
echo '
';
@@ -191,6 +191,12 @@
echo '
'.$priceI['bruttotxt'].'
';
echo '
'.$priceI['bruttoformat'].'
';
}
+
+ if ($priceI['costinfo'] != '') {
+ echo '
';
+ echo '
'.$priceI['costinfo'].'
';
+
+ }
}
echo '
';
diff --git a/site/views/item/tmpl/default.php b/site/views/item/tmpl/default.php
index 93ebe91f..19de1d5d 100644
--- a/site/views/item/tmpl/default.php
+++ b/site/views/item/tmpl/default.php
@@ -192,6 +192,7 @@
// Set stock: product, variations, or advanced stock status
$class_btn = '';
$class_icon = '';
+
if ($this->t['display_stock_status'] == 1 || $this->t['display_stock_status'] == 3) {
$stock = PhocacartStock::getStockItemsChangedByAttributes($this->t['stock_status'], $this->t['attr_options'], $x);
diff --git a/site/views/items/tmpl/default.php b/site/views/items/tmpl/default.php
index dd83e491..929bf70d 100644
--- a/site/views/items/tmpl/default.php
+++ b/site/views/items/tmpl/default.php
@@ -416,11 +416,7 @@
echo $icon['addtocart'];
}
- if ($this->t['cv_display_description'] == 1 && $v->description != '') {
- echo '
';
- echo JHtml::_('content.prepare', $v->description);
- echo '
';// end desc
- }
+
// REVIEW - STAR RATING
if ((int)$this->t['display_star_rating'] > 0) {
@@ -431,6 +427,12 @@
echo $layoutR->render($d);
}
+ if ($this->t['cv_display_description'] == 1 && $v->description != '') {
+ echo '
';
+ echo JHtml::_('content.prepare', $v->description);
+ echo '
';// end desc
+ }
+
// VIEW PRODUCT BUTTON
echo '
';
@@ -512,11 +514,7 @@
echo PhocacartRenderFront::renderProductHeader($this->t['product_name_link'], $v, 'item', '', $lt);
//echo '
';// end caption
- if ($this->t['cv_display_description'] == 1 && $v->description != '') {
- echo '
';
- echo JHtml::_('content.prepare', $v->description);
- echo '
';// end desc
- }
+
// REVIEW - STAR RATING
if ((int)$this->t['display_star_rating'] > 0) {
@@ -527,6 +525,12 @@
echo $layoutR->render($d);
}
+ if ($this->t['cv_display_description'] == 1 && $v->description != '') {
+ echo '
';
+ echo JHtml::_('content.prepare', $v->description);
+ echo '
';// end desc
+ }
+
echo '
';
// :L: PRICE
diff --git a/site/views/pos/tmpl/default_main_content_orders.php b/site/views/pos/tmpl/default_main_content_orders.php
index 2f6463d2..26dfce88 100644
--- a/site/views/pos/tmpl/default_main_content_orders.php
+++ b/site/views/pos/tmpl/default_main_content_orders.php
@@ -26,10 +26,13 @@
echo '
';
foreach ($this->items as $v) {
+
+ $orderNumber = isset($v->order_number) && $v->order_number != '' ? $v->order_number : false;
+
echo '
';
echo '
';
- echo '
'.PhocacartOrder::getOrderNumber($v->id, $v->date, $v->order_number).'
';
+ echo '
'.PhocacartOrder::getOrderNumber($v->id, $v->date, $orderNumber).'
';
echo '
';
echo '
';
diff --git a/site/views/pos/tmpl/default_main_content_payment.php b/site/views/pos/tmpl/default_main_content_payment.php
index 1d78eab0..8c0ac8ed 100644
--- a/site/views/pos/tmpl/default_main_content_payment.php
+++ b/site/views/pos/tmpl/default_main_content_payment.php
@@ -37,9 +37,12 @@
echo '
';
echo '
';
-echo '
'; // end row
+echo '
'; // end row-vac
+
+echo '
';
echo '
';
-echo '';
+
echo '
';
echo '
';
echo '
';
+echo '