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/css/admin-theme.css
+25 -11
View File
@@ -1748,7 +1748,7 @@ input[type="button"].btn-block {
margin-bottom: 0; margin-bottom: 0;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px; } border-bottom-left-radius: 3px; }
.list-group-item > .badge { .list-group-item > .badge, .list-group-item > .badge-success, .list-group-item > .badge-error {
float: right; float: right;
margin-right: -15px; } margin-right: -15px; }
@@ -2938,7 +2938,7 @@ a.thumbnail:focus {
.label-info[href]:hover, .label-info[href]:focus { .label-info[href]:hover, .label-info[href]:focus {
background-color: #31b0d5; } background-color: #31b0d5; }
.badge { .badge, .badge-success, .badge-error {
display: inline-block; display: inline-block;
min-width: 10px; min-width: 10px;
padding: 3px 7px; padding: 3px 7px;
@@ -2951,24 +2951,26 @@ a.thumbnail:focus {
text-align: center; text-align: center;
background-color: #999999; background-color: #999999;
border-radius: 10px; } border-radius: 10px; }
.badge:empty { .badge:empty, .badge-success:empty, .badge-error:empty {
display: none; } display: none; }
a.badge:hover, a.badge:focus { a.badge:hover, a.badge-success:hover, a.badge-error:hover, a.badge:focus, a.badge-success:focus, a.badge-error:focus {
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
cursor: pointer; } cursor: pointer; }
.btn .badge, .toolbar_btn .badge { .btn .badge, .toolbar_btn .badge, .btn .badge-success, .toolbar_btn .badge-success, .btn .badge-error, .toolbar_btn .badge-error {
position: relative; position: relative;
top: -1px; } top: -1px; }
a.list-group-item.active > .badge, a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a.list-group-item.active > .badge-error,
.nav-pills > .active > a > .badge { .nav-pills > .active > a > .badge,
.nav-pills > .active > a > .badge-success,
.nav-pills > .active > a > .badge-error {
color: #313a45; color: #313a45;
background-color: #fff; } background-color: #fff; }
.nav-pills > li > a > .badge { .nav-pills > li > a > .badge, .nav-pills > li > a > .badge-success, .nav-pills > li > a > .badge-error {
margin-left: 3px; } margin-left: 3px; }
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
@@ -5037,7 +5039,8 @@ https://github.com/ghinda/css-toggle-switch
.prestashop-switch span { .prestashop-switch span {
color: #fff; } } color: #fff; } }
html, body { html, body {
height: 100%; } height: 100%;
min-height: 700px; }
body.fixed-top { body.fixed-top {
position: relative; position: relative;
@@ -5140,15 +5143,20 @@ body.fixed-top {
width: 240px; width: 240px;
border-bottom: solid 1px black; border-bottom: solid 1px black;
-webkit-box-shadow: #b4ac9c 0 4px 0; -webkit-box-shadow: #b4ac9c 0 4px 0;
box-shadow: #b4ac9c 0 4px 0; } box-shadow: #b4ac9c 0 4px 0;
min-height: 700px;
height: 100%; }
.page-sidebar > ul > li > ul.sub-menu { .page-sidebar > ul > li > ul.sub-menu {
display: none; display: none;
list-style: none; list-style: none;
clear: both; clear: both;
margin: 8px 0px 8px 0px; } margin: 8px 0px 8px 0px; }
.page-sidebar > ul { .page-sidebar > ul {
height: 100%;
overflow: scroll;
margin: 0; margin: 0;
padding: 0; } padding: 0;
padding-bottom: 100px; }
.page-sidebar > ul li { .page-sidebar > ul li {
background-color: #48525f; background-color: #48525f;
list-style: none; } list-style: none; }
@@ -5478,3 +5486,9 @@ tr.filter {
.breadcrumb { .breadcrumb {
background-color: white; } background-color: white; }
.badge-success {
background-color: #5cb85c; }
.badge-error {
background-color: #d9534f; }
admin-dev/themes/default/css/admin-theme.sass
+17 -1
View File
@@ -11,6 +11,7 @@ $bg-head-color: #9ED072
html, body html, body
height: 100% height: 100%
min-height: 700px
body.fixed-top body.fixed-top
position: relative position: relative
@@ -105,15 +106,19 @@ body.fixed-top
width: 240px width: 240px
border-bottom: solid 1px black border-bottom: solid 1px black
@include box-shadow(darken($bg-content-color,30%) 0 4px 0) @include box-shadow(darken($bg-content-color,30%) 0 4px 0)
min-height: 700px
height: 100%
> ul > li > ul.sub-menu > ul > li > ul.sub-menu
display: none display: none
list-style: none list-style: none
clear: both clear: both
margin: 8px 0px 8px 0px margin: 8px 0px 8px 0px
> ul > ul
height: 100%
overflow: scroll
margin: 0 margin: 0
padding: 0 padding: 0
padding-bottom: 100px
li li
background-color: #48525F background-color: #48525F
list-style: none list-style: none
@@ -465,3 +470,14 @@ tr.filter
.breadcrumb .breadcrumb
background-color: lighten($bg-content-color,7%) background-color: lighten($bg-content-color,7%)
.badge-success
@extend .badge
background-color: $brand-success
.badge-error
@extend .badge
background-color: $brand-danger
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"} {extends file="helpers/form/form.tpl"}
{block name=script} {block name=script}
$(document).ready(function() { $(document).ready(function() {
var btn_save_date = $('span[class~="process-icon-save-date"]').parent(); var btn_save_date = $('span[class~="process-icon-save-date"]').parent();
var btn_submit_date = $('#submitPrint'); var btn_submit_date = $('#submitPrint');
if (btn_save_date.length > 0 && btn_submit_date.length > 0) if (btn_save_date.length > 0 && btn_submit_date.length > 0)
{ {
btn_submit_date.hide(); btn_submit_date.hide();
@@ -41,10 +39,8 @@
$('#invoice_date_form').submit(); $('#invoice_date_form').submit();
}); });
} }
var btn_save_status = $('span[class~="process-icon-save-status"]').parent(); var btn_save_status = $('span[class~="process-icon-save-status"]').parent();
var btn_submit_status = $('#submitPrint2'); var btn_submit_status = $('#submitPrint2');
if (btn_save_status.length > 0 && btn_submit_status.length > 0) if (btn_save_status.length > 0 && btn_submit_status.length > 0)
{ {
btn_submit_status.hide(); btn_submit_status.hide();
@@ -52,12 +48,10 @@
btn_save_status.find('span').addClass('process-icon-save'); btn_save_status.find('span').addClass('process-icon-save');
btn_save_status.click(function() { btn_save_status.click(function() {
btn_submit_status.before('<input type="hidden" name="'+btn_submit_status.attr("name")+'" value="1" />'); btn_submit_status.before('<input type="hidden" name="'+btn_submit_status.attr("name")+'" value="1" />');
$('#invoice_status_form').submit(); $('#invoice_status_form').submit();
}); });
} }
}); });
{/block} {/block}
{block name="input"} {block name="input"}
@@ -67,9 +61,25 @@
<p class="checkbox"> <p class="checkbox">
<label for="{$id_checkbox}" class="control-label"> <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} /> <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]} {$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> </label>
</p> </p>
{/foreach} {/foreach}
@@ -77,5 +87,3 @@
{$smarty.block.parent} {$smarty.block.parent}
{/if} {/if}
{/block} {/block}
admin-dev/themes/default/template/helpers/form/form.tpl
+11 -6
View File
@@ -440,12 +440,17 @@
{hook h=$hookName fieldset=$f} {hook h=$hookName fieldset=$f}
{/if} {/if}
{elseif $key == 'submit'} {elseif $key == 'submit'}
<div class="margin-form"> <div class="row">
<input type="submit" <div class="col-lg-9 col-offset-3">
id="{if isset($field.id)}{$field.id}{else}{$table}_form_submit_btn{/if}" <button
value="{$field.title}" type="submit"
name="{if isset($field.name)}{$field.name}{else}{$submit_action}{/if}{if isset($field.stay) && $field.stay}AndStay{/if}" id="{if isset($field.id)}{$field.id}{else}{$table}_form_submit_btn{/if}"
{if isset($field.class)}class="{$field.class}"{/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> </div>
{elseif $key == 'desc'} {elseif $key == 'desc'}
<p class="clear"> <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"> <fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if} class="col-lg-12">
{* Options category title *} {* Options category title *}
<legend> <legend>
<img src="{$categoryData['image']}"/> <i class="icon-cogs"></i>
{if isset($categoryData['title'])}{$categoryData['title']}{else}{l s='Options'}{/if} {if isset($categoryData['title'])}{$categoryData['title']}{else}{l s='Options'}{/if}
</legend> </legend>
@@ -226,9 +226,18 @@
{/if} {/if}
{/foreach} {/foreach}
{if isset($categoryData['submit'])} {if isset($categoryData['submit'])}
<div class="col-lg-12 text-right"> <div class="row">
<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="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> </div>
{/if} {/if}
{if isset($categoryData['required_fields']) && $categoryData['required_fields']} {if isset($categoryData['required_fields']) && $categoryData['required_fields']}
controllers/admin/AdminInvoicesController.php
+11 -11
View File
@@ -89,32 +89,31 @@ class AdminInvoicesControllerCore extends AdminController
$this->fields_form = array( $this->fields_form = array(
'legend' => array( 'legend' => array(
'title' => $this->l('By date'), 'title' => $this->l('By date'),
'image' => '../img/admin/pdf.gif' 'icon' => 'icon-calendar'
), ),
'input' => array( 'input' => array(
array( array(
'type' => 'date', 'type' => 'date',
'label' => $this->l('From:'), 'label' => $this->l('From:'),
'name' => 'date_from', 'name' => 'date_from',
'size' => 20,
'maxlength' => 10, 'maxlength' => 10,
'required' => true, 'required' => true,
'desc' => $this->l('Format: 2011-12-31 (inclusive)') 'hint' => $this->l('Format: 2011-12-31 (inclusive)')
), ),
array( array(
'type' => 'date', 'type' => 'date',
'label' => $this->l('To:'), 'label' => $this->l('To:'),
'name' => 'date_to', 'name' => 'date_to',
'size' => 20,
'maxlength' => 10, 'maxlength' => 10,
'required' => true, 'required' => true,
'desc' => $this->l('Format: 2012-12-31 (inclusive)') 'hint' => $this->l('Format: 2012-12-31 (inclusive)')
) )
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Generate PDF file by date'), 'title' => $this->l('Generate PDF file by date'),
'class' => 'button', 'class' => 'btn btn-primary',
'id' => 'submitPrint' 'id' => 'submitPrint',
'icon' => 'icon-download-alt'
) )
); );
@@ -133,7 +132,7 @@ class AdminInvoicesControllerCore extends AdminController
$this->fields_form = array( $this->fields_form = array(
'legend' => array( 'legend' => array(
'title' => $this->l('By order status'), 'title' => $this->l('By order status'),
'image' => '../img/admin/pdf.gif' 'icon' => 'icon-pushpin'
), ),
'input' => array( 'input' => array(
array( array(
@@ -145,13 +144,14 @@ class AdminInvoicesControllerCore extends AdminController
'id' => 'id_order_state', 'id' => 'id_order_state',
'name' => 'name' 'name' => 'name'
), ),
'desc' => $this->l('You can also export orders which have not been charged yet.').' (<img src="../img/admin/charged_ko.gif" alt="" />).' 'hint' => $this->l('You can also export orders which have not been charged yet.')
) )
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Generate PDF file by status.'), 'title' => $this->l('Generate PDF file by status.'),
'class' => 'button', 'class' => 'btn btn-primary',
'id' => 'submitPrint2' 'id' => 'submitPrint2',
'icon' => 'icon-download-alt'
) )
); );