diff --git a/admin/themes/default/template/controllers/sources/modals/_merge_source_form.tpl b/admin/themes/default/template/controllers/sources/modals/_merge_source_form.tpl index 8002b45f4..7eecabd2f 100644 --- a/admin/themes/default/template/controllers/sources/modals/_merge_source_form.tpl +++ b/admin/themes/default/template/controllers/sources/modals/_merge_source_form.tpl @@ -11,8 +11,8 @@
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 489edb743..7e786f24f 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -356,7 +356,7 @@ abstract class PaymentModuleCore extends Module if (isset($this->idBookingSource) && $this->idBookingSource) { $order->id_source = (int)$this->idBookingSource; } else { - $order->id_source = Source::getDefaultSourceId(); + $order->id_source = (int)Source::getDefaultSourceId(); } if (self::DEBUG_MODE) { diff --git a/classes/order/Order.php b/classes/order/Order.php index e5ed30602..25f23e88f 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -271,6 +271,7 @@ class OrderCore extends ObjectModel 'invoice_date' => array('type' => self::TYPE_DATE), 'delivery_date' => array('type' => self::TYPE_DATE), 'source' => array('type' => self::TYPE_STRING), + 'id_source' => array('type' => self::TYPE_INT), 'valid' => array('type' => self::TYPE_BOOL), 'reference' => array('type' => self::TYPE_STRING), 'is_advance_payment' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0), diff --git a/controllers/admin/AdminSourcesController.php b/controllers/admin/AdminSourcesController.php index de80d4a01..299069578 100644 --- a/controllers/admin/AdminSourcesController.php +++ b/controllers/admin/AdminSourcesController.php @@ -62,22 +62,6 @@ class AdminSourcesControllerCore extends AdminController public function init() { - if (Tools::isSubmit('viewbusiness_source') - || Tools::isSubmit('submitFiltersource') - || Tools::isSubmit('submitResetsource') - || Tools::getValue('sourceOrderby') - || Tools::getValue('sourceOrderway') - ) { - $this->list_id = 'source'; - } - - $idSourceType = (int) Tools::getValue('id_source_type'); - - if ($idSourceType && Tools::getValue('viewbusiness_source')) { - self::$currentIndex .= '&id_source_type=' . $idSourceType . '&viewbusiness_source'; - $this->className = 'Source'; - } - if (Tools::isSubmit('addsource') || Tools::isSubmit('addbusiness_source')) { $this->display = 'add'; } @@ -91,10 +75,23 @@ class AdminSourcesControllerCore extends AdminController $this->display = Tools::getValue('id_source_type') ? 'edit' : 'add'; } - return parent::init(); } + public function initContent() + { + if (Tools::isSubmit('submitFiltersource') || Tools::isSubmit('submitResetsource')) { + $this->list_id = 'source'; + $this->display = 'view'; + + $idSourceType = (int) Tools::getValue('id_source_type'); + self::$currentIndex .= '&id_source_type=' . $idSourceType . '&viewbusiness_source'; + if (Tools::isSubmit('submitResetsource')) { + $this->processResetFilters('source'); + } + } + parent::initContent(); + } /** * @see AdminController::initPageHeaderToolbar() */ @@ -153,7 +150,7 @@ class AdminSourcesControllerCore extends AdminController 'position' => 'position' ), 'orders_count' => array( - 'title' => $this->l('Orders'), + 'title' => $this->l('Orders (%)'), 'align' => 'text-center', 'orderby' => false, 'search' => false, @@ -200,7 +197,7 @@ class AdminSourcesControllerCore extends AdminController 'position' => 'position' ), 'orders_count' => array( - 'title' => $this->l('Orders'), + 'title' => $this->l('Orders (%)'), 'align' => 'text-center', 'orderby' => false, 'search' => false, @@ -240,7 +237,7 @@ class AdminSourcesControllerCore extends AdminController $idSourceType = (int)Tools::getValue('id_source_type'); $objBusinessSource = new BusinessSource($idSourceType, (int)$this->context->language->id); if (!Validate::isLoadedObject($objBusinessSource)) { - return; + Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token); } $this->addRowAction('edit'); @@ -428,20 +425,20 @@ class AdminSourcesControllerCore extends AdminController } else { Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_source_type='.(int)$objSource->id_source_type.'&conf=1&token='.$this->token); } + } else if(Tools::isSubmit('statussource')){ + if(Validate::isLoadedObject($objSource = new Source((int)Tools::getValue('id_source')))){ + $idSourceType = $objSource->id_source_type; + $objSource->active = !$objSource->active; + if($objSource->save()){ + $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_source_type='.(int)$idSourceType.'&conf=5&token='.$this->token; + } + + } + } else if(Tools::isSubmit('submitBulkenableSelectionsource')){ - $idSourceType = (int)Tools::getValue('id_source_type'); - $this->className = 'Source'; - $this->table = 'source'; - $this->boxes = Tools::getValue('sourceBox'); - parent::processBulkEnableSelection(); - $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_source_type='.(int)$idSourceType.'&token='.$this->token; + $this->processUpdateStatusBulk(1); } else if(Tools::isSubmit('submitBulkdisableSelectionsource')){ - $idSourceType = (int)Tools::getValue('id_source_type'); - $this->className = 'Source'; - $this->table = 'source'; - $this->boxes = Tools::getValue('sourceBox'); - parent::processBulkDisableSelection(); - $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_source_type='.(int)$idSourceType.'&token='.$this->token; + $this->processUpdateStatusBulk(0); } elseif (Tools::isSubmit('submitBulkdeletesource')) { $idSourceType = 0; foreach (Tools::getValue('sourceBox') as $selection) { @@ -486,6 +483,22 @@ class AdminSourcesControllerCore extends AdminController } } + protected function processUpdateStatusBulk($status = 1) + { + $idSourceType = (int)Tools::getValue('id_source_type'); + $this->className = 'Source'; + $this->table = 'source'; + $this->boxes = Tools::getValue('sourceBox'); + if(empty($this->boxes)){ + $this->errors[] = $this->l('You must select at least one item to perform a bulk action.'); + } + $this->display = 'view'; + if(!$this->errors){ + parent::processBulkStatusSelection($status); + $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_source_type='.(int)$idSourceType.'&conf=5&token='.$this->token; + } + } + protected function postProcessSource() { $idSource = (int)Tools::getValue('id_source'); @@ -549,8 +562,8 @@ class AdminSourcesControllerCore extends AdminController protected function postProcessMergeSource() { $idSourceType = (int)Tools::getValue('id_source_type'); - $idCurrentSource = (int)Tools::getValue('merge_current_source'); - $idTargetSource = (int)Tools::getValue('merge_target_source'); + $idCurrentSource = (int)Tools::getValue('current_source'); + $idTargetSource = (int)Tools::getValue('target_source'); $objCurrent = new Source($idCurrentSource); $objTarget = new Source($idTargetSource); @@ -564,7 +577,7 @@ class AdminSourcesControllerCore extends AdminController } else { $objCurrent->mergeOrdersInto($idTargetSource); } - + $this->display = 'view'; if (!count($this->errors)) { Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_source_type='.$idSourceType.'&conf=4&token='.$this->token); } @@ -645,7 +658,7 @@ class AdminSourcesControllerCore extends AdminController $this->context->smarty->assign(array( 'modal_id' => 'merge_source_modal', 'modal_class' => 'modal-md', - 'modal_title' => $this->l('Merge Booking Source'), + 'modal_title' => '   ' .$this->l('Merge Booking Source'), 'modal_content' => $this->context->smarty->fetch('controllers/sources/modals/_merge_source_form.tpl'), )); diff --git a/install/data/xml/source.xml b/install/data/xml/source.xml index 90a44e9a8..e08ef2489 100644 --- a/install/data/xml/source.xml +++ b/install/data/xml/source.xml @@ -16,7 +16,7 @@ - + diff --git a/js/admin/sources.js b/js/admin/sources.js index b2721b3f5..263dda926 100644 --- a/js/admin/sources.js +++ b/js/admin/sources.js @@ -34,7 +34,7 @@ $(document).on('click', '.merge-source-btn', function (e) { $('#footer').next('.bootstrap').append(result.modalHtml); $('#merge_source_modal').modal('show'); } else { - showErrorMessage(result.error || 'Could not open the merge form.'); + showErrorMessage(result.error); } }, complete: function () {