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

//fix added toolbar in AdminInvoicesController and change initForm() method

Browse Source
This commit is contained in:
lLefevre
2011-11-18 10:28:21 +00:00
parent 00f61bc35b
commit 2837f230ab
4 changed files with 245 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/helper/form/form.tpl
+2 -2
View File
@@ -38,12 +38,12 @@
</div>
</div>
</div>
<div class="leadin">{block name="leadin"}{/block}</div>
{/if}
<div class="leadin">{block name="leadin"}{/block}</div>
{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
{block name="defaultForm"}
<form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
<form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
{if $form_id}
<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
{/if}
admin-dev/themes/template/invoices/content.tpl
-70
View File
@@ -1,70 +0,0 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<h2>{l s='Print PDF invoices'}</h2>
<fieldset style="float:left;width:300px"><legend><img src="../img/admin/pdf.gif" alt="" /> {l s='By date'}</legend>
<form action="{$url_post}" method="post">
<label style="width:90px">{l s='From:'} </label>
<div class="margin-form" style="padding-left:100px">
<input type="text" size="4" maxlength="10" name="date_from" value="{$date}" style="width: 120px;" /> <sup>*</sup>
<p class="clear">{l s='Format: 2007-12-31 (inclusive)'}</p>
</div>
<label style="width:90px">{l s='To:'} </label>
<div class="margin-form" style="padding-left:100px">
<input type="text" size="4" maxlength="10" name="date_to" value="{$date}" style="width: 120px;" /> <sup>*</sup>
<p class="clear">{l s='Format: 2008-12-31 (inclusive)'}</p>
</div>
<div class="margin-form" style="padding-left:100px">
<input type="submit" value="{l s='Generate PDF file'}" name="submitPrint" class="button" />
</div>
<div class="small"><sup>*</sup> {l s='Required fields'}</div>
</form>
</fieldset>
<fieldset style="float:left;width: 500px;margin-left:10px"><legend><img src="../img/admin/pdf.gif" alt="" /> {l s='By statuses'}</legend>
<form action="{$url_post}" method="post">
<label style="width:90px">{l s='Statuses'} :</label>
<div class="margin-form" style="padding-left:100px">
<ul>
{foreach $statuses as $status}
<li style="list-style: none;">
<input type="checkbox" name="id_order_state[]" value="{$status['id_order_state']|intval}" id="id_order_state_{$status['id_order_state']|intval}">
<label for="id_order_state_{$status['id_order_state']|intval}" style="float:none;{if !(isset($statusStats[$status['id_order_state']]) && $statusStats[$status['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
<img src="../img/admin/charged_{if $status['invoice']}ok{else}ko{/if}.gif" alt="" />
{$status['name']} ({if isset($statusStats[$status['id_order_state']]) && $statusStats[$status['id_order_state']]}{$statusStats[$status['id_order_state']]}{else}0{/if})
</label>
</li>
{/foreach}
</ul>
<p class="clear">{l s='You can also export orders which have not been charged yet.'}(<img src="../img/admin/charged_ko.gif" alt="" />)</p>
</div>
<div class="margin-form">
<input type="submit" value="{l s='Generate PDF file'}" name="submitPrint2" class="button" />
</div>
</form>
</fieldset>
<div class="clear">&nbsp;</div>
{$content}
admin-dev/themes/template/invoices/form.tpl
+85
View File
@@ -0,0 +1,85 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 8971 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{extends file="helper/form/form.tpl"}
{block name=script}
$(document).ready(function() {
var btn_save_date = $('span[class~="process-icon-save-date"]').parent();
var btn_submit_date = $('#submitPrint');
if (btn_save_date.length > 0 && btn_submit_date.length > 0)
{
btn_submit_date.hide();
btn_save_date.find('span').removeClass('process-icon-save-date');
btn_save_date.find('span').addClass('process-icon-save-calendar');
btn_save_date.click(function() {
btn_submit_date.before('<input type="hidden" name="'+btn_submit_date.attr("name")+'" value="1" />');
$('#invoice_date_form').submit();
});
}
var btn_save_status = $('span[class~="process-icon-save-status"]').parent();
var btn_submit_status = $('#submitPrint2');
if (btn_save_status.length > 0 && btn_submit_status.length > 0)
{
btn_submit_status.hide();
btn_save_status.find('span').removeClass('process-icon-save-status');
btn_save_status.find('span').addClass('process-icon-save');
btn_save_status.click(function() {
btn_submit_status.before('<input type="hidden" name="'+btn_submit_status.attr("name")+'" value="1" />');
$('#invoice_status_form').submit();
});
}
});
{/block}
{block name="start_field_block"}
<div class="margin-form">
{if $input.type == 'checkboxStatuses'}
{foreach $input.values.query as $value}
{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]|intval}
<input type="checkbox"
name="{$input.name}[]"
id="{$id_checkbox}"
value="{$value[$input.values.id]|intval}"
{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
<label for="{$id_checkbox}"
style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
{$value[$input.values.name]}
({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
</label><br />
{/foreach}
{/if}
{/block}
{block name="other_fieldsets"}<div class="clear">&nbsp;</div>{/block}