Merge pull request #1850 from openbaypro/master

Changes to install to auto enable / disable during install / uninstall
opencart · Sep 19, 2014 · 9cd0811 · 9cd0811
2 parents e8556db + 3312465
commit 9cd0811
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/upload/admin/controller/common/menu.php b/upload/admin/controller/common/menu.php
@@ -178,20 +178,20 @@ public function index() {
 		$data['recurring'] = $this->url->link('catalog/recurring', 'token=' . $this->session->data['token'], 'SSL');
 		$data['order_recurring'] = $this->url->link('sale/recurring', 'token=' . $this->session->data['token'], 'SSL');
 
-		$data['openbay_show_menu'] = $this->config->get('openbay_menu');
+		$data['openbay_show_menu'] = $this->config->get('openbaypro_menu');
 		$data['openbay_link_extension'] = $this->url->link('extension/openbay', 'token=' . $this->session->data['token'], 'SSL');
-		$data['openbay_link_orders'] = $this->url->link('extension/openbay/orderList', 'token=' . $this->session->data['token'], 'SSL');
-		$data['openbay_link_items'] = $this->url->link('extension/openbay/itemList', 'token=' . $this->session->data['token'], 'SSL');
+		$data['openbay_link_orders'] = $this->url->link('extension/openbay/orderlist', 'token=' . $this->session->data['token'], 'SSL');
+		$data['openbay_link_items'] = $this->url->link('extension/openbay/itemlist', 'token=' . $this->session->data['token'], 'SSL');
 		$data['openbay_link_ebay'] = $this->url->link('openbay/ebay', 'token=' . $this->session->data['token'], 'SSL');
 		$data['openbay_link_ebay_settings'] = $this->url->link('openbay/ebay/settings', 'token=' . $this->session->data['token'], 'SSL');
-		$data['openbay_link_ebay_links'] = $this->url->link('openbay/ebay/viewItemLinks', 'token=' . $this->session->data['token'], 'SSL');
-		$data['openbay_link_ebay_orderimport'] = $this->url->link('openbay/ebay/viewOrderImport', 'token=' . $this->session->data['token'], 'SSL');
+		$data['openbay_link_ebay_links'] = $this->url->link('openbay/ebay/viewitemlinks', 'token=' . $this->session->data['token'], 'SSL');
+		$data['openbay_link_ebay_orderimport'] = $this->url->link('openbay/ebay/vieworderimport', 'token=' . $this->session->data['token'], 'SSL');
 		$data['openbay_link_amazon'] = $this->url->link('openbay/amazon', 'token=' . $this->session->data['token'], 'SSL');
 		$data['openbay_link_amazon_settings'] = $this->url->link('openbay/amazon/settings', 'token=' . $this->session->data['token'], 'SSL');
-		$data['openbay_link_amazon_links'] = $this->url->link('openbay/amazon/itemLinks', 'token=' . $this->session->data['token'], 'SSL');
+		$data['openbay_link_amazon_links'] = $this->url->link('openbay/amazon/itemlinks', 'token=' . $this->session->data['token'], 'SSL');
 		$data['openbay_link_amazonus'] = $this->url->link('openbay/amazonus', 'token=' . $this->session->data['token'], 'SSL');
 		$data['openbay_link_amazonus_settings'] = $this->url->link('openbay/amazonus/settings', 'token=' . $this->session->data['token'], 'SSL');
-		$data['openbay_link_amazonus_links'] = $this->url->link('openbay/amazonus/itemLinks', 'token=' . $this->session->data['token'], 'SSL');
+		$data['openbay_link_amazonus_links'] = $this->url->link('openbay/amazonus/itemlinks', 'token=' . $this->session->data['token'], 'SSL');
 		$data['openbay_markets'] = array(
 			'ebay' => $this->config->get('ebay_status'),
 			'amazon' => $this->config->get('amazon_status'),

diff --git a/upload/admin/controller/feed/openbaypro.php b/upload/admin/controller/feed/openbaypro.php
@@ -56,9 +56,10 @@ public function install() {
 		$this->model_user_user_group->addPermission($this->user->getId(), 'access', 'extension/openbay');
 		$this->model_user_user_group->addPermission($this->user->getId(), 'modify', 'extension/openbay');
 
-		$settings = $this->model_setting_setting->getSetting('openbaymanager');
-		$settings['openbay_menu'] = 1;
-		$this->model_setting_setting->editSetting('openbaymanager', $settings);
+		$settings = $this->model_setting_setting->getSetting('openbaypro');
+		$settings['openbaypro_menu'] = 1;
+		$settings['openbaypro_status'] = 1;
+		$this->model_setting_setting->editSetting('openbaypro', $settings);
 
 		// register the event triggers
 		$this->model_tool_event->addEvent('openbaypro', 'post.admin.delete.product', 'extension/openbay/eventDeleteProduct');
@@ -69,9 +70,10 @@ public function uninstall() {
 		$this->load->model('setting/setting');
 		$this->load->model('tool/event');
 
-		$settings = $this->model_setting_setting->getSetting('openbaymanager');
-		$settings['openbay_menu'] = 0;
-		$this->model_setting_setting->editSetting('openbaymanager', $settings);
+		$settings = $this->model_setting_setting->getSetting('openbaypro');
+		$settings['openbaypro_menu'] = 0;
+		$settings['openbaypro_status'] = 0;
+		$this->model_setting_setting->editSetting('openbaypro', $settings);
 
 		// delete the event triggers
 		$this->model_tool_event->deleteEvent('openbaypro');