From 541da9b395c74930629161dfdfc51c6c331f924f Mon Sep 17 00:00:00 2001 From: ffctcc Date: Fri, 15 Aug 2014 16:35:15 +0300 Subject: [PATCH 001/121] Revert currency-related changes to the Balance model --- upload/admin/controller/multiseller/transaction.php | 3 +-- upload/system/library/msbalance.php | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/upload/admin/controller/multiseller/transaction.php b/upload/admin/controller/multiseller/transaction.php index b9316056..d30b0d45 100644 --- a/upload/admin/controller/multiseller/transaction.php +++ b/upload/admin/controller/multiseller/transaction.php @@ -35,8 +35,7 @@ public function getTableData() { array( 'id' => $result['balance_id'], 'seller' => $result['nickname'], - //'amount' => $this->currency->format($result['amount'], $this->config->get('config_currency')), - 'amount' => $this->currency->format($result['amount'], $result['currency_code']), + 'amount' => $this->currency->format($result['amount'], $this->config->get('config_currency')), 'description' => (mb_strlen($result['mb.description']) > 80 ? mb_substr($result['mb.description'], 0, 80) . '...' : $result['mb.description']), 'date_created' => date($this->language->get('date_format_short'), strtotime($result['mb.date_created'])), ) diff --git a/upload/system/library/msbalance.php b/upload/system/library/msbalance.php index b4cdc68f..504d1226 100644 --- a/upload/system/library/msbalance.php +++ b/upload/system/library/msbalance.php @@ -42,10 +42,11 @@ public function getBalanceEntries($data = array(), $sort = array()) { SQL_CALC_FOUND_ROWS *, mb.description as 'mb.description', - mb.date_created as 'mb.date_created', - o.currency_code - FROM " . DB_PREFIX . "ms_balance AS mb, " . DB_PREFIX . "ms_seller AS ms, `" . DB_PREFIX . "order` AS o - WHERE mb.seller_id = ms.seller_id AND o.order_id = mb.order_id" + mb.date_created as 'mb.date_created' + FROM " . DB_PREFIX . "ms_balance mb + INNER JOIN " . DB_PREFIX . "ms_seller ms + ON (mb.seller_id = ms.seller_id) + WHERE 1 = 1" . (isset($data['order_id']) ? " AND mb.order_id = " . (int)$data['order_id'] : '') . (isset($data['product_id']) ? " AND mb.product_id = " . (int)$data['product_id'] : '') . (isset($data['seller_id']) ? " AND mb.seller_id = " . (int)$data['seller_id'] : '') From 3723e7d850c939c6340557c1436225ab5d04f9cc Mon Sep 17 00:00:00 2001 From: Martin Boze Date: Wed, 20 Aug 2014 22:47:31 +0300 Subject: [PATCH 002/121] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index ad572e88..440a1d05 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,12 @@ 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. + +Social Media contest +========== + +Now when the first official open source release of MultiMerch is out, we'd like to popularize it as much as possible to get people to use it. + +Therefore, we're running the [MultiMerch Social Media contest](http://multimerch.com/blog/multimerch-6-core-free-social-contest/) with a prize pool worth $1000+. Take part and win one of our MultiMerch addon bundles! + +Meanwhile, we'll be updating the documentation and setting up support forums :) From 3665476b315f9f451152b01fd222f17e05b0e283 Mon Sep 17 00:00:00 2001 From: NITROjkee Date: Thu, 11 Sep 2014 15:09:55 +0300 Subject: [PATCH 003/121] ordercomments fix --- .../xml/multimerch_core_ordercomments.xml | 76 +++++++++++-------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/upload/vqmod/xml/multimerch_core_ordercomments.xml b/upload/vqmod/xml/multimerch_core_ordercomments.xml index 4e5598dc..a454c033 100644 --- a/upload/vqmod/xml/multimerch_core_ordercomments.xml +++ b/upload/vqmod/xml/multimerch_core_ordercomments.xml @@ -32,41 +32,18 @@ $this->session->data['comment'] = strip_tags($this->request->post['comment']); ]]> request->post['comment'] as $key => $value) - $comment[$key] = strip_tags($value); + if(is_array($this->request->post['comment'])) { + foreach($this->request->post['comment'] as $key => $value) { + $comment[$key] = strip_tags($value); + } + } else { + $comment = strip_tags($this->request->post['comment']); + } $this->session->data['comment'] = $comment; ]]> - - - session->data['comment']; - ]]> - session->data['comment']); - ]]> - - - - cart->getProducts() as $product) { - ]]> - MsLoader->MsProduct->getSellerId($product['product_id']); - $this->MsLoader->MsOrderData->addOrderComment( - $this->session->data['order_id'], - $product['product_id'], - array( - 'seller_id' => $seller_id, - 'comment' => $this->session->data['comment'][$seller_id], - ) - ); - ]]> - - - session->data['comment']); + if(is_array($this->session->data['comment'])) { + $data['comment'] = end($this->session->data['comment']); + } + ]]> + + + + session->data['comment']; + ]]> + session->data['comment'])) { + $data['comment'] = implode('\n',$this->session->data['comment']); + } else { + $data['comment'] = $this->session->data['comment']; + } + ]]> + + + + cart->getProducts() as $product) { + ]]> + MsLoader->MsProduct->getSellerId($product['product_id']); + if($seller_id != 0) { + $this->MsLoader->MsOrderData->addOrderComment( + $this->session->data['order_id'], + $product['product_id'], + array( + 'seller_id' => $seller_id, + 'comment' => isset($this->session->data['comment'][$seller_id]) ? $this->session->data['comment'][$seller_id] : $this->session->data['comment'], + ) + ); + } ]]> - + + \ No newline at end of file From 3410b9071492451a15c16abe0d3d62e8aa4092ab Mon Sep 17 00:00:00 2001 From: Stan Date: Thu, 25 Sep 2014 10:32:37 +0300 Subject: [PATCH 004/121] fix with thousand_point product price --- upload/catalog/controller/seller/account-product.php | 4 ++-- upload/system/library/mshelper.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/upload/catalog/controller/seller/account-product.php b/upload/catalog/controller/seller/account-product.php index 300f0b71..6686455a 100644 --- a/upload/catalog/controller/seller/account-product.php +++ b/upload/catalog/controller/seller/account-product.php @@ -1318,8 +1318,8 @@ public function update() { $decimal_point = $this->language->get('decimal_point'); $thousand_point = $this->language->get('thousand_point'); //$product['price'] = number_format(round($this->currency->convert($product['price'], $this->MsLoader->MsProduct->getDefaultCurrency(), $_SESSION['currency'] ), (int)$decimal_place), (int)$decimal_place, $decimal_point, ''); - $product['price'] = number_format(round($product['price'], (int)$decimal_place), (int)$decimal_place, $decimal_point, $thousand_point); - + $product['price'] = round($product['price'], (int)$decimal_place); + if(isset($product['manufacturer_id'])){ $product['manufacturer_id'] = (int)$product['manufacturer_id']; $this->load->model('catalog/manufacturer'); diff --git a/upload/system/library/mshelper.php b/upload/system/library/mshelper.php index 559b2c9a..827e97f3 100644 --- a/upload/system/library/mshelper.php +++ b/upload/system/library/mshelper.php @@ -84,7 +84,7 @@ public function admSetBreadcrumbs($data) { } public function loadTemplate($templateName, $children = FALSE) { - // ugly + // ugly if(strpos($templateName, '/') == false) { $templateName = 'multiseller/' . $templateName; } @@ -233,7 +233,7 @@ public function isUnsignedFloat($val) { } public function uniformDecimalPoint($number) { - return (float)(str_replace(',', '.', $number)); + return (float)(str_replace($this->language->get('thousand_point'), '', $number)); } public function trueCurrencyFormat($number) { @@ -246,7 +246,7 @@ public function trueCurrencyFormat($number) { } public function isInstalled() { - $this->load->model('setting/extension'); + $this->load->model('setting/extension'); $installed_extensions = $this->model_setting_extension->getInstalled('module'); return array_search('multiseller', $installed_extensions) !== FALSE; } From 99a52cb499f9354374293ac111b1283dc5b65221 Mon Sep 17 00:00:00 2001 From: Stan Date: Thu, 25 Sep 2014 14:23:49 +0300 Subject: [PATCH 005/121] fix with thousand_point product price for france --- upload/system/library/mshelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/system/library/mshelper.php b/upload/system/library/mshelper.php index 827e97f3..a7c53008 100644 --- a/upload/system/library/mshelper.php +++ b/upload/system/library/mshelper.php @@ -233,7 +233,7 @@ public function isUnsignedFloat($val) { } public function uniformDecimalPoint($number) { - return (float)(str_replace($this->language->get('thousand_point'), '', $number)); + return (float)(str_replace($this->language->get('thousand_point'), '', str_replace($this->language->get('decimal_point'), '.', $number))); } public function trueCurrencyFormat($number) { From fd2c34e1a8eb5e999629bd8c24c5781384261107 Mon Sep 17 00:00:00 2001 From: ffctcc Date: Mon, 20 Oct 2014 11:02:13 +0300 Subject: [PATCH 006/121] Multiple order comments fix --- upload/vqmod/xml/multimerch_core_ordercomments.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/upload/vqmod/xml/multimerch_core_ordercomments.xml b/upload/vqmod/xml/multimerch_core_ordercomments.xml index a454c033..3d9095cf 100644 --- a/upload/vqmod/xml/multimerch_core_ordercomments.xml +++ b/upload/vqmod/xml/multimerch_core_ordercomments.xml @@ -87,17 +87,6 @@ - - - session->data['comment'])) { - $data['comment'] = end($this->session->data['comment']); - } - ]]> - - session->data['comment']; @@ -131,4 +120,4 @@ - \ No newline at end of file + From 6f5c855b19b4836c7a52b669d23dabec3b04e683 Mon Sep 17 00:00:00 2001 From: Martin Boze Date: Wed, 22 Oct 2014 10:39:23 +0300 Subject: [PATCH 007/121] One more fix to multiple comments --- upload/vqmod/xml/multimerch_core_ordercomments.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/vqmod/xml/multimerch_core_ordercomments.xml b/upload/vqmod/xml/multimerch_core_ordercomments.xml index 3d9095cf..ca8946a2 100644 --- a/upload/vqmod/xml/multimerch_core_ordercomments.xml +++ b/upload/vqmod/xml/multimerch_core_ordercomments.xml @@ -53,7 +53,7 @@

session->data['sellers'] as $seller) { ?>
language->get('ms_seller_forseller'); ?>:
- +

]]> From 393b34af1e78b55a0bf503251b121e0037038946 Mon Sep 17 00:00:00 2001 From: ffctcc Date: Wed, 5 Nov 2014 15:04:22 +0200 Subject: [PATCH 008/121] Admin xml modifications for OC2 - menus, transactions, temp loader hotfix --- upload/vqmod/xml/multimerch_core_admin.xml | 96 ++++++------- .../xml/multimerch_core_oc2_loader_magic.xml | 22 +++ .../vqmod/xml/multimerch_core_sellerinfos.xml | 4 +- .../xml/multimerch_core_transactions.xml | 136 ------------------ 4 files changed, 71 insertions(+), 187 deletions(-) create mode 100644 upload/vqmod/xml/multimerch_core_oc2_loader_magic.xml diff --git a/upload/vqmod/xml/multimerch_core_admin.xml b/upload/vqmod/xml/multimerch_core_admin.xml index 343cf858..f5392cea 100644 --- a/upload/vqmod/xml/multimerch_core_admin.xml +++ b/upload/vqmod/xml/multimerch_core_admin.xml @@ -72,27 +72,28 @@ - - + + db->query("DELETE FROM `" . DB_PREFIX . "ms_order_product_data` WHERE order_id = '" . (int)$order_id . "'"); + $data = array_merge(isset($data) ? $data : array(), $this->load->language('multiseller/multiseller')); + $lang = "view/javascript/multimerch/datatables/lang/" . $this->config->get('config_admin_language') . ".txt"; + $data['dt_language'] = file_exists(DIR_APPLICATION . $lang) ? "'$lang'" : "undefined"; ]]> - - + ]]> load->model('multiseller/upgrade'); ?> - + MsLoader->MsHelper->isInstalled() && !$this->model_multiseller_upgrade->isDbLatest()) { ?>
language->get('ms_db_upgrade'), $this->url->link('module/multiseller/upgradeDb', 'token=' . $this->session->data['token'], 'SSL')); ?>
@@ -109,64 +110,49 @@ ]]> config = $config; ?> ]]> - - - - -
  • -
      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    -
    • - - ]]>     -     - + + data = array_merge($this->data, $this->load->language('multiseller/multiseller')); - $lang = "view/javascript/multimerch/datatables/lang/" . $this->config->get('config_admin_language') . ".txt"; - $this->data['dt_language'] = file_exists(DIR_APPLICATION . $lang) ? "'$lang'" : "undefined"; + $data = array_merge(isset($data) ? $data : array(), $this->load->language('multiseller/multiseller')); ]]> - + + + - data['stores'] = array(); + ]]> data['ms_link_sellers'] = $this->url->link('multiseller/seller', 'token=' . $this->session->data['token'], 'SSL'); - $this->data['ms_link_seller_groups'] = $this->url->link('multiseller/seller-group', 'token=' . $this->session->data['token'], 'SSL'); - $this->data['ms_link_attributes'] = $this->url->link('multiseller/attribute', 'token=' . $this->session->data['token'], 'SSL'); - $this->data['ms_link_products'] = $this->url->link('multiseller/product', 'token=' . $this->session->data['token'], 'SSL'); - $this->data['ms_link_payment'] = $this->url->link('multiseller/payment', 'token=' . $this->session->data['token'], 'SSL'); - $this->data['ms_link_transactions'] = $this->url->link('multiseller/transaction', 'token=' . $this->session->data['token'], 'SSL'); - $this->data['ms_link_settings'] = $this->url->link('module/multiseller', 'token=' . $this->session->data['token'], 'SSL'); +
  • +
      +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    +
    • ]]>     -     +     data['products'][] = array( + $product_data = array( ]]> language->load('multiseller/multiseller'); @@ -183,7 +169,19 @@ data['products'][] = array( + $data['products'][] = array( + ]]> + array( + 'seller_id' => isset($seller['seller_id']) ? $seller['seller_id'] : '', + 'nickname' => isset($seller['ms.nickname']) ? $seller['ms.nickname'] : '' + ), + ]]> + + + + $product['product_id'], ]]> array( @@ -224,7 +222,7 @@ - + @@ -235,7 +233,7 @@ - + data['cancel'] = $this->url->link('sale/contact', 'token=' . $this->session->data['token'], 'SSL'); diff --git a/upload/vqmod/xml/multimerch_core_oc2_loader_magic.xml b/upload/vqmod/xml/multimerch_core_oc2_loader_magic.xml new file mode 100644 index 00000000..8d69fd6d --- /dev/null +++ b/upload/vqmod/xml/multimerch_core_oc2_loader_magic.xml @@ -0,0 +1,22 @@ + + +> + + + + + registry->get($key); + } + + public function __set($key, $value) { + $this->registry->set($key, $value); + } + ]]> + + + diff --git a/upload/vqmod/xml/multimerch_core_sellerinfos.xml b/upload/vqmod/xml/multimerch_core_sellerinfos.xml index 41509a02..7b6202e0 100644 --- a/upload/vqmod/xml/multimerch_core_sellerinfos.xml +++ b/upload/vqmod/xml/multimerch_core_sellerinfos.xml @@ -55,7 +55,7 @@ - + data['products'][] = array( @@ -66,7 +66,7 @@ - + "> diff --git a/upload/vqmod/xml/multimerch_core_transactions.xml b/upload/vqmod/xml/multimerch_core_transactions.xml index bc2d139c..03028945 100644 --- a/upload/vqmod/xml/multimerch_core_transactions.xml +++ b/upload/vqmod/xml/multimerch_core_transactions.xml @@ -152,140 +152,4 @@ ]]> - - - - db->query("UPDATE `" . DB_PREFIX . "order` SET order_status_id = '" . (int)$data['order_status_id'] . "', date_modified = NOW() WHERE order_id = '" . (int)$order_id . "'"); - ]]> - db->query("SELECT * FROM " . DB_PREFIX . "order_product WHERE order_id = '" . (int)$order_id . "'"); - ]]> - - - - db->query("SELECT * FROM " . DB_PREFIX . "order_product WHERE order_id = '" . (int)$order_id . "'"); - ]]> - language->load('multiseller/multiseller'); - if (in_array($data['order_status_id'], $this->config->get('msconf_credit_order_statuses'))) { - $sendmail = false; - foreach ($ms_order_product_query->rows as $order_product) { - // increment sold counter - $this->db->query("UPDATE " . DB_PREFIX . "ms_product SET number_sold = (number_sold + " . (int)$order_product['quantity'] . ") WHERE product_id = '" . (int)$order_product['product_id'] . "'"); - - $seller_id = $this->MsLoader->MsProduct->getSellerId($order_product['product_id']); - if (!$seller_id) continue; - - $balance_entry = $this->MsLoader->MsBalance->getBalanceEntry( - array( - 'seller_id' => $seller_id, - 'product_id' => $order_product['product_id'], - 'order_id' => $order_id, - 'balance_type' => MsBalance::MS_BALANCE_TYPE_SALE - ) - ); - - if (!$balance_entry) { - $commissions = $this->MsLoader->MsCommission->calculateCommission(array('seller_id' => $seller_id)); - - if ($order_product['total'] > 0) { - $store_commission_flat = $commissions[MsCommission::RATE_SALE]['flat']; - $store_commission_pct = $order_product['total'] * $commissions[MsCommission::RATE_SALE]['percent'] / 100; - $seller_net_amt = $order_product['total'] - ($store_commission_flat + $store_commission_pct); - } else { - $store_commission_flat = $store_commission_pct = $seller_net_amt = 0; - } - - // Add order data if doesn't exist yet - $order_data = $this->MsLoader->MsOrderData->getOrderData( - array( - 'product_id' => $order_product['product_id'], - 'order_id' => $order_product['order_id'], - ) - ); - if (!$order_data) { - $this->MsLoader->MsOrderData->addOrderProductData( - $order_product['order_id'], - $order_product['product_id'], - array( - 'seller_id' => $seller_id, - 'store_commission_flat' => $store_commission_flat, - 'store_commission_pct' => $store_commission_pct, - 'seller_net_amt' => $seller_net_amt - ) - ); - } - - $this->MsLoader->MsBalance->addBalanceEntry( - $seller_id, - array( - 'order_id' => $order_product['order_id'], - 'product_id' => $order_product['product_id'], - 'balance_type' => MsBalance::MS_BALANCE_TYPE_SALE, - 'amount' => $seller_net_amt, - 'description' => sprintf($this->language->get('ms_transaction_sale'), ($order_product['quantity'] > 1 ? $order_product['quantity'] . ' x ' : '') . $order_product['name'], $this->currency->format($store_commission_flat + $store_commission_pct, $this->config->get('config_currency'))) - ) - ); - - $sendmail = true; - } else { - // send order status change mails - } - } - if ($sendmail) $this->MsLoader->MsMail->sendOrderMails($order_id); - } else if (in_array($data['order_status_id'], $this->config->get('msconf_debit_order_statuses'))) { - $sendmail = false; - foreach ($ms_order_product_query->rows as $order_product) { - // decrement sold counter - $this->db->query("UPDATE " . DB_PREFIX . "ms_product SET number_sold = (number_sold - " . (int)$order_product['quantity'] . ") WHERE product_id = '" . (int)$order_product['product_id'] . "'"); - - $seller_id = $this->MsLoader->MsProduct->getSellerId($order_product['product_id']); - if (!$seller_id) continue; - - $refund_balance_entry = $this->MsLoader->MsBalance->getBalanceEntry( - array( - 'seller_id' => $seller_id, - 'product_id' => $order_product['product_id'], - 'order_id' => $order_id, - 'balance_type' => MsBalance::MS_BALANCE_TYPE_REFUND - ) - ); - - if (!$refund_balance_entry) { - $balance_entry = $this->MsLoader->MsBalance->getBalanceEntry( - array( - 'seller_id' => $seller_id, - 'product_id' => $order_product['product_id'], - 'order_id' => $order_id, - 'balance_type' => MsBalance::MS_BALANCE_TYPE_SALE - ) - ); - - if ($balance_entry) { - $this->MsLoader->MsBalance->addBalanceEntry( - $balance_entry['seller_id'], - array( - 'order_id' => $balance_entry['order_id'], - 'product_id' => $balance_entry['product_id'], - 'balance_type' => MsBalance::MS_BALANCE_TYPE_REFUND, - 'amount' => -1 * $balance_entry['amount'], - 'description' => sprintf($this->language->get('ms_transaction_refund'), ($order_product['quantity'] > 1 ? $order_product['quantity'] . ' x ' : '') . $order_product['name']) - ) - ); - - // send refund mails - // $this->MsLoader->MsMail->sendOrderMails($order_id); - } else { - // send order status change mails - } - } - } - } - ]]> - - From acf133afcc4646d8ee72e6884c2751a99054be55 Mon Sep 17 00:00:00 2001 From: ffctcc Date: Fri, 7 Nov 2014 17:07:15 +0200 Subject: [PATCH 009/121] Admin base controller/seller list modifications --- upload/admin/controller/multiseller/base.php | 2 + .../admin/controller/multiseller/seller.php | 12 +- .../view/template/multiseller/seller.tpl | 109 ++++++++++-------- 3 files changed, 70 insertions(+), 53 deletions(-) diff --git a/upload/admin/controller/multiseller/base.php b/upload/admin/controller/multiseller/base.php index 74963138..50141b4c 100644 --- a/upload/admin/controller/multiseller/base.php +++ b/upload/admin/controller/multiseller/base.php @@ -2,6 +2,7 @@ class ControllerMultisellerBase extends Controller { private $error = array(); + public $data = array(); public function __construct($registry) { parent::__construct($registry); @@ -10,6 +11,7 @@ public function __construct($registry) { 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'); diff --git a/upload/admin/controller/multiseller/seller.php b/upload/admin/controller/multiseller/seller.php index 02d53749..c8de5013 100644 --- a/upload/admin/controller/multiseller/seller.php +++ b/upload/admin/controller/multiseller/seller.php @@ -352,8 +352,10 @@ public function index() { ) )); - list($this->template, $this->children) = $this->MsLoader->MsHelper->admLoadTemplate('seller'); - $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/seller.tpl', $this->data)); } public function create() { @@ -385,8 +387,10 @@ public function create() { ) )); - list($this->template, $this->children) = $this->MsLoader->MsHelper->admLoadTemplate('seller-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/seller-form.tpl', $this->data)); } public function update() { diff --git a/upload/admin/view/template/multiseller/seller.tpl b/upload/admin/view/template/multiseller/seller.tpl index 8d4af8e3..fad0b462 100644 --- a/upload/admin/view/template/multiseller/seller.tpl +++ b/upload/admin/view/template/multiseller/seller.tpl @@ -1,56 +1,67 @@ - +
    -
    - - - +
    +
    +
    +
    +

    +
      + +
      • + +
    +
    - -
    - - -
    - -
    -
    -

    -
    - +
    + +
    + +
    + + +
    + +
    + +
    +
    +

    +
    +
    +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    -
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    \ No newline at end of file diff --git a/upload/admin/view/template/multiseller/seller-group.tpl b/upload/admin/view/template/multiseller/seller-group.tpl index 41e83256..6bab83ea 100644 --- a/upload/admin/view/template/multiseller/seller-group.tpl +++ b/upload/admin/view/template/multiseller/seller-group.tpl @@ -1,5 +1,5 @@ -
    +
    From 81755ed0c5706d8006a0e3570651bf052bd72495 Mon Sep 17 00:00:00 2001 From: Martin Boze Date: Wed, 12 Nov 2014 04:37:31 +0200 Subject: [PATCH 018/121] Converting seller group admin pages to OC2 layout Changed MM menu icon --- .../controller/multiseller/seller-group.php | 2 +- .../admin/controller/multiseller/seller.php | 6 +- .../stylesheet/multimerch/multiseller.css | 2 +- .../view/template/multiseller/seller-form.tpl | 6 +- .../multiseller/seller-group-form.tpl | 289 +++++++++--------- .../template/multiseller/seller-group.tpl | 2 +- upload/vqmod/xml/multimerch_core_admin.xml | 2 +- 7 files changed, 154 insertions(+), 155 deletions(-) diff --git a/upload/admin/controller/multiseller/seller-group.php b/upload/admin/controller/multiseller/seller-group.php index 37550355..78a52e7f 100644 --- a/upload/admin/controller/multiseller/seller-group.php +++ b/upload/admin/controller/multiseller/seller-group.php @@ -227,7 +227,7 @@ public function jxSave() { foreach ($data['description'] as $language_id => $value) { if ((utf8_strlen($value['name']) < 3) || (utf8_strlen($value['name']) > 32)) { - $json['errors']['name_' . $language_id] = $this->language->get('ms_error_seller_group_name'); + $json['errors']['seller_group[description]['.$language_id.'][name]'] = $this->language->get('ms_error_seller_group_name'); } } diff --git a/upload/admin/controller/multiseller/seller.php b/upload/admin/controller/multiseller/seller.php index 5d83d51a..941d2ecf 100644 --- a/upload/admin/controller/multiseller/seller.php +++ b/upload/admin/controller/multiseller/seller.php @@ -449,8 +449,10 @@ public function update() { ) )); - list($this->template, $this->children) = $this->MsLoader->MsHelper->admLoadTemplate('seller-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/seller-form.tpl', $this->data)); } } ?> diff --git a/upload/admin/view/stylesheet/multimerch/multiseller.css b/upload/admin/view/stylesheet/multimerch/multiseller.css index 8078c5fe..6c4225b8 100644 --- a/upload/admin/view/stylesheet/multimerch/multiseller.css +++ b/upload/admin/view/stylesheet/multimerch/multiseller.css @@ -2,7 +2,7 @@ overflow-x: initial; } -.control-inline input { +.control-inline input, .control-inline select { width: auto; display: inline; } diff --git a/upload/admin/view/template/multiseller/seller-form.tpl b/upload/admin/view/template/multiseller/seller-form.tpl index 0a63d5b8..afa3df4b 100644 --- a/upload/admin/view/template/multiseller/seller-form.tpl +++ b/upload/admin/view/template/multiseller/seller-form.tpl @@ -4,7 +4,7 @@
    -
    +

      @@ -246,7 +246,7 @@
      -
      +
      currency->getSymbolLeft(); ?> @@ -258,7 +258,7 @@
      -
      +
      currency->getSymbolLeft(); ?> diff --git a/upload/admin/view/template/multiseller/seller-group-form.tpl b/upload/admin/view/template/multiseller/seller-group-form.tpl index 95341410..4a29e820 100644 --- a/upload/admin/view/template/multiseller/seller-group-form.tpl +++ b/upload/admin/view/template/multiseller/seller-group-form.tpl @@ -1,137 +1,137 @@ - +
      -
      - - - -
      -
      -
      -

      -
      - - -
      -
      -
      -
      - -
      - - -
      -
      - - - - - +
      +
      +
      + +
      +

      +
        + +
        • + +
      +
      +
      +
      + + +
      +
      +

      +
      +
      + + +
        +
        • +
        • +
      + +
      +
      + +
      + +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      + +
      + +
      +
      -
      - - - - - - - - - - - - - -
      * - - -
      -

      - -
      - - - -

      - -
      config->get('msconf_default_seller_group_id')) { ?>* language->get('ms_product_period'); ?> - -

      -
      config->get('msconf_default_seller_group_id')) { ?>* language->get('ms_product_quantity'); ?> - -

      -
      -
      - -
      - - - - - - - - - - - - - - - - - -
      config->get('msconf_default_seller_group_id')) { ?>* language->get('ms_commission_' . MsCommission::RATE_SALE); ?> - - - currency->getSymbolLeft(); ?> - - currency->getSymbolRight(); ?> - +% -

      -
      config->get('msconf_default_seller_group_id')) { ?>* language->get('ms_commission_' . MsCommission::RATE_LISTING); ?> - - - currency->getSymbolLeft(); ?> - - currency->getSymbolRight(); ?> - +% - -

      -
      config->get('msconf_default_seller_group_id')) { ?>* language->get('ms_commission_' . MsCommission::RATE_SIGNUP); ?> - - - currency->getSymbolLeft(); ?> - - currency->getSymbolRight(); ?> - -

      -
      -
      - -
      +
      + +
      + +
      +
      + +
      + +
      + +
      +
      +
      + +
      + + +
      + +
      + + + currency->getSymbolLeft(); ?> + + currency->getSymbolRight(); ?> + +% +
      +
      + +
      + +
      + + + currency->getSymbolLeft(); ?> + + currency->getSymbolRight(); ?> + +% + +
      +
      + +
      + +
      + + + currency->getSymbolLeft(); ?> + + currency->getSymbolRight(); ?> + +% + +
      +
      + +
      + +
      +
      - + \ No newline at end of file diff --git a/upload/system/library/mshelper.php b/upload/system/library/mshelper.php index daf83da7..6be5fb7e 100644 --- a/upload/system/library/mshelper.php +++ b/upload/system/library/mshelper.php @@ -82,7 +82,7 @@ public function admSetBreadcrumbs($data) { return $breadcrumbs; } - + public function loadTemplate($templateName, $children = FALSE) { // ugly if(strpos($templateName, '/') == false) { @@ -94,18 +94,18 @@ public function loadTemplate($templateName, $children = FALSE) { } else { $template = "default/template/$templateName.tpl"; } - - if ($children === FALSE) { + + if ($children == FALSE) { $children = array( - 'common/column_left', - 'common/column_right', - 'common/content_top', - 'common/content_bottom', - 'common/footer', - 'common/header' + 'column_left' => $this->load->controller('common/column_left'), + 'column_right' => $this->load->controller('common/column_right'), + 'content_top' => $this->load->controller('common/content_top'), + 'content_bottom' => $this->load->controller('common/content_bottom'), + 'footer' => $this->load->controller('common/footer'), + 'header' => $this->load->controller('common/header') ); } - + return array($template, $children); } diff --git a/upload/vqmod/xml/multimerch_core.xml b/upload/vqmod/xml/multimerch_core.xml index 35f7cc30..baa993e9 100644 --- a/upload/vqmod/xml/multimerch_core.xml +++ b/upload/vqmod/xml/multimerch_core.xml @@ -43,35 +43,21 @@ ]]> - - - - -
      - ]]> - config->get('msconf_hide_sellers_product_count') == 1) { ?> -
      - - ]]>       - - data = array_merge($this->data, $this->load->language('multiseller/multiseller')); - $this->data['ms_total_products'] = $this->MsLoader->MsProduct->getTotalProducts(array( + $data = array_merge($this->load->language('multiseller/multiseller'), isset($data) ? $data : array()); + $data['ms_total_products'] = $this->MsLoader->MsProduct->getTotalProducts(array( 'enabled' => 1, //'product_status' => array(MsProduct::STATUS_ACTIVE), )); - $this->data['ms_total_sellers'] = $this->MsLoader->MsSeller->getTotalSellers(array( + $data['ms_total_sellers'] = $this->MsLoader->MsSeller->getTotalSellers(array( 'seller_status' => array(MsSeller::STATUS_ACTIVE) )); @@ -79,7 +65,7 @@ // note: renamed catalog $lang = "view/javascript/multimerch/datatables/lang/" . $this->config->get('config_language') . ".txt"; - $this->data['dt_language'] = file_exists(DIR_APPLICATION . $lang) ? "'catalog/$lang'" : "undefined"; + $data['dt_language'] = file_exists(DIR_APPLICATION . $lang) ? "'catalog/$lang'" : "undefined"; // Add complemented common.js $this->document->addScript('catalog/view/javascript/ms-common.js'); @@ -142,7 +128,7 @@ ]]> load->model('localisation/order_status'); - $this->data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses(); + $data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses(); ]]> @@ -157,7 +143,7 @@ data['products'][] = array( + $data['products'][] = array( ]]> $this->model_localisation_order_status->getSuborderStatusId($order_id, $seller_id), @@ -168,10 +154,10 @@ data = array_merge($this->data, $this->load->language('multiseller/multiseller')); + $data = array_merge($this->load->language('multiseller/multiseller'), isset($data) ? $data : array()); ]]> diff --git a/upload/vqmod/xml/multimerch_core_onepagereg.xml b/upload/vqmod/xml/multimerch_core_onepagereg.xml_ similarity index 100% rename from upload/vqmod/xml/multimerch_core_onepagereg.xml rename to upload/vqmod/xml/multimerch_core_onepagereg.xml_ diff --git a/upload/vqmod/xml/multimerch_core_sellerinfos.xml b/upload/vqmod/xml/multimerch_core_sellerinfos.xml index 7b6202e0..1e8a296c 100644 --- a/upload/vqmod/xml/multimerch_core_sellerinfos.xml +++ b/upload/vqmod/xml/multimerch_core_sellerinfos.xml @@ -10,7 +10,7 @@ data['products'][] = array( + $data['products'][] = array( ]]> $product['product_id'], @@ -58,7 +58,7 @@ data['products'][] = array( + $data['products'][] = array( ]]> $product['product_id'], @@ -121,7 +121,7 @@ data['products'][] = array( + $data['products'][] = array( ]]> $product['product_id'], diff --git a/upload/vqmod/xml/multimerch_core_sellermenu.xml b/upload/vqmod/xml/multimerch_core_sellermenu.xml index 87f55977..d512d985 100644 --- a/upload/vqmod/xml/multimerch_core_sellermenu.xml +++ b/upload/vqmod/xml/multimerch_core_sellermenu.xml @@ -13,89 +13,87 @@

      ]]> -
      -
      ]]>             @@ -103,18 +101,18 @@ response->setOutput($this->render()); + $this->load->language('account/account'); ]]> data['ms_seller_created'] = $this->MsLoader->MsSeller->isCustomerSeller($this->customer->getId()); - $this->data = array_merge($this->data, $this->load->language('multiseller/multiseller')); + $data['ms_seller_created'] = $this->MsLoader->MsSeller->isCustomerSeller($this->customer->getId()); + $data = array_merge($this->load->language('multiseller/multiseller'), $data); ]]> - + ]]> @@ -144,11 +142,11 @@ render(); + $this->load->language('module/account'); ]]> data['ms_seller_created'] = $this->MsLoader->MsSeller->isCustomerSeller($this->customer->getId()); - $this->data = array_merge($this->data, $this->load->language('multiseller/multiseller')); + $data['ms_seller_created'] = $this->MsLoader->MsSeller->isCustomerSeller($this->customer->getId()); + $data = array_merge($this->load->language('multiseller/multiseller'), $data); ]]> From 25feaa77fe89dc92e7595aba37021269a270b1b6 Mon Sep 17 00:00:00 2001 From: Martin Boze Date: Tue, 18 Nov 2014 23:35:02 +0200 Subject: [PATCH 020/121] Converting stats / transactions pages to OC2 layout --- .../controller/seller/account-stats.php | 7 +- .../controller/seller/account-transaction.php | 134 +++++++++--------- .../template/multiseller/account-stats.tpl | 81 +++++------ .../multiseller/account-transaction.tpl | 70 ++++----- 4 files changed, 144 insertions(+), 148 deletions(-) diff --git a/upload/catalog/controller/seller/account-stats.php b/upload/catalog/controller/seller/account-stats.php index 374f9549..db022118 100644 --- a/upload/catalog/controller/seller/account-stats.php +++ b/upload/catalog/controller/seller/account-stats.php @@ -5,8 +5,7 @@ public function index() { $this->data['link_back'] = $this->url->link('account/account', '', 'SSL'); $this->document->setTitle($this->language->get('ms_account_stats_heading')); - $this->document->addScript('catalog/view/javascript/jquery/tabs.js'); - + $this->data['breadcrumbs'] = $this->MsLoader->MsHelper->setBreadcrumbs(array( array( 'text' => $this->language->get('text_account'), @@ -88,8 +87,8 @@ public function index() { $this->data['grand_total'] = $grand_total; - list($this->template, $this->children) = $this->MsLoader->MsHelper->loadTemplate('account-stats'); - $this->response->setOutput($this->render()); + list($template, $children) = $this->MsLoader->MsHelper->loadTemplate('account-stats'); + $this->response->setOutput($this->load->view($template, array_merge($this->data, $children))); } public function getSalesByYear(){ diff --git a/upload/catalog/controller/seller/account-transaction.php b/upload/catalog/controller/seller/account-transaction.php index 8aa92fb7..6e0da197 100644 --- a/upload/catalog/controller/seller/account-transaction.php +++ b/upload/catalog/controller/seller/account-transaction.php @@ -1,16 +1,16 @@ - 'ms.nickname', 'type' => 'payment_type', 'description' => 'mpay.description', 'date_created' => 'mpay.date_created', 'date_paid' => 'mpay.date_paid' - ); - - $seller_id = $this->customer->getId(); + ); + + $seller_id = $this->customer->getId(); $sorts = array('payment_type', 'payment_id', 'amount', 'payment_status', 'date_created'); $filters = array_diff(array_merge($sorts, array('description')), array('payment_status', 'type')); @@ -19,8 +19,8 @@ public function getPaymentData() { $filterParams = $this->MsLoader->MsHelper->getFilterParams($filters, $colMap); $results = $this->MsLoader->MsPayment->getPayments( - array( - 'seller_id' => $seller_id + array( + 'seller_id' => $seller_id ), array( 'order_by' => $sortCol, @@ -34,15 +34,15 @@ public function getPaymentData() { $total = isset($results[0]) ? $results[0]['total_rows'] : 0; $columns = array(); - foreach ($results as $result) { - if ($result['payment_status'] == MsPayment::STATUS_UNPAID && $result['payment_type'] == MsPayment::TYPE_SALE) { + foreach ($results as $result) { + if ($result['payment_status'] == MsPayment::STATUS_UNPAID && $result['payment_type'] == MsPayment::TYPE_SALE) { $total--; continue; - } + } $columns[] = array_merge( $result, - array( + array( 'payment_type' => ($result['payment_type'] == MsPayment::TYPE_SALE ? $this->language->get('ms_payment_type_' . $result['payment_type']) . ' (' . sprintf($this->language->get('ms_payment_order'), $result['order_id']) . ')' : $this->language->get('ms_payment_type_' . $result['payment_type'])), 'amount' => $this->currency->format(abs($result['amount']),$result['currency_code']), 'description' => (mb_strlen($result['mpay.description']) > 80 ? mb_substr($result['mpay.description'], 0, 80) . '...' : $result['mpay.description']), @@ -50,24 +50,24 @@ public function getPaymentData() { 'date_created' => date($this->language->get('date_format_short'), strtotime($result['mpay.date_created'])), ) ); - } + } $this->response->setOutput(json_encode(array( 'iTotalRecords' => $total, 'iTotalDisplayRecords' => $total, 'aaData' => $columns ))); - } - - public function getTransactionData() { - $seller_id = $this->customer->getId(); - + } + + public function getTransactionData() { + $seller_id = $this->customer->getId(); + $colMap = array( 'transaction_id' => 'balance_id', 'seller' => '`nickname`', 'description' => 'mb.description', 'date_created' => 'mb.date_created' - ); + ); $sorts = array('transaction_id', 'seller', 'amount', 'date_created'); $filters = array_merge($sorts, array('description')); @@ -76,8 +76,8 @@ public function getTransactionData() { $filterParams = $this->MsLoader->MsHelper->getFilterParams($filters, $colMap); $results = $this->MsLoader->MsBalance->getBalanceEntries( - array( - 'seller_id' => $seller_id + array( + 'seller_id' => $seller_id ), array( 'order_by' => $sortCol, @@ -108,48 +108,48 @@ public function getTransactionData() { 'iTotalDisplayRecords' => $total, 'aaData' => $columns ))); - } - - public function index() { - $seller_id = $this->customer->getId(); - - $seller_balance = $this->MsLoader->MsBalance->getSellerBalance($seller_id); - $pending_funds = $this->MsLoader->MsBalance->getReservedSellerFunds($seller_id); - $waiting_funds = $this->MsLoader->MsBalance->getWaitingSellerFunds($seller_id, 14); - $balance_formatted = $this->currency->format($seller_balance,$this->config->get('config_currency')); - - $balance_reserved_formatted = $pending_funds > 0 ? sprintf($this->language->get('ms_account_balance_reserved_formatted'), $this->currency->format($pending_funds)) . ', ' : ''; - $balance_reserved_formatted .= $waiting_funds > 0 ? sprintf($this->language->get('ms_account_balance_waiting_formatted'), $this->currency->format($waiting_funds)) . ', ' : ''; - $balance_reserved_formatted = ($balance_reserved_formatted == '' ? '' : '(' . substr($balance_reserved_formatted, 0, -2) . ')'); - - $this->data['ms_balance_formatted'] = $balance_formatted; - $this->data['ms_reserved_formatted'] = $balance_reserved_formatted; - - $earnings = $this->MsLoader->MsSeller->getTotalEarnings($seller_id); - - $this->data['earnings'] = $this->currency->format($earnings, $this->config->get('config_currency')); - $this->data['link_back'] = $this->url->link('account/account', '', 'SSL'); - - $this->document->setTitle($this->language->get('ms_account_transactions_heading')); - - $this->data['breadcrumbs'] = $this->MsLoader->MsHelper->setBreadcrumbs(array( - array( - 'text' => $this->language->get('text_account'), - 'href' => $this->url->link('account/account', '', 'SSL'), - ), - array( - 'text' => $this->language->get('ms_account_dashboard_breadcrumbs'), - 'href' => $this->url->link('seller/account-dashboard', '', 'SSL'), - ), - array( - 'text' => $this->language->get('ms_account_transactions_breadcrumbs'), - 'href' => $this->url->link('seller/account-transaction', '', 'SSL'), - ) - )); - - list($this->template, $this->children) = $this->MsLoader->MsHelper->loadTemplate('account-transaction'); - $this->response->setOutput($this->render()); - } -} - -?> + } + + public function index() { + $seller_id = $this->customer->getId(); + + $seller_balance = $this->MsLoader->MsBalance->getSellerBalance($seller_id); + $pending_funds = $this->MsLoader->MsBalance->getReservedSellerFunds($seller_id); + $waiting_funds = $this->MsLoader->MsBalance->getWaitingSellerFunds($seller_id, 14); + $balance_formatted = $this->currency->format($seller_balance,$this->config->get('config_currency')); + + $balance_reserved_formatted = $pending_funds > 0 ? sprintf($this->language->get('ms_account_balance_reserved_formatted'), $this->currency->format($pending_funds)) . ', ' : ''; + $balance_reserved_formatted .= $waiting_funds > 0 ? sprintf($this->language->get('ms_account_balance_waiting_formatted'), $this->currency->format($waiting_funds)) . ', ' : ''; + $balance_reserved_formatted = ($balance_reserved_formatted == '' ? '' : '(' . substr($balance_reserved_formatted, 0, -2) . ')'); + + $this->data['ms_balance_formatted'] = $balance_formatted; + $this->data['ms_reserved_formatted'] = $balance_reserved_formatted; + + $earnings = $this->MsLoader->MsSeller->getTotalEarnings($seller_id); + + $this->data['earnings'] = $this->currency->format($earnings, $this->config->get('config_currency')); + $this->data['link_back'] = $this->url->link('account/account', '', 'SSL'); + + $this->document->setTitle($this->language->get('ms_account_transactions_heading')); + + $this->data['breadcrumbs'] = $this->MsLoader->MsHelper->setBreadcrumbs(array( + array( + 'text' => $this->language->get('text_account'), + 'href' => $this->url->link('account/account', '', 'SSL'), + ), + array( + 'text' => $this->language->get('ms_account_dashboard_breadcrumbs'), + 'href' => $this->url->link('seller/account-dashboard', '', 'SSL'), + ), + array( + 'text' => $this->language->get('ms_account_transactions_breadcrumbs'), + 'href' => $this->url->link('seller/account-transaction', '', 'SSL'), + ) + )); + + list($template, $children) = $this->MsLoader->MsHelper->loadTemplate('account-transaction'); + $this->response->setOutput($this->load->view($template, array_merge($this->data, $children))); + } +} + +?> diff --git a/upload/catalog/view/theme/default/template/multiseller/account-stats.tpl b/upload/catalog/view/theme/default/template/multiseller/account-stats.tpl index 54886cc7..68f33e5c 100644 --- a/upload/catalog/view/theme/default/template/multiseller/account-stats.tpl +++ b/upload/catalog/view/theme/default/template/multiseller/account-stats.tpl @@ -1,28 +1,31 @@ - - -
    -
    +
    From f185d3fead61846c43ff006a84a8899d686889b0 Mon Sep 17 00:00:00 2001 From: Martin Boze Date: Wed, 19 Nov 2014 07:56:04 +0200 Subject: [PATCH 025/121] Converting payout request to OC2 layout / Part2 --- .../controller/seller/account-withdrawal.php | 4 +- .../template/multiseller/account-profile.tpl | 14 +-- .../multiseller/account-withdrawal.tpl | 92 +++++++++---------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/upload/catalog/controller/seller/account-withdrawal.php b/upload/catalog/controller/seller/account-withdrawal.php index 19d19f52..b7956133 100644 --- a/upload/catalog/controller/seller/account-withdrawal.php +++ b/upload/catalog/controller/seller/account-withdrawal.php @@ -114,8 +114,8 @@ public function index() { ) )); - list($this->template, $this->children) = $this->MsLoader->MsHelper->loadTemplate('account-withdrawal'); - $this->response->setOutput($this->render()); + list($template, $children) = $this->MsLoader->MsHelper->loadTemplate('account-withdrawal'); + $this->response->setOutput($this->load->view($template, array_merge($this->data, $children))); } } diff --git a/upload/catalog/view/theme/default/template/multiseller/account-profile.tpl b/upload/catalog/view/theme/default/template/multiseller/account-profile.tpl index 4448ecbe..4650e60f 100644 --- a/upload/catalog/view/theme/default/template/multiseller/account-profile.tpl +++ b/upload/catalog/view/theme/default/template/multiseller/account-profile.tpl @@ -50,7 +50,7 @@
    -
    +
    @@ -59,7 +59,7 @@
    -
    +
    @@ -67,7 +67,7 @@
    -
    +
    @@ -88,7 +88,7 @@
    -
    +
    @@ -96,7 +96,7 @@
    -
    +
    @@ -134,7 +134,7 @@ -
    +
    diff --git a/upload/catalog/view/theme/default/template/multiseller/account-withdrawal.tpl b/upload/catalog/view/theme/default/template/multiseller/account-withdrawal.tpl index 12199147..5d612c73 100644 --- a/upload/catalog/view/theme/default/template/multiseller/account-withdrawal.tpl +++ b/upload/catalog/view/theme/default/template/multiseller/account-withdrawal.tpl @@ -1,30 +1,40 @@ - + + \ No newline at end of file From 154fb813d0b84ffd5817545e1151c2d85cbc1b32 Mon Sep 17 00:00:00 2001 From: Martin Boze Date: Thu, 20 Nov 2014 17:22:34 +0200 Subject: [PATCH 026/121] Converting seller account menus to OC2 layout --- .../theme/default/stylesheet/multiseller.css | 4 ++ .../vqmod/xml/multimerch_core_sellermenu.xml | 40 ++++++++++--------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/upload/catalog/view/theme/default/stylesheet/multiseller.css b/upload/catalog/view/theme/default/stylesheet/multiseller.css index 600733f1..8cc74592 100644 --- a/upload/catalog/view/theme/default/stylesheet/multiseller.css +++ b/upload/catalog/view/theme/default/stylesheet/multiseller.css @@ -143,6 +143,10 @@ table.list tbody td, table.list thead td { width: 200px; } +.ms-product select { + width: 200px; +} + .ms-product textarea { width: 400px; height: 100px; diff --git a/upload/vqmod/xml/multimerch_core_sellermenu.xml b/upload/vqmod/xml/multimerch_core_sellermenu.xml index d512d985..856b7e64 100644 --- a/upload/vqmod/xml/multimerch_core_sellermenu.xml +++ b/upload/vqmod/xml/multimerch_core_sellermenu.xml @@ -113,28 +113,30 @@ - + ]]> -
    • - MsLoader->MsSeller->getStatus($this->customer->getId()) == MsSeller::STATUS_ACTIVE) { ?> -
    • - - -
    • +
    + + + MsLoader->MsSeller->getStatus($this->customer->getId()) == MsSeller::STATUS_ACTIVE) { ?> + + + + - MsLoader->MsSeller->getStatus($this->customer->getId()) == MsSeller::STATUS_ACTIVE) { ?> -
    • -
    • -
    • -
    • - config->get('msconf_allow_withdrawal_requests')) { ?> -
    • - -
    • - + MsLoader->MsSeller->getStatus($this->customer->getId()) == MsSeller::STATUS_ACTIVE) { ?> + + + + + config->get('msconf_allow_withdrawal_requests')) { ?> + + + + +
    ]]>         From 19d9af19340d4ced3e942c1469d157104d9bb59a Mon Sep 17 00:00:00 2001 From: Martin Boze Date: Thu, 20 Nov 2014 21:04:14 +0200 Subject: [PATCH 027/121] Converting the rest of seller account to OpenCart2 --- .../controller/seller/account-product.php | 16 +- .../view/javascript/account-product-form.js | 44 +- .../theme/default/stylesheet/multiseller.css | 47 +- .../multiseller/account-dashboard.tpl | 10 +- .../account-product-form-options-values.tpl | 12 +- .../account-product-form-options.tpl | 2 +- .../multiseller/account-product-form.tpl | 710 +++++++++--------- .../template/multiseller/account-profile.tpl | 2 +- 8 files changed, 423 insertions(+), 420 deletions(-) diff --git a/upload/catalog/controller/seller/account-product.php b/upload/catalog/controller/seller/account-product.php index 2fdb23e6..308b98f6 100644 --- a/upload/catalog/controller/seller/account-product.php +++ b/upload/catalog/controller/seller/account-product.php @@ -923,8 +923,8 @@ public function jxRenderOptions() { } else { $this->template = 'default/template/multiseller/account-product-form-options.tpl'; } - - $this->response->setOutput($this->render(TRUE), $this->config->get('config_compression')); + + $this->response->setOutput($this->load->view($this->template, $this->data)); } public function jxRenderOptionValues() { @@ -944,7 +944,7 @@ public function jxRenderOptionValues() { $this->template = 'default/template/multiseller/account-product-form-options-values.tpl'; } - $this->response->setOutput($this->render(TRUE), $this->config->get('config_compression')); + $this->response->setOutput($this->load->view($this->template, $this->data)); } public function jxRenderProductOptions() { @@ -956,7 +956,7 @@ public function jxRenderProductOptions() { $this->data['option_index'] = 0; foreach ($options as $o) { $this->data['option'] = $o; - $this->data['product_option_values'] = $o['option_value']; + $this->data['product_option_values'] = $o['product_option_value']; $this->data['values'] = $this->MsLoader->MsOption->getOptionValues($o['option_id']); if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/multiseller/account-product-form-options-values.tpl')) { @@ -965,7 +965,7 @@ public function jxRenderProductOptions() { $this->template = 'default/template/multiseller/account-product-form-options-values.tpl'; } - $output .= $this->render(); + $output .= $this->load->view($this->template, $this->data); $this->data['option_index']++; } } @@ -1082,11 +1082,11 @@ private function _initForm() { $this->document->addScript('catalog/view/javascript/plupload/plupload.full.js'); $this->document->addScript('catalog/view/javascript/plupload/jquery.plupload.queue/jquery.plupload.queue.js'); - $this->document->addScript('catalog/view/javascript/jquery/ui/jquery-ui-timepicker-addon.js'); $this->document->addScript('catalog/view/javascript/account-product-form.js'); $this->document->addScript('catalog/view/javascript/multimerch/account-product-form-options.js'); - $this->document->addScript('catalog/view/javascript/jquery/tabs.js'); - + $this->document->addScript('//code.jquery.com/ui/1.11.2/jquery-ui.min.js'); + + // ckeditor if($this->config->get('msconf_enable_rte')) $this->document->addScript('catalog/view/javascript/multimerch/ckeditor/ckeditor.js'); diff --git a/upload/catalog/view/javascript/account-product-form.js b/upload/catalog/view/javascript/account-product-form.js index de9567dc..35bb6373 100644 --- a/upload/catalog/view/javascript/account-product-form.js +++ b/upload/catalog/view/javascript/account-product-form.js @@ -1,17 +1,17 @@ $(function() { - $('#language-tabs a.lang').tabs(); - $('#general-tabs a').tabs(); $( ".product_image_files" ).sortable(); $("body").delegate(".ms-price-dynamic", "propertychange input paste focusout", function(){ $(".attention.ms-commission span").load($('base').attr('href') + "index.php?route=seller/account-product/jxGetFee&price=" + $(".ms-price-dynamic").val()); }); $(".attention.ms-commission span").load($('base').attr('href') + "index.php?route=seller/account-product/jxGetFee&price=" + $(".ms-price-dynamic").val()); - + + /* $("body").delegate(".date", "focusin", function(){ $(this).datepicker({dateFormat: 'yy-mm-dd'}); }); + $("body").delegate(".datetime", "focusin", function(){ $(this).datetimepicker({ dateFormat: 'yy-mm-dd', @@ -22,7 +22,7 @@ $(function() { $("body").delegate(".time", "focusin", function(){ $(this).timepicker({timeFormat: 'h:m'}); }); - + */ $('body').delegate("a.ms-button-delete", "click", function() { $(this).parents('tr').remove(); }); @@ -43,7 +43,7 @@ $(function() { $(this).closest('table').find('tbody').append(newRow.removeAttr('class')); }); - $("input[name='product_enable_shipping']").live('change', function() { + $('body').on('change', "input[name='product_enable_shipping']", function() { if ($(this).val() == 1) { ProductShippingCategories(1) if (!$("input[name='product_quantity']").hasClass("ffUnchangeable")) { @@ -138,35 +138,39 @@ $(function() { url: $('base').attr('href') + 'index.php?route=seller/account-product/'+url, data: $("form#ms-new-product").serialize(), beforeSend: function() { - button.hide().before(' '); + $('.error').html(''); + $('.alert-danger').hide().find('i').text(''); + button.hide().before(''); }, complete: function(jqXHR, textStatus) { + button.show().prev('span.wait').remove(); if (textStatus != 'success') { button.show().prev('span.wait').remove(); - $(".warning.main").text(msGlobals.formError).show(); + $('.alert-danger').text(msGlobals.formError).show(); window.scrollTo(0,0); } }, success: function(jsonData) { - $('.error').text(''); - $('.warning.main').text('').hide(); - if (jsonData.fail) { - $(".warning.main").text(msGlobals.formError).show(); + $('.alert-danger').show().find('i').text(msGlobals.formError); window.scrollTo(0,0); } else if (!jQuery.isEmptyObject(jsonData.errors)) { button.show().prev('span.wait').remove(); for (error in jsonData.errors) { - if (!jsonData.errors.hasOwnProperty(error)) { - continue; - } - - if ($('#error_'+error).length > 0) - $('#error_'+error).text(jsonData.errors[error]); - else - $('[name^="'+error+'"]').nextAll('.error:first').text(jsonData.errors[error]); + if (!jsonData.errors.hasOwnProperty(error)) { + continue; + } + + if ($('#error_' + error).length > 0) { + $('#error_' + error).text(jsonData.errors[error]); + $('#error_' + error).parents('.form-group').addClass('has-error'); + } else { + $('[name^="' + error + '"]').nextAll('.error:first').text(jsonData.errors[error]); + $('[name^="' + error + '"]').parents('.form-group').addClass('has-error'); + } + } - $(".warning.main").text(msGlobals.formNotice).show(); + $('.alert-danger').show().find('i').text(msGlobals.formNotice); window.scrollTo(0,0); } else if (!jQuery.isEmptyObject(jsonData.data) && jsonData.data.amount) { $(".ms-payment-form form input[name='custom']").val(jsonData.data.custom); diff --git a/upload/catalog/view/theme/default/stylesheet/multiseller.css b/upload/catalog/view/theme/default/stylesheet/multiseller.css index 8cc74592..58891174 100644 --- a/upload/catalog/view/theme/default/stylesheet/multiseller.css +++ b/upload/catalog/view/theme/default/stylesheet/multiseller.css @@ -16,14 +16,14 @@ display: inline-block; } -.ms-account-dashboard table.list tbody td, -.ms-account-orders table.list tbody td { - vertical-align: middle; -} - table.list tbody td, table.list thead td { text-align: center; padding: 7px; + vertical-align: middle; +} + +.dataTables_wrapper .pagination { + display: block; } .ms-totals { @@ -134,11 +134,6 @@ table.list tbody td, table.list thead td { vertical-align: top; } -.ms-product tr td:first-child { - padding-top: 5px; - width: 150px; -} - .ms-product input[type='text'] { width: 200px; } @@ -241,6 +236,14 @@ table.list tbody td, table.list thead td { border-top: none; } +.option_value { + margin-bottom: 5px; +} + +.select_option_value { + margin-top: 15px; +} + .option_name { display: inline-block; width: 125px; @@ -327,9 +330,9 @@ input.option_quantity { position: absolute; bottom: 3px; right: 3px; - width: 16px; - height: 16px; - background: url('../image/remove.png'); + width: 32px; + height: 32px; + background: url('../image/ms-cross.png'); cursor: pointer; } @@ -343,8 +346,6 @@ input.option_quantity { } .ms-language-div { - border: 1px solid #EEEEEE; - border-top: none; } .ms-note { @@ -757,14 +758,6 @@ ul.ms-sellermenu.graphical li a { margin: 10px; } -.ms-account-dashboard .overview, -.ms-account-dashboard .stats, -.ms-account-dashboard .nav { - position: relative; - float: left; - width: 33%; -} - .ms-account-dashboard .stats p, .ms-account-dashboard .stats h3, .ms-account-dashboard .nav a, .ms-account-dashboard .nav h3 { padding-left: 40px; @@ -923,3 +916,11 @@ table.list thead td.right { .comment-ratings tr td { padding-right: 10px; } + +.has-error .error, .error { + color: #a94442; +} + +.inline { + display:inline; +} \ No newline at end of file diff --git a/upload/catalog/view/theme/default/template/multiseller/account-dashboard.tpl b/upload/catalog/view/theme/default/template/multiseller/account-dashboard.tpl index bc603499..8b4f44fc 100644 --- a/upload/catalog/view/theme/default/template/multiseller/account-dashboard.tpl +++ b/upload/catalog/view/theme/default/template/multiseller/account-dashboard.tpl @@ -21,7 +21,7 @@