From 8438b1ed870119359004bf84d5b2af26b25af456 Mon Sep 17 00:00:00 2001 From: Kishan Patel Date: Thu, 4 Aug 2022 19:32:15 +0530 Subject: [PATCH 1/2] system logger added for Forte. --- app/Models/CompanyGateway.php | 2 ++ app/Models/SystemLog.php | 3 +++ app/PaymentDrivers/Forte/ACH.php | 25 ++++++++++++++++++++++ app/PaymentDrivers/Forte/CreditCard.php | 26 +++++++++++++++++++++++ app/PaymentDrivers/FortePaymentDriver.php | 2 +- public/main.dart.js | 1 + public/main.foss.dart.js | 1 + public/main.html.dart.js | 1 + public/main.last.dart.js | 1 + public/main.next.dart.js | 1 + public/main.profile.dart.js | 2 ++ public/main.wasm.dart.js | 1 + 12 files changed, 65 insertions(+), 1 deletion(-) diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index 68c5ef318d59..0942bbf6bcc4 100644 --- a/app/Models/CompanyGateway.php +++ b/app/Models/CompanyGateway.php @@ -73,6 +73,7 @@ class CompanyGateway extends BaseModel // const TYPE_WEPAY = 309; // const TYPE_PAYFAST = 310; // const TYPE_PAYTRACE = 311; + // const TYPE_FORTE = 314; public $gateway_consts = [ '38f2c48af60c7dd69e04248cbb24c36e' => 300, @@ -85,6 +86,7 @@ class CompanyGateway extends BaseModel '8fdeed552015b3c7b44ed6c8ebd9e992' => 309, 'd6814fc83f45d2935e7777071e629ef9' => 310, 'bbd736b3254b0aabed6ad7fda1298c88' => 311, + 'kivcvjexxvdiyqtj3mju5d6yhpeht2xs' => 314, '65faab2ab6e3223dbe848b1686490baz' => 320, 'b9886f9257f0c6ee7c302f1c74475f6c' => 321, 'hxd6gwg3ekb9tb3v9lptgx1mqyg69zu9' => 322, diff --git a/app/Models/SystemLog.php b/app/Models/SystemLog.php index 6cdeb9969d0f..6fde23135d15 100644 --- a/app/Models/SystemLog.php +++ b/app/Models/SystemLog.php @@ -73,6 +73,7 @@ class SystemLog extends Model const TYPE_PAYTRACE = 311; const TYPE_MOLLIE = 312; const TYPE_EWAY = 313; + const TYPE_FORTE = 314; const TYPE_SQUARE = 320; const TYPE_GOCARDLESS = 321; const TYPE_RAZORPAY = 322; @@ -217,6 +218,8 @@ class SystemLog extends Model return "WePay"; case self::TYPE_PAYFAST: return "Payfast"; + case self::TYPE_FORTE: + return "Forte"; default: return 'undefined'; } diff --git a/app/PaymentDrivers/Forte/ACH.php b/app/PaymentDrivers/Forte/ACH.php index 4795f956d6d0..426f96717f71 100644 --- a/app/PaymentDrivers/Forte/ACH.php +++ b/app/PaymentDrivers/Forte/ACH.php @@ -20,6 +20,8 @@ use App\Http\Requests\Request; use App\Utils\Traits\MakesHash; use Illuminate\Support\Facades\Validator; use App\PaymentDrivers\FortePaymentDriver; +use App\Jobs\Util\SystemLogger; +use App\Models\SystemLog; class ACH { @@ -129,13 +131,36 @@ class ACH } catch (\Throwable $th) { throw $th; } + + $message = [ + 'server_message' => $response->response->response_desc, + 'server_response' => $response, + 'data' => $payment_hash->data, + ]; if ($httpcode>299) { + SystemLogger::dispatch( + $message, + SystemLog::CATEGORY_GATEWAY_RESPONSE, + SystemLog::EVENT_GATEWAY_FAILURE, + SystemLog::TYPE_FORTE, + $this->forte->client, + $this->forte->client->company, + ); $error = Validator::make([], []); $error->getMessageBag()->add('gateway_error', $response->response->response_desc); return redirect('client/invoices')->withErrors($error); } + SystemLogger::dispatch( + $message, + SystemLog::CATEGORY_GATEWAY_RESPONSE, + SystemLog::EVENT_GATEWAY_SUCCESS, + SystemLog::TYPE_FORTE, + $this->forte->client, + $this->forte->client->company, + ); + $data = [ 'payment_method' => $request->payment_method_id, 'payment_type' => PaymentType::ACH, diff --git a/app/PaymentDrivers/Forte/CreditCard.php b/app/PaymentDrivers/Forte/CreditCard.php index ad599f32f925..88d8007780d2 100644 --- a/app/PaymentDrivers/Forte/CreditCard.php +++ b/app/PaymentDrivers/Forte/CreditCard.php @@ -21,6 +21,8 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Validator; use App\PaymentDrivers\FortePaymentDriver; use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest; +use App\Jobs\Util\SystemLogger; +use App\Models\SystemLog; class CreditCard { @@ -141,12 +143,36 @@ class CreditCard } catch (\Throwable $th) { throw $th; } + + $message = [ + 'server_message' => $response->response->response_desc, + 'server_response' => $response, + 'data' => $payment_hash->data, + ]; + if ($httpcode>299) { + SystemLogger::dispatch( + $message, + SystemLog::CATEGORY_GATEWAY_RESPONSE, + SystemLog::EVENT_GATEWAY_FAILURE, + SystemLog::TYPE_FORTE, + $this->forte->client, + $this->forte->client->company, + ); $error = Validator::make([], []); $error->getMessageBag()->add('gateway_error', $response->response->response_desc); return redirect('client/invoices')->withErrors($error); } + SystemLogger::dispatch( + $message, + SystemLog::CATEGORY_GATEWAY_RESPONSE, + SystemLog::EVENT_GATEWAY_SUCCESS, + SystemLog::TYPE_FORTE, + $this->forte->client, + $this->forte->client->company, + ); + $data = [ 'payment_method' => $request->payment_method_id, 'payment_type' => PaymentType::parseCardType(strtolower($request->card_brand)) ?: PaymentType::CREDIT_CARD_OTHER, diff --git a/app/PaymentDrivers/FortePaymentDriver.php b/app/PaymentDrivers/FortePaymentDriver.php index e79df1dd96dd..b243908c2e00 100644 --- a/app/PaymentDrivers/FortePaymentDriver.php +++ b/app/PaymentDrivers/FortePaymentDriver.php @@ -49,7 +49,7 @@ class FortePaymentDriver extends BaseDriver return $types; } - const SYSTEM_LOG_TYPE = SystemLog::TYPE_STRIPE; //define a constant for your gateway ie TYPE_YOUR_CUSTOM_GATEWAY - set the const in the SystemLog model + const SYSTEM_LOG_TYPE = SystemLog::TYPE_FORTE; //define a constant for your gateway ie TYPE_YOUR_CUSTOM_GATEWAY - set the const in the SystemLog model public function setPaymentMethod($payment_method_id) { diff --git a/public/main.dart.js b/public/main.dart.js index 345944cdc466..0d00710e4970 100755 --- a/public/main.dart.js +++ b/public/main.dart.js @@ -173573,6 +173573,7 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" +case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.foss.dart.js b/public/main.foss.dart.js index afc643488256..cad115fd4c9e 100644 --- a/public/main.foss.dart.js +++ b/public/main.foss.dart.js @@ -171806,6 +171806,7 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" +case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.html.dart.js b/public/main.html.dart.js index ec3f5ce5de69..55410fecab88 100644 --- a/public/main.html.dart.js +++ b/public/main.html.dart.js @@ -165860,6 +165860,7 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" +case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.last.dart.js b/public/main.last.dart.js index 526ad7045c07..91ac6a9a15d5 100644 --- a/public/main.last.dart.js +++ b/public/main.last.dart.js @@ -150388,6 +150388,7 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" +case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.next.dart.js b/public/main.next.dart.js index 3619c7dc20aa..3f6bc6c32199 100644 --- a/public/main.next.dart.js +++ b/public/main.next.dart.js @@ -171338,6 +171338,7 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" +case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js index 210ac114a508..7963a0371eef 100644 --- a/public/main.profile.dart.js +++ b/public/main.profile.dart.js @@ -329229,6 +329229,8 @@ return "Mollie"; case 313: return "eWay"; + case 314: + return "Forte"; case 320: return "Square"; case 400: diff --git a/public/main.wasm.dart.js b/public/main.wasm.dart.js index 4458e46d1a07..a33df130b89c 100644 --- a/public/main.wasm.dart.js +++ b/public/main.wasm.dart.js @@ -146310,6 +146310,7 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" +case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" From 504aa58df9e46839ccd3c8838190f574c597f8c0 Mon Sep 17 00:00:00 2001 From: Kishan Patel Date: Fri, 5 Aug 2022 07:37:03 +0530 Subject: [PATCH 2/2] case removed for forte in flutter. --- public/main.dart.js | 1 - public/main.foss.dart.js | 1 - public/main.html.dart.js | 1 - public/main.last.dart.js | 1 - public/main.next.dart.js | 1 - public/main.profile.dart.js | 2 -- public/main.wasm.dart.js | 1 - 7 files changed, 8 deletions(-) diff --git a/public/main.dart.js b/public/main.dart.js index 0d00710e4970..345944cdc466 100755 --- a/public/main.dart.js +++ b/public/main.dart.js @@ -173573,7 +173573,6 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" -case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.foss.dart.js b/public/main.foss.dart.js index cad115fd4c9e..afc643488256 100644 --- a/public/main.foss.dart.js +++ b/public/main.foss.dart.js @@ -171806,7 +171806,6 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" -case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.html.dart.js b/public/main.html.dart.js index 55410fecab88..ec3f5ce5de69 100644 --- a/public/main.html.dart.js +++ b/public/main.html.dart.js @@ -165860,7 +165860,6 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" -case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.last.dart.js b/public/main.last.dart.js index 91ac6a9a15d5..526ad7045c07 100644 --- a/public/main.last.dart.js +++ b/public/main.last.dart.js @@ -150388,7 +150388,6 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" -case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.next.dart.js b/public/main.next.dart.js index 3f6bc6c32199..3619c7dc20aa 100644 --- a/public/main.next.dart.js +++ b/public/main.next.dart.js @@ -171338,7 +171338,6 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" -case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure" diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js index 7963a0371eef..210ac114a508 100644 --- a/public/main.profile.dart.js +++ b/public/main.profile.dart.js @@ -329229,8 +329229,6 @@ return "Mollie"; case 313: return "eWay"; - case 314: - return "Forte"; case 320: return "Square"; case 400: diff --git a/public/main.wasm.dart.js b/public/main.wasm.dart.js index a33df130b89c..4458e46d1a07 100644 --- a/public/main.wasm.dart.js +++ b/public/main.wasm.dart.js @@ -146310,7 +146310,6 @@ case 310:return"PayFast" case 311:return"PayTrace" case 312:return"Mollie" case 313:return"eWay" -case 314:return"Forte" case 320:return"Square" case 400:return"quota_exceeded" case 401:return"upstream_failure"