🐛 forward checkoutFormData up to the order creation, thanks @tobimori

Author: bnomei

classes/Kart/Models/OrdersPage.php

@@ -121,17 +121,19 @@ public function createOrder(array $data, ?User $customer = null): ?Page
             return null;
         }
 
+        // remove a few fields that were set in [provider]->completed()
+        // but should not be forwarded as content to the order itself.
+        // keep the remaining kvs as they might be from checkoutFormData.
+        unset($data['uuid']);
+        unset($data['email']);
+        unset($data['customer']);
+
         /** @var Page $p */
         $p = kirby()->impersonate('kirby', fn () => self::createChild([
             'template' => kart()->option('orders.order.template', 'order'),
             'model' => kart()->option('orders.order.model', 'order'),
             // id, title, slug and uuid are automatically generated
-            'content' => A::get($data, [
-                'paidDate',
-                'paymentMethod',
-                'paymentComplete',
-                'items',
-            ]) + [
+            'content' => $data + [
                 'customer' => [$customer?->uuid()->toString()], // kirby user field expects an array
             ],
         ]));

classes/Kart/Provider/Mollie.php

@@ -181,7 +181,7 @@ public function completed(array $data = []): array
         }
         $data = array_merge($data, array_filter([
             // 'session_id' => $sessionId,
-            'uuid' => A::get($json, 'metadata.order_id'),
+            // 'uuid' => A::get($json, 'metadata.order_id'),
             'email' => A::get($customer, 'email'),
             'customer' => ! empty($customer) ? [
                 'id' => A::get($customer, 'id'),

classes/Kart/Provider/Paypal.php

@@ -181,7 +181,7 @@ public function completed(array $data = []): array
         }
         $data = array_merge($data, array_filter([
             // 'session_id' => $sessionId,
-            'uuid' => A::get($json, 'purchase_units.0.custom_id'),
+            // 'uuid' => A::get($json, 'purchase_units.0.custom_id'),
             'email' => A::get($json, 'payer.email_address'),
             'customer' => [
                 'id' => A::get($json, 'payer.payer_id'),

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby-kart",
   "type": "kirby-plugin",
-  "version": "5.6.4",
+  "version": "5.6.5",
   "description": "Streamlined E-Commerce Shopping Cart Solution",
   "license": "proprietary",
   "authors": [