dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Improvement : target blank on PDF

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11594 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot
2011-12-22 13:38:00 +00:00
parent 5f430e1f97
commit 2a5faa0271
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/helper/list/list_content.tpl
+1 -1
View File
@@ -51,7 +51,7 @@
{if isset($params.position) && $order_by == 'position'} dragHandle{/if} {if isset($params.position) && $order_by == 'position'} dragHandle{/if}
{if isset($params.align)} {$params.align}{/if}" {if isset($params.align)} {$params.align}{/if}"
{if (!isset($params.position) && !$no_link)} {if (!isset($params.position) && !$no_link && !isset($params.remove_onclick))}
onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'"> onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">
{else} {else}
> >
admin-dev/themes/template/orders/_documents.tpl
+1 -1
View File
@@ -15,7 +15,7 @@
{*/if*} {*/if*}
<td class="document_date">{dateFormat date=$document->date_add}</td> <td class="document_date">{dateFormat date=$document->date_add}</td>
<td class="document_type">Invoice</td> <td class="document_type">Invoice</td>
<td class="document_number"><a href="pdf.php?pdf&id_order_invoice={$document->id}">{$document->getInvoiceNumberFormatted($current_id_lang)} <img src="../img/admin/details.gif" alt="{l s='See the invoice'}" /></a></td> <td class="document_number"><a target="_blank" href="pdf.php?pdf&id_order_invoice={$document->id}">{$document->getInvoiceNumberFormatted($current_id_lang)} <img src="../img/admin/details.gif" alt="{l s='See the invoice'}" /></a></td>
<td class="document_amount"> <td class="document_amount">
{*if TYPE DOCUMENT = INVOICE *} {*if TYPE DOCUMENT = INVOICE *}
{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp; {displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
admin-dev/themes/template/orders/_print_pdf_icon.tpl
+2 -2
View File
@@ -27,7 +27,7 @@
{* Generate HTML code for printing Invoice Icon with link *} {* Generate HTML code for printing Invoice Icon with link *}
<span style="width:20px; margin-right:5px;"> <span style="width:20px; margin-right:5px;">
{if (($order_state->invoice && $order->invoice_number) && $tr['product_number'])} {if (($order_state->invoice && $order->invoice_number) && $tr['product_number'])}
<a href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a> <a target="_blank" href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
{else} {else}
- -
{/if} {/if}
@@ -36,7 +36,7 @@
{* Generate HTML code for printing Delivery Icon with link *} {* Generate HTML code for printing Delivery Icon with link *}
<span style="width:20px;"> <span style="width:20px;">
{if ($order_state->delivery && $order->delivery_number)} {if ($order_state->delivery && $order->delivery_number)}
<a href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="delivery" /></a> <a target="_blank" href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
{else} {else}
- -
{/if} {/if}
admin-dev/themes/template/orders/view.tpl
+1 -1
View File
@@ -69,7 +69,7 @@
{/if} {/if}
- -
{if ($currentState->delivery || $order->delivery_number)} {if ($currentState->delivery || $order->delivery_number)}
<a href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a> <a target="_blank" href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
{else} {else}
<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'} <img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
{/if} {/if}
classes/order/Order.php
+2 -2
View File
@@ -1139,13 +1139,13 @@ class OrderCore extends ObjectModel
die(Tools::displayError('Invalid objects')); die(Tools::displayError('Invalid objects'));
echo '<span style="width:20px; margin-right:5px;">'; echo '<span style="width:20px; margin-right:5px;">';
if (($orderState->invoice AND $order->invoice_number) AND (int)($tr['product_number'])) if (($orderState->invoice AND $order->invoice_number) AND (int)($tr['product_number']))
echo '<a href="pdf.php?id_order='.(int)($order->id).'&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>'; echo '<a target="_blank" href="pdf.php?id_order='.(int)($order->id).'&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>';
else else
echo '&nbsp;'; echo '&nbsp;';
echo '</span>'; echo '</span>';
echo '<span style="width:20px;">'; echo '<span style="width:20px;">';
if ($orderState->delivery AND $order->delivery_number) if ($orderState->delivery AND $order->delivery_number)
echo '<a href="pdf.php?id_delivery='.(int)($order->delivery_number).'"><img src="../img/admin/delivery.gif" alt="delivery" /></a>'; echo '<a target="_blank" href="pdf.php?id_delivery='.(int)($order->delivery_number).'"><img src="../img/admin/delivery.gif" alt="delivery" /></a>';
else else
echo '&nbsp;'; echo '&nbsp;';
echo '</span>'; echo '</span>';
controllers/admin/AdminOrdersController.php
+1 -1
View File
@@ -70,7 +70,7 @@ class AdminOrdersControllerCore extends AdminController
'payment' => array('title' => $this->l('Payment'), 'width' => 100), 'payment' => array('title' => $this->l('Payment'), 'width' => 100),
'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 230, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'), 'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 230, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'),
'date_add' => array('title' => $this->l('Date'), 'width' => 120, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), 'date_add' => array('title' => $this->l('Date'), 'width' => 120, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'),
'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false)); 'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false, 'remove_onclick' => true));
$this->shopLinkType = 'shop'; $this->shopLinkType = 'shop';
$this->shopShareDatas = Shop::SHARE_ORDER; $this->shopShareDatas = Shop::SHARE_ORDER;