Skip to content

Commit

Permalink
Merge pull request #287 from fyndiq/shorten-key
Browse files Browse the repository at this point in the history
changed import_orders_status to disable_orders
  • Loading branch information
Håkan Nylén committed Oct 29, 2015
2 parents 3657ffa + f01970d commit f4ba513
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/backoffice/FmController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function __construct($fmPrestashop, $fmOutput, $fmConfig, $fmApiModel)
$this->fmConfig = $fmConfig;
$this->fmPrestashop = $fmPrestashop;
$this->fmApiModel = $fmApiModel;
$importOrdersStatus = $this->fmConfig->get('import_orders_status');
$importOrdersStatus = $this->fmConfig->get('disable_orders');

$path = $fmPrestashop->getModuleUrl();
$this->data = array(
Expand Down Expand Up @@ -92,7 +92,7 @@ private function authenticate()
}
$this->fmConfig->set('username', $username);
$this->fmConfig->set('api_token', $apiToken);
$this->fmConfig->set('import_orders_status', $importOrdersStatus);
$this->fmConfig->set('disable_orders', $importOrdersStatus);
$base = $this->fmPrestashop->getBaseModuleUrl();
$pingToken = $this->fmPrestashop->toolsEncrypt(time());
$this->fmConfig->set('ping_token', $pingToken);
Expand Down
2 changes: 1 addition & 1 deletion src/backoffice/FmServiceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ protected function getTime()
*/
private function importOrders()
{
$importOrdersStatus = $this->fmConfig->get('import_orders_status');
$importOrdersStatus = $this->fmConfig->get('disable_orders');
if ($importOrdersStatus == FmUtils::ORDERS_DISABLED) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/backoffice/notification_service.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function handleRequest($params)
*/
private function order_created($params)
{
$importOrdersStatus = $this->fmConfig->get('import_orders_status');
$importOrdersStatus = $this->fmConfig->get('disable_orders');
if ($importOrdersStatus == FmUtils::ORDERS_DISABLED) {
return $this->getFyndiqOutput()->showError(403, 'Forbidden', 'Forbidden');
}
Expand Down

0 comments on commit f4ba513

Please sign in to comment.