|
@@ -433,7 +433,7 @@ class Order extends Core
|
|
|
|
|
|
public function getOrderId($id)
|
|
|
{
|
|
|
- $info = Dever::db('act/order_temp')->one($id);
|
|
|
+ $info = Dever::db('act/order')->one($id);
|
|
|
if ($info['order_id']) {
|
|
|
return $info['order_id'] . '/' . $id;
|
|
|
}
|
|
@@ -441,6 +441,12 @@ class Order extends Core
|
|
|
return $this->createOrderId($info, $id) . '/' . $id;
|
|
|
}
|
|
|
|
|
|
+ public function getOrderTempId($id)
|
|
|
+ {
|
|
|
+ $info = Dever::db('act/order')->one($id);
|
|
|
+ return $this->createOrderId($info, $id) . '/' . $id;
|
|
|
+ }
|
|
|
+
|
|
|
public function getOrder($order_id)
|
|
|
{
|
|
|
if (!is_numeric($order_id)) {
|