diff --git a/.env.example b/.env.example index 7e90083e..21f1608b 100644 --- a/.env.example +++ b/.env.example @@ -49,6 +49,7 @@ S3_URL= STRIPE_SECRET_KEY= STRIPE_PUBLIC_KEY= +STRIPE_WEBHOOK_SECRET= PAYSTACK_SECRET= PAYSTACK_PUBLIC_KEY= diff --git a/config/subscription.php b/config/subscription.php deleted file mode 100644 index 1620400e..00000000 --- a/config/subscription.php +++ /dev/null @@ -1,54 +0,0 @@ - env('SUBSCRIPTION_DRIVER', 'stripe'), - - /* - * Activate drivers to handle subscription - */ - 'available_drivers' => [ - 'paystack', - 'paypal', - 'stripe', - ], - 'metered_billing' => [ - 'settlement_period' => 30, - /* - * Drivers which have native support for metered billing. - * This native support doesn't use subscription package credit system, but prefer - * auto-renew and maintain metered subscription on behalf of external service. - */ - 'native_support' => [ - 'stripe', - ], - ], - 'paystack' => [ - /* - * List of allowed ip address to verify paystack webhook request - */ - 'allowed_ips' => [ - '52.214.14.220', - '52.49.173.169', - '52.31.139.75', - ], - ], - - /* - * Get gateway credentials - */ - 'credentials' => [ - 'stripe' => [ - 'secret' => env('STRIPE_SECRET_KEY'), - 'public_key' => env('STRIPE_PUBLIC_KEY'), - ], - 'paystack' => [ - 'secret' => env('PAYSTACK_SECRET'), - 'public_key' => env('PAYSTACK_PUBLIC_KEY'), - ], - 'paypal' => [ - 'id' => env('PAYPAL_CLIENT_ID'), - 'secret' => env('PAYPAL_CLIENT_SECRET'), - 'webhook_id' => env('PAYPAL_WEBHOOK_ID'), - ], - ], -]; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 76427a57..37a36cbe 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,84 +1,115 @@ { - "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~7523d900.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~7523d900.js?id=12f4c5ab48b5a0cb2e2c", - "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=1d1feb9fb4447eaa5641", - "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js?id=f3eadc8c0db6eeb1a69e", - "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=04c7ff456d7c14690036", - "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=78c9623f5520dfc4d48f", - "/chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js": "/chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js?id=3884992f17df664ebeea", - "/vendors~chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/vendors~chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=65d4d1f3dee0c903b256", - "/chunks/app-others~chunks/payments/settings.js": "/chunks/app-others~chunks/payments/settings.js?id=799c453eb44b1ea910a1", - "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ee72c7f5b121615a9960", - "/chunks/shared-with-me~chunks/team-folders.js": "/chunks/shared-with-me~chunks/team-folders.js?id=c87a868a0817239251c6", - "/js/main.js": "/js/main.js?id=75220b8c1a57eb8218f9", - "/css/app.css": "/css/app.css?id=6a553b278ba6a0d8016b", - "/css/tailwind.css": "/css/tailwind.css?id=88aee0b85bd31c31ade0", - "/chunks/admin.js": "/chunks/admin.js?id=f148ec110b65e43c6459", - "/chunks/admin-account.js": "/chunks/admin-account.js?id=2b451c5c771360d72cd0", - "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=e527cbebd91b9d2d7908", - "/chunks/app-email.js": "/chunks/app-email.js?id=645276efac64183780dc", - "/chunks/app-index.js": "/chunks/app-index.js?id=586f74c66a03b0b396e0", - "/chunks/app-language.js": "/chunks/app-language.js?id=3dd20e4b50862daaa65a", - "/chunks/app-others.js": "/chunks/app-others.js?id=83b3e4c6230def37602f", - "/chunks/app-settings.js": "/chunks/app-settings.js?id=c42c35e7b970d2f2f349", - "/chunks/app-setup.js": "/chunks/app-setup.js?id=6a3d3e183ce8182166a6", - "/chunks/billing.js": "/chunks/billing.js?id=5b0a69e406a4506ea89c", - "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=db3c6e848558218931d9", - "/chunks/contact-us.js": "/chunks/contact-us.js?id=c294f47b200581435945", - "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=a2c7e484c5205ed2e9c6", - "/chunks/dashboard.js": "/chunks/dashboard.js?id=d71a4a2403dd5f601eea", - "/chunks/database.js": "/chunks/database.js?id=2af01e9c3d88fc2b0a49", - "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=8a7bb56d9acbfe129a28", - "/chunks/email-verified.js": "/chunks/email-verified.js?id=c5bfc71a5460b5e19196", - "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=1c10cce558d9a39ba034", - "/chunks/files.js": "/chunks/files.js?id=6a47868d4be7939433b5", - "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=3f220c64899793a33819", - "/chunks/homepage.js": "/chunks/homepage.js?id=32b05a7c0907f55b8e67", - "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=b5caafeb5b87c2268d9d", - "/chunks/invitation.js": "/chunks/invitation.js?id=b6db6b5befcfcff728a4", - "/chunks/invoices.js": "/chunks/invoices.js?id=866b8c5506ecb42b254a", - "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=a999320ddca23d30d34b", - "/chunks/not-found.js": "/chunks/not-found.js?id=8fddfcba9f83bfb3d64a", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=2dca766243e82485200f", - "/chunks/pages.js": "/chunks/pages.js?id=f1028759827c8794c1ac", - "/chunks/payments.js": "/chunks/payments.js?id=264dce06b933189b33ac", - "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=72f7e2d0c5a6e812c832", - "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=2bd241ecea50351d7541", - "/chunks/plan.js": "/chunks/plan.js?id=716d6ac00f24879afc20", - "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=770989e5aad8ce1433ff", - "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=ddc541162fdd24a6b458", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=95630a92a5bd394b9290", - "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=39d9d86eac5a1be2e251", - "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=ce70af553911edeff576", - "/chunks/plans.js": "/chunks/plans.js?id=fe8843ac30ff2db713a7", - "/chunks/platform.js": "/chunks/platform.js?id=c14adb096bb5bde1f0be", - "/chunks/profile.js": "/chunks/profile.js?id=972ed8899fe05a76250e", - "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=444ae11d2b264904b51f", - "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=d9d3e9c6fe97b2d495c0", - "/chunks/settings.js": "/chunks/settings.js?id=3ee73fa13aa46c1fcaed", - "/chunks/settings-password.js": "/chunks/settings-password.js?id=75987240d0e5300bfdc5", - "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=8a7504754e5647251eea", - "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=6165541cce8410232012", - "/chunks/shared.js": "/chunks/shared.js?id=fde0575ed24156e0d6c9", - "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=9de5ff0e3e78fd021a7d", - "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=ad07139861184425d752", - "/chunks/shared/files.js": "/chunks/shared/files.js?id=3cf054e4bbac38b44292", - "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=80018f7992ea3e46347e", - "/chunks/sign-in.js": "/chunks/sign-in.js?id=1f605786f4ec26d621a2", - "/chunks/sign-up.js": "/chunks/sign-up.js?id=9ae0e7e5626dabfb3573", - "/chunks/status-check.js": "/chunks/status-check.js?id=068fef72f720995f5585", - "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=6dc6d832e8a776cb2b10", - "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=f6825fd66311e671f02f", - "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=55db282ebc78be5616d6", - "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=8a385097021ec028878d", - "/chunks/team-folders.js": "/chunks/team-folders.js?id=d95aacf2906766dc6728", - "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=e9fe30c954d3022e93a6", - "/chunks/trash.js": "/chunks/trash.js?id=6787d7ac1ccff44a2e7a", - "/chunks/user.js": "/chunks/user.js?id=abe319cfdb8daa6b3446", - "/chunks/user-create.js": "/chunks/user-create.js?id=efa76029e2f7b97e1168", - "/chunks/user-delete.js": "/chunks/user-delete.js?id=9f9d9e7bd5d746e5061c", - "/chunks/user-detail.js": "/chunks/user-detail.js?id=45aca1983864df64ac31", - "/chunks/user-password.js": "/chunks/user-password.js?id=6085861301512f226336", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=299c57cce9bcb4e55a67", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=cfe7fff102a153d2ac1c", - "/chunks/users.js": "/chunks/users.js?id=ee5e758fd44918ce7e8c" + "/js/main.js": "/js/main.js", + "/css/app.css": "/css/app.css", + "/css/tailwind.css": "/css/tailwind.css", + "/chunks/admin.js": "/chunks/admin.js?id=9cd48b7dbccd9d558e4b", + "/chunks/admin-account.js": "/chunks/admin-account.js?id=c83a81863882b9478feb", + "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js?id=b315e8dcb5e79c1c8e7c", + "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app~f4e3acb1.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app~f4e3acb1.js?id=08ee54ab4c19d49dc342", + "/chunks/admin~chunks/app-language~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/pages~ch~f0fcfeb5.js": "/chunks/admin~chunks/app-language~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/pages~ch~f0fcfeb5.js?id=49d24ddd9000251f2f71", + "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js?id=0ae7b3d840e0e20fe358", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=7b94fd0c332ed326530d", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=9535568da44844c1bf50", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=510e6c1b1017a73a40a6", + "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=354c892546e5c369a749", + "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=30e106dacad45945a1f8", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=f83cd7a31e2a057fcc6a", + "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=afeba4ebd13af7e995be", + "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=8c2056d19d6d40d79cb7", + "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~45d16af9.js": "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~45d16af9.js?id=a4b9a9a416c656f4d95d", + "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~fdb7bddc.js": "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~fdb7bddc.js?id=c5ac05de67d02437f154", + "/chunks/app-email.js": "/chunks/app-email.js?id=e03724a7c525acdc90ad", + "/chunks/app-index.js": "/chunks/app-index.js?id=25af79d14fabd8f41c59", + "/chunks/app-language.js": "/chunks/app-language.js?id=3da08c7a521fae79b71c", + "/chunks/app-language~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/pages~chunks/plans~ch~34cbbba8.js": "/chunks/app-language~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/pages~chunks/plans~ch~34cbbba8.js?id=cde56423f3c014574388", + "/chunks/app-language~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-create/fixed~chunks/pl~5bde2d56.js": "/chunks/app-language~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-create/fixed~chunks/pl~5bde2d56.js?id=6ec0bf9b17cff3594760", + "/chunks/app-others.js": "/chunks/app-others.js?id=ed899e0c8ae8aa1c7741", + "/chunks/app-others~chunks/payments/settings.js": "/chunks/app-others~chunks/payments/settings.js?id=699b3df59133d2f56399", + "/chunks/app-settings.js": "/chunks/app-settings.js?id=ebd7d0e703b9adc47eae", + "/chunks/app-setup.js": "/chunks/app-setup.js?id=c3a013b11ae7bde6f39d", + "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~2c1222b7.js": "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~2c1222b7.js?id=5963f5d9fb4e759c600a", + "/chunks/billing.js": "/chunks/billing.js?id=b09b7920784f89ffae52", + "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=0ffe43f76a33278ce1b8", + "/chunks/billing~chunks/dashboard~chunks/invoices~chunks/pages~chunks/payments/settings~chunks/plan-su~cdf8788b.js": "/chunks/billing~chunks/dashboard~chunks/invoices~chunks/pages~chunks/payments/settings~chunks/plan-su~cdf8788b.js?id=d56f3c7df8d8dd9caaaf", + "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js?id=669bd6d15cfa4c6e75df", + "/chunks/contact-us.js": "/chunks/contact-us.js?id=b3feaa361fc486e6a0b3", + "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=65ee559ca803555be568", + "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=8451872075acf5b1b9ab", + "/chunks/dashboard.js": "/chunks/dashboard.js?id=f3df2b84140150d58f4d", + "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js": "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js?id=7c627ccb1eb284aee632", + "/chunks/database.js": "/chunks/database.js?id=d469910e2c3f230d05f0", + "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6c86916c6c6f679fa86b", + "/chunks/email-verified.js": "/chunks/email-verified.js?id=d2ad805b24006febdd9e", + "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=449141bd7e0d93947999", + "/chunks/files.js": "/chunks/files.js?id=f0a4d97bafb958087749", + "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=64ac90ff8ae7d3ee3ed1", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=fd09338f95a63dfa9f95", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js?id=95a21dc98f0b9a5ba0cb", + "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=1a5fcbb2e18b3d7c2b73", + "/chunks/homepage.js": "/chunks/homepage.js?id=5c13035882099966e4bc", + "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=518f83e155f2d84fc626", + "/chunks/invitation.js": "/chunks/invitation.js?id=b3a04d44ea7e75c6203a", + "/chunks/invoices.js": "/chunks/invoices.js?id=2032e4f8e4f5ed58b8b4", + "/chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js": "/chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js?id=266aebab10b95e7bcc74", + "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ef0a2dbe808eaee42c1f", + "/chunks/not-found.js": "/chunks/not-found.js?id=9b179edd89e9b0544566", + "/chunks/page-edit.js": "/chunks/page-edit.js?id=153e56a1e7b98c976a15", + "/chunks/pages.js": "/chunks/pages.js?id=fc4b17b939582125c0c3", + "/chunks/payments.js": "/chunks/payments.js?id=346c518edc0a3def08ba", + "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=5d27194aaaeb808207a9", + "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=fb1a6b7bab043baa17e8", + "/chunks/plan.js": "/chunks/plan.js?id=2887b10b3fd458412fe7", + "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=e48027f07e88a84eb7a1", + "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=f6b52099dd641e8dd64b", + "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=c713fecd58059a5467a0", + "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=8764a4e1479f76665c09", + "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=d3c7ce482e801cf846ab", + "/chunks/plans.js": "/chunks/plans.js?id=e97cd80733d7e60189e6", + "/chunks/platform.js": "/chunks/platform.js?id=f87ec44cdb5b120f1258", + "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=79f939d6b1f26b9b833c", + "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=ca9ca67afd5839597647", + "/chunks/profile.js": "/chunks/profile.js?id=8688d9c7ff850e6989e6", + "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=7474887245d57e6c8d96", + "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=2da6b9e5f951fb7f4312", + "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=8577d4c771602671b38a", + "/chunks/settings.js": "/chunks/settings.js?id=2f69a8a26bd5ec20f9c8", + "/chunks/settings-password.js": "/chunks/settings-password.js?id=54ee44cd05ce22b6acf3", + "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=9eefbf595758685d01b7", + "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=aafc9cd6aa47b01bc25a", + "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5", + "/chunks/shared.js": "/chunks/shared.js?id=db60726012b6d246bd77", + "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=cf39d503eef93bcc7f1c", + "/chunks/shared-with-me~chunks/team-folders.js": "/chunks/shared-with-me~chunks/team-folders.js?id=abf65131397ea2b12355", + "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=4bac60e6cf1a4a5bd770", + "/chunks/shared/files.js": "/chunks/shared/files.js?id=75150f652f04adac3f7a", + "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=1abb5dd58d0ed626cd6e", + "/chunks/sign-in.js": "/chunks/sign-in.js?id=e78d6d18a2e648cc54fb", + "/chunks/sign-up.js": "/chunks/sign-up.js?id=b8fd62b6a30b5b196ac6", + "/chunks/status-check.js": "/chunks/status-check.js?id=14f6e6490fd43e652e2c", + "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=a237b94d6cdced4808fe", + "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=6fa05c370b50ee5a7b5d", + "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=8ac19b3fcfd57d79e5b1", + "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=b44f135f876591688d94", + "/chunks/team-folders.js": "/chunks/team-folders.js?id=aa0351b975cf45efac3b", + "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=2269ad0b9a010b240838", + "/chunks/trash.js": "/chunks/trash.js?id=1f5f349fb9ec23ba2e93", + "/chunks/user.js": "/chunks/user.js?id=7025a168a3d28e8612c2", + "/chunks/user-create.js": "/chunks/user-create.js?id=7afa7e2ff21c807d4b1d", + "/chunks/user-delete.js": "/chunks/user-delete.js?id=1de26d97d08b3946abce", + "/chunks/user-detail.js": "/chunks/user-detail.js?id=827a7748f817e852aaa4", + "/chunks/user-password.js": "/chunks/user-password.js?id=da0dced867709ba29629", + "/chunks/user-storage.js": "/chunks/user-storage.js?id=efc9202b1c892a73b559", + "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=9e0d19218275cae61754", + "/chunks/users.js": "/chunks/users.js?id=d32a40d18460d974c5dd", + "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~7523d900.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~7523d900.js?id=02104d6d78a8ffe97c12", + "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~d86004d6.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~d86004d6.js?id=b40f5f673ec2ab7de20b", + "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=ab29ab0a0c2d5a40b39d", + "/vendors~chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/vendors~chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a0fa80db175709ba340a", + "/vendors~chunks/settings.js": "/vendors~chunks/settings.js?id=5bf155d80b2fb871ec84", + "/chunks/plan-create/fixed.5c8d36b9bdb858b95858.hot-update.js": "/chunks/plan-create/fixed.5c8d36b9bdb858b95858.hot-update.js", + "/chunks/plan-create/metered.2f808f3870b3d9e0b6d3.hot-update.js": "/chunks/plan-create/metered.2f808f3870b3d9e0b6d3.hot-update.js", + "/chunks/payments/settings.407ad218d442506201a9.hot-update.js": "/chunks/payments/settings.407ad218d442506201a9.hot-update.js", + "/chunks/payments/settings.811395c78e7605cb5b11.hot-update.js": "/chunks/payments/settings.811395c78e7605cb5b11.hot-update.js", + "/chunks/payments/settings.45b116f0c6d160b5150e.hot-update.js": "/chunks/payments/settings.45b116f0c6d160b5150e.hot-update.js", + "/chunks/payments/settings.987a5810ad14724e5acc.hot-update.js": "/chunks/payments/settings.987a5810ad14724e5acc.hot-update.js" } diff --git a/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue b/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue index 9183db35..bc6255c4 100644 --- a/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue +++ b/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue @@ -91,6 +91,11 @@ + + + + + {{ $t('Store Credentials') }} @@ -201,6 +206,11 @@ + + + + + {{ $t('Store Credentials') }} @@ -285,6 +295,7 @@ credentials: { key: undefined, secret: undefined, + webhook: undefined, } }, paystack: { @@ -305,9 +316,9 @@ credentials: { key: undefined, secret: undefined, + webhook: undefined, } }, - columns: [ { label: this.$t('Name'), @@ -352,6 +363,7 @@ service: service, key: this[service].credentials.key, secret: this[service].credentials.secret, + webhook: this[service].credentials.webhook || undefined, }) .then(() => { @@ -363,7 +375,7 @@ }[service] // Commit credentials - this.$store.commit(commitKey, credentials[service]) + this.$store.commit(commitKey, this[service].credentials) this[service].allowedService = true this[service].isConfigured = true diff --git a/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue index 7a47203d..4ecef8d3 100644 --- a/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue +++ b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue @@ -158,8 +158,8 @@ message: this.$t('toaster.plan_created'), }) - // Go to User page - this.$router.push({name: 'PlanSettings', params: {id: response.data.data.id}}) + // Go to plan page + this.$router.push({name: 'PlanFixedSettings', params: {id: response.data.data.id}}) }) .catch(error => { diff --git a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue index c9294fa0..ac5bd46a 100644 --- a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue +++ b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue @@ -217,7 +217,7 @@ message: this.$t('toaster.plan_created'), }) - // Go to User page + // Go to plan page this.$router.push({name: 'PlanMeteredSettings', params: {id: response.data.data.id}}) }) .catch(error => { diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php index 5cda6f43..9d71ab3e 100644 --- a/src/App/Console/Commands/SetupDevEnvironment.php +++ b/src/App/Console/Commands/SetupDevEnvironment.php @@ -1083,6 +1083,10 @@ class SetupDevEnvironment extends Command 'name' => 'allowed_stripe', 'value' => 1, ], + [ + 'name' => 'subscription_type', + 'value' => 'fixed', + ], ])->each(function ($col) { Setting::updateOrCreate([ 'name' => $col['name'], diff --git a/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php b/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php index 8a3b5818..42ddb0f0 100644 --- a/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php +++ b/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php @@ -43,8 +43,9 @@ class StorePaymentServiceCredentialsController if (! app()->runningUnitTests()) { $credentials = [ 'stripe' => [ - 'STRIPE_PUBLIC_KEY' => $request->input('key'), - 'STRIPE_SECRET_KEY' => $request->input('secret'), + 'STRIPE_PUBLIC_KEY' => $request->input('key'), + 'STRIPE_SECRET_KEY' => $request->input('secret'), + 'STRIPE_WEBHOOK_SECRET' => $request->input('webhook'), ], 'paystack' => [ 'PAYSTACK_PUBLIC_KEY' => $request->input('key'), @@ -53,6 +54,7 @@ class StorePaymentServiceCredentialsController 'paypal' => [ 'PAYPAL_CLIENT_ID' => $request->input('key'), 'PAYPAL_CLIENT_SECRET' => $request->input('secret'), + 'PAYPAL_WEBHOOK_ID' => $request->input('webhook'), ], ];