diff --git a/app/Http/Controllers/Admin/TahesabController.php b/app/Http/Controllers/Admin/TahesabController.php index 40a05a1..6ae184c 100644 --- a/app/Http/Controllers/Admin/TahesabController.php +++ b/app/Http/Controllers/Admin/TahesabController.php @@ -17,15 +17,15 @@ use Hekmatinasser\Verta\Verta; class TahesabController extends Controller { - public function storeTrade($input = null) + public function storeTrade($data) { - if ($input instanceof \Illuminate\Http\Request) { - $data = $input->all(); - } elseif (is_array($input)) { - $data = $input; - } else { - $data = request()->all(); - } +// if ($input instanceof \Illuminate\Http\Request) { +// $data = $input->all(); +// } elseif (is_array($input)) { +// $data = $input; +// } else { +// $data = request()->all(); +// } // return ($data); if (!isset($data['customer_id']) || !isset($data['product']['amount'])) { @@ -53,6 +53,7 @@ class TahesabController extends Controller "customer_id" => $customer->id, "desc" => $data['direction'] == 1 ? "خرید آبشده" : "فروش آبشده", "amount" => $amount, + "order_id" => $data['order']['id'] ?? null, "date" => $data['pay_at'], "type" => $data['product']['metal_id'] == 1 ? "طلا" : "نقره", "created_at" => Carbon::now(), @@ -88,18 +89,20 @@ class TahesabController extends Controller $data['product']['metal_id'] == 1 ? 0 : 2, //Jens_Felez (string)Verta::instance($data['pay_at']), ] - ]); + ])->json(); } catch (Exception $e) { return $e->getMessage(); } if ($response['OK']) { - $tahesab->sh_factor = $response['Sh_factor']; - $tahesab->tahesab_id = $response['OK']; - $tahesab->factor_number = $response['Factor_Number']; - $tahesab->tah_id = $response['ID']; - $tahesab->res = $response; - $tahesab->data = $data; - $tahesab->save(); + Tahesab::where('id', $tahesab->id)->update([ + "sh_factor" => $response['Sh_factor'], + "tahesab_id" => $response['OK'], + "factor_number" => $response['Factor_Number'], + "tah_id" => $response['ID'], + "data" => json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT), + "res" => json_encode($response, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT), + ]); + return $data; } return false; @@ -139,6 +142,7 @@ class TahesabController extends Controller "customer_id" => $customer->id, "desc" => $data['direction'] == 0 ? "شارژ حساب" : "برداشت از حساب", "amount" => $data['value'], + "type" => "ريال", "date" => Carbon::now(), "created_at" => Carbon::now(), ]); @@ -177,6 +181,9 @@ class TahesabController extends Controller Tahesab::where('id', $tahesab->id)->update([ "sh_factor" => $response['Sh_factor'], "tahesab_id" => $response['OK'], + "tah_id" => $response['ID'], + "factor_number" => $response['Factor_Number'], + "data" => json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT), "res" => json_encode($response, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT), ]); diff --git a/app/Http/Controllers/Single/SingleOrderController.php b/app/Http/Controllers/Single/SingleOrderController.php index 21e547c..5d6af04 100644 --- a/app/Http/Controllers/Single/SingleOrderController.php +++ b/app/Http/Controllers/Single/SingleOrderController.php @@ -29,6 +29,11 @@ class SingleOrderController extends Controller { public function store(Request $request) { + $goldir = Cnt::where('key', 'goldir_closed')->first(); + if(isset($goldir) && $goldir['value'] == "true"){ + throw new UnprocessableEntityHttpException('عدم ارائه سرویس.'); + } + // throw new UnprocessableEntityHttpException('به دلیل نوسانات سفارشات بسته میباشد.'); $data = $request->all(); $transactionType = $data['direction'] == 1 ? "خرید" : "فروش"; @@ -157,7 +162,7 @@ class SingleOrderController extends Controller 'start_at' => now(), ], 1, true, false); $response['1'] = 2; - //send to liman + //send to Goldir $this->sendGoldir($data); return $response; } @@ -268,7 +273,7 @@ class SingleOrderController extends Controller 'order_id' => $order->id ], 2, false, true); - //send to liman + //send to Goldir $this->sendGoldir($data); } @@ -441,8 +446,8 @@ class SingleOrderController extends Controller { if ($this->Config('send_to_goldir') == "true") { - $liman_diff = Cnt::where('key', 'goldir_diff')->value('value'); - $liman_price = Cnt::where('key', 'goldir_price')->value('value'); +// $liman_diff = Cnt::where('key', 'goldir_diff')->value('value'); +// $liman_price = Cnt::where('key', 'goldir_price')->value('value'); $mazaneh = ($data['direction'] == 1) ? Cnt::where('key', 'goldir_truly_buy_mazaneh')->value('value') : Cnt::where('key', 'goldir_truly_sell_mazaneh')->value('value'); $cash = Cnt::where('key', 'goldir_price')->value('value') * $data['amount']; @@ -476,11 +481,11 @@ class SingleOrderController extends Controller throw new UnprocessableEntityHttpException('سفارشات توسط ارائه دهنده بسته شده است.'); } + $data['provider_id'] = $response[1]['id']; + return $response; } // $data['total_price_goldir'] = ($data['direction'] == 1) ? ($liman_price+$liman_diff) : ($liman_price-$liman_diff) ; - $data['provider_id'] = $response[1]['id']; - return $response; } public function storeBackUp(Request $request)