From d61e7f57a2906899715612b3f67b734f23e13beb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 5 May 2021 16:21:37 +1000 Subject: [PATCH 1/2] Fixes for wepay --- app/Http/Controllers/WePayController.php | 2 +- .../ninja2020/gateways/wepay/signup/wepay-signup.blade.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/WePayController.php b/app/Http/Controllers/WePayController.php index 6dfe7496fbe8..978360948f88 100644 --- a/app/Http/Controllers/WePayController.php +++ b/app/Http/Controllers/WePayController.php @@ -44,8 +44,8 @@ class WePayController extends BaseController // $data['user_id'] = $this->encodePrimaryKey($hash['user_id']); // $data['company_key'] = $hash['company_key']; - $data['user_id'] = 1; $user = User::first(); + $data['user_id'] = $user->id; $data['company_key'] = $user->account->companies()->first()->company_key; diff --git a/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php b/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php index 5d61f82f9256..5a7f470e282d 100644 --- a/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php +++ b/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php @@ -82,6 +82,12 @@ +
+ + {{ ctrans('texts.standard_fees_apply')}} + +
+
From eb54e0705a7aedac6cd1b32cd2bd2550dcb4bf1c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 5 May 2021 16:51:45 +1000 Subject: [PATCH 2/2] We Pay logo --- public/images/wepay.svg | 383 ++++++++++++++++++ .../gateways/wepay/signup/index.blade.php | 5 + 2 files changed, 388 insertions(+) create mode 100644 public/images/wepay.svg diff --git a/public/images/wepay.svg b/public/images/wepay.svg new file mode 100644 index 000000000000..25f541e8c251 --- /dev/null +++ b/public/images/wepay.svg @@ -0,0 +1,383 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/portal/ninja2020/gateways/wepay/signup/index.blade.php b/resources/views/portal/ninja2020/gateways/wepay/signup/index.blade.php index f8df912e7ea4..2152b2a1a235 100644 --- a/resources/views/portal/ninja2020/gateways/wepay/signup/index.blade.php +++ b/resources/views/portal/ninja2020/gateways/wepay/signup/index.blade.php @@ -2,6 +2,11 @@ @section('meta_title', ctrans('texts.sign_up_with_wepay')) @section('body') + + +
+ We Pay +
@livewire('wepay-signup', ['user_id' => $user_id, 'company_key' => $company_key])