Merge branch 'fix-10571' into develop

This commit is contained in:
Marion Muszynski 2016-08-23 15:02:55 +02:00
commit 3d12d226f5

View File

@ -113,7 +113,7 @@ class AdminInvoices extends AdminTab
<th align="center">'. $this->l('Delay') .'</th>
</tr>';
// <th align="center">M2\'</th>
$id_sales = unserialize(Configuration::get("ANT_CHECKED_SALE_".$cookie->id_employee));
$id_sales = unserialize(Configuration::get("ANT_CHECKED_SALES"));
foreach ($this->print_sales as $key => $sale) {
if( $key%2 == 0) {
$class = 'alt_row';
@ -354,8 +354,7 @@ class AdminInvoices extends AdminTab
public function ajaxProcessResetPrintM2Plus()
{
global $cookie;
Configuration::updateValue("ANT_CHECKED_SALE_".$cookie->id_employee, '');
Configuration::updateValue("ANT_CHECKED_SALES", '');
}
public function display()
@ -366,7 +365,7 @@ class AdminInvoices extends AdminTab
public function postProcess()
{
global $currentIndex, $cookie;
global $currentIndex;
if (Tools::isSubmit('submitPrint'))
{
@ -501,7 +500,7 @@ class AdminInvoices extends AdminTab
include_once(dirname(__FILE__).'/../../modules/privatesales/Sale.php');
$id_sales = Tools::getValue('multi2');
Configuration::updateValue("ANT_CHECKED_SALE_".$cookie->id_employee, serialize($id_sales));
Configuration::updateValue("ANT_CHECKED_SALES", serialize($id_sales));
if (empty($id_sales) || (count($id_sales) < 2) ) {
$this->_errors[] = $this->l('You must select 2 sales minimum for print M2+');