Please look at this and review. I am in trouble.

README.md

@@ -1,6 +1,35 @@
-MultiMerch Marketplace for OpenCart
-==========
-
-[MultiMerch Digital Marketplace for OpenCart](http://multimerch.com/) is now available on GitHub!
-
-We'll be updating the readme and the docs shortly, meanwhile feel free to check it out and start fiddling with the code.
+# MultiMerch Multivendor Marketplace
+
+MultiMerch Marketplace is an OpenCart extension for creating multivendor marketplaces.
+
+[Demo](http://demo.multimerch.com) | [Website](http://multimerch.com) | [Forum](http://community.multimerch.com)
+
+## Core Features
+
+MultiMerch Core is a free & open source version of MultiMerch providing basic multivendor functionality that can be further extended via addons if necessary.
+
+- Front office seller accounts - vendors have no access to OpenCart admin
+- Support for custom OpenCart themes and extensions
+- Flexible fee and commission system - signup, listing and sale fees
+- Multiple languages and currencies if needed
+- Seller groups, PayPal payouts, user-friendly interfaces and lots of other  features
+- Extensive configuration with dozens of settings
+
+## Addons
+
+It's also possible to extend MultiMerch Core with dozens of other MultiMerch addons (free or paid), including:
+- Advanced Shipping system - different shipping rates per product, seller, carrier & zone
+- Custom seller badges like top or premium sellers
+- Private messaging with conversation support between buyers and sellers
+- PayPal MassPay & PayPal Adaptive
+- Seller & product comments and others
+
+## Documentation
+The links below will take you to the latest versions of documentation available on MultiMerch website.
+- [Installation](http://multimerch.com/docs/installation/)
+- [Configuration](http://multimerch.com/docs/configuration/)
+- [Custom Themes](http://multimerch.com/docs/custom-theme-compatibility/)
+- [Seller Accounts](http://multimerch.com/docs/multimerch-seller-accounts/)
+- [Transactions & Balance](http://multimerch.com/docs/transactions-seller-balance/)
+- [Fees & Commissions](http://multimerch.com/docs/commissions/)
+- [Seller Groups](http://multimerch.com/docs/seller-groups/)

readme.txt

@@ -0,0 +1 @@
+Please see the MultiMerch documentation at http://multimerch.com/documentation/.

upload/admin/controller/module/multiseller.php

@@ -8,6 +8,8 @@ class ControllerModuleMultiseller extends ControllerMultisellerBase {
 		"multiseller/payment",
 		"multiseller/seller",
 		"multiseller/transaction",
+		"multiseller/dashboard",
+		"multiseller/debug",
 		"multiseller/seller-group"
 	);
 
@@ -18,6 +20,7 @@ class ControllerModuleMultiseller extends ControllerMultisellerBase {
 		"msconf_nickname_rules" => 0, // 0 - alnum, 1 - latin extended, 2 - utf
 		"msconf_credit_order_statuses" => array(5),
 		"msconf_debit_order_statuses" => array(8),
+		"msconf_display_order_statuses" => array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16),
 		"msconf_minimum_withdrawal_amount" => "50",
 		"msconf_allow_partial_withdrawal" => 1,
 
@@ -44,8 +47,6 @@ class ControllerModuleMultiseller extends ControllerMultisellerBase {
 		"msconf_provide_buyerinfo" => 0, // 0 - no, 1 - yes, 2 - shipping dependent
 		"msconf_enable_quantities" => 0, // 0 - no, 1 - yes, 2 - shipping dependent
         "msconf_enable_categories" => 0, // 0 - no, 1 - yes
-        "msconf_physical_product_categories" => array(),
-        "msconf_digital_product_categories" => array(),
 
 		"msconf_disable_product_after_quantity_depleted" => 0,
 		"msconf_allow_relisting" => 0,
@@ -64,14 +65,15 @@ class ControllerModuleMultiseller extends ControllerMultisellerBase {
 		"msconf_allow_discounts" => 1,
 		"msconf_withdrawal_waiting_period" => 0,
 		"msconf_graphical_sellermenu" => 1,
-
+		"msconf_enable_seller_banner" => 1,
+
 		"msconf_enable_rte" => 0,
 		"msconf_rte_whitelist" => "",
 
 		"msconf_seller_avatar_seller_profile_image_width" => 100,
 		"msconf_seller_avatar_seller_profile_image_height" => 100,
-		"msconf_seller_avatar_seller_list_image_width" => 100,
-		"msconf_seller_avatar_seller_list_image_height" => 100,
+		"msconf_seller_avatar_seller_list_image_width" => 228,
+		"msconf_seller_avatar_seller_list_image_height" => 228,
 		"msconf_seller_avatar_product_page_image_width" => 100,
 		"msconf_seller_avatar_product_page_image_height" => 100,
 		"msconf_seller_avatar_dashboard_image_width" => 100,
@@ -86,7 +88,9 @@ class ControllerModuleMultiseller extends ControllerMultisellerBase {
 		"msconf_product_seller_products_image_height" => 100,
 		"msconf_product_seller_product_list_seller_area_image_width" => 40,
 		"msconf_product_seller_product_list_seller_area_image_height" => 40,
-
+		"msconf_product_seller_banner_width" => 750,
+		"msconf_product_seller_banner_height" => 100,
+
 		"msconf_min_uploaded_image_width" => 0,
 		"msconf_min_uploaded_image_height" => 0,
 		"msconf_max_uploaded_image_width" => 0,
@@ -102,7 +106,7 @@ class ControllerModuleMultiseller extends ControllerMultisellerBase {
 		"msconf_avatars_for_sellers" => 0, // 0 - Uploaded manually by seller, 1 - Both, uploaded by seller and pre-defined, 2 - Only pre-defined
 		"msconf_change_seller_nickname" => 1,
 
-		"msconf_enable_private_messaging" => 1, // 0 - no, 2 - yes (email only)
+		"msconf_enable_private_messaging" => 2, // 0 - no, 2 - yes (email only)
 		"msconf_enable_one_page_seller_registration" => 0 // 0 - no, 1 - yes
 	);
 
@@ -113,10 +117,10 @@ public function __construct($registry) {
 
 	private function _editSettings() {
 		$this->load->model('setting/setting');
-		$this->load->model('setting/extension');
+		$this->load->model('extension/extension');
 
-		$set = $this->model_setting_setting->getSetting('multiseller');
-		$installed_extensions = $this->model_setting_extension->getInstalled('module');
+		$set = $this->model_setting_setting->getSetting('msconf');
+		$installed_extensions = $this->model_extension_extension->getInstalled('module');
 
 		$extensions_to_be_installed = array();
 		foreach ($this->settings as $name=>$value) {
@@ -149,11 +153,11 @@ private function _editSettings() {
 					$this->data[$s] = $this->settings[$s];
 			}
 		}
-		
-		$this->model_setting_setting->editSetting('multiseller', $set);
+
+		$this->model_setting_setting->editSetting('msconf', $set);
 
 		foreach ($extensions_to_be_installed as $ext) {
-			$this->model_setting_extension->install('module',$ext);	
+			$this->model_extension_extension->install('module',$ext);
 		}
 	}
 	public function install() {
@@ -163,7 +167,7 @@ public function install() {
 
 		$this->model_multiseller_install->createSchema();
 		$this->model_multiseller_install->createData();
-		$this->model_setting_setting->editSetting('multiseller', $this->settings);
+		$this->model_setting_setting->editSetting('msconf', $this->settings);
 
 		$this->load->model('user/user_group');
 
@@ -194,12 +198,6 @@ public function install() {
 				}
 			}
 		}
-
-		// ckeditor
-		/*if (!copy(DIR_APPLICATION . 'view/javascript/ckeditor/', DIR_CATALOG . 'view/javascript/multimerch/')) {
-			$this->session->data['error'] .= sprintf($this->language->get('ms_error_ckeditor'), DIR_APPLICATION . 'view/javascript/ckeditor/', DIR_CATALOG . 'view/javascript/multimerch/');
-		}*/
-		$this->session->data['error'] .= sprintf($this->language->get('ms_notice_ckeditor'), DIR_APPLICATION . 'view/javascript/ckeditor/', DIR_CATALOG . 'view/javascript/multimerch/ckeditor/');
 	}
 
 	public function uninstall() {
@@ -220,10 +218,13 @@ public function saveSettings() {
 		magic*/
 
 		if (!isset($this->request->post['msconf_credit_order_statuses']))
-			$this->request->post['msconf_credit_order_statuses'] = array();
+			$this->request->post['msconf_credit_order_statuses'] = array(-1);
 
 		if (!isset($this->request->post['msconf_debit_order_statuses']))
-			$this->request->post['msconf_debit_order_statuses'] = array();
+			$this->request->post['msconf_debit_order_statuses'] = array(-1);
+
+		if (!isset($this->request->post['msconf_display_order_statuses']))
+			$this->request->post['msconf_display_order_statuses'] = array(-1);
 
 		if (!isset($this->request->post['msconf_product_options']))
 			$this->request->post['msconf_product_options'] = array();
@@ -299,12 +300,14 @@ public function index() {
 			),
 			array(
 				'text' => $this->language->get('ms_settings_breadcrumbs'),
-				'href' => $this->url->link('multiseller/settings', '', 'SSL'),
+				'href' => $this->url->link('module/multiseller', '', 'SSL'),
 			)
 		));
 
-		list($this->template, $this->children) = $this->MsLoader->MsHelper->admLoadTemplate('settings');
-		$this->response->setOutput($this->render());
+		$this->data['column_left'] = $this->load->controller('common/column_left');
+		$this->data['footer'] = $this->load->controller('common/footer');
+		$this->data['header'] = $this->load->controller('common/header');
+		$this->response->setOutput($this->load->view('multiseller/settings.tpl', $this->data));
 	}
 
 	public function upgradeDb() {
@@ -316,7 +319,7 @@ public function upgradeDb() {
 			$this->session->data['ms_db_latest'] = $this->language->get('ms_db_latest');
 		}
 
-		$this->redirect($this->url->link('module/multiseller', 'token=' . $this->session->data['token'], 'SSL'));
+		$this->response->redirect($this->url->link('module/multiseller', 'token=' . $this->session->data['token'], 'SSL'));
 	}
 }
 ?>

upload/admin/controller/multiseller/attribute.php

@@ -2,10 +2,10 @@
 
 class ControllerMultisellerAttribute extends ControllerMultisellerBase {
 	public function getTableData() {
-		$colMap = array(
-			'id' => 'ma.attribute_id',
-			'status' => '`ma.enabled`',
-			'type' => 'attribute_type'
+		$colMap = array(
+			'id' => 'ma.attribute_id',
+			'status' => '`ma.enabled`',
+			'type' => 'attribute_type'
 		);
 
 		$sorts = array('name', 'type', 'sort_order', 'status');
@@ -31,8 +31,8 @@ public function getTableData() {
 		foreach ($results as $result) {
 			// actions
 			$actions = "";
-			$actions .= "<a class='ms-button ms-button-edit' href='" . $this->url->link('multiseller/attribute/update', 'token=' . $this->session->data['token'] . '&attribute_id=' . $result['attribute_id'], 'SSL') . "' title='".$this->language->get('text_edit')."'></a>";
-			$actions .= "<a class='ms-button ms-button-delete' href='" . $this->url->link('multiseller/attribute/delete', 'token=' . $this->session->data['token'] . '&attribute_id=' . $result['attribute_id'], 'SSL') . "' title='".$this->language->get('text_delete')."'></a>";
+			$actions .= "<a class='ms-button ms-button-edit' href='" . $this->url->link('multiseller/attribute/update', 'token=' . $this->session->data['token'] . '&attribute_id=' . $result['attribute_id'], 'SSL') . "' title='".$this->language->get('button_edit')."'></a>";
+			$actions .= "<a class='ms-button ms-button-delete' href='" . $this->url->link('multiseller/attribute/delete', 'token=' . $this->session->data['token'] . '&attribute_id=' . $result['attribute_id'], 'SSL') . "' title='".$this->language->get('button_delete')."'></a>";
 
 			$columns[] = array_merge(
 				$result,
@@ -86,8 +86,10 @@ public function index() {
 			)
 		));
 
-		list($this->template, $this->children) = $this->MsLoader->MsHelper->admLoadTemplate('attribute');
-		$this->response->setOutput($this->render());
+		$this->data['column_left'] = $this->load->controller('common/column_left');
+		$this->data['footer'] = $this->load->controller('common/footer');
+		$this->data['header'] = $this->load->controller('common/header');
+		$this->response->setOutput($this->load->view('multiseller/attribute.tpl', $this->data));
 	}
 
 	public function create() {
@@ -98,8 +100,8 @@ public function create() {
 		$this->data['attribute'] = FALSE;
 		$this->data['attribute_groups'] = $this->model_catalog_attribute_group->getAttributeGroups();
 		$this->data['languages'] = $this->model_localisation_language->getLanguages();
-		$this->data['no_image'] = $this->model_tool_image->resize('no_image.jpg', 100, 100);
-		
+		$this->data['no_image'] = $this->model_tool_image->resize('no_image.png', 100, 100);
+
 		$this->data['cancel'] = $this->url->link('multiseller/attribute', 'token=' . $this->session->data['token'], 'SSL');
 		$this->data['token'] = $this->session->data['token'];
 		$this->data['heading'] = $this->language->get('ms_attribute_create');
@@ -113,11 +115,17 @@ public function create() {
 			array(
 				'text' => $this->language->get('ms_attribute_breadcrumbs'),
 				'href' => $this->url->link('multiseller/attribute', '', 'SSL'),
+			),
+			array(
+				'text' => $this->language->get('ms_attribute_create'),
+				'href' => $this->url->link('multiseller/seller/create', 'SSL'),
 			)
 		));
 
-		list($this->template, $this->children) = $this->MsLoader->MsHelper->admLoadTemplate('attribute-form');
-		$this->response->setOutput($this->render());		
+		$this->data['column_left'] = $this->load->controller('common/column_left');
+		$this->data['footer'] = $this->load->controller('common/footer');
+		$this->data['header'] = $this->load->controller('common/header');
+		$this->response->setOutput($this->load->view('multiseller/attribute-form.tpl', $this->data));
 	}
 
 	public function update() {
@@ -136,12 +144,12 @@ public function update() {
 
 			foreach ($this->data['attribute']['attribute_values'] as  &$value) {
 				$value['attribute_value_description'] = $this->MsLoader->MsAttribute->getAttributeValueDescriptions($value['attribute_value_id']);
-				$value['thumb'] = (!empty($value['image']) ? $this->model_tool_image->resize($value['image'], 100, 100) : $this->model_tool_image->resize('no_image.jpg', 100, 100));
+				$value['thumb'] = (!empty($value['image']) ? $this->model_tool_image->resize($value['image'], 100, 100) : $this->model_tool_image->resize('no_image.png', 100, 100));
 			}			
 		}
 
 		$this->data['languages'] = $this->model_localisation_language->getLanguages();
-		$this->data['no_image'] = $this->model_tool_image->resize('no_image.jpg', 100, 100);
+		$this->data['no_image'] = $this->model_tool_image->resize('no_image.png', 100, 100);
 
 		$this->data['cancel'] = $this->url->link('multiseller/attribute', 'token=' . $this->session->data['token'], 'SSL');
 		$this->data['token'] = $this->session->data['token'];
@@ -156,11 +164,17 @@ public function update() {
 			array(
 				'text' => $this->language->get('ms_attribute_breadcrumbs'),
 				'href' => $this->url->link('multiseller/attribute', '', 'SSL'),
+			),
+			array(
+				'text' => $this->language->get('ms_attribute_edit'),
+				'href' => $this->url->link('multiseller/attribute/update', '&attribute_id=' . $attribute_id, 'SSL'),
 			)
 		));
 
-		list($this->template, $this->children) = $this->MsLoader->MsHelper->admLoadTemplate('attribute-form');
-		$this->response->setOutput($this->render());		
+		$this->data['column_left'] = $this->load->controller('common/column_left');
+		$this->data['footer'] = $this->load->controller('common/footer');
+		$this->data['header'] = $this->load->controller('common/header');
+		$this->response->setOutput($this->load->view('multiseller/attribute-form.tpl', $this->data));
 	}
 
 	public function delete() { 
@@ -174,14 +188,14 @@ public function delete() {
 			$this->session->data['success'] = $this->language->get('ms_success');
 		}
 
-		if (isset($this->request->get['attribute_id'])) $this->redirect($this->url->link('multiseller/attribute', 'token=' . $this->session->data['token'], 'SSL'));
+		if (isset($this->request->get['attribute_id'])) $this->response->redirect($this->url->link('multiseller/attribute', 'token=' . $this->session->data['token'], 'SSL'));
 	}
 
 	public function jxSubmitAttribute() {
 		$json = array();
 		$data = $this->request->post;
 		unset($data['attribute_value'][0]);
-		
+
 		foreach ($data['attribute_description'] as $language_id => $value) {
 			if ((utf8_strlen($value['name']) < 1) || (utf8_strlen($value['name']) > 128)) {
 				$json['errors']["attribute_description[$language_id][name]"] = $this->language->get('ms_error_attribute_name');
@@ -192,7 +206,9 @@ public function jxSubmitAttribute() {
 			if (empty($data['attribute_value'])) {
 				$json['errors']['attribute_type'] = $this->language->get('ms_error_attribute_type');
 			}
-		} else if (($data['attribute_type'] != MsAttribute::TYPE_TEXT && $data['attribute_type'] != MsAttribute::TYPE_TEXTAREA)) {
+		} else if (($data['attribute_type'] == MsAttribute::TYPE_TEXT || $data['attribute_type'] == MsAttribute::TYPE_TEXTAREA)) {
+			unset($data['attribute_value']);
+		} else {
 			unset($data['text_type']);
 			unset($data['attribute_value']);
 		}

upload/admin/controller/multiseller/base.php

@@ -2,20 +2,23 @@
 
 class ControllerMultisellerBase extends Controller {
 	private $error = array();
+	public  $data = array();
 
 	public function __construct($registry) {
 		parent::__construct($registry);
 		$this->registry = $registry;
 		$parts = explode('/', $this->request->request['route']);
 		if (!isset($parts[2]) || !in_array($parts[2], array('install','uninstall'))) {
 		}
-
+
+		//$data = array();
 		$this->data = array_merge($this->data, $this->load->language('multiseller/multiseller'));
 		$this->data['token'] = $this->session->data['token'];
 		$this->document->addStyle('view/stylesheet/multimerch/multiseller.css');
 		$this->document->addStyle('view/javascript/multimerch/datatables/css/jquery.dataTables.css');
 		$this->document->addScript('view/javascript/multimerch/datatables/js/jquery.dataTables.min.js');
 		$this->document->addScript('view/javascript/multimerch/common.js');
+		//$this->document->addScript('//code.jquery.com/ui/1.11.2/jquery-ui.min.js');
 	}
 
 	// @todo: validation

upload/admin/controller/multiseller/dashboard.php

@@ -0,0 +1,8 @@
+<?php
+
+class ControllerMultisellerDashboard extends ControllerMultisellerBase {
+	public function index() {
+		$this->response->redirect($this->url->link('module/multiseller', 'token=' . $this->session->data['token'], 'SSL'));
+	}
+}
+?>