From 6f14e127a31d1cf107afe71486cec611b01a5171 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 24 Aug 2023 17:08:32 +0200
Subject: [PATCH] fix things

---
 config/subscription.php                     | 16 +++++------
 docker-compose.prod.yml                     | 31 +++++++++++++++++----
 resources/views/components/stripe.blade.php |  0
 resources/views/subscription/show.blade.php |  1 -
 4 files changed, 33 insertions(+), 15 deletions(-)
 delete mode 100644 resources/views/components/stripe.blade.php

diff --git a/config/subscription.php b/config/subscription.php
index de2f6d568..f646723f8 100644
--- a/config/subscription.php
+++ b/config/subscription.php
@@ -4,7 +4,6 @@
     'provider'=> env('SUBSCRIPTION_PROVIDER', null), // stripe, paddle, lemon
     // Stripe
     'stripe_api_key' => env('STRIPE_API_KEY', null),
-    'stripe_secret' => env('STRIPE_SECRET', null),
     'stripe_webhook_secret' => env('STRIPE_WEBHOOK_SECRET', null),
     'stripe_price_id_basic_monthly' => env('STRIPE_PRICE_ID_BASIC_MONTHLY', null),
     'stripe_price_id_basic_yearly' => env('STRIPE_PRICE_ID_BASIC_YEARLY', null),
@@ -17,6 +16,7 @@
     // Paddle
     'paddle_vendor_id' => env('PADDLE_VENDOR_ID', null),
     'paddle_vendor_auth_code' => env('PADDLE_VENDOR_AUTH_CODE', null),
+    'paddle_webhook_secret' => env('PADDLE_WEBHOOK_SECRET', null),
     'paddle_public_key' => env('PADDLE_PUBLIC_KEY', null),
     'paddle_price_id_basic_monthly' => env('PADDLE_PRICE_ID_BASIC_MONTHLY', null),
     'paddle_price_id_basic_yearly' => env('PADDLE_PRICE_ID_BASIC_YEARLY', null),
@@ -24,18 +24,18 @@
     'paddle_price_id_pro_yearly' => env('PADDLE_PRICE_ID_PRO_YEARLY', null),
     'paddle_price_id_ultimate_monthly' => env('PADDLE_PRICE_ID_ULTIMATE_MONTHLY', null),
     'paddle_price_id_ultimate_yearly' => env('PADDLE_PRICE_ID_ULTIMATE_YEARLY', null),
-    'paddle_webhook_secret' => env('PADDLE_WEBHOOK_SECRET', null),
+
 
 
     // Lemon
     'lemon_squeezy_api_key' => env('LEMON_SQUEEZY_API_KEY', null),
     'lemon_squeezy_webhook_secret' => env('LEMON_SQUEEZY_WEBHOOK_SECRET', null),
-    'lemon_squeezy_checkout_id_monthly_basic' => env('LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_BASIC', null),
-    'lemon_squeezy_checkout_id_monthly_pro' => env('LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_PRO', null),
-    'lemon_squeezy_checkout_id_monthly_ultimate' => env('LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_ULTIMATE', null),
-    'lemon_squeezy_checkout_id_yearly_basic' => env('LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_BASIC', null),
-    'lemon_squeezy_checkout_id_yearly_pro' => env('LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_PRO', null),
-    'lemon_squeezy_checkout_id_yearly_ultimate' => env('LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_ULTIMATE', null),
+    'lemon_squeezy_checkout_id_basic_monthly' => env('LEMON_SQUEEZY_CHECKOUT_ID_BASIC_MONTHLY', null),
+    'lemon_squeezy_checkout_id_basic_yearly' => env('LEMON_SQUEEZY_CHECKOUT_ID_BASIC_YEARLY', null),
+    'lemon_squeezy_checkout_id_pro_monthly' => env('LEMON_SQUEEZY_CHECKOUT_ID_PRO_MONTHLY', null),
+    'lemon_squeezy_checkout_id_pro_yearly' => env('LEMON_SQUEEZY_CHECKOUT_ID_PRO_YEARLY', null),
+    'lemon_squeezy_checkout_id_ultimate_monthly' => env('LEMON_SQUEEZY_CHECKOUT_ID_ULTIMATE_MONTHLY', null),
+    'lemon_squeezy_checkout_id_ultimate_yearly' => env('LEMON_SQUEEZY_CHECKOUT_ID_ULTIMATE_YEARLY', null),
     'lemon_squeezy_basic_plan_ids' => env('LEMON_SQUEEZY_BASIC_PLAN_IDS', ""),
     'lemon_squeezy_pro_plan_ids' => env('LEMON_SQUEEZY_PRO_PLAN_IDS', ""),
     'lemon_squeezy_ultimate_plan_ids' => env('LEMON_SQUEEZY_ULTIMATE_PLAN_IDS', ""),
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 2f9058269..710f44f2c 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -34,14 +34,33 @@ services:
       - PHP_PM_MAX_SPARE_SERVERS=10
       - SELF_HOSTED
       - WAITLIST
