Skip to content

Beautiful Open-Source Form Builder

Admin billing improvements (#850)

Chirag Chhatralac2fba187d8d8
diff --git a/api/app/Http/Controllers/Admin/AdminController.php b/api/app/Http/Controllers/Admin/AdminController.php
index 4ae294158..4635b590c 100644
--- a/api/app/Http/Controllers/Admin/AdminController.php
+++ b/api/app/Http/Controllers/Admin/AdminController.php
@@ -163,7 +163,6 @@ class AdminController extends Controller
'subcription_id' => $subscription->id,
'coupon_id' => $couponId,
'subscription_stripe_id' => $subscription->stripe_id,
- 'moderator_id' => request()->user()->id,
]);
return $this->success([
@@ -191,7 +190,6 @@ class AdminController extends Controller
'subcription_id' => $subscription->id,
'nb_days' => $request->get('number_of_day'),
'subscription_stripe_id' => $subscription->stripe_id,
- 'moderator_id' => request()->user()->id,
]);
return $this->success([
@@ -209,6 +207,12 @@ class AdminController extends Controller
$user = User::find($request->get("user_id"));
$subscription = $user->subscriptions()->find($request->get("subscription_id"));
+ if (! $subscription) {
+ return $this->error([
+ "message" => "Subscription not found."
+ ], 404);
+ }
+
if ($subscription && !in_array($subscription->stripe_status, ['active', 'trialing'])) {
return $this->error([
"message" => "The subscription is not active or trialing."
@@ -221,7 +225,6 @@ class AdminController extends Controller
self::log('Cancel Subscription', [
'user_id' => $user->id,
'cancel_reason' => $request->get('cancellation_reason'),
- 'moderator_id' => request()->user()->id,
'subcription_id' => $subscription->id,
'subscription_stripe_id' => $subscription->stripe_id
]);
@@ -245,7 +248,6 @@ class AdminController extends Controller
self::log('Sent password reset email', [
'user_id' => $user->id,
- 'moderator_id' => request()->user()->id,
]);
return $this->success([
@@ -294,7 +296,6 @@ class AdminController extends Controller
'invoice_id' => $latestInvoice->id,
'stripe_refund_id' => $refund->id,
'refund_reason' => $request->get('refund_reason'),
- 'moderator_id' => request()->user()->id,
]);
} catch (\Exception $e) {
self::log('Refund Error', [
@@ -311,6 +312,28 @@ class AdminController extends Controller
public static function log($message, $data = [])
{
+ $moderator = request()->user();
+
+ // Always include moderator information
+ $baseData = [
+ 'moderator' => $moderator->email . ' (' . $moderator->id . ')',
+ ];
+
+ // Add action button for admin panel if user_id or target_id is present
+ if (isset($data['user_id'])) {
+ $baseData['actions'] = [
+ 'Open Admin' => front_url('/settings/admin?user_id=' . $data['user_id'])
+ ];
+ } elseif (isset($data['target_id'])) {
+ $baseData['actions'] = [
+ 'Open Admin' => front_url('/settings/admin?user_id=' . $data['target_id'])
+ ];
+ }
+
+ // Merge with provided data (provided data takes precedence)
+ $logData = array_merge($baseData, $data);
+
Log::warning(self::ADMIN_LOG_PREFIX . $message, $data);
+ Log::channel('slack_admin')->warning($message, $logData);
}
}
diff --git a/api/app/Http/Controllers/Admin/BillingController.php b/api/app/Http/Controllers/Admin/BillingController.php
index d0d131cfb..2b090ca6a 100644
--- a/api/app/Http/Controllers/Admin/BillingController.php
+++ b/api/app/Http/Controllers/Admin/BillingController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Http\Request;
+use Laravel\Cashier\Cashier;
class BillingController extends Controller
{
@@ -48,7 +49,6 @@ class BillingController extends Controller
AdminController::log('Update billing email', [
'user_id' => $user->id,
'stripe_id' => $user->stripe_id,
- 'moderator_id' => auth()->id()
]);
$user->updateStripeCustomer(['email' => $request->billing_email]);
@@ -70,7 +70,8 @@ class BillingController extends Controller
"name" => ucfirst($user->name),
"plan" => $subscription->type,
"status" => $subscription->stripe_status,
- "creation_date" => $subscription->created_at->format('Y-m-d')
+ "creation_date" => $subscription->created_at->format('Y-m-d'),
+ "canceled_at" => $subscription->ends_at ? $subscription->ends_at->format('Y-m-d') : null,
];
});
return $this->success([
@@ -88,12 +89,24 @@ class BillingController extends Controller
}
$payments = $user->invoices();
$payments = $payments->map(function ($payment) use ($user) {
+ $status = $payment->status;
+
+ // If the underlying Stripe charge was refunded, reflect that in the status
+ try {
+ $stripeInvoice = Cashier::stripe()->invoices->retrieve($payment->id, ['expand' => ['charge']]);
+ if (isset($stripeInvoice->charge) && ($stripeInvoice->charge->refunded ?? false)) {
+ $status = 'refunded';
+ }
+ } catch (\Exception $e) {
+ // Ignore errors while deriving refund status; fall back to invoice status
+ }
+
return [
"id" => $payment->id,
"amount_paid" => ($payment->amount_paid),
"name" => ucfirst($payment->account_name),
"creation_date" => Carbon::parse($payment->created)->format("Y-m-d H:i:s"),
- "status" => $payment->status,
+ "status" => $status,
];
});
return $this->success([
diff --git a/api/app/Http/Controllers/Admin/FormController.php b/api/app/Http/Controllers/Admin/FormController.php
index 316167f4f..556f3f618 100644
--- a/api/app/Http/Controllers/Admin/FormController.php
+++ b/api/app/Http/Controllers/Admin/FormController.php
@@ -30,7 +30,6 @@ class FormController extends Controller
AdminController::log('Restore deleted form', [
'form_id' => $form->id,
- 'moderator_id' => auth()->id()
]);
return $this->success(['message' => 'Form restored successfully']);
diff --git a/api/app/Service/UserActionService.php b/api/app/Service/UserActionService.php
index 512e0d055..320be2b99 100644
--- a/api/app/Service/UserActionService.php
+++ b/api/app/Service/UserActionService.php
@@ -20,7 +20,6 @@ class UserActionService
AdminController::log('User blocked', [
'user_id' => $user->id,
'reason' => $reason,
- 'moderator_id' => $moderatorId,
]);
// Log to Slack
@@ -48,7 +47,6 @@ class UserActionService
AdminController::log('User unblocked', [
'user_id' => $user->id,
'reason' => $reason,
- 'moderator_id' => $moderatorId,
]);
// Log to Slack
diff --git a/api/vapor.yml b/api/vapor.yml
index f82082956..255347b7e 100644
--- a/api/vapor.yml
+++ b/api/vapor.yml
@@ -18,7 +18,6 @@ environments:
runtime: "php-8.2:al2-arm"
storage: opnforms-prod
database: OpnForm
- database-proxy: true
domain: api.opnform.com
build:
- "COMPOSER_MIRROR_PATH_REPOS=1 composer install --no-dev"
@@ -36,7 +35,6 @@ environments:
runtime: "php-8.2:al2-arm"
storage: opnforms-staging
database: OpnForm
- database-proxy: true
domain: api.stg.opnform.com
build:
- "COMPOSER_MIRROR_PATH_REPOS=1 composer install --no-dev"
diff --git a/client/components/open/components/EditSubmissionModal.vue b/client/components/open/components/EditSubmissionModal.vue
index 0ad74ed7f..0500c5253 100644
--- a/client/components/open/components/EditSubmissionModal.vue
+++ b/client/components/open/components/EditSubmissionModal.vue
@@ -10,10 +10,10 @@
:theme="theme"
@submit="updateForm"
>
- <template #submit-btn="{ loading }">
+ <template #submit-btn="{ isProcessing }">
<UButton
class="mt-4"
- :loading="loading"
+ :loading="loading || isProcessing"
@click.prevent="updateForm"
label="Update Submission"
/>
diff --git a/client/components/pages/admin/BillingEmail.vue b/client/components/pages/admin/BillingEmail.vue
index 0783692da..2db72b56d 100644
--- a/client/components/pages/admin/BillingEmail.vue
+++ b/client/components/pages/admin/BillingEmail.vue
@@ -30,7 +30,7 @@
:disabled="!userCreated"
/>
<UButton
- :loading="loading"
+ :loading="form.busy"
type="submit"
block
:disabled="!userCreated"
@@ -49,7 +49,6 @@ const props = defineProps({
})
const loadingBillingEmail = ref(false)
-const loading = ref(false)
const userCreated = ref(false)
const form = useForm({
billing_email: '',
@@ -70,18 +69,12 @@ onMounted(() => {
})
const updateUserBillingEmail = () => {
- loading.value = true
- adminApi.billing.updateEmail({
- billing_email: form.billing_email,
- user_id: form.user_id
- })
+ form.patch('/moderator/billing/email')
.then(async (data) => {
- loading.value = false
useAlert().success(data.message)
})
.catch((error) => {
useAlert().error(error.data.message)
- loading.value = false
})
}
</script>
diff --git a/client/components/pages/admin/BlockUser.vue b/client/components/pages/admin/BlockUser.vue
index 777b651c9..c6d3a2cb6 100644
--- a/client/components/pages/admin/BlockUser.vue
+++ b/client/components/pages/admin/BlockUser.vue
@@ -25,7 +25,7 @@
<div class="flex space-x-2 mt-4">
<UButton
block
- :loading="loading"
+ :loading="form.busy"
type="submit"
class="grow"
:label="isBlocked ? 'Unblock User' : 'Block User'"
@@ -56,7 +56,7 @@
</template>
<script setup>
-import { adminApi } from '~/api'
+
const props = defineProps({
user: { type: Object, required: true }
@@ -64,7 +64,6 @@ const props = defineProps({
const emit = defineEmits(['user-updated'])
const alert = useAlert()
-const loading = ref(false)
const isModalOpen = ref(false)
const form = useForm({
@@ -147,21 +146,18 @@ const alertContent = computed(() => {
async function submit() {
- loading.value = true
try {
let response
if (isBlocked.value) {
- response = await adminApi.unblockUser(form.data())
+ response = await form.post('/moderator/unblock-user')
} else {
- response = await adminApi.blockUser(form.data())
+ response = await form.post('/moderator/block-user')
}
alert.success(response.message)
emit('user-updated', response.user)
form.reset()
} catch (error) {
alert.error(error.data?.message || 'An error occurred.')
- } finally {
- loading.value = false
}
}
</script>
\ No newline at end of file
diff --git a/client/components/pages/admin/DeletedForms.vue b/client/components/pages/admin/DeletedForms.vue
index e1bb2aefa..2b3e796a7 100644
--- a/client/components/pages/admin/DeletedForms.vue
+++ b/client/components/pages/admin/DeletedForms.vue
@@ -14,7 +14,7 @@
>
<template #actions-cell="{ row }">
<UButton
- :loading="restoringForm"
+ :loading="restoreFormForm.busy"
size="sm"
color="neutral"
variant="outline"
@@ -45,11 +45,14 @@ const props = defineProps({
})
const loading = ref(true)
-const restoringForm = ref(false)
const forms = ref([])
const page = ref(1)
const pageCount = 5
+const restoreFormForm = useForm({
+ slug: null
+})
+
const rows = computed(() => {
return forms.value.slice((page.value - 1) * pageCount, (page.value) * pageCount)
})
@@ -72,13 +75,11 @@ const restoreForm = (slug) => {
return useAlert().confirm(
"Are you sure you want to restore this form?",
() => {
- restoringForm.value = true
- adminApi.forms.restore(slug).then(data => {
- restoringForm.value = false
+ restoreFormForm.slug = slug
+ restoreFormForm.patch(`/moderator/forms/${slug}/restore`).then(data => {
useAlert().success(data.message)
getDeletedForms()
}).catch(error => {
- restoringForm.value = false
useAlert().error(error.data.message)
})
})
diff --git a/client/components/pages/admin/DiscountOnSubscription.vue b/client/components/pages/admin/DiscountOnSubscription.vue
index f975f1f9b..89c5fa0c9 100644
--- a/client/components/pages/admin/DiscountOnSubscription.vue
+++ b/client/components/pages/admin/DiscountOnSubscription.vue
@@ -15,7 +15,7 @@
subscriptions before you can apply the 40% discount.
</p>
<UButton
- :loading="loading"
+ :loading="form.busy"
type="submit"
block
label="Apply Discount"
@@ -29,23 +29,19 @@ const props = defineProps({
user: { type: Object, required: true }
})
-let loading = ref(false)
const form = useForm({
user_id: props.user.id
})
const applyDiscount = () => {
if (!props.user.stripe_id) return
- loading = true
form
.patch('/moderator/apply-discount')
.then(async (data) => {
- loading = false
useAlert().success(data.message)
})
.catch((error) => {
useAlert().error(error.data.message)
- loading = false
})
}
diff --git a/client/components/pages/admin/ExtendTrial.vue b/client/components/pages/admin/ExtendTrial.vue
index 94542a13c..509315e0e 100644
--- a/client/components/pages/admin/ExtendTrial.vue
+++ b/client/components/pages/admin/ExtendTrial.vue
@@ -24,7 +24,7 @@
placeholder="7"
/>
<UButton
- :loading="loading"
+ :loading="form.busy"
type="submit"
block
label="Apply Extend Trial"
@@ -39,7 +39,6 @@ const props = defineProps({
user: { type: Object, required: true }
})
-let loading = ref(false)
const form = useForm({
user_id: props.user.id,
number_of_day: ''
@@ -47,16 +46,13 @@ const form = useForm({
const extendTrial = () => {
if (!props.user.stripe_id) return
- loading = true
form
.patch('/moderator/extend-trial')
.then(async (data) => {
- loading = false
useAlert().success(data.message)
})
.catch((error) => {
useAlert().error(error.data.message)
- loading = false
})
}
diff --git a/client/components/pages/admin/ImpersonateUser.vue b/client/components/pages/admin/ImpersonateUser.vue
index 98174268b..a81518d82 100644
--- a/client/components/pages/admin/ImpersonateUser.vue
+++ b/client/components/pages/admin/ImpersonateUser.vue
@@ -1,14 +1,14 @@
<template>
<UButton
icon="i-heroicons-eye-16-solid"
- :loading="loading"
+ :loading="form.busy"
@click="impersonate"
label="Impersonate User"
/>
</template>
<script setup>
-import { adminApi } from '~/api'
+
import { useQueryClient } from '@tanstack/vue-query'
const props = defineProps({
@@ -18,17 +18,16 @@ const props = defineProps({
const authStore = useAuthStore()
const queryClient = useQueryClient()
-const loading = ref(false)
+const form = useForm({
+ user_id: props.user.id
+})
const { user } = useAuth()
const { data: userData } = user()
const impersonate = () => {
- loading.value = true
authStore.startImpersonating()
- adminApi.impersonate(props.user.id).then(async (data) => {
- loading.value = false
-
+ form.post(`/moderator/impersonate/${props.user.id}`).then(async (data) => {
// Save the token with its expiration time.
authStore.setToken(data.token, data.expires_in)
await queryClient.invalidateQueries()
@@ -38,7 +37,6 @@ const impersonate = () => {
})
.catch((error) => {
useAlert().error(error.data.message)
- loading.value = false
})
}
</script>
diff --git a/client/components/pages/admin/SendPasswordResetEmail.vue b/client/components/pages/admin/SendPasswordResetEmail.vue
index f5fdc19c3..4f813fb1f 100644
--- a/client/components/pages/admin/SendPasswordResetEmail.vue
+++ b/client/components/pages/admin/SendPasswordResetEmail.vue
@@ -2,7 +2,7 @@
<UButton
variant="outline"
icon="i-heroicons-key-16-solid"
- :loading="loading"
+ :loading="form.busy"
@click="resetPassword"
label="Reset Password"
/>
@@ -13,7 +13,6 @@ const props = defineProps({
user: { type: Object, required: true }
})
-const loading = ref(false)
const form = useForm({
user_id: props.user.id
})
@@ -22,16 +21,13 @@ const resetPassword = ()=>{
return useAlert().confirm(
"Are you sure you want to send a password reset email?",
() => {
- loading.value = true
form
.patch('/moderator/send-password-reset-email')
.then(async (data) => {
- loading.value = false
useAlert().success(data.message)
})
.catch((error) => {
useAlert().error(error.data.message)
- loading.value = false
})
})
}
diff --git a/client/components/pages/admin/UserSubscriptions.vue b/client/components/pages/admin/UserSubscriptions.vue
index 85b25a27f..d656fead7 100644
--- a/client/components/pages/admin/UserSubscriptions.vue
+++ b/client/components/pages/admin/UserSubscriptions.vue
@@ -36,7 +36,7 @@
</template>
<template #actions-cell="{ row }">
<UButton
- v-if="row.original.status == 'active' || row.original.status == 'trialing'"
+ v-if="['active', 'trialing'].includes(row.original.status) && !row.original.canceled_at"
color="error"
variant="outline"
size="sm"
@@ -148,6 +148,9 @@ const columns = [{
}, {
accessorKey: 'status',
header: 'Status'
+},{
+ accessorKey: 'canceled_at',
+ header: 'Canceled at'
}, {
accessorKey: 'actions',
header: '',