mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-07-11 23:46:35 -04:00
Fix incorrect function calls
- Fixed encrypter references
This commit is contained in:
committed by
Steve Ireland
parent
9aec0b45ac
commit
271d146e73
@@ -20,6 +20,7 @@ use App\Models\Tax;
|
||||
use CodeIgniter\Encryption\Encryption;
|
||||
use CodeIgniter\Encryption\EncrypterInterface;
|
||||
use CodeIgniter\Files\File;
|
||||
use Config\Services;
|
||||
use DirectoryIterator;
|
||||
use NumberFormatter;
|
||||
use ReflectionException;
|
||||
@@ -59,9 +60,6 @@ class Config extends Secure_Controller
|
||||
$this->rounding_mode = model('Rounding_mode');
|
||||
$this->stock_location = model('Stock_location');
|
||||
$this->tax = model('Tax');
|
||||
|
||||
$this->encryption = new Encryption();
|
||||
$this->encrypter = $this->encryption->initialize();
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -278,8 +276,10 @@ class Config extends Secure_Controller
|
||||
|
||||
if($this->_check_encryption()) //TODO: Hungarian notation
|
||||
{
|
||||
$data['mailchimp']['api_key'] = $this->encrypter->decrypt(config('OSPOS')->settings['mailchimp_api_key']);
|
||||
$data['mailchimp']['list_id'] = $this->encrypter->decrypt(config('OSPOS')->settings['mailchimp_list_id']);
|
||||
$encrypter = Services::encrypter();
|
||||
|
||||
$data['mailchimp']['api_key'] = $encrypter->decrypt(config('OSPOS')->settings['mailchimp_api_key']);
|
||||
$data['mailchimp']['list_id'] = $encrypter->decrypt(config('OSPOS')->settings['mailchimp_list_id']);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -984,4 +984,4 @@ class Config extends Secure_Controller
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user