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

// add delivery slip

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11693 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-12-22 21:21:41 +00:00
parent 3b22a2d2e6
commit 45cc1929d4
13 changed files with 172 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/pdf.php
+36 -10
View File
@@ -36,6 +36,7 @@ $functionArray = array(
'pdf' => 'generateInvoicePDF',
'id_order_slip' => 'generateOrderSlipPDF',
'id_delivery' => 'generateDeliverySlipPDF',
'delivery' => 'generateDeliverySlipPDF',
'invoices' => 'generateInvoicesPDF',
'invoices2' => 'generateInvoicesPDF2',
'slips' => 'generateOrderSlipsPDF',
@@ -66,10 +67,10 @@ function generateSupplyOrderFormPDF()
function generateInvoicePDF()
{
if (Tools::isSubmit('id_order'))
generateInvoicePDFByIdOrder(Tools::getValue('id_order'));
elseif (Tools::isSubmit('id_order_invoice'))
generateInvoicePDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
if (Tools::isSubmit('id_order'))
generateInvoicePDFByIdOrder(Tools::getValue('id_order'));
elseif (Tools::isSubmit('id_order_invoice'))
generateInvoicePDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
else
die (Tools::displayError('Missing order ID or invoice order ID'));
exit;
@@ -110,11 +111,37 @@ function generateOrderSlipPDF()
function generateDeliverySlipPDF()
{
$order = Order::getByDelivery((int)($_GET['id_delivery']));
if (!Validate::isLoadedObject($order))
die(Tools::displayError('Cannot find order in database'));
if (Tools::isSubmit('id_order'))
generateDeliverySlipPDFByIdOrder(Tools::getValue('id_order'));
elseif (Tools::isSubmit('id_order_invoice'))
generateDeliverySlipPDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
elseif (Tools::isSubmit('id_delivery'))
{
$order = Order::getByDelivery(Tools::getValue('id_delivery'));
generateDeliverySlipPDFByIdOrder($order->id);
}
else
die (Tools::displayError('Missing order ID or invoice order ID'));
exit;
}
generatePDF($order, PDF::TEMPLATE_DELIVERY_SLIP);
function generateDeliverySlipPDFByIdOrder($id_order)
{
$order = new Order($id_order);
if (!Validate::isLoadedObject($order))
throw new PrestashopException('Can\'t load Order object');
$order_invoice_collection = $order->getInvoicesCollection();
generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
}
function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
{
$order_invoice = new OrderInvoice($id_order_invoice);
if (!Validate::isLoadedObject($order_invoice))
throw new PrestashopException('Can\'t load Order Invoice object');
generatePDF($order_invoice, PDF::TEMPLATE_DELIVERY_SLIP);
}
function generateInvoicesPDF()
@@ -175,5 +202,4 @@ function generatePDF($object, $template)
global $smarty;
$pdf = new PDF($object, $template, $smarty);
$pdf->render();
}
}
admin-dev/themes/template/orders/_documents.tpl
+44 -8
View File
@@ -12,32 +12,67 @@
{foreach from=$order->getDocuments() item=document}
{if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)}
<tr class="invoice_line" id="delivery_{$document->id}">
{else}
<tr class="invoice_line" id="invoice_{$document->id}">
{/if}
{elseif get_class($document) eq 'OrderSlip'}
<tr class="invoice_line" id="orderslip_{$document->id}">
{/if}
<td class="document_date">{dateFormat date=$document->date_add}</td>
<td class="document_type">{if get_class($document) eq 'OrderInvoice'}Invoice{elseif get_class($document) eq 'OrderSlip'}Credit Slip{/if}</td>
<td class="document_number"><a target="_blank" href="{if get_class($document) eq 'OrderInvoice'}pdf.php?pdf&id_order_invoice={$document->id}{elseif get_class($document) eq 'OrderSlip'}pdf.php?id_order_slip={$document->id}{/if}">{if get_class($document) eq 'OrderInvoice'}{$document->getInvoiceNumberFormatted($current_id_lang)}{elseif get_class($document) eq 'OrderSlip'}{l s='#'}{'%06d'|sprintf:$document->id}{/if} <img src="../img/admin/details.gif" alt="{l s='See the invoice'}" /></a></td>
<td class="document_type">
{if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)}
{l s='Delivery slip'}
{else}
{l s='Invoice'}
{/if}
{elseif get_class($document) eq 'OrderSlip'}
{l s='Credit Slip'}
{/if}</td>
<td class="document_number">
<a target="_blank" href="
{if get_class($document) eq 'OrderInvoice'}
pdf.php?{if isset($document->is_delivery)}delivery{else}pdf{/if}&id_order_invoice={$document->id}
{elseif get_class($document) eq 'OrderSlip'}
pdf.php?id_order_slip={$document->id}
{/if}">
{if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)}
#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->delivery_number}
{else}
{$document->getInvoiceNumberFormatted($current_id_lang)}
{/if}
{elseif get_class($document) eq 'OrderSlip'}
{l s='#'}{'%06d'|sprintf:$document->id}
{/if} <img src="../img/admin/details.gif" alt="{l s='See the document'}" /></a></td>
<td class="document_amount">
{if get_class($document) eq 'OrderInvoice'}
{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
{if $document->getRestPaid()}
<span style="color:red;font-weight:bold;">({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'})</span>
{if isset($document->is_delivery)}
--
{else}
{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
{if $document->getRestPaid()}
<span style="color:red;font-weight:bold;">({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'})</span>
{/if}
{/if}
{/if}
</td>
<td class="right document_action">
{if get_class($document) eq 'OrderInvoice'}
{if $document->getRestPaid()}
<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
{if !isset($document->is_delivery)}
{if $document->getRestPaid()}
<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
{/if}
<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"><img src="../img/admin/note.png" alt="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"{if $document->note eq ''} class="js-disabled-action"{/if} /></a>
{/if}
<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"><img src="../img/admin/note.png" alt="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"{if $document->note eq ''} class="js-disabled-action"{/if} /></a>
{/if}
</td>
</tr>
{if get_class($document) eq 'OrderInvoice'}
{if !isset($document->is_delivery)}
<tr id="invoiceNote{$document->id}" style="display:none" class="current-edit">
<td colspan="5">
<form action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
@@ -53,6 +88,7 @@
</form>
</td>
</tr>
{/if}
{/if}
{foreachelse}
<tr>
admin-dev/themes/template/orders/_print_pdf_icon.tpl
+1 -1
View File
@@ -36,7 +36,7 @@
{* Generate HTML code for printing Delivery Icon with link *}
<span style="width:20px;">
{if ($order_state->delivery && $order->delivery_number)}
<a target="_blank" href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
<a target="_blank" href="pdf.php?id_order={$order->id}&delivery"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
{else}
-
{/if}
admin-dev/themes/template/orders/view.tpl
+2 -2
View File
@@ -63,13 +63,13 @@
<fieldset style="width:98%; margin-bottom: 10px;">
<div style="width:50%; float: left;">
{if (count($invoices_collection))}
<a href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}</a>
<a href="pdf.php?id_order={$order->id}&pdf" target="_blank"><img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}</a>
{else}
<img src="../img/admin/charged_ko.gif" alt="{l s='No invoice'}" /> {l s='No invoice'}
{/if}
-
{if ($currentState->delivery || $order->delivery_number)}
<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>
<a href="pdf.php?id_order={$order->id}&delivery" target="_blank"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
{else}
<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
{/if}