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

[*] BO : #PSFV-94 - added AdminInvoicesController and missing geolocation template

Browse Source
This commit is contained in:
tDidierjean
2011-10-21 12:20:37 +00:00
parent a425113cba
commit b9cf3b3afb
4 changed files with 173 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/geolocation/content.tpl
+28
View File
@@ -0,0 +1,28 @@
{*
* 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='Geolocation'}</h2>
{$content}
admin-dev/themes/template/geolocation/options.tpl
+60
View File
@@ -0,0 +1,60 @@
{*
* 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
*}
{extends file="../options.tpl"}
{block name="start_field_block"}
{if $field['type'] == 'checkbox_table'}
<div class="margin-form" style="float: left; padding-left: 0; width: 317px; margin-top: 6px; height: 300px; overflow-y: auto;">
<table class="table" cellspacing="0">
<thead>
<tr>
<th><input type="checkbox" name="checkAll" onclick="checkDelBoxes(this.form, 'countries[]', this.checked)" /></th>
<th>{l s='Name'}</th>
<tr>
</thead>
<tbody>
{foreach $field['list'] as $country}
<tr>
<td><input type="checkbox" name="countries[]" value="{$country[$field['identifier']]}" {if in_array(strtoupper($country['iso_code']), $allowed_countries)}checked="checked"{/if} /></td>
<td>{$country['name']|escape:'htmlall':'UTF-8'}</td>
</tr>
{/foreach}
</tbody>
</table>
{elseif $field['type'] == 'textarea_newlines'}
<div class="margin-form">
<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
{else}
<div class="margin-form">
{/if}
{/block}
{block name="end_field_block"}
{if $field['type'] == 'checkbox_table'}
<div class="clear"></div>
<br />
{/if}
{/block}
admin-dev/themes/template/invoices/content.tpl
+70
View File
@@ -0,0 +1,70 @@
{*
* 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/tabs/AdminInvoices.php → controllers/admin/AdminInvoicesController.php
+15 -57
View File
@@ -25,29 +25,30 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminInvoices extends AdminTab class AdminInvoicesControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
$this->table = 'invoice'; $this->table = 'invoice';
$this->optionsList = array( $this->options = array(
'general' => array( 'general' => array(
'title' => $this->l('Invoice options'), 'title' => $this->l('Invoice options'),
'fields' => array( 'fields' => array(
'PS_INVOICE' => array('title' => $this->l('Enable invoices:'), 'desc' => $this->l('Select whether or not to activate invoices for your shop'), 'cast' => 'intval', 'type' => 'bool'), 'PS_INVOICE' => array('title' => $this->l('Enable invoices:'), 'desc' => $this->l('Select whether or not to activate invoices for your shop'), 'cast' => 'intval', 'type' => 'bool'),
'PS_INVOICE_PREFIX' => array('title' => $this->l('Invoice prefix:'), 'desc' => $this->l('Prefix used for invoices'), 'size' => 6, 'type' => 'textLang'), 'PS_INVOICE_PREFIX' => array('title' => $this->l('Invoice prefix:'), 'desc' => $this->l('Prefix used for invoices'), 'size' => 6, 'type' => 'textLang'),
'PS_INVOICE_START_NUMBER' => array('title' => $this->l('Invoice number:'), 'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice. Set to 0 if you want to keep the current number (#').(Order::getLastInvoiceNumber() + 1).').', 'size' => 6, 'type' => 'text', 'cast' => 'intval'), 'PS_INVOICE_START_NUMBER' => array('title' => $this->l('Invoice number:'), 'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice. Set to 0 if you want to keep the current number (#').(Order::getLastInvoiceNumber() + 1).').', 'size' => 6, 'type' => 'text', 'cast' => 'intval'),
'PS_INVOICE_FREE_TEXT' => array('title' => $this->l('Free Text:'), 'desc' => $this->l('This text will appear at the bottom of the invoice'), 'size' => 6, 'type' => 'textareaLang', 'PS_INVOICE_FREE_TEXT' => array('title' => $this->l('Free Text:'), 'desc' => $this->l('This text will appear at the bottom of the invoice'), 'size' => 6, 'type' => 'textareaLang',
'cols' => 40, 'rows' => 8) 'cols' => 40, 'rows' => 8)
), ),
'submit' => array()
), ),
); );
parent::__construct(); parent::__construct();
} }
public function displayForm($isMainTab = true) public function initContent()
{ {
$statuses = OrderState::getOrderStates($this->context->language->id); $statuses = OrderState::getOrderStates($this->context->language->id);
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
@@ -65,56 +66,13 @@ class AdminInvoices extends AdminTab
foreach ($result as $row) foreach ($result as $row)
$statusStats[$row['id_order_state']] = $row['nbOrders']; $statusStats[$row['id_order_state']] = $row['nbOrders'];
echo ' $this->context->smarty->assign(array(
<h2>'.$this->l('Print PDF invoices').'</h2> 'url_post' => self::$currentIndex.'&token='.$this->token,
<fieldset style="float:left;width:300px"><legend><img src="../img/admin/pdf.gif" alt="" /> '.$this->l('By date').'</legend> 'date' => date('Y-m-d'),
<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post"> 'statuses' => $statuses,
<label style="width:90px">'.$this->l('From:').' </label> 'statusStats' => $statusStats
<div class="margin-form" style="padding-left:100px"> ));
<input type="text" size="4" maxlength="10" name="date_from" value="'.(date('Y-m-d')).'" style="width: 120px;" /> <sup>*</sup> parent::initContent();
<p class="clear">'.$this->l('Format: 2007-12-31 (inclusive)').'</p>
</div>
<label style="width:90px">'.$this->l('To:').' </label>
<div class="margin-form" style="padding-left:100px">
<input type="text" size="4" maxlength="10" name="date_to" value="'.(date('Y-m-d')).'" style="width: 120px;" /> <sup>*</sup>
<p class="clear">'.$this->l('Format: 2008-12-31 (inclusive)').'</p>
</div>
<div class="margin-form" style="padding-left:100px">
<input type="submit" value="'.$this->l('Generate PDF file').'" name="submitPrint" class="button" />
</div>
<div class="small"><sup>*</sup> '.$this->l('Required fields').'</div>
</form>
</fieldset>
<fieldset style="float:left;width: 500px;margin-left:10px"><legend><img src="../img/admin/pdf.gif" alt="" /> '.$this->l('By statuses').'</legend>
<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post">
<label style="width:90px">'.$this->l('Statuses').' :</label>
<div class="margin-form" style="padding-left:100px">
<ul>';
foreach ($statuses as $status)
echo ' <li style="list-style: none;">
<input type="checkbox" name="id_order_state[]" value="'.(int)$status['id_order_state'].'" id="id_order_state_'.(int)$status['id_order_state'].'">
<label for="id_order_state_'.(int)$status['id_order_state'].'" style="float:none;'.((isset($statusStats[$status['id_order_state']]) AND $statusStats[$status['id_order_state']]) ? '' : 'font-weight:normal;').'padding:0;text-align:left;width:100%;color:#000">
<img src="../img/admin/charged_'.($status['invoice'] ? 'ok' : 'ko').'.gif" alt="" />
'.$status['name'].' ('.((isset($statusStats[$status['id_order_state']]) AND $statusStats[$status['id_order_state']]) ? $statusStats[$status['id_order_state']] : '0').')
</label>
</li>';
echo ' </ul>
<p class="clear">'.$this->l('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="'.$this->l('Generate PDF file').'" name="submitPrint2" class="button" />
</div>
</form>
</fieldset>
<div class="clear">&nbsp;</div>';
return parent::displayForm();
}
public function display()
{
$this->displayForm();
$this->displayOptionsList();
} }
public function postProcess() public function postProcess()
@@ -148,7 +106,7 @@ class AdminInvoices extends AdminTab
else else
parent::postProcess(); parent::postProcess();
} }
public function beforeUpdateOptions() public function beforeUpdateOptions()
{ {
if ((int)Tools::getValue('PS_INVOICE_START_NUMBER') != 0 AND (int)Tools::getValue('PS_INVOICE_START_NUMBER') <= Order::getLastInvoiceNumber()) if ((int)Tools::getValue('PS_INVOICE_START_NUMBER') != 0 AND (int)Tools::getValue('PS_INVOICE_START_NUMBER') <= Order::getLastInvoiceNumber())