Skip to content

Commit

Permalink
Merge branch 'master' of github.com:opencart/opencart
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesallsup committed Sep 13, 2015
2 parents 56361d4 + 647086e commit 8195318
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions upload/catalog/controller/payment/cod.php
@@ -1,8 +1,6 @@
<?php
class ControllerPaymentCod extends Controller {
public function index() {
$data['text_loading'] = $this->language->get('text_loading');

$data['button_confirm'] = $this->language->get('button_confirm');

$data['text_loading'] = $this->language->get('text_loading');
Expand All @@ -23,4 +21,4 @@ public function confirm() {
$this->model_checkout_order->addOrderHistory($this->session->data['order_id'], $this->config->get('cod_order_status_id'));
}
}
}
}

0 comments on commit 8195318

Please sign in to comment.