Skip to content

Commit

Permalink
2.3.0.2 structural bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@timoj
timoj committed May 22, 2018
1 parent a04984a commit 32c0521
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 49 deletions.
66 changes: 34 additions & 32 deletions admin/controller/module/wuunder.php → ...n/controller/extension/module/wuunder.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

class ControllerModuleWuunder extends Controller
class ControllerExtensionModuleWuunder extends Controller
{
private $error = array();

Expand All @@ -16,7 +16,7 @@ public function index()
$this->model_setting_setting->editSetting('wuunder', $this->request->post);

$this->session->data['success'] = $this->language->get('text_success');
$this->response->redirect($this->url->link('extension/module', 'token=' . $this->session->data['token'] . '&type=module', true));
$this->response->redirect($this->url->link('extension/extension', 'token=' . $this->session->data['token'] . '&type=module', true));
}

$data['heading_title'] = $this->language->get('heading_title');
Expand Down Expand Up @@ -65,10 +65,10 @@ public function index()

$data['breadcrumbs'][] = array(
'text' => $this->language->get('heading_title'),
'href' => $this->url->link('module/wuunder', 'token=' . $this->session->data['token'], true)
'href' => $this->url->link('extension/module/wuunder', 'token=' . $this->session->data['token'], true)
);

$data['action'] = $this->url->link('module/wuunder', 'token=' . $this->session->data['token'], true);
$data['action'] = $this->url->link('extension/module/wuunder', 'token=' . $this->session->data['token'], true);

$data['cancel'] = $this->url->link('extension/module', 'token=' . $this->session->data['token'] . '&type=module', true);

Expand Down Expand Up @@ -108,24 +108,24 @@ public function index()
$data['column_left'] = $this->load->controller('common/column_left');
$data['footer'] = $this->load->controller('common/footer');

$this->response->setOutput($this->load->view('module/wuunder.tpl', $data));
$this->response->setOutput($this->load->view('extension/module/wuunder.tpl', $data));
}

public function install()
{
$this->load->model('module/wuunder');
$this->model_module_wuunder->installTable();
$this->load->model('extension/module/wuunder');
$this->model_extension_module_wuunder->installTable();
}

public function uninstall()
{
$this->load->model('module/wuunder');
$this->model_module_wuunder->uninstallTable();
$this->load->model('extension/module/wuunder');
$this->model_extension_module_wuunder->uninstallTable();
}

protected function validate()
{
if (!$this->user->hasPermission('modify', 'module/wuunder')) {
if (!$this->user->hasPermission('modify', 'extension/module/wuunder')) {
$this->error['warning'] = $this->language->get('error_permission');
}

Expand All @@ -134,31 +134,31 @@ protected function validate()

public function getLabelInfo($order_id)
{
$this->load->model('module/wuunder');
return $this->model_module_wuunder->getLabel($order_id);
$this->load->model('extension/module/wuunder');
return $this->model_extension_module_wuunder->getLabel($order_id);
}

public function getLabelCreatedMessage()
{
$this->load->language('module/wuunder');
$this->load->language('extension/module/wuunder');
return $this->language->get('label_created');
}

public function getCreateLabelMessage()
{
$this->load->language('module/wuunder');
$this->load->language('extension/module/wuunder');
return $this->language->get('create_label');
}

public function getDownloadLabelMessage()
{
$this->load->language('module/wuunder');
$this->load->language('extension/module/wuunder');
return $this->language->get('download_label');
}

public function getFollowShipmentMessage()
{
$this->load->language('module/wuunder');
$this->load->language('extension/module/wuunder');
return $this->language->get('follow_shipment');
}

Expand Down Expand Up @@ -257,38 +257,40 @@ private function buildWuunderData($order_id)
'height' => $defHeight,
'weight' => $defWeight,
'delivery_address' => $customerAdr,
'pickup_address' => $pickupAdr
'pickup_address' => $pickupAdr,
'source' => array("product" => "Opencart 2.3.0.2 extension", "version" => array("build" => "1.0.0", "plugin" => "1.0"))
);
}

