From 8dafd04887b59a4df65162c10491375b6ba084f3 Mon Sep 17 00:00:00 2001 From: Helge Sverre Date: Tue, 13 Feb 2024 15:14:33 +0100 Subject: [PATCH 1/4] add .idea folder to .gitignore, used by PhpStorm and other Jetbrain IDEs. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 35aa09e..5cf58d5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ composer.lock /phpunit.xml /.phpunit.cache .phpunit.result.cache +.idea From 7c263e042cb49d89270f8332ceebc7aa998c2fc9 Mon Sep 17 00:00:00 2001 From: Helge Sverre Date: Tue, 13 Feb 2024 15:34:10 +0100 Subject: [PATCH 2/4] Add ability to provide client_side_token instead of seller_id, the client side token will take precedence over the seller id, as you cannot specify both. --- config/cashier.php | 2 ++ resources/views/js.blade.php | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config/cashier.php b/config/cashier.php index 690abe4..cae1611 100644 --- a/config/cashier.php +++ b/config/cashier.php @@ -15,6 +15,8 @@ 'seller_id' => env('PADDLE_SELLER_ID'), + 'client_side_token' => env('PADDLE_CLIENT_SIDE_TOKEN'), + 'api_key' => env('PADDLE_AUTH_CODE') ?? env('PADDLE_API_KEY'), 'retain_key' => env('PADDLE_RETAIN_KEY'), diff --git a/resources/views/js.blade.php b/resources/views/js.blade.php index 4cce7e7..75ad75b 100644 --- a/resources/views/js.blade.php +++ b/resources/views/js.blade.php @@ -1,9 +1,14 @@ (int) config('cashier.seller_id'), - 'pwAuth' => (int) config('cashier.retain_key'), + 'pwAuth' => (int)config('cashier.retain_key'), ]); +if (config('cashier.client_side_token')) { + $seller['token'] = config('cashier.client_side_token'); +} elseif (config('cashier.seller_id')) { + $seller['seller'] = (int)config('cashier.seller_id'); +} + if (isset($seller['pwAuth']) && Auth::check() && $customer = Auth::user()->customer) { $seller['pwCustomer'] = ['id' => $customer->paddle_id]; } From 2ab2f27df0e72beafa8edfe0263f8181e48465eb Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 13 Feb 2024 09:03:15 -0600 Subject: [PATCH 3/4] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5cf58d5..35aa09e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ composer.lock /phpunit.xml /.phpunit.cache .phpunit.result.cache -.idea From 1ae47eccbbf4872df715da036f4b42456ebe2942 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 13 Feb 2024 09:03:58 -0600 Subject: [PATCH 4/4] Update js.blade.php --- resources/views/js.blade.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/views/js.blade.php b/resources/views/js.blade.php index 75ad75b..666ea31 100644 --- a/resources/views/js.blade.php +++ b/resources/views/js.blade.php @@ -1,12 +1,13 @@ (int)config('cashier.retain_key'), + 'pwAuth' => (int) config('cashier.retain_key'), ]); if (config('cashier.client_side_token')) { $seller['token'] = config('cashier.client_side_token'); } elseif (config('cashier.seller_id')) { - $seller['seller'] = (int)config('cashier.seller_id'); + $seller['seller'] = (int) config('cashier.seller_id'); } if (isset($seller['pwAuth']) && Auth::check() && $customer = Auth::user()->customer) {