From 2f9f34ebc76347fec8f08b560e9fa7c745ba7d29 Mon Sep 17 00:00:00 2001 From: ct Date: Thu, 3 Jul 2025 01:23:15 +0800 Subject: [PATCH] Update --- MEMEAIGEN/STRIPE WEBHOOKS.bru | 255 ++++++++---------- .../video-download/video-download-modal.jsx | 4 +- .../js/modules/upgrade/upgrade-sheet.jsx | 67 ++--- 3 files changed, 142 insertions(+), 184 deletions(-) diff --git a/MEMEAIGEN/STRIPE WEBHOOKS.bru b/MEMEAIGEN/STRIPE WEBHOOKS.bru index ee323d2..45b6e56 100644 --- a/MEMEAIGEN/STRIPE WEBHOOKS.bru +++ b/MEMEAIGEN/STRIPE WEBHOOKS.bru @@ -12,179 +12,136 @@ post { body:json { { - "id": "evt_1Rg71IEEXQJo9EEOmxJtfwVm", + "id": "evt_1RgRPrEEXQJo9EEOWggvNEHe", "object": "event", "api_version": "2025-05-28.basil", - "created": 1751387215, + "created": 1751465619, "data": { "object": { - "id": "in_1Rg71FEEXQJo9EEOmxbGjtdH", - "object": "invoice", - "account_country": "MY", - "account_name": "MEMEAIGEN sandbox", - "account_tax_ids": null, - "amount_due": 400, - "amount_overpaid": 0, - "amount_paid": 400, - "amount_remaining": 0, - "amount_shipping": 0, - "application": null, - "attempt_count": 1, - "attempted": true, - "auto_advance": false, + "id": "cs_test_a1RMSyzQu5Mk2cZYoAYLOCV9hfoc5z9RuYdE4jLY2htoizGr1AJZeAcnDh", + "object": "checkout.session", + "adaptive_pricing": { + "enabled": true + }, + "after_expiration": null, + "allow_promotion_codes": null, + "amount_subtotal": 400, + "amount_total": 400, "automatic_tax": { - "disabled_reason": null, "enabled": false, "liability": null, "provider": null, "status": null }, - "automatically_finalizes_at": null, - "billing_reason": "subscription_create", - "collection_method": "charge_automatically", - "created": 1751387213, - "currency": "usd", - "custom_fields": null, - "customer": "cus_SbGYl34MpG4nv5", - "customer_address": null, - "customer_email": "memeaigen.com@gmail.com", - "customer_name": null, - "customer_phone": null, - "customer_shipping": null, - "customer_tax_exempt": "none", - "customer_tax_ids": [], - "default_payment_method": null, - "default_source": null, - "default_tax_rates": [], - "description": null, - "discounts": [], - "due_date": null, - "effective_at": 1751387213, - "ending_balance": 0, - "footer": null, - "from_invoice": null, - "hosted_invoice_url": "https://invoice.stripe.com/i/acct_1RfMzuEEXQJo9EEO/test_YWNjdF8xUmZNenVFRVhRSm85RUVPLF9TYkplU0VDWWdKSG53bDVZT2VuNjNGZFFaaFJsbFFkLDE0MTkyODAxNg0200EQHRg6hn?s=ap", - "invoice_pdf": "https://pay.stripe.com/invoice/acct_1RfMzuEEXQJo9EEO/test_YWNjdF8xUmZNenVFRVhRSm85RUVPLF9TYkplU0VDWWdKSG53bDVZT2VuNjNGZFFaaFJsbFFkLDE0MTkyODAxNg0200EQHRg6hn/pdf?s=ap", - "issuer": { - "type": "self" + "billing_address_collection": null, + "cancel_url": "https://memeaigen.test/subscribe/cancelled?session_id={CHECKOUT_SESSION_ID}", + "client_reference_id": null, + "client_secret": null, + "collected_information": { + "shipping_details": null }, - "last_finalization_error": null, - "latest_revision": null, - "lines": { - "object": "list", - "data": [ - { - "id": "il_1Rg71FEEXQJo9EEOhVjRevMb", - "object": "line_item", - "amount": 400, - "currency": "usd", - "description": "1 × Personal Creator (at $4.00 / month)", - "discount_amounts": [], - "discountable": true, - "discounts": [], - "invoice": "in_1Rg71FEEXQJo9EEOmxbGjtdH", - "livemode": false, - "metadata": { - "is_on_session_checkout": "true" - }, - "parent": { - "invoice_item_details": null, - "subscription_item_details": { - "invoice_item": null, - "proration": false, - "proration_details": { - "credited_items": null - }, - "subscription": "sub_1Rg71FEEXQJo9EEO18sXSEho", - "subscription_item": "si_SbJesuW5WgGoZ7" - }, - "type": "subscription_item_details" - }, - "period": { - "end": 1754065613, - "start": 1751387213 - }, - "pretax_credit_amounts": [], - "pricing": { - "price_details": { - "price": "price_1RfN2VEEXQJo9EEOzjPI2HGt", - "product": "prod_SaY8TGjiPi5hWu" - }, - "type": "price_details", - "unit_amount_decimal": "400" - }, - "quantity": 1, - "taxes": [] - } - ], - "has_more": false, - "total_count": 1, - "url": "/v1/invoices/in_1Rg71FEEXQJo9EEOmxbGjtdH/lines" + "consent": null, + "consent_collection": null, + "created": 1751465613, + "currency": "usd", + "currency_conversion": null, + "custom_fields": [], + "custom_text": { + "after_submit": null, + "shipping_address": null, + "submit": null, + "terms_of_service_acceptance": null + }, + "customer": "cus_SbGYl34MpG4nv5", + "customer_creation": null, + "customer_details": { + "address": { + "city": null, + "country": "MY", + "line1": null, + "line2": null, + "postal_code": null, + "state": null + }, + "email": "memeaigen.com@gmail.com", + "name": "TEST NAME", + "phone": null, + "tax_exempt": "none", + "tax_ids": [] + }, + "customer_email": null, + "discounts": [], + "expires_at": 1751552013, + "invoice": null, + "invoice_creation": { + "enabled": false, + "invoice_data": { + "account_tax_ids": null, + "custom_fields": null, + "description": null, + "footer": null, + "issuer": null, + "metadata": {}, + "rendering_options": null + } }, "livemode": false, + "locale": null, "metadata": {}, - "next_payment_attempt": null, - "number": "IN7OJLTH-0001", - "on_behalf_of": null, - "parent": { - "quote_details": null, - "subscription_details": { - "metadata": { - "is_on_session_checkout": "true" - }, - "subscription": "sub_1Rg71FEEXQJo9EEO18sXSEho" - }, - "type": "subscription_details" + "mode": "payment", + "payment_intent": "pi_3RgRPqEEXQJo9EEO1a43uB5g", + "payment_link": null, + "payment_method_collection": "if_required", + "payment_method_configuration_details": { + "id": "pmc_1RfN0QEEXQJo9EEOzYHrN3LV", + "parent": null }, - "payment_settings": { - "default_mandate": null, - "payment_method_options": { - "acss_debit": null, - "bancontact": null, - "card": { - "request_three_d_secure": "automatic" - }, - "customer_balance": null, - "konbini": null, - "sepa_debit": null, - "us_bank_account": null - }, - "payment_method_types": null + "payment_method_options": { + "card": { + "request_three_d_secure": "automatic" + } }, - "period_end": 1751387213, - "period_start": 1751387213, - "post_payment_credit_notes_amount": 0, - "pre_payment_credit_notes_amount": 0, - "receipt_number": null, - "rendering": null, + "payment_method_types": [ + "card", + "link" + ], + "payment_status": "paid", + "permissions": null, + "phone_number_collection": { + "enabled": false + }, + "recovered_from": null, + "saved_payment_method_options": { + "allow_redisplay_filters": [ + "always" + ], + "payment_method_remove": "disabled", + "payment_method_save": null + }, + "setup_intent": null, + "shipping_address_collection": null, "shipping_cost": null, - "shipping_details": null, - "starting_balance": 0, - "statement_descriptor": null, - "status": "paid", - "status_transitions": { - "finalized_at": 1751387213, - "marked_uncollectible_at": null, - "paid_at": 1751387215, - "voided_at": null + "shipping_options": [], + "status": "complete", + "submit_type": null, + "subscription": null, + "success_url": "https://memeaigen.test/subscribe/success?session_id={CHECKOUT_SESSION_ID}", + "total_details": { + "amount_discount": 0, + "amount_shipping": 0, + "amount_tax": 0 }, - "subtotal": 400, - "subtotal_excluding_tax": 400, - "test_clock": null, - "total": 400, - "total_discount_amounts": [], - "total_excluding_tax": 400, - "total_pretax_credit_amounts": [], - "total_taxes": [], - "webhooks_delivered_at": null + "ui_mode": "hosted", + "url": null, + "wallet_options": null } }, "livemode": false, "pending_webhooks": 2, "request": { "id": null, - "idempotency_key": "e50baede-20b6-4a06-a2c4-15f43ca47dd4" + "idempotency_key": null }, - "type": "invoice.paid" + "type": "checkout.session.completed" } } diff --git a/resources/js/modules/editor/partials/canvas/video-download/video-download-modal.jsx b/resources/js/modules/editor/partials/canvas/video-download/video-download-modal.jsx index 7c1b009..b70db1c 100644 --- a/resources/js/modules/editor/partials/canvas/video-download/video-download-modal.jsx +++ b/resources/js/modules/editor/partials/canvas/video-download/video-download-modal.jsx @@ -12,7 +12,7 @@ const VideoDownloadModal = ({ isOpen, onClose, ffmpegCommand, handleDownloadButt - Download Video + Export Video {exportStatus || (exportProgress > 0 && ( @@ -39,7 +39,7 @@ const VideoDownloadModal = ({ isOpen, onClose, ffmpegCommand, handleDownloadButt {showDebug &&