public function generateBookingUrl()
{
if (isset($_REQUEST['order'])) {
$order_id = $_REQUEST['order'];
$this->load->model('module/wuunder');
if (!$this->model_module_wuunder->checkLabelExists($order_id)) {
$this->load->model('extension/module/wuunder');
if (!$this->model_extension_module_wuunder->checkLabelExists($order_id)) {
$booking_token = uniqid();
// $this->model_module_wuunder->insertBookingToken($order_id, $booking_token);

if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' && $_SERVER['HTTPS']) {
$protocol = "https://";
} else {
$protocol = "http://";
}

$redirectUrl = urlencode($protocol . $this->request->server['SERVER_NAME'] . "/admin/index.php?route=sale/order&label=created&token=" . $this->session->data['token']);
$webhookUrl = urlencode($protocol . $this->request->server['SERVER_NAME'] . "/index.php?route=module/wuunder/webhook&order=" . $order_id . "&token=" . $booking_token);

if (intval($this->config->get('wuunder_api'))) {
$apiUrl = 'https://api.wearewuunder.com/api/bookings?redirect_url=' . $redirectUrl . '&webhook_url=' . $webhookUrl;
$apiUrl = 'https://api.wearewuunder.com/api/bookings';
$apiKey = $this->config->get('wuunder_live_key');
} else {
$apiUrl = 'https://api-staging.wearewuunder.com/api/bookings?redirect_url=' . $redirectUrl . '&webhook_url=' . $webhookUrl;
$apiUrl = 'https://api-staging.wearewuunder.com/api/bookings';
$apiKey = $this->config->get('wuunder_staging_key');
}

$wuunderData = $this->buildWuunderData($order_id);

if (isset($this->request->server['HTTPS']) && (($this->request->server['HTTPS'] == 'on') || ($this->request->server['HTTPS'] == '1'))) {
$base = HTTP_SERVER;
$catBase = HTTP_CATALOG;
} else {
$base = HTTPS_SERVER;
$catBase = HTTP_CATALOG;
}

$wuunderData['redirect_url'] = $base . "index.php?route=sale/order&label=created&token=" . $this->session->data['token'];
$wuunderData['webhook_url'] = $catBase . "index.php?route=extension/module/wuunder/webhook&order=" . $order_id . "&token=" . $booking_token;

// Encode variables
$json = json_encode($wuunderData);

Expand All @@ -315,7 +317,7 @@ public function generateBookingUrl()
// Close connection
curl_close($cc);

$this->model_module_wuunder->insertBookingUrlAndToken($order_id, $url, $booking_token);
$this->model_extension_module_wuunder->insertBookingUrlAndToken($order_id, $url, $booking_token);

if (!(substr($url, 0, 5) === "http:" || substr($url, 0, 6) === "https:")) {
if (intval($this->config->get('wuunder_api'))) {
Expand Down
2 changes: 1 addition & 1 deletion admin/model/module/wuunder.php → admin/model/extension/module/wuunder.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

class ModelModuleWuunder extends Model
class ModelExtensionModuleWuunder extends Model
{

public function installTable()
Expand Down
0 admin/view/template/module/wuunder.tpl → ...iew/template/extension/module/wuunder.tpl
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion catalog/controller/module/wuunder.php → ...g/controller/extension/module/wuunder.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

class ControllerModuleWuunder extends Controller
class ControllerExtensionModuleWuunder extends Controller
{

public function index()
Expand Down
0 catalog/view/template/module/wuunder.tpl → ...iew/template/extension/module/wuunder.tpl
View file
File renamed without changes.
25 changes: 14 additions & 11 deletions vqmod/xml/orders.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,30 @@
$results = $this->model_sale_order->getOrders($filter_data);
]]></search>
<add><![CDATA[
$data['create_label'] = $this->load->controller('module/wuunder/getCreateLabelMessage');
$data['download_label'] = $this->load->controller('module/wuunder/getDownloadLabelMessage');
$data['follow_shipment'] = $this->load->controller('module/wuunder/getFollowShipmentMessage');
$data['create_label'] = $this->load->controller('extension/module/wuunder/getCreateLabelMessage');
$data['download_label'] = $this->load->controller('extension/module/wuunder/getDownloadLabelMessage');
$data['follow_shipment'] = $this->load->controller('extension/module/wuunder/getFollowShipmentMessage');
$results = $this->model_sale_order->getOrders($filter_data);
$this->load->model('module/wuunder');
$this->load->model('extension/module/wuunder');
foreach ($results as $result) {
$label_info = $this->load->controller('module/wuunder/getLabelInfo', $result['order_id']);
if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' && $_SERVER['HTTPS']) {
$protocol = "https://";
$label_info = $this->load->controller('extension/module/wuunder/getLabelInfo', $result['order_id']);
if (isset($this->request->server['HTTPS']) && (($this->request->server['HTTPS'] == 'on') || ($this->request->server['HTTPS'] == '1'))) {
$base = HTTP_SERVER;
} else {
$protocol = "http://";
$base = HTTPS_SERVER;
}
$data['orders'][] = array(
'order_id' => $result['order_id'],
'label_id' => ($label_info ? $label_info['label_id'] : null),
'label_url' => ($label_info ? $label_info['label_url'] : null),
'label_tt_url' => ($label_info ? $label_info['label_tt_url'] : null),
'booking_url' => ($label_info ? $label_info['booking_url'] : null),
'order_status_code' => $this->model_module_wuunder->getOrderStatusCode($result['order_id']),
'generate_booking_url' => $protocol . $this->request->server['SERVER_NAME'] . "/admin/index.php?route=module/wuunder/generateBookingUrl&order=" . $result['order_id'] . "&token=" . $this->session->data['token'],
'base' => $base,
'order_status_code' => $this->model_extension_module_wuunder->getOrderStatusCode($result['order_id']),
'generate_booking_url' => $base . "index.php?route=extension/module/wuunder/generateBookingUrl&order=" . $result['order_id'] . "&token=" . $this->session->data['token'],
]]></add>
</operation>
<operation info="add warning info">
Expand All @@ -42,7 +45,7 @@
]]></search>
<add><![CDATA[
if (array_key_exists("label", $_REQUEST) && $_REQUEST['label'] === "created") {
$data['success'] = $label_info = $this->load->controller('module/wuunder/getLabelCreatedMessage');
$data['success'] = $label_info = $this->load->controller('extension/module/wuunder/getLabelCreatedMessage');
}
if (isset($this->request->post['selected'])) {
]]></add>
Expand Down
8 changes: 4 additions & 4 deletions vqmod/xml/orders_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
<ul class="wuunder-icons">
<?php if (is_null($order['label_id'])) {
if (is_null($order['booking_url']) || empty($order['booking_url'])) { ?>
<a href="<?php echo $order['generate_booking_url']; ?>" title="<?php echo $create_label; ?>"><img class="wuunder-icon" src="/admin/view/image/wuunder/create-label.png"/></a>
<a href="<?php echo $order['generate_booking_url']; ?>" title="<?php echo $create_label; ?>"><img class="wuunder-icon" src="<?php echo $order['base']; ?>view/image/wuunder/create-label.png"/></a>
<?php } else { ?>
<a href="<?php echo $order['booking_url']; ?>" title="<?php echo $create_label; ?>"><img class="wuunder-icon" src="/admin/view/image/wuunder/create-label.png" /></a>
<a href="<?php echo $order['booking_url']; ?>" title="<?php echo $create_label; ?>"><img class="wuunder-icon" src="<?php echo $order['base']; ?>view/image/wuunder/create-label.png" /></a>
<?php }
} else { ?>
<a href="<?php echo $order['label_url']; ?>" title="<?php echo $download_label; ?>" target="_blank"><img class="wuunder-icon" src="/admin/view/image/wuunder/print-label.png" /></a>
<a href="<?php echo $order['label_tt_url']; ?>" title="<?php echo $follow_shipment; ?>" target="_blank"><img class="wuunder-icon" src="/admin/view/image/wuunder/in-transit.png" /></a>
<a href="<?php echo $order['label_url']; ?>" title="<?php echo $download_label; ?>" target="_blank"><img class="wuunder-icon" src="<?php echo $order['base']; ?>view/image/wuunder/print-label.png" /></a>
<a href="<?php echo $order['label_tt_url']; ?>" title="<?php echo $follow_shipment; ?>" target="_blank"><img class="wuunder-icon" src="<?php echo $order['base']; ?>view/image/wuunder/in-transit.png" /></a>
<?php } ?>
</ul>
<a href="<?php echo $order['view']; ?>
Expand Down

0 comments on commit 32c0521

Please sign in to comment.