diff --git a/src/GatewayResolver.php b/src/GatewayResolver.php index db606619..593c0a5b 100644 --- a/src/GatewayResolver.php +++ b/src/GatewayResolver.php @@ -79,7 +79,7 @@ public function __call($name, $arguments) */ function getTable() { - return DB::table($this->config->get('gateway.db_tables.transactions')); + return DB::table($this->config->get('gateway.table')); } /** diff --git a/src/JahanPay/JahanPay.php b/src/JahanPay/JahanPay.php index b3fd988e..b6995735 100644 --- a/src/JahanPay/JahanPay.php +++ b/src/JahanPay/JahanPay.php @@ -2,6 +2,7 @@ namespace Larabookir\Gateway\JahanPay; +use Illuminate\Support\Facades\Input; use Larabookir\Gateway\Enum; use SoapClient; use Larabookir\Gateway\PortAbstract; @@ -133,7 +134,7 @@ protected function sendPayRequest() */ protected function userPayment() { - $refId = @$_GET['au']; + $refId = Input::get('au'); if ($this->refId() != $refId) { $this->transactionFailed(); diff --git a/src/Mellat/Mellat.php b/src/Mellat/Mellat.php index 854ba5c3..79d7a6af 100644 --- a/src/Mellat/Mellat.php +++ b/src/Mellat/Mellat.php @@ -3,6 +3,7 @@ namespace Larabookir\Gateway\Mellat; use DateTime; +use Illuminate\Support\Facades\Input; use Larabookir\Gateway\Enum; use SoapClient; use Larabookir\Gateway\PortAbstract; @@ -139,10 +140,10 @@ protected function sendPayRequest() */ protected function userPayment() { - $this->refId = @$_POST['RefId']; - $this->trackingCode = @$_POST['SaleReferenceId']; - $this->cardNumber = @$_POST['CardHolderPan']; - $payRequestResCode = @$_POST['ResCode']; + $this->refId = Input::get('RefId'); + $this->trackingCode = Input::get('SaleReferenceId'); + $this->cardNumber = Input::get('CardHolderPan'); + $payRequestResCode = Input::get('ResCode'); if ($payRequestResCode == '0') { return true; diff --git a/src/Parsian/Parsian.php b/src/Parsian/Parsian.php index ceee4b77..f10e0ebd 100644 --- a/src/Parsian/Parsian.php +++ b/src/Parsian/Parsian.php @@ -2,6 +2,7 @@ namespace Larabookir\Gateway\Parsian; +use Illuminate\Support\Facades\Input; use SoapClient; use Larabookir\Gateway\PortAbstract; use Larabookir\Gateway\PortInterface; @@ -144,11 +145,11 @@ protected function sendPayRequest() */ protected function verifyPayment() { - if (!isset($_REQUEST['au']) && !isset($_REQUEST['rs'])) + if (!isset(Input::get('au')) && !isset(Input::get('rs'))) throw new ParsianErrorException('درخواست غیر معتبر', -1); - $authority = $_REQUEST['au']; - $status = $_REQUEST['rs']; + $authority = Input::get('au'); + $status = Input::get('rs'); if ($status != 0) { $errorMessage = ParsianResult::errorMessage($status); diff --git a/src/Payline/Payline.php b/src/Payline/Payline.php index d3576fa1..bcfdf798 100644 --- a/src/Payline/Payline.php +++ b/src/Payline/Payline.php @@ -2,6 +2,7 @@ namespace Larabookir\Gateway\Payline; +use Illuminate\Support\Facades\Input; use Larabookir\Gateway\Enum; use Larabookir\Gateway\PortAbstract; use Larabookir\Gateway\PortInterface; @@ -140,8 +141,8 @@ protected function sendPayRequest() */ protected function userPayment() { - $this->refIf = @$_POST['id_get']; - $trackingCode = @$_POST['trans_id']; + $this->refIf = Input::get('id_get'); + $trackingCode = Input::get('trans_id'); if (is_numeric($trackingCode) && $trackingCode > 0) { $this->trackingCode = $trackingCode; diff --git a/src/PortAbstract.php b/src/PortAbstract.php index 8360e595..d837ca10 100644 --- a/src/PortAbstract.php +++ b/src/PortAbstract.php @@ -1,7 +1,9 @@ db->table($this->config->get('gateway.db_tables.transactions')); + return $this->db->table($this->config->get('gateway.table')); } /** @@ -94,7 +96,7 @@ function getTable() */ function getLogTable() { - return $this->db->table($this->config->get('gateway.db_tables.logs')); + return $this->db->table($this->config->get('gateway.table') . '_logs'); } /** @@ -114,7 +116,7 @@ function getPortName() */ function setPortName($name) { - $this->portName=$name; + $this->portName = $name; } /** @@ -158,7 +160,8 @@ function refId() * @param $price * @return mixed */ - function price($price){ + function price($price) + { return $this->set($price); } @@ -191,8 +194,9 @@ protected function newTransaction() 'port' => $this->getPortName(), 'price' => $this->amount, 'status' => Enum::TRANSACTION_INIT, - 'created_at' => time(), - 'updated_at' => time(), + 'ip' => Request::getClientIp(), + 'created_at' => Carbon::now(), + 'updated_at' => Carbon::now(), ]); return $this->transactionId; @@ -210,8 +214,8 @@ protected function transactionSucceed() 'status' => Enum::TRANSACTION_SUCCEED, 'tracking_code' => $this->trackingCode, 'card_number' => $this->cardNumber, - 'payment_date' => time(), - 'updated_at' => time(), + 'payment_date' => Carbon::now(), + 'updated_at' => Carbon::now(), ]); } @@ -225,7 +229,7 @@ protected function transactionFailed() { return $this->getTable()->whereId($this->transactionId)->update([ 'status' => Enum::TRANSACTION_FAILED, - 'updated_at' => time(), + 'updated_at' => Carbon::now(), ]); } @@ -238,7 +242,7 @@ protected function transactionSetRefId() { return $this->getTable()->whereId($this->transactionId)->update([ 'ref_id' => $this->refId, - 'updated_at' => time(), + 'updated_at' => Carbon::now(), ]); } @@ -255,7 +259,7 @@ protected function newLog($statusCode, $statusMessage) 'transaction_id' => $this->transactionId, 'result_code' => $statusCode, 'result_message' => $statusMessage, - 'log_date' => time(), + 'log_date' => Carbon::now(), ]); } diff --git a/src/Zarinpal/Zarinpal.php b/src/Zarinpal/Zarinpal.php index 2cdecdb1..ff04d539 100644 --- a/src/Zarinpal/Zarinpal.php +++ b/src/Zarinpal/Zarinpal.php @@ -3,6 +3,7 @@ namespace Larabookir\Gateway\Zarinpal; use DateTime; +use Illuminate\Support\Facades\Input; use Larabookir\Gateway\Enum; use SoapClient; use Larabookir\Gateway\PortAbstract; @@ -173,8 +174,8 @@ protected function sendPayRequest() */ protected function userPayment() { - $this->authority = @$_GET['Authority']; - $status = @$_GET['Status']; + $this->authority = Input::get('Authority'); + $status = Input::get('Status'); if ($status == 'OK') { return true; diff --git a/src/config/gateway.php b/src/config/gateway.php index e0edbee8..7c44c528 100644 --- a/src/config/gateway.php +++ b/src/config/gateway.php @@ -68,8 +68,5 @@ //------------------------------- // Tables names //-------------------------------- - 'db_tables' => [ - 'transactions' => 'gateway_transactions', - 'logs' => 'gateway_status_log', - ], + 'table'=>=> 'gateway_transactions', ]; diff --git a/src/migrations/2016_05_02_193213_create_gateway_transactions_table.php b/src/migrations/2016_05_02_193213_create_gateway_transactions_table.php index 5a68abd1..52af1d42 100644 --- a/src/migrations/2016_05_02_193213_create_gateway_transactions_table.php +++ b/src/migrations/2016_05_02_193213_create_gateway_transactions_table.php @@ -8,11 +8,9 @@ class CreateGatewayTransactionsTable extends Migration { - private $table = 'gateway_transactions'; - function getTable() { - return config('gateway.db_tables.transactions', $this->table); + return config('gateway.table', 'gateway_transactions'); } /** @@ -42,8 +40,8 @@ public function up() Enum::TRANSACTION_SUCCEED, Enum::TRANSACTION_FAILED, ])->default(Enum::TRANSACTION_INIT); + $table->string('ip', 20)->nullable(); $table->timestamp('payment_date')->nullable(); - $table->timestamps(); }); } diff --git a/src/migrations/2016_05_02_193229_create_gateway_status_log_table.php b/src/migrations/2016_05_02_193229_create_gateway_status_log_table.php index 8b55099f..857622e4 100644 --- a/src/migrations/2016_05_02_193229_create_gateway_status_log_table.php +++ b/src/migrations/2016_05_02_193229_create_gateway_status_log_table.php @@ -5,11 +5,10 @@ class CreateGatewayStatusLogTable extends Migration { - private $table = 'gateway_status_log'; function getTable() { - return config('gateway.db_tables.logs',$this->table); + return config('gateway.table','gateway_transactions').'_logs'; } /** * Run the migrations.