← All changes
|
src/Infrastructure/WP/ShortcodeService/StepBookingShortcodeService.php
+8
-14
trunk
→
2.4
View file →
| @@ -7,11 +7,8 @@ | ||
| 7 | 7 | |
| 8 | 8 | namespace AmeliaBooking\Infrastructure\WP\ShortcodeService; |
| 9 | 9 | |
| 10 | 10 | use AmeliaBooking\Domain\Common\Exceptions\InvalidArgumentException; |
| 11 | -use AmeliaBooking\Domain\Services\Settings\SettingsService; | |
| 12 | -use AmeliaBooking\Infrastructure\Common\Container; | |
| 13 | -use AmeliaBooking\Infrastructure\WP\Integrations\PluginInstaller; | |
| 14 | 11 | |
| 15 | 12 | /** |
| 16 | 13 | * Class StepBookingShortcodeService |
| 17 | 14 | * |
| @@ -25,20 +22,10 @@ | ||
| 25 | 22 | * @throws InvalidArgumentException |
| 26 | 23 | */ |
| 27 | 24 | public static function shortcodeHandler($params) |
| 28 | 25 | { |
| 29 | - self::$container = self::$container ?: require AMELIA_PATH . '/src/Infrastructure/ContainerConfig/container.php'; | |
| 30 | - | |
| 31 | - /** @var SettingsService $settingsService */ | |
| 32 | - $settingsService = self::$container->get('domain.settings.service'); | |
| 33 | - | |
| 34 | - if (!empty($params['ivy']) && (!$settingsService->isFeatureEnabled('ivy') || !PluginInstaller::isPluginActive('ivyforms'))) { | |
| 35 | - $params['ivy'] = ''; | |
| 36 | - } | |
| 37 | - | |
| 38 | 26 | $params = shortcode_atts( |
| 39 | 27 | [ |
| 40 | - 'ivy' => '', | |
| 41 | 28 | 'trigger' => '', |
| 42 | 29 | 'trigger_type' => '', |
| 43 | 30 | 'in_dialog' => '', |
| 44 | 31 | 'layout' => '', |
| @@ -52,7 +39,14 @@ | ||
| 52 | 39 | ], |
| 53 | 40 | $params |
| 54 | 41 | ); |
| 55 | 42 | |
| 56 | - return self::renderView('step-booking.inc.php', $params); | |
| 43 | + self::prepareScriptsAndStyles(); | |
| 44 | + | |
| 45 | + ob_start(); | |
| 46 | + include AMELIA_PATH . '/view/frontend/step-booking.inc.php'; | |
| 47 | + $html = ob_get_contents(); | |
| 48 | + ob_end_clean(); | |
| 49 | + | |
| 50 | + return $html; | |
| 57 | 51 | } |
| 58 | 52 | } |