diff --git a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php index 649009dcd7a6..96d072994941 100644 --- a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php +++ b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php @@ -64,11 +64,11 @@ class AuthorizePaymentMethod } - public function authorizeResponseView($payment_method, $data) + public function authorizeResponseView($data) { - $this->payment_method = $payment_method; + $this->payment_method = $data['payment_method_id']; - switch ($payment_method) { + switch ($this->payment_method) { case GatewayType::CREDIT_CARD: return $this->authorizeCreditCardResponse($data); break; diff --git a/app/PaymentDrivers/AuthorizePaymentDriver.php b/app/PaymentDrivers/AuthorizePaymentDriver.php index bc83570df46c..d9a60dd5cdb5 100644 --- a/app/PaymentDrivers/AuthorizePaymentDriver.php +++ b/app/PaymentDrivers/AuthorizePaymentDriver.php @@ -102,7 +102,7 @@ class AuthorizePaymentDriver extends BaseDriver public function authorizeResponseView(array $data) { - return (new AuthorizePaymentMethod($this))->authorizeResponseView($data['gateway_type_id'], $data); + return (new AuthorizePaymentMethod($this))->authorizeResponseView($data); } public function authorize($payment_method) diff --git a/database/seeds/RandomDataSeeder.php b/database/seeds/RandomDataSeeder.php index 855dfecf51dc..c4eed11060dc 100644 --- a/database/seeds/RandomDataSeeder.php +++ b/database/seeds/RandomDataSeeder.php @@ -265,29 +265,29 @@ class RandomDataSeeder extends Seeder ]); - if (config('ninja.testvars.stripe')) { - $cg = new CompanyGateway; - $cg->company_id = $company->id; - $cg->user_id = $user->id; - $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; - $cg->require_cvv = true; - $cg->show_billing_address = true; - $cg->show_shipping_address = true; - $cg->update_details = true; - $cg->config = encrypt(config('ninja.testvars.stripe')); - $cg->save(); + // if (config('ninja.testvars.stripe')) { + // $cg = new CompanyGateway; + // $cg->company_id = $company->id; + // $cg->user_id = $user->id; + // $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; + // $cg->require_cvv = true; + // $cg->show_billing_address = true; + // $cg->show_shipping_address = true; + // $cg->update_details = true; + // $cg->config = encrypt(config('ninja.testvars.stripe')); + // $cg->save(); - $cg = new CompanyGateway; - $cg->company_id = $company->id; - $cg->user_id = $user->id; - $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; - $cg->require_cvv = true; - $cg->show_billing_address = true; - $cg->show_shipping_address = true; - $cg->update_details = true; - $cg->config = encrypt(config('ninja.testvars.stripe')); - $cg->save(); - } + // $cg = new CompanyGateway; + // $cg->company_id = $company->id; + // $cg->user_id = $user->id; + // $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; + // $cg->require_cvv = true; + // $cg->show_billing_address = true; + // $cg->show_shipping_address = true; + // $cg->update_details = true; + // $cg->config = encrypt(config('ninja.testvars.stripe')); + // $cg->save(); + // } // if (config('ninja.testvars.paypal')) { // $cg = new CompanyGateway; @@ -315,18 +315,18 @@ class RandomDataSeeder extends Seeder // $cg->save(); // } - // if(config('ninja.testvars.authorize')) { - // $cg = new CompanyGateway; - // $cg->company_id = $company->id; - // $cg->user_id = $user->id; - // $cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb'; - // $cg->require_cvv = true; - // $cg->show_billing_address = true; - // $cg->show_shipping_address = true; - // $cg->update_details = true; - // $cg->config = encrypt(config('ninja.testvars.authorize')); - // $cg->save(); - // } + if(config('ninja.testvars.authorize')) { + $cg = new CompanyGateway; + $cg->company_id = $company->id; + $cg->user_id = $user->id; + $cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb'; + $cg->require_cvv = true; + $cg->show_billing_address = true; + $cg->show_shipping_address = true; + $cg->update_details = true; + $cg->config = encrypt(config('ninja.testvars.authorize')); + $cg->save(); + } } } diff --git a/public/js/clients/payment_methods/authorize-authorize-card.js b/public/js/clients/payment_methods/authorize-authorize-card.js index 9e3b91b50224..c09786af1ac1 100644 --- a/public/js/clients/payment_methods/authorize-authorize-card.js +++ b/public/js/clients/payment_methods/authorize-authorize-card.js @@ -1 +1,2 @@ -!function(e){var t={};function n(a){if(t[a])return t[a].exports;var r=t[a]={i:a,l:!1,exports:{}};return e[a].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,a){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:a})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var a=Object.create(null);if(n.r(a),Object.defineProperty(a,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(a,r,function(t){return e[t]}.bind(null,r));return a},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=2)}({2:function(e,t,n){e.exports=n("6vDv")},"6vDv":function(e,t){function n(e,t){for(var n=0;n { - document.getElementById("card_number").addEventListener('keyup', (e) => { - let errors = document.getElementById('card_number_errors'); - if (valid.number(e.target.value).isValid) { - errors.hidden = true; - this.form.valid = true; - } else { - errors.textContent = this.translations.invalidCard; - errors.hidden = false; - this.form.valid = false; - } - }); - - document.getElementById("expiration_month").addEventListener('keyup', (e) => { - let errors = document.getElementById('expiration_month_errors'); - if (valid.expirationMonth(e.target.value).isValid) { - errors.hidden = true; - this.form.valid = true; - } else { - errors.textContent = this.translations.invalidMonth; - errors.hidden = false; - this.form.valid = false; - } - }); - - document.getElementById("expiration_year").addEventListener('keyup', (e) => { - let errors = document.getElementById('expiration_year_errors'); - if (valid.expirationYear(e.target.value).isValid) { - errors.hidden = true; - this.form.valid = true; - } else { - errors.textContent = this.translations.invalidYear; - errors.hidden = false; - this.form.valid = false; - } - }); - } - handle() { - this.handleFormValidation(); + //this.handleFormValidation(); // At this point as an small API you can request this.form.valid to check if input elements are valid. // Note: this.form.valid will not handle empty fields. this.cardButton.addEventListener("click", () => { this.cardButton.disabled = !this.cardButton.disabled; - // this.handleAuthorization(); + this.handleAuthorization(); }); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 42c5f2bfaf78..80dce68b9f4c 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3224,4 +3224,6 @@ return [ 'year_invalid' => 'Provided year is not valid.', 'if_you_need_help' => 'If you need help you can either post to our', + 'https_required' => 'HTTPS is required, form will fail', + ]; diff --git a/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php b/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php index 74c9c03f02d6..1249b394c48e 100644 --- a/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php +++ b/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php @@ -30,6 +30,9 @@
+ @if(!Request::isSecure()) +

{{ ctrans('texts.https_required') }}

+ @endif