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

[+] BO Invoices

Browse Source
This commit is contained in:
Kevin Granger
2013-07-26 15:34:11 +02:00
parent 3287ff5300
commit 1a2b78b00f
6 changed files with 95 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
+18 -10
View File
@@ -25,11 +25,9 @@
{extends file="helpers/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();
@@ -41,10 +39,8 @@
$('#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();
@@ -52,12 +48,10 @@
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="input"}
@@ -67,9 +61,25 @@
<p class="checkbox">
<label for="{$id_checkbox}" class="control-label">
<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} />
<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
{if $value['invoice']}
{$value[$input.values.name]}
({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
<span class="badge-success">
{if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}
{$statusStats[$value['id_order_state']]}
{else}
0
{/if}
</span>
{else}
{$value[$input.values.name]}
<span class="badge-error">
{if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}
{$statusStats[$value['id_order_state']]}
{else}
0
{/if}
</span>
{/if}
</label>
</p>
{/foreach}
@@ -77,5 +87,3 @@
{$smarty.block.parent}
{/if}
{/block}
admin-dev/themes/default/template/helpers/form/form.tpl
+11 -6
View File
@@ -440,12 +440,17 @@
{hook h=$hookName fieldset=$f}
{/if}
{elseif $key == 'submit'}
<div class="margin-form">
<input type="submit"
id="{if isset($field.id)}{$field.id}{else}{$table}_form_submit_btn{/if}"
value="{$field.title}"
name="{if isset($field.name)}{$field.name}{else}{$submit_action}{/if}{if isset($field.stay) && $field.stay}AndStay{/if}"
{if isset($field.class)}class="{$field.class}"{/if} />
<div class="row">
<div class="col-lg-9 col-offset-3">
<button
type="submit"
id="{if isset($field.id)}{$field.id}{else}{$table}_form_submit_btn{/if}"
name="{if isset($field.name)}{$field.name}{else}{$submit_action}{/if}{if isset($field.stay) && $field.stay}AndStay{/if}"
{if isset($field.class)}class="{$field.class}"{/if}
>
{if isset($field.icon)}<i class="{$field.icon}"></i>{/if} {$field.title}
</button>
</div>
</div>
{elseif $key == 'desc'}
<p class="clear">
admin-dev/themes/default/template/helpers/options/options.tpl
+13 -4
View File
@@ -44,7 +44,7 @@
<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if} class="col-lg-12">
{* Options category title *}
<legend>
<img src="{$categoryData['image']}"/>
<i class="icon-cogs"></i>
{if isset($categoryData['title'])}{$categoryData['title']}{else}{l s='Options'}{/if}
</legend>
@@ -226,9 +226,18 @@
{/if}
{/foreach}
{if isset($categoryData['submit'])}
<div class="col-lg-12 text-right">
<input type="submit" value="{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}" name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}" class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}" id="{$table}_form_submit_btn"
/>
<div class="row">
<div class="col-lg-9 col-offset-3">
<button
type="submit"
id="{$table}_form_submit_btn"
name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-primary{/if}"
>
<i class="{if isset($categoryData['submit']['icon'])}{$categoryData['submit']['icon']}{else}icon-save{/if}"></i>
{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}
</button>
</div>
</div>
{/if}
{if isset($categoryData['required_fields']) && $categoryData['required_fields']}