This commit is contained in:
parent
09d91c8c32
commit
4f1f263552
@ -38,6 +38,12 @@ If you are __upgrading your existing cart__, be sure to read the [upgrade instru
|
||||
5. You should be taken to the installer page. Follow the on screen instructions.
|
||||
6. After successful install, delete the ```/install/``` directory.
|
||||
|
||||
7. Make sure the following extensions are enabled in php.ini:
|
||||
|
||||
extension=curl;
|
||||
extension=gd;
|
||||
extension=zip;
|
||||
|
||||
## Local Install
|
||||
|
||||
There are many all-in-one web servers out there and most of them should work with OpenCart out of the box.
|
||||
@ -49,7 +55,7 @@ Some examples...
|
||||
* http://www.usbwebserver.net
|
||||
* http://www.wampserver.com/en/
|
||||
|
||||
## Notes
|
||||
## Notes
|
||||
|
||||
Godaddy Issues
|
||||
|
||||
|
@ -21,6 +21,7 @@ class Order extends \Opencart\System\Engine\Controller {
|
||||
$data['breadcrumbs'] = [];
|
||||
|
||||
$data['breadcrumbs'][] = [
|
||||
'text' => $this->language->get('text_home'),
|
||||
'text' => $this->language->get('text_home'),
|
||||
'href' => $this->url->link('common/home', 'language=' . $this->config->get('config_language'))
|
||||
];
|
||||
@ -118,7 +119,7 @@ class Order extends \Opencart\System\Engine\Controller {
|
||||
if ($order_info) {
|
||||
$heading_title = sprintf($this->language->get('text_order'), $order_info['order_id']);
|
||||
|
||||
$this->document->setTitle($heading_title));
|
||||
$this->document->setTitle($heading_title);
|
||||
|
||||
$data['heading_title'] = $heading_title;
|
||||
|
||||
|
@ -151,7 +151,11 @@ class Subscription extends \Opencart\System\Engine\Controller {
|
||||
$subscription_info = $this->model_account_subscription->getSubscription($subscription_id);
|
||||
|
||||
if ($subscription_info) {
|
||||
$this->document->setTitle($this->language->get('text_subscription'));
|
||||
$heading_title = sprintf($this->language->get('text_subscription'), $subscription_info['subscription_id']);
|
||||
|
||||
$this->document->setTitle($heading_title);
|
||||
|
||||
$data['heading_title'] = $heading_title;
|
||||
|
||||
$url = '';
|
||||
|
||||
@ -177,7 +181,7 @@ class Subscription extends \Opencart\System\Engine\Controller {
|
||||
];
|
||||
|
||||
$data['breadcrumbs'][] = [
|
||||
'text' => $this->language->get('text_subscription'),
|
||||
'text' => $heading_title,
|
||||
'href' => $this->url->link('account/subscription.info', 'language=' . $this->config->get('config_language') . '&customer_token=' . $this->session->data['customer_token'] . '&subscription_id=' . $this->request->get['subscription_id'] . $url)
|
||||
];
|
||||
|
||||
|
@ -5,8 +5,6 @@ $_['heading_title'] = 'Orders';
|
||||
// Text
|
||||
$_['text_account'] = 'Account';
|
||||
$_['text_order'] = 'Order #%s';
|
||||
$_['text_order_info'] = 'Order Information';
|
||||
|
||||
$_['text_order_detail'] = 'Order Details';
|
||||
$_['text_invoice_no'] = 'Invoice No.:';
|
||||
$_['text_order_id'] = 'Order ID:';
|
||||
|
@ -4,13 +4,11 @@ $_['heading_title'] = 'Subscriptions';
|
||||
|
||||
// Text
|
||||
$_['text_account'] = 'Account';
|
||||
$_['text_subscription'] = 'Subscription Information';
|
||||
$_['text_subscriptions'] = 'Subscriptions';
|
||||
|
||||
$_['text_subscription_id'] = 'Subscription ID';
|
||||
$_['text_subscription'] = 'Subscription #%s';
|
||||
$_['text_subscription_detail'] = 'Subscription Payment Details';
|
||||
|
||||
|
||||
$_['text_invoice_no'] = 'Invoice No.:';
|
||||
$_['text_subscription_id'] = 'Subscription ID';
|
||||
$_['text_order_id'] = 'Order ID:';
|
||||
$_['text_subscription_trial'] = '%s every %d %s(s) for %d payment(s) then ';
|
||||
$_['text_subscription_duration'] = '%s every %d %s(s) for %d payment(s)';
|
||||
$_['text_subscription_cancel'] = '%s every %d %s(s) until canceled';
|
||||
|
@ -1,12 +1,15 @@
|
||||
default_charset = UTF-8
|
||||
memory_limit = 128M
|
||||
max_execution_time = 30
|
||||
upload_max_filesize = 20M
|
||||
mysql.connect_timeout = 20
|
||||
session.auto_start = Off
|
||||
session.use_only_cookies = On
|
||||
session.use_cookies = On
|
||||
session.use_trans_sid = Off
|
||||
allow_url_fopen = On
|
||||
;display_errors = 1
|
||||
;error_reporting = E_ALL
|
||||
default_charset = UTF-8;
|
||||
memory_limit = 128M;
|
||||
max_execution_time = 30;
|
||||
upload_max_filesize = 20M;
|
||||
mysql.connect_timeout = 20;
|
||||
session.auto_start = Off;
|
||||
session.use_only_cookies = On;
|
||||
session.use_cookies = On;
|
||||
session.use_trans_sid = Off;
|
||||
allow_url_fopen = On;
|
||||
;display_errors = 1;
|
||||
;error_reporting = E_ALL;
|
||||
extension=curl;
|
||||
extension=gd;
|
||||
extension=zip;
|
@ -6740,11 +6740,6 @@ function oc_db_schema() {
|
||||
'not_null' => true,
|
||||
'auto_increment' => true
|
||||
],
|
||||
[
|
||||
'name' => 'trial_price',
|
||||
'type' => 'decimal(10,4)',
|
||||
'not_null' => true
|
||||
],
|
||||
[
|
||||
'name' => 'trial_frequency',
|
||||
'type' => 'enum(\'day\',\'week\',\'semi_month\',\'month\',\'year\')',
|
||||
|
@ -36,7 +36,7 @@ class Cart {
|
||||
$this->db->query("DELETE FROM `" . DB_PREFIX . "cart` WHERE `cart_id` = '" . (int)$cart['cart_id'] . "'");
|
||||
|
||||
// The advantage of using $this->add is that it will check if the products already exist and increase the quantity if necessary.
|
||||
$this->add($cart['product_id'], $cart['quantity'], json_decode($cart['option'], true), $cart['subscription_plan_id']);
|
||||
$this->add($cart['product_id'], $cart['quantity'], json_decode($cart['option'], true), $cart['subscription_plan_id'], $cart['override'], $cart['price']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user