Fix order webhook handler (#62)

* Use Order::STATUS_PAID instead of static::STATUS_PAID * Adjust orders webhook handling * wip * Add identifier back * Update WebhookController.php * Update Order.php * Update WebhookController.php * Update WebhookController.php --------- Co-authored-by: Dries Vints <[email protected]>
lmsqueezy · Nov 20, 2023 · afbd6ec · afbd6ec
1 parent b883f4f
commit afbd6ec
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/database/migrations/2023_01_16_000003_create_orders_table.php b/database/migrations/2023_01_16_000003_create_orders_table.php
@@ -23,7 +23,7 @@ public function up(): void
             $table->integer('discount_total');
             $table->integer('tax');
             $table->integer('total');
-            $table->string('tax_name');
+            $table->string('tax_name')->nullable();
             $table->string('status');
             $table->string('receipt_url')->nullable();
             $table->boolean('refunded');

diff --git a/src/Concerns/ManagesOrders.php b/src/Concerns/ManagesOrders.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use LemonSqueezy\Laravel\LemonSqueezy;
+use LemonSqueezy\Laravel\Order;
 
 trait ManagesOrders
 {
@@ -20,14 +21,14 @@ public function orders(): MorphMany
      */
     public function hasPurchasedProduct(string $productId): bool
     {
-        return $this->orders()->where('product_id', $productId)->where('status', static::STATUS_PAID)->exists();
+        return $this->orders()->where('product_id', $productId)->where('status', Order::STATUS_PAID)->exists();
     }
 
     /**
      * Determine if the billable has purchased a specific variant of a product.
      */
     public function hasPurchasedVariant(string $variantId): bool
     {
-        return $this->orders()->where('variant_id', $variantId)->where('status', static::STATUS_PAID)->exists();
+        return $this->orders()->where('variant_id', $variantId)->where('status', Order::STATUS_PAID)->exists();
     }
 }
diff --git a/src/Http/Controllers/WebhookController.php b/src/Http/Controllers/WebhookController.php
@@ -83,8 +83,9 @@ public function handleOrderCreated(array $payload): void
             $order = $billable->orders()->create([
                 'lemon_squeezy_id' => $payload['data']['id'],
                 'customer_id' => $attributes['customer_id'],
-                'product_id' => $attributes['product_id'],
-                'variant_id' => $attributes['variant_id'],
+                'product_id' => $attributes['first_order_item']['product_id'],
+                'variant_id' => $attributes['first_order_item']['variant_id'],
+                'identifier' => $attributes['identifier'],
                 'order_number' => $attributes['order_number'],
                 'currency' => $attributes['currency'],
                 'subtotal' => $attributes['subtotal'],

diff --git a/src/Order.php b/src/Order.php
@@ -179,8 +179,8 @@ public function sync(array $attributes): self
     {
         $this->update([
             'customer_id' => $attributes['customer_id'],
-            'product_id' => $attributes['product_id'],
-            'variant_id' => $attributes['variant_id'],
+            'product_id' => $attributes['first_order_item']['product_id'],
+            'variant_id' => $attributes['first_order_item']['variant_id'],
             'order_number' => $attributes['order_number'],
             'currency' => $attributes['currency'],
             'subtotal' => $attributes['subtotal'],