Merge branch '7.x'

Author: duncanmcclean

.github/workflows/tests.yaml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.3, 8.4]
+        php: [8.3, 8.4, 8.5]
         laravel: [12.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -37,7 +37,7 @@ jobs:
       - name: Run PHPUnit
         run: vendor/bin/pest
         env:
-          STRIPE_KEY: ${{ matrix.php == '8.4' && secrets.STRIPE_KEY || '' }}
-          STRIPE_SECRET: ${{ matrix.php == '8.4' && secrets.STRIPE_SECRET || '' }}
-          MOLLIE_KEY: ${{ matrix.php == '8.4' && secrets.MOLLIE_KEY || '' }}
-          MOLLIE_PROFILE: ${{ matrix.php == '8.4' && secrets.MOLLIE_PROFILE || '' }}
+          STRIPE_KEY: ${{ matrix.php == '8.5' && secrets.STRIPE_KEY || '' }}
+          STRIPE_SECRET: ${{ matrix.php == '8.5' && secrets.STRIPE_SECRET || '' }}
+          MOLLIE_KEY: ${{ matrix.php == '8.5' && secrets.MOLLIE_KEY || '' }}
+          MOLLIE_PROFILE: ${{ matrix.php == '8.5' && secrets.MOLLIE_PROFILE || '' }}

composer.json

@@ -43,10 +43,9 @@
     },
     "require-dev": {
         "laravel/pint": "dev-main",
-        "orchestra/testbench": "^10.0",
-        "pestphp/pest": "^3.0",
-        "pestphp/pest-plugin-laravel": "^3.0",
-        "phpunit/phpunit": "^11.0",
+        "orchestra/testbench": "^10.8",
+        "pestphp/pest": "^3.0 || ^4.1.4",
+        "pestphp/pest-plugin-laravel": "^3.0 || ^4.0",
         "spatie/ray": "^1.17",
         "spatie/test-time": "^1.3",
         "statamic-rad-pack/runway": "^9.0.0-alpha.5"

src/Console/Commands/PurgeCartOrdersCommand.php

@@ -4,6 +4,7 @@
 
 use DuncanMcClean\SimpleCommerce\Facades\Order;
 use DuncanMcClean\SimpleCommerce\Orders\OrderStatus;
+use DuncanMcClean\SimpleCommerce\SimpleCommerce;
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
 use Statamic\Console\RunsInPlease;
@@ -20,9 +21,15 @@ public function handle()
     {
         $this->info('Cleaning up..');
 
+        $fourteenDaysFromNow = Carbon::now()->subDays(14);
+
+        if ($this->isOrExtendsClass(SimpleCommerce::orderDriver()['repository'], \DuncanMcClean\SimpleCommerce\Orders\EntryOrderRepository::class)) {
+            $fourteenDaysFromNow = $fourteenDaysFromNow->timestamp;
+        }
+
         Order::query()
             ->whereOrderStatus(OrderStatus::Cart)
-            ->where('updated_at', '<=', Carbon::now()->subDays(14)->timestamp)
+            ->where('updated_at', '<=', $fourteenDaysFromNow)
             ->chunk(100, function ($orders) {
                 $orders->each(function ($order) {
                     $this->line("Deleting Order: {$order->id()}");