Refactor ThemeServiceProvider and enhance SEO metadata structure

- Updated the ThemeServiceProvider.php file to replace the existing encoded content with a new encoded string.
- Modified the HasEditor trait to include a new 'seo' array in the toPublic() method, encapsulating meta title, keywords, and description for improved SEO handling.

Author: dipaksarkar

lib/helpers.php

@@ -110,6 +110,26 @@ function app_url($path = '', $query = [])
     }
 }
 
+if (!function_exists('base_route')) {
+    function base_route($path = '', $query = [])
+    {
+        if (empty($path)) {
+            $url =  '/';
+        } else {
+            // Check if $path starts with a slash
+            $separator = (substr($path, 0, 1) === '/') ? '' : '/';
+            $url = $separator . $path;
+        }
+
+        // Append query parameters if provided
+        if (!empty($query)) {
+            $url .= '?' . http_build_query($query);
+        }
+
+        return $url;
+    }
+}
+
 if (!function_exists('user_route')) {
     function user_route($path = '', $query = [])
     {

src/Coderstm.php

@@ -100,6 +100,18 @@ class Coderstm
      */
     protected static $gocardlessClient;
 
+    /**
+     * The cached PayPal client instance.
+     *  @var \Srmklive\PayPal\Services\PayPal
+     */
+    protected static $paypalClient;
+
+    /**
+     * The cached Razorpay client instance.
+     *  @var \Razorpay\Api\Api
+     */
+    protected static $razorpayClient;
+
     /**
      * Determine if Coderstm's migrations should be run.
      *
@@ -264,4 +276,45 @@ public static function gocardless(array $options = []): \GoCardlessPro\Client
 
         return static::$gocardlessClient = new \GoCardlessPro\Client($clientOptions);
     }
+
+    /**
+     * Get the paypal client instance.
+     *  @param  array  $options
+     * @return \Srmklive\PayPal\Services\PayPal
+     */
+    public static function paypal(array $options = []): \Srmklive\PayPal\Services\PayPal
+    {
+        if (static::$paypalClient) {
+            return static::$paypalClient;
+        }
+
+        $options = array_merge(config('paypal'), $options);
+
+        $provider = new \Srmklive\PayPal\Services\PayPal;
+        $provider->setApiCredentials(config('paypal'));
+        $provider->getAccessToken();
+
+        return static::$paypalClient = $provider;
+    }
+
+    /**
+     * Get the razorpay client instance.
+     *  @param  array  $options
+     * @return \Razorpay\Api\Api
+     */
+    public static function razorpay(array $options = []): \Razorpay\Api\Api
+    {
+        if (static::$razorpayClient) {
+            return static::$razorpayClient;
+        }
+
+        $keyId = $options['key_id'] ?? config('razorpay.key_id');
+        $keySecret = $options['key_secret'] ?? config('razorpay.key_secret');
+
+        if (empty($keyId) || empty($keySecret)) {
+            throw new \Exception('Razorpay key ID and secret are required. Please configure your Razorpay payment method.');
+        }
+
+        return static::$razorpayClient = new \Razorpay\Api\Api($keyId, $keySecret);
+    }
 }

src/Http/Controllers/Payment/PaypalController.php

@@ -2,29 +2,18 @@
 
 namespace Coderstm\Http\Controllers\Payment;
 
+use Coderstm\Coderstm;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Coderstm\Models\Shop\Order;
 use Coderstm\Traits\Paymentable;
 use Coderstm\Models\PaymentMethod;
 use Coderstm\Http\Controllers\Controller;
-use Srmklive\PayPal\Services\PayPal as PayPalClient;
 
 class PaypalController extends Controller
 {
     use Paymentable;
 
-    protected PayPalClient $provider;
-
-    function __construct()
-    {
-        if (PaymentMethod::has('paypal')) {
-            $this->provider = new PayPalClient;
-            $this->provider->setApiCredentials(config('paypal'));
-            $this->provider->getAccessToken();
-        }
-    }
-
     public function token(Request $request)
     {
         $request->validate([
@@ -33,7 +22,7 @@ public function token(Request $request)
 
         $order = Order::findByKey($request->key)->load('customer');
 
-        $response = $this->provider->createOrder([
+        $response = Coderstm::paypal()->createOrder([
             "intent" => "CAPTURE",
             "purchase_units" => [
                 [
@@ -57,7 +46,8 @@ public function token(Request $request)
             ], 200);
         } else {
             return response()->json([
-                'error' => $response['message'] ?? 'Something went wrong.'
+                'response' => $response,
+                'error' => $response['error']['message'] ?? 'Something went wrong.'
             ], 500);
         }
     }
@@ -76,7 +66,7 @@ private function verifyPayment(Request $request): Order
         $orderable = $order->orderable;
 
         try {
-            $payment = $this->provider->capturePaymentOrder($orderID);
+            $payment = Coderstm::paypal()->capturePaymentOrder($orderID);
 
             if (isset($payment['status']) && $payment['status'] == 'COMPLETED') {
                 $order->markAsPaid(PaymentMethod::paypal()->id, [

src/Http/Controllers/Payment/RazorpayController.php

@@ -2,25 +2,18 @@
 
 namespace Coderstm\Http\Controllers\Payment;
 
+use Coderstm\Coderstm;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Coderstm\Models\Shop\Order;
 use Coderstm\Traits\Paymentable;
-use Razorpay\Api\Api as Razorpay;
 use Coderstm\Models\PaymentMethod;
 use Coderstm\Http\Controllers\Controller;
 
 class RazorpayController extends Controller
 {
     use Paymentable;
 
-    protected Razorpay $provider;
-
-    function __construct()
-    {
-        $this->provider = new Razorpay(config('razorpay.key_id'), config('razorpay.key_secret'));
-    }
-
     public function token(Request $request)
     {
         $request->validate([
@@ -29,7 +22,7 @@ public function token(Request $request)
 
         $order = Order::findByKey($request->key)->load('customer');
 
-        $paymentIntent = $this->provider->order->create([
+        $paymentIntent = Coderstm::razorpay()->order->create([
             'receipt' => $order->formated_id,
             'amount' => (int) $order->grand_total * 100,
             'currency' => Str::upper($order->currency),
@@ -61,14 +54,14 @@ private function verifyPayment(Request $request): Order
 
         try {
             // Verify the signature
-            $this->provider->utility->verifyPaymentSignature($request->only([
+            Coderstm::razorpay()->utility->verifyPaymentSignature($request->only([
                 'razorpay_signature',
                 'razorpay_payment_id',
                 'razorpay_order_id',
             ]));
 
             // Fetch the payment details
-            $payment = $this->provider->payment->fetch($request->razorpay_payment_id);
+            $payment = Coderstm::razorpay()->payment->fetch($request->razorpay_payment_id);
 
             // Payment is successful, proceed with your business logic
             $order->markAsPaid(PaymentMethod::razorpay()->id, [

src/Models/PaymentMethod.php

@@ -3,9 +3,10 @@
 namespace Coderstm\Models;
 
 use Coderstm\Traits\Core;
-use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 
 class PaymentMethod extends Model
@@ -20,6 +21,7 @@ class PaymentMethod extends Model
     const DIRECT_DEBIT = 'direct_debit';
 
     const CACHE_KEY = 'payment_methods_configurations';
+    public static string $cacheKey = self::CACHE_KEY;
 
     protected $fillable = [
         'name',
@@ -48,6 +50,11 @@ class PaymentMethod extends Model
         'options' => 'array',
     ];
 
+    protected static function cacheKey(): string
+    {
+        return static::$cacheKey ?? static::CACHE_KEY;
+    }
+
     protected function label(): Attribute
     {
         return Attribute::make(
@@ -186,7 +193,7 @@ protected static function booted()
     public static function updateProviderCache(string $provider): void
     {
         // Get all cached configs
-        $allConfigs = Cache::get(self::CACHE_KEY, []);
+        $allConfigs = Cache::get(self::cacheKey(), []);
 
         // Update or remove the specified provider
         $config = self::getProviderConfig($provider);
@@ -200,7 +207,7 @@ public static function updateProviderCache(string $provider): void
         }
 
         // Store updated configs back to cache
-        Cache::forever(self::CACHE_KEY, $allConfigs);
+        Cache::forever(self::cacheKey(), $allConfigs);
     }
 
     /**
@@ -282,7 +289,7 @@ public static function getProviderConfig(string $provider): ?array
      */
     public static function applyProviderConfig(string $provider): void
     {
-        $allConfigs = Cache::get(self::CACHE_KEY, []);
+        $allConfigs = Cache::get(self::cacheKey(), []);
 
         if (isset($allConfigs[$provider]) && !empty($allConfigs[$provider])) {
             config($allConfigs[$provider]);
@@ -320,7 +327,7 @@ public static function syncConfig(): void
             $providers = [self::STRIPE, self::PAYPAL, self::RAZORPAY, self::GOCARDLESS];
 
             // Use rememberForever for efficient caching
-            $configs = Cache::rememberForever(self::CACHE_KEY, function () use ($providers) {
+            $configs = Cache::rememberForever(self::cacheKey(), function () use ($providers) {
                 $allConfigs = [];
 
                 // Fetch all active payment methods in a single query

src/Providers/CoderstmEventServiceProvider.php

@@ -1,31 +1,31 @@
 <?php //002cd
 if(extension_loaded('ionCube Loader')){die('The file '.__FILE__." is corrupted.\n");}echo("\nScript error: the ".(($cli=(php_sapi_name()=='cli')) ?'ionCube':'<a href="https://www.ioncube.com">ionCube</a>')." Loader for PHP needs to be installed.\n\nThe ionCube Loader is the industry standard PHP extension for running protected PHP code,\nand can usually be added easily to a PHP installation.\n\nFor Loaders please visit".($cli?":\n\nhttps://get-loader.ioncube.com\n\nFor":' <a href="https://get-loader.ioncube.com">get-loader.ioncube.com</a> and for')." an instructional video please see".($cli?":\n\nhttp://ioncu.be/LV\n\n":' <a href="http://ioncu.be/LV">http://ioncu.be/LV</a> ')."\n\n");exit(199);
 ?>
-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
-vnGsgAjcXpWZSgKzz+jWAAtZaUqu
+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