@@ -38,11 +38,14 @@ class BillingController extends Controller | |||||
$transaction->charge = $amount; | $transaction->charge = $amount; | ||||
$transaction->status = 'processing'; | $transaction->status = 'processing'; | ||||
$transaction->completed = false; | $transaction->completed = false; | ||||
$total_credits = $transaction->credits + $transaction->credits_extra; | |||||
$intent = PaymentIntent::create([ | $intent = PaymentIntent::create([ | ||||
'amount' => $amount, | 'amount' => $amount, | ||||
'currency' => 'usd', | 'currency' => 'usd', | ||||
'customer' => Auth::user()->customer_id, | 'customer' => Auth::user()->customer_id, | ||||
'description' => "You have received $total_credits credits.", | |||||
'receipt_email' => Auth::user()->email, | |||||
'metadata' => ['transaction_id' => $transaction->id] | 'metadata' => ['transaction_id' => $transaction->id] | ||||
]); | ]); | ||||
$transaction->intent_id = $intent->id; | $transaction->intent_id = $intent->id; | ||||
@@ -33,7 +33,8 @@ class UserController extends Controller | |||||
$user->role = "client"; | $user->role = "client"; | ||||
$user->active = true; | $user->active = true; | ||||
$user->password = Hash::make($request->password); | $user->password = Hash::make($request->password); | ||||
$user->customer_id = Customer::create()->id; | |||||
$user->customer_id = Customer::create(['email' => | |||||
$request->email], 'metadata' => ['user_id' => $user->id])->id; | |||||
$user->save(); | $user->save(); | ||||
event(new Registered($user)); | event(new Registered($user)); | ||||
@@ -22,7 +22,7 @@ class CreateOrdersTable extends Migration | |||||
$table->integer('attempts')->default(0); | $table->integer('attempts')->default(0); | ||||
$table->string('note')->default(''); | $table->string('note')->default(''); | ||||
$table->bigInteger('remaining')->default(0); | $table->bigInteger('remaining')->default(0); | ||||
$table->string('status'); | |||||
$table->enum('status', ['processing', 'pending', 'canceled', 'refunded', 'completed']); | |||||
$table->string('url'); | $table->string('url'); | ||||
}); | }); | ||||
} | } | ||||
@@ -179,7 +179,7 @@ class DatabaseSeeder extends Seeder | |||||
'name' => 'test_user_unverified', | 'name' => 'test_user_unverified', | ||||
'email' => 'unverified@example.com', | 'email' => 'unverified@example.com', | ||||
'role' => 'client', | 'role' => 'client', | ||||
'customer_id' => Customer::create()->id, | |||||
'customer_id' => Customer::create(['email' => 'unverified@example.com'])->id, | |||||
'active' => true, | 'active' => true, | ||||
'password' => Hash::make("test123") | 'password' => Hash::make("test123") | ||||
]); | ]); | ||||
@@ -188,7 +188,7 @@ class DatabaseSeeder extends Seeder | |||||
'email' => 'verified@example.com', | 'email' => 'verified@example.com', | ||||
'email_verified_at' => now(), | 'email_verified_at' => now(), | ||||
'credits' => 250, | 'credits' => 250, | ||||
'customer_id' => Customer::create()->id, | |||||
'customer_id' => Customer::create(['email' => 'verified@example.com'])->id, | |||||
'role' => 'client', | 'role' => 'client', | ||||
'active' => true, | 'active' => true, | ||||
'password' => Hash::make("test123") | 'password' => Hash::make("test123") | ||||
@@ -197,7 +197,7 @@ class DatabaseSeeder extends Seeder | |||||
'name' => 'test_admin_verified', | 'name' => 'test_admin_verified', | ||||
'email' => 'admin_verified@example.com', | 'email' => 'admin_verified@example.com', | ||||
'email_verified_at' => now(), | 'email_verified_at' => now(), | ||||
'customer_id' => Customer::create()->id, | |||||
'customer_id' => Customer::create(['email' => 'admin_verified@example.com'])->id, | |||||
'role' => 'admin', | 'role' => 'admin', | ||||
'active' => true, | 'active' => true, | ||||
'password' => Hash::make("test123") | 'password' => Hash::make("test123") | ||||
@@ -26,7 +26,8 @@ | |||||
<tr v-bind:key='order.id' v-for='order in orders.slice(historyPage*10-10, historyPage*10)'> | <tr v-bind:key='order.id' v-for='order in orders.slice(historyPage*10-10, historyPage*10)'> | ||||
<td>{{order.updated_at}}</td> | <td>{{order.updated_at}}</td> | ||||
<td>{{order.id}}</td> | <td>{{order.id}}</td> | ||||
<td>{{order.service.name.length > 20 ? order.service.name.substring(0, 19) + '...' : order.service.name}}</td> | |||||
<td>{{order.service.name.length > 20 ? order.service.name.substring(0, | |||||
19) + '...' : order.service.name}}</td> | |||||
<td :class="order.status" | <td :class="order.status" | ||||
class="status"><span>{{order.status.charAt(0).toUpperCase() + | class="status"><span>{{order.status.charAt(0).toUpperCase() + | ||||
order.status.slice(1)}}</span></td> | order.status.slice(1)}}</span></td> | ||||