Merge pull request #885 from w3bdesign/dev

Fix Stripe payment not working

Author: w3bdesign

.env.example

@@ -53,6 +53,7 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 STRIPE_KEY="changeme"
 STRIPE_SECRET="changeme"
+STRIPE_WEBHOOK_SECRET="changeme"
 
 MIX_STRIPE_KEY="${STRIPE_KEY}"
 

README.md

@@ -45,7 +45,7 @@ Ecommerce site with Laravel 10, Vue 3 and Stripe.
 
 -   Fork or clone the project
 
--   Ensure you have PHP 8.2.4 or newer installed and setup properly (alternatively use Docker, see <https://laravel.com/docs/9.x/sail>)
+-   Ensure you have PHP 8.2.4 or newer installed and setup properly (alternatively use Docker, see <https://laravel.com/docs/10.x/sail>)
 
 -   Ensure you have access to a PostgreSQL database
 

app/Http/Controllers/Api/UserController.php

@@ -18,7 +18,7 @@ public function purchase(Request $request)
             ],
             [
                 'password' => Hash::make(Str::random(12)),
-                'name' => $request->input('first_name').' '.$request->input('last_name'),
+                'name' => $request->input('first_name') . ' ' . $request->input('last_name'),
                 'address' => $request->input('address'),
                 'city' => $request->input('city'),
                 'state' => $request->input('state'),
@@ -36,9 +36,11 @@ public function purchase(Request $request)
 
             $order = $user->orders()
                 ->create([
-                    'transaction_id' => $payment->charges->data[0]->id,
-                    'total' => $payment->charges->data[0]->amount,
+                    'transaction_id' => $payment->id,
+                    'total' => $payment->amount,
                 ]);
+
+
             foreach (json_decode($request->input('cart'), true) as $item) {
                 $order->products()
                     ->attach($item['id'], ['quantity' => $item['quantity']]);

composer.json

@@ -10,7 +10,7 @@
     "require": {
         "php": "8.2.4",
         "guzzlehttp/guzzle": "7.7.0",
-        "laravel/cashier": "v14.12.1",
+        "laravel/cashier": "^14.12",
         "laravel/framework": "v10.11.0",
         "laravel/sanctum": "v3.2.5",
         "laravel/tinker": "v2.8.1"

composer.lock

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('stripe_id')->nullable()->index();
+            $table->string('pm_type')->nullable();
+            $table->string('pm_last_four', 4)->nullable();
+            $table->timestamp('trial_ends_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn([
+                'stripe_id',
+                'pm_type',
+                'pm_last_four',
+                'trial_ends_at',
+            ]);
+        });
+    }
+};

database/migrations/2019_05_03_000001_create_customer_columns.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('subscriptions', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id');
+            $table->string('name');
+            $table->string('stripe_id')->unique();
+            $table->string('stripe_status');
+            $table->string('stripe_price')->nullable();
+            $table->integer('quantity')->nullable();
+            $table->timestamp('trial_ends_at')->nullable();
+            $table->timestamp('ends_at')->nullable();
+            $table->timestamps();
+
+            $table->index(['user_id', 'stripe_status']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('subscriptions');
+    }
+};

database/migrations/2019_05_03_000002_create_subscriptions_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('subscription_items', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('subscription_id');
+            $table->string('stripe_id')->unique();
+            $table->string('stripe_product');
+            $table->string('stripe_price');
+            $table->integer('quantity')->nullable();
+            $table->timestamps();
+
+            $table->unique(['subscription_id', 'stripe_price']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('subscription_items');
+    }
+};

database/migrations/2019_05_03_000003_create_subscription_items_table.php

@@ -667,6 +667,10 @@ video {
   margin: 1rem;
 }
 
+.m-2 {
+  margin: 0.5rem;
+}
+
 .mx-auto {
   margin-left: auto;
   margin-right: auto;