|
|
|
|
218
|
$data["status"] = $order->status;
|
218
|
$data["status"] = $order->status;
|
219
|
$data["price"] = $order->price;
|
219
|
$data["price"] = $order->price;
|
220
|
$data["order_type"] = $order->order_type;
|
220
|
$data["order_type"] = $order->order_type;
|
221
|
- $data["photo"] = preg_split(";", $order->photo)[0];
|
|
|
|
|
221
|
+ $data["photo"] = preg_split("/;/", $order->photo)[0];
|
222
|
$data["created_at"] = $order->created_at->toDateTimeString();
|
222
|
$data["created_at"] = $order->created_at->toDateTimeString();
|
223
|
if($order->comment_id) {
|
223
|
if($order->comment_id) {
|
224
|
$data["comment"] = true;
|
224
|
$data["comment"] = true;
|
|
|
|
|
255
|
$productTmp["classify"] = $prd["classify"];
|
255
|
$productTmp["classify"] = $prd["classify"];
|
256
|
$productTmp["color"] = $prd["color"];
|
256
|
$productTmp["color"] = $prd["color"];
|
257
|
$productTmp["price"] = $prd["price"];
|
257
|
$productTmp["price"] = $prd["price"];
|
258
|
- $productTmp["photo"] = preg_split(";", $prd["photo"])[0];
|
|
|
|
|
258
|
+ $productTmp["photo"] = preg_split("/;/", $prd["photo"])[0];
|
259
|
$productTmp["amount"] = $prd["pivot"]["product_amount"];
|
259
|
$productTmp["amount"] = $prd["pivot"]["product_amount"];
|
260
|
array_push($data["products"], $productTmp);
|
260
|
array_push($data["products"], $productTmp);
|
261
|
}
|
261
|
}
|