Skip to content

Commit

Permalink
unfinished order editing system update
Browse files Browse the repository at this point in the history 
also replaced some language loads
  • Loading branch information
@danielkerr
danielkerr committed Jun 22, 2015
1 parent bcfd7d9 commit 9f3ab03
Show file tree
Hide file tree
Showing 25 changed files with 246 additions and 488 deletions.
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/attribute.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogAttribute extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/attribute');
$this->language->load('catalog/attribute');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/attribute');
$this->language->load('catalog/attribute');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/attribute');
$this->language->load('catalog/attribute');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/attribute');
$this->language->load('catalog/attribute');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/attribute_group.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogAttributeGroup extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/attribute_group');
$this->language->load('catalog/attribute_group');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/attribute_group');
$this->language->load('catalog/attribute_group');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/attribute_group');
$this->language->load('catalog/attribute_group');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/attribute_group');
$this->language->load('catalog/attribute_group');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/category.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogCategory extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/category');
$this->language->load('catalog/category');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/category');
$this->language->load('catalog/category');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/category');
$this->language->load('catalog/category');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/category');
$this->language->load('catalog/category');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -111,7 +111,7 @@ public function delete() {
}

public function repair() {
$this->load->language('catalog/category');
$this->language->load('catalog/category');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/download.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogDownload extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/download');
$this->language->load('catalog/download');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/download');
$this->language->load('catalog/download');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/download');
$this->language->load('catalog/download');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/download');
$this->language->load('catalog/download');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -426,7 +426,7 @@ protected function validateDelete() {
}

public function upload() {
$this->load->language('catalog/download');
$this->language->load('catalog/download');

$json = array();

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/filter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogFilter extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/filter');
$this->language->load('catalog/filter');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/filter');
$this->language->load('catalog/filter');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/filter');
$this->language->load('catalog/filter');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/filter');
$this->language->load('catalog/filter');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/information.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogInformation extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/information');
$this->language->load('catalog/information');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/information');
$this->language->load('catalog/information');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/information');
$this->language->load('catalog/information');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/information');
$this->language->load('catalog/information');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/manufacturer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogManufacturer extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/manufacturer');
$this->language->load('catalog/manufacturer');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/manufacturer');
$this->language->load('catalog/manufacturer');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/manufacturer');
$this->language->load('catalog/manufacturer');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/manufacturer');
$this->language->load('catalog/manufacturer');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/option.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogOption extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/option');
$this->language->load('catalog/option');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/option');
$this->language->load('catalog/option');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -45,7 +45,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/option');
$this->language->load('catalog/option');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -77,7 +77,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/option');
$this->language->load('catalog/option');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -462,7 +462,7 @@ public function autocomplete() {
$json = array();

if (isset($this->request->get['filter_name'])) {
$this->load->language('catalog/option');
$this->language->load('catalog/option');

$this->load->model('catalog/option');

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogProduct extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/product');
$this->language->load('catalog/product');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/product');
$this->language->load('catalog/product');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -65,7 +65,7 @@ public function add() {
}

public function edit() {
$this->load->language('catalog/product');
$this->language->load('catalog/product');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -117,7 +117,7 @@ public function edit() {
}

public function delete() {
$this->load->language('catalog/product');
$this->language->load('catalog/product');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down Expand Up @@ -171,7 +171,7 @@ public function delete() {
}

public function copy() {
$this->load->language('catalog/product');
$this->language->load('catalog/product');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
4 changes: 2 additions & 2 deletions upload/admin/controller/catalog/recurring.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ControllerCatalogRecurring extends Controller {
private $error = array();

public function index() {
$this->load->language('catalog/recurring');
$this->language->load('catalog/recurring');

$this->document->setTitle($this->language->get('heading_title'));

Expand All @@ -13,7 +13,7 @@ public function index() {
}

public function add() {
$this->load->language('catalog/recurring');
$this->language->load('catalog/recurring');

$this->document->setTitle($this->language->get('heading_title'));

Expand Down
4 changes: 2 additions & 2 deletions upload/admin/controller/extension/openbay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ public function addOrderInfo() {
}

public function orderList() {
$this->load->language('sale/order');
$this->language->load('sale/order');
$this->load->model('openbay/order');

$data = $this->load->language('openbay/openbay_order');
Expand Down Expand Up @@ -881,7 +881,7 @@ public function orderListUpdate() {
$this->response->redirect($this->url->link('extension/openbay/orderList', 'token=' . $this->session->data['token'], 'SSL'));
} else {
$this->load->model('openbay/order');
$this->load->language('sale/order');
$this->language->load('sale/order');

$data['column_order_id'] = $this->language->get('column_order_id');
$data['column_customer'] = $this->language->get('column_customer');
Expand Down
Loading

0 comments on commit 9f3ab03

Please sign in to comment.