Merge branch '1.x'

# Conflicts: # CHANGELOG.md
laravel · Jun 8, 2021 · 4e6020e · 4e6020e
2 parents 19960d0 + d31b365
commit 4e6020e
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
@@ -12,3 +12,6 @@ about: 'Report a general library issue. Please ensure your version is still supp
 
 
 ### Steps To Reproduce:
+
+<!-- If possible, please provide a GitHub repository to demonstrate your issue -->
+<!-- laravel new bug-report --github="--public" -->
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,15 +8,15 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: true
       matrix:
         php: [7.3, 7.4, 8.0]
         laravel: [^8.0]
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }}
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
     steps:
       - name: Checkout code

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,72 +1,78 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/cashier-paddle/compare/v1.4.4...master)
+## [Unreleased](https://github.com/laravel/cashier-paddle/compare/v1.4.5...master)
 
 
-## [v1.4.4 (2021-03-09)](https://github.com/laravel/cashier-paddle/compare/1.4.3...v1.4.4)
+## [v1.4.5 (2021-06-08)](https://github.com/laravel/cashier-paddle/compare/v1.4.4...v1.4.5)
+
+### Fixed
+- Trim whitespace for pay link values ([#121](https://github.com/laravel/cashier-paddle/pull/121))
+
+
+## [v1.4.4 (2021-03-09)](https://github.com/laravel/cashier-paddle/compare/v1.4.3...v1.4.4)
 
 ### Fixed
 - Fix maxlength characters for charge title ([#112](https://github.com/laravel/cashier-paddle/pull/112))
 
 
-## [v1.4.3 (2021-02-23)](https://github.com/laravel/cashier-paddle/compare/1.4.2...v1.4.3)
+## [v1.4.3 (2021-02-23)](https://github.com/laravel/cashier-paddle/compare/v1.4.2...v1.4.3)
 
 ### Changed
 - Allow custom models ([#106](https://github.com/laravel/cashier-paddle/pull/106))
 
 
-## [v1.4.2 (2021-02-19)](https://github.com/laravel/cashier-paddle/compare/1.4.1...v1.4.2)
+## [v1.4.2 (2021-02-19)](https://github.com/laravel/cashier-paddle/compare/v1.4.1...v1.4.2)
 
 ### Fixed
 - Fix payment method calls ([#105](https://github.com/laravel/cashier-paddle/pull/105))
 
 
-## [v1.4.1 (2021-01-05)](https://github.com/laravel/cashier-paddle/compare/1.4.0...v1.4.1)
+## [v1.4.1 (2021-01-05)](https://github.com/laravel/cashier-paddle/compare/v1.4.0...v1.4.1)
 
 ### Fixed
 - Fix bug with `cancelNow` ([#99](https://github.com/laravel/cashier-paddle/pull/99))
 - Fix cancelling paused subscriptions ([#101](https://github.com/laravel/cashier-paddle/pull/101), [#102](https://github.com/laravel/cashier-paddle/pull/102))
 
 
-## [v1.4.0 (2020-12-15)](https://github.com/laravel/cashier-paddle/compare/1.3.0...v1.4.0)
+## [v1.4.0 (2020-12-15)](https://github.com/laravel/cashier-paddle/compare/v1.3.0...v1.4.0)
 
 ### Added
 - Subscription Modifiers ([#95](https://github.com/laravel/cashier-paddle/pull/95))
 
 
-## [v1.3.0 (2020-11-03)](https://github.com/laravel/cashier-paddle/compare/1.2.3...v1.3.0)
+## [v1.3.0 (2020-11-03)](https://github.com/laravel/cashier-paddle/compare/v1.2.3...v1.3.0)
 
 ### Added
 - PHP 8 Support ([#91](https://github.com/laravel/cashier-paddle/pull/91))
 
 
-## [v1.2.3 (2020-10-20)](https://github.com/laravel/cashier-paddle/compare/1.2.2...v1.2.3)
+## [v1.2.3 (2020-10-20)](https://github.com/laravel/cashier-paddle/compare/v1.2.2...v1.2.3)
 
 ### Fixed
 - Fix trial ends at ([#87](https://github.com/laravel/cashier-paddle/pull/87))
 - Ignore manual paylinks ([#89](https://github.com/laravel/cashier-paddle/pull/89))
 
 
-## [v1.2.2 (2020-10-06)](https://github.com/laravel/cashier-paddle/compare/1.2.1...v1.2.2)
+## [v1.2.2 (2020-10-06)](https://github.com/laravel/cashier-paddle/compare/v1.2.1...v1.2.2)
 
 ### Fixed
 - Missing use statement for `SubscriptionPaymentFailed` ([#81](https://github.com/laravel/cashier-paddle/pull/81))
 - Fix n+1 problem with subscription retrieval ([#83](https://github.com/laravel/cashier-paddle/pull/83))
 
 
-## [v1.2.1 (2020-09-29)](https://github.com/laravel/cashier-paddle/compare/1.2.0...v1.2.1)
+## [v1.2.1 (2020-09-29)](https://github.com/laravel/cashier-paddle/compare/v1.2.0...v1.2.1)
 
 ### Changed
 - Allow customer values in payload override ([#78](https://github.com/laravel/cashier-paddle/pull/78))
 
 
-## [v1.2.0 (2020-09-22)](https://github.com/laravel/cashier-paddle/compare/1.1.0...v1.2.0)
+## [v1.2.0 (2020-09-22)](https://github.com/laravel/cashier-paddle/compare/v1.1.0...v1.2.0)
 
 ### Added
 - Event Improvements ([#72](https://github.com/laravel/cashier-paddle/pull/72))
 
 
-## [v1.1.0 (2020-09-01)](https://github.com/laravel/cashier-paddle/compare/1.0.0...v1.1.0)
+## [v1.1.0 (2020-09-01)](https://github.com/laravel/cashier-paddle/compare/v1.0.0...v1.1.0)
 
 ### Added
 - Added function to see when the trial is ending ([#69](https://github.com/laravel/cashier-paddle/pull/69))

diff --git a/composer.json b/composer.json
@@ -10,11 +10,11 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         },
         {
             "name": "Dries Vints",
-            "email": "dries@vints.io"
+            "email": "dries@laravel.com"
         }
     ],
     "require": {

diff --git a/src/Concerns/PerformsCharges.php b/src/Concerns/PerformsCharges.php
@@ -73,6 +73,10 @@ protected function generatePayLink(array $payload)
 
         $payload['passthrough'] = json_encode($payload['passthrough']);
 
+        $payload = array_map(function ($value) {
+            return is_string($value) ? trim($value) : $value;
+        }, $payload);
+
         return Cashier::post('/product/generate_pay_link', $payload)['response']['url'];
     }
 

diff --git a/src/Http/Controllers/WebhookController.php b/src/Http/Controllers/WebhookController.php
@@ -7,7 +7,6 @@
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Str;
 use Laravel\Paddle\Cashier;
-use Laravel\Paddle\Customer;
 use Laravel\Paddle\Events\PaymentSucceeded;
 use Laravel\Paddle\Events\SubscriptionCancelled;
 use Laravel\Paddle\Events\SubscriptionCreated;

diff --git a/tests/Feature/SubscriptionsTest.php b/tests/Feature/SubscriptionsTest.php
@@ -26,7 +26,7 @@ public function test_customers_can_perform_subscription_checks()
             'name' => 'main',
             'paddle_id' => 244,
             'paddle_plan' => 2323,
-            'paddle_status' => 'active',
+            'paddle_status' => Subscription::STATUS_ACTIVE,
             'quantity' => 1,
         ]);
 
@@ -67,7 +67,7 @@ public function test_customers_can_check_if_their_subscription_is_on_trial()
             'name' => 'main',
             'paddle_id' => 244,
             'paddle_plan' => 2323,
-            'paddle_status' => 'trialing',
+            'paddle_status' => Subscription::STATUS_TRIALING,
             'quantity' => 1,
             'trial_ends_at' => Carbon::tomorrow(),
         ]);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,6 @@ about: 'Report a general library issue. Please ensure your version is still supp


		### Steps To Reproduce:

		<!-- If possible, please provide a GitHub repository to demonstrate your issue -->
		<!-- laravel new bug-report --github="--public" -->