Merge branch 'mollie:main' into main

mollie · Dec 1, 2023 · 21edf0d · 21edf0d
2 parents b938e68 + ec07354
commit 21edf0d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/config/cashier_plans.php b/config/cashier_plans.php
@@ -22,7 +22,7 @@
         /**
          * The default chain of subscription OrderItem preprocessors. These are called right before the Subscription's
          * OrderItem is processed into an OrderItem. You can use this for calculating variable costs a.k.a. metered billing.
-         * Can be overridden per subscription plan. Make sure the preprocessors implement the PreprocessesOrderItems
+         * Can be overridden per subscription plan. Make sure the preprocessors implement the BaseOrderItemPreprocessor
          * interface.
          */
         'order_item_preprocessors' => [

diff --git a/database/migrations/upgrade_to_cashier_v2.php.stub b/database/migrations/upgrade_to_cashier_v2.php.stub
@@ -15,7 +15,6 @@ class UpgradeToCashierV2 extends Migration
     {
         Schema::table('orders', function (Blueprint $table) {
             $table->unsignedInteger('amount_refunded')->after('total_due')->default(0);
-            $table->unsignedInteger('amount_charged_back')->after('amount_refunded')->default(0);
         });
 
         Schema::create('refunds', function (Blueprint $table) {

diff --git a/src/CashierServiceProvider.php b/src/CashierServiceProvider.php
@@ -19,7 +19,7 @@ class CashierServiceProvider extends ServiceProvider
 {
     use RegistersMollieInteractions;
 
-    const PACKAGE_VERSION = '2.10.0';
+    const PACKAGE_VERSION = '2.11.0';
 
     /**
      * Bootstrap the application services.

diff --git a/src/Order/Order.php b/src/Order/Order.php
@@ -765,4 +765,9 @@ public function retryNow()
             $this->processPayment();
         });
     }
+
+    public function amountChargedBack(): int
+    {
+        return $this->payments()->sum('amount_charged_back');
+    }
 }