Merge pull request #4 from fridzema/patch-1

Update to BladeCompiler
akaunting · Feb 6, 2018 · c8efd04 · c8efd04
2 parents 159533e + d682378
commit c8efd04
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Provider.php b/src/Provider.php
@@ -2,8 +2,8 @@
 
 namespace Akaunting\Money;
 
-use Blade;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Compilers\BladeCompiler;
 
 class Provider extends ServiceProvider
 {
@@ -22,12 +22,16 @@ public function boot()
         Currency::setCurrencies($this->app->make('config')->get('money'));
 
         // Register blade directives
-        Blade::directive('money', function ($expression) {
-            return "<?php echo money($expression); ?>";
+        $this->app->afterResolving('blade.compiler', function (BladeCompiler $bladeCompiler) {
+            $bladeCompiler->directive('money', function ($expression) {
+                return "<?php echo money($expression); ?>";
+            });
         });
 
-        Blade::directive('currency', function ($expression) {
-            return "<?php echo currency($expression); ?>";
+        $this->app->afterResolving('blade.compiler', function (BladeCompiler $bladeCompiler) {
+            $bladeCompiler->directive('currency', function ($expression) {
+                return "<?php echo currency($expression); ?>";
+            });
         });
     }