|
@@ -67,7 +67,7 @@ class Yspay extends Core
|
|
|
|
|
|
if ($sign == $string) {
|
|
|
if (isset($this->config['prefix']) && $this->config['prefix']) {
|
|
|
- $input['merOrderId'] = str_replace($this->config['prefix'] . '_', '', $input['merOrderId']);
|
|
|
+ $input['merOrderId'] = str_replace($this->config['prefix'], '', $input['merOrderId']);
|
|
|
}
|
|
|
$this->updateOrder($input['merOrderId'], $input['totalAmount']);
|
|
|
echo 'SUCCESS';die;
|
|
@@ -84,7 +84,7 @@ class Yspay extends Core
|
|
|
$order_id = $this->createOrder($uid, $username, $account_id, $project_id, $product_id, $name, $cash, $this->config['type'], $order_id);
|
|
|
|
|
|
if (isset($this->config['prefix']) && $this->config['prefix']) {
|
|
|
- $request['merOrderId'] = $this->config['prefix'] . '_' . $order_id;
|
|
|
+ $request['merOrderId'] = $this->config['prefix'] . $order_id;
|
|
|
} else {
|
|
|
$request['merOrderId'] = $order_id;
|
|
|
}
|
|
@@ -110,7 +110,7 @@ class Yspay extends Core
|
|
|
$request['subOrders'] = array();
|
|
|
$request['subOrders']['mid'] = $other['mid'];
|
|
|
if (isset($this->config['prefix']) && $this->config['prefix']) {
|
|
|
- $request['subOrders']['merOrderId'] = $this->config['prefix'] . '_' . $other['order_id'];
|
|
|
+ $request['subOrders']['merOrderId'] = $this->config['prefix'] . $other['order_id'];
|
|
|
} else {
|
|
|
$request['subOrders']['merOrderId'] = $other['order_id'];
|
|
|
}
|
|
@@ -160,9 +160,9 @@ class Yspay extends Core
|
|
|
public function refund($order_id, $cash, $order, $refund_order_id = false)
|
|
|
{
|
|
|
if (isset($this->config['prefix']) && $this->config['prefix']) {
|
|
|
- $request['merOrderId'] = $this->config['prefix'] . '_' . $order_id;
|
|
|
+ $request['merOrderId'] = $this->config['prefix'] . $order_id;
|
|
|
if ($refund_order_id) {
|
|
|
- $request['refundOrderId'] = $this->config['prefix'] . '_' . $refund_order_id;
|
|
|
+ $request['refundOrderId'] = $this->config['prefix'] . $refund_order_id;
|
|
|
}
|
|
|
} else {
|
|
|
$request['merOrderId'] = $order_id;
|
|
@@ -188,9 +188,9 @@ class Yspay extends Core
|
|
|
$request['subOrders'] = array();
|
|
|
$request['subOrders']['mid'] = $other['mid'];
|
|
|
if (isset($this->config['prefix']) && $this->config['prefix']) {
|
|
|
- $request['subOrders']['merOrderId'] = $this->config['prefix'] . '_' . $other['order_id'];
|
|
|
+ $request['subOrders']['merOrderId'] = $this->config['prefix'] . $other['order_id'];
|
|
|
if ($refund_order_id) {
|
|
|
- $request['subOrders']['refundOrderId'] = $this->config['prefix'] . '_' . $refund_order_id;
|
|
|
+ $request['subOrders']['refundOrderId'] = $this->config['prefix'] . $refund_order_id;
|
|
|
}
|
|
|
} else {
|
|
|
$request['subOrders']['merOrderId'] = $other['order_id'];
|