|
@@ -60,7 +60,7 @@ discard block |
|
|
block discarded – undo |
|
60
|
60
|
if (filter_input(INPUT_GET, 'id') !== null && filter_input(INPUT_GET, 'action') === 'show') { |
|
61
|
61
|
$iId = \filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT); |
|
62
|
62
|
|
|
63
|
|
- $sql = 'SELECT * FROM ' . 'orders WHERE o_id = :id AND o_custno = \'' . $_SESSION['user']['cust_no'] . '\' AND o_ordercompleted != \'d\''; |
|
|
63
|
+ $sql = 'SELECT * FROM '.'orders WHERE o_id = :id AND o_custno = \''.$_SESSION['user']['cust_no'].'\' AND o_ordercompleted != \'d\''; |
|
64
|
64
|
$hResult = $this->db->prepare($sql); |
|
65
|
65
|
$hResult->bindValue(':id', $iId); |
|
66
|
66
|
$hResult->execute(); |
|
@@ -73,7 +73,7 @@ discard block |
|
|
block discarded – undo |
|
73
|
73
|
$aOrder['o_ordertimestamp'] |
|
74
|
74
|
); |
|
75
|
75
|
$this->P->cb_customdata['orderdata']['orderremarks'] = $aOrder['o_remarks']; |
|
76
|
|
- $this->P->cb_customdata['orderdata']['paymentmethod'] = $this->textcats->T('order_paymentmethod_' . $aOrder['o_paymentmethod']); |
|
|
76
|
+ $this->P->cb_customdata['orderdata']['paymentmethod'] = $this->textcats->T('order_paymentmethod_'.$aOrder['o_paymentmethod']); |
|
77
|
77
|
$this->P->cb_customdata['orderdata']['paymentcompleted'] = (($aOrder['o_paymentcompleted'] === 'y') ? $this->textcats->T('myorders_paymentstatus_completed') : $this->textcats->T('myorders_paymentstatus_open')); |
|
78
|
78
|
$this->P->cb_customdata['orderdata']['orderstatus'] = $this->helperShop->showOrderStatusText($this->textcats, $aOrder['o_ordercompleted']); |
|
79
|
79
|
$this->P->cb_customdata['orderdata']['shippingservice'] = $aOrder['o_shipping_service']; |
|
@@ -115,12 +115,12 @@ discard block |
|
|
block discarded – undo |
|
115
|
115
|
} |
|
116
|
116
|
} else { |
|
117
|
117
|
$COList = [ |
|
118
|
|
- ['title' => $this->textcats->T('order_head_orderdate'), 'key' => 'o_ordertime', 'width' => 110, 'linked' => false,], |
|
119
|
|
- ['title' => $this->textcats->T('order_head_paymenthethod'), 'key' => 'o_paymentmethod', 'width' => 125, 'linked' => false,], |
|
120
|
|
- ['title' => $this->textcats->T('order_head_paid'), 'key' => 'o_paymentcompleted', 'width' => 60, 'linked' => false,], |
|
121
|
|
- ['title' => $this->textcats->T('order_head_status'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false,], |
|
122
|
|
- ['title' => $this->textcats->T('order_head_shipping_service'), 'key' => 'o_shipping_service', 'width' => 90, 'linked' => false,], |
|
123
|
|
- ['title' => $this->textcats->T('order_head_shipping_trackingno'), 'key' => 'o_shipping_trackingno', 'width' => 130, 'linked' => false,], |
|
|
118
|
+ ['title' => $this->textcats->T('order_head_orderdate'), 'key' => 'o_ordertime', 'width' => 110, 'linked' => false, ], |
|
|
119
|
+ ['title' => $this->textcats->T('order_head_paymenthethod'), 'key' => 'o_paymentmethod', 'width' => 125, 'linked' => false, ], |
|
|
120
|
+ ['title' => $this->textcats->T('order_head_paid'), 'key' => 'o_paymentcompleted', 'width' => 60, 'linked' => false, ], |
|
|
121
|
+ ['title' => $this->textcats->T('order_head_status'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false, ], |
|
|
122
|
+ ['title' => $this->textcats->T('order_head_shipping_service'), 'key' => 'o_shipping_service', 'width' => 90, 'linked' => false, ], |
|
|
123
|
+ ['title' => $this->textcats->T('order_head_shipping_trackingno'), 'key' => 'o_shipping_trackingno', 'width' => 130, 'linked' => false, ], |
|
124
|
124
|
[ |
|
125
|
125
|
'title' => $this->textcats->T('order_show'), |
|
126
|
126
|
'key' => 'o_id', |
|
@@ -128,7 +128,7 @@ discard block |
|
|
block discarded – undo |
|
128
|
128
|
'linked' => true, |
|
129
|
129
|
'ltarget' => '/_misc/myorders.html', |
|
130
|
130
|
'lkeyname' => 'id', |
|
131
|
|
- 'lgetvars' => ['action' => 'show',], |
|
|
131
|
+ 'lgetvars' => ['action' => 'show', ], |
|
132
|
132
|
], |
|
133
|
133
|
]; |
|
134
|
134
|
|
HaaseIT /
HCSF