+      - SUBSCRIPTION_PROVIDER
+      - STRIPE_API_KEY
+      - STRIPE_WEBHOOK_SECRET
+      - STRIPE_PRICE_ID_BASIC_MONTHLY
+      - STRIPE_PRICE_ID_BASIC_YEARLY
+      - STRIPE_PRICE_ID_PRO_MONTHLY
+      - STRIPE_PRICE_ID_PRO_YEARLY
+      - STRIPE_PRICE_ID_ULTIMATE_MONTHLY
+      - STRIPE_PRICE_ID_ULTIMATE_YEARLY
+      - PADDLE_VENDOR_ID
+      - PADDLE_WEBHOOK_SECRET
+      - PADDLE_VENDOR_AUTH_CODE
+      - PADDLE_PUBLIC_KEY
+      - PADDLE_PRICE_ID_BASIC_MONTHLY
+      - PADDLE_PRICE_ID_BASIC_YEARLY
+      - PADDLE_PRICE_ID_PRO_MONTHLY
+      - PADDLE_PRICE_ID_PRO_YEARLY
+      - PADDLE_PRICE_ID_ULTIMATE_MONTHLY
+      - PADDLE_PRICE_ID_ULTIMATE_YEARLY
       - LEMON_SQUEEZY_API_KEY
       - LEMON_SQUEEZY_WEBHOOK_SECRET
-      - LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_BASIC
-      - LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_PRO
-      - LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_ULTIMATE
-      - LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_BASIC
-      - LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_PRO
-      - LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_ULTIMATE
+      - LEMON_SQUEEZY_CHECKOUT_ID_BASIC_MONTHLY
+      - LEMON_SQUEEZY_CHECKOUT_ID_BASIC_YEARLY
+      - LEMON_SQUEEZY_CHECKOUT_ID_PRO_MONTHLY
+      - LEMON_SQUEEZY_CHECKOUT_ID_PRO_YEARLY
+      - LEMON_SQUEEZY_CHECKOUT_ID_ULTIMATE_MONTHLY
+      - LEMON_SQUEEZY_CHECKOUT_ID_ULTIMATE_YEARLY
       - LEMON_SQUEEZY_BASIC_PLAN_IDS
       - LEMON_SQUEEZY_PRO_PLAN_IDS
       - LEMON_SQUEEZY_ULTIMATE_PLAN_IDS
diff --git a/resources/views/components/stripe.blade.php b/resources/views/components/stripe.blade.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/resources/views/subscription/show.blade.php b/resources/views/subscription/show.blade.php
index 1cab51638..669e94c0e 100644
--- a/resources/views/subscription/show.blade.php
+++ b/resources/views/subscription/show.blade.php
@@ -1,7 +1,6 @@
 <x-layout-subscription>
     @if ($settings->is_resale_license_active)
         <div class="flex justify-center mx-10">
-
             <div x-data>
                 <div class="flex gap-2">
                     <h2>Subscription</h2>