diff --git a/retailcrm/lib/RetailcrmExportOrdersHelper.php b/retailcrm/lib/RetailcrmExportOrdersHelper.php index 3973c82..7e9efed 100644 --- a/retailcrm/lib/RetailcrmExportOrdersHelper.php +++ b/retailcrm/lib/RetailcrmExportOrdersHelper.php @@ -100,8 +100,7 @@ class RetailcrmExportOrdersHelper $sqlOrdersInfo = 'FROM `' . _DB_PREFIX_ . 'retailcrm_exported_orders` eo LEFT JOIN `' . _DB_PREFIX_ . 'orders` o on o.`id_order` = eo.`id_order` - WHERE ( eo.`id_order` IS NULL OR ( 1 ' . Shop::addSqlRestriction(false, 'o') . ' ) )' - ; + WHERE ( eo.`id_order` IS NULL OR ( 1 ' . Shop::addSqlRestriction(false, 'o') . ' ) )'; if (0 < count($ordersIds)) { $sqlOrdersInfo .= ' AND (eo.`id_order` IN ( ' . pSQL(implode(', ', $ordersIds)) . ') diff --git a/retailcrm/lib/events/RetailcrmMissingEvent.php b/retailcrm/lib/events/RetailcrmMissingEvent.php index fdb203f..47558a7 100644 --- a/retailcrm/lib/events/RetailcrmMissingEvent.php +++ b/retailcrm/lib/events/RetailcrmMissingEvent.php @@ -120,8 +120,7 @@ class RetailcrmMissingEvent extends RetailcrmAbstractEvent implements RetailcrmE } else { $order['status'] = array_key_exists($orderInstance->current_state, $status) ? $status[$orderInstance->current_state] - : 'completed' - ; + : 'completed'; } /** @@ -134,8 +133,7 @@ class RetailcrmMissingEvent extends RetailcrmAbstractEvent implements RetailcrmE if ($address instanceof Address) { $phone = null === $address->phone ? null === $address->phone_mobile ? '' : $address->phone_mobile - : $address->phone - ; + : $address->phone; $postcode = $address->postcode; $city = $address->city; diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php index 1abd475..1f6e73c 100644 --- a/retailcrm/retailcrm.php +++ b/retailcrm/retailcrm.php @@ -203,8 +203,7 @@ class RetailCRM extends Module && ($this->use_new_hooks ? $this->registerHook('actionCustomerAccountUpdate') : true) && ($this->use_new_hooks ? $this->registerHook('actionValidateCustomerAddressForm') : true) && $this->installDB() - && $this->installTab() - ; + && $this->installTab(); } /** @@ -358,8 +357,7 @@ class RetailCRM extends Module && Configuration::deleteByName(RetailcrmJobManager::CURRENT_TASK) && Configuration::deleteByName(RetailcrmCli::CURRENT_TASK_CLI) && $this->uninstallDB() - && $this->uninstallTab() - ; + && $this->uninstallTab(); } public function enable($force_all = false) @@ -369,8 +367,7 @@ class RetailCRM extends Module self::updateCrmModuleState($context->shop->id); return parent::enable($force_all) - && $this->installTab() - ; + && $this->installTab(); } public function disable($force_all = false) diff --git a/retailcrm/upgrade/upgrade-3.4.0.php b/retailcrm/upgrade/upgrade-3.4.0.php index 8174b7b..68a6d54 100644 --- a/retailcrm/upgrade/upgrade-3.4.0.php +++ b/retailcrm/upgrade/upgrade-3.4.0.php @@ -146,8 +146,7 @@ function upgrade_module_3_4_0($module) 'retailcrm/views/templates/admin/settings.tpl', ]) && $module->uninstallOldTabs() - && $module->installTab() - ; + && $module->installTab(); } function retailcrm_convert_old_default_values_format()