Merge pull request #1164 from Blair2004/v4.8.x

V4.8.x

Author: nexopos

app/Casts/FloatConvertCasting.php

@@ -17,7 +17,7 @@ class FloatConvertCasting implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes)
     {
-        return ns()->currency->getRaw( $value );
+        return ns()->math->set( $value ?: 0 )->toFloat();
     }
 
     /**

app/Jobs/RecomputeCashFlowForDate.php

@@ -4,6 +4,7 @@
 
 use App\Models\Role;
 use App\Services\ReportService;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -40,6 +41,9 @@ public function handle()
             Auth::login( $user );
         }
 
+        $this->fromDate     =   Carbon::parse( $this->fromDate );
+        $this->toDate     =   Carbon::parse( $this->toDate );
+
         /**
          * @var ReportService $reportService
          */

app/Providers/AppServiceProvider.php

@@ -16,6 +16,7 @@
 use App\Services\DemoService;
 use App\Services\ExpenseService;
 use App\Services\Helper;
+use App\Services\MathService;
 use App\Services\MediaService;
 use App\Services\MenuService;
 use App\Services\NotificationService;
@@ -129,7 +130,8 @@ public function register()
                 app()->make( OrdersService::class ),
                 app()->make( NotificationService::class ),
                 app()->make( ProcurementService::class ),
-                app()->make( Options::class )
+                app()->make( Options::class ),
+                app()->make( MathService::class )
             );
         });
 

app/Services/CoreService.php

@@ -29,7 +29,8 @@ public function __construct(
         public OrdersService $order,
         public NotificationService $notification,
         public ProcurementService $procurement,
-        public Options $option
+        public Options $option,
+        public MathService $math 
     ) {
         // ...
     }

app/Services/MathService.php

@@ -0,0 +1,12 @@
+<?php
+namespace App\Services;
+
+use Brick\Math\BigNumber;
+
+class MathService
+{
+    public function set( $value )
+    {
+        return BigNumber::of( $value );
+    }
+}

app/Services/UpdateService.php

@@ -30,7 +30,9 @@ public function getMigrations( $ignoreMigrations = false ): Collection
             $migrations = Migration::get()->map( fn( $migration ) => $migration->migration );
         }
 
-        $files = collect( Storage::disk( 'ns' )->allFiles( 'database/migrations' ) )->map( function( $file ) {
+        $files = collect( Storage::disk( 'ns' )->allFiles( 'database/migrations' ) )
+            ->filter( fn( $file ) => pathinfo( $file )[ 'extension' ] === 'php' )
+            ->map( function( $file ) {
             $fileInfo = pathinfo( $file );
 
             return $fileInfo[ 'filename' ];
@@ -41,7 +43,9 @@ public function getMigrations( $ignoreMigrations = false ): Collection
 
     public function getMatchingFullPath( $file )
     {
-        $files = collect( Storage::disk( 'ns' )->allFiles( 'database/migrations' ) )->mapWithKeys( function( $file ) {
+        $files = collect( Storage::disk( 'ns' )->allFiles( 'database/migrations' ) )
+            ->filter( fn( $file ) => pathinfo( $file )[ 'extension' ] === 'php' )
+            ->mapWithKeys( function( $file ) {
             $fileInfo = pathinfo( $file );
 
             return [ $fileInfo[ 'filename' ] => $file ];

config/nexopos.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'version' => '4.8.7',
+    'version' => '4.8.8',
     'languages' => [
         'en' => 'English',
         'fr' => 'Français',

database/migrations/update/2022_01_02_200145_wipe_cash_flow_transaction_2janv22.php

@@ -20,7 +20,7 @@ public function up()
             $fromDate = Carbon::parse( $order->created_at );
             $toDate = ns()->date->copy()->endOfDay();
 
-            RecomputeCashFlowForDate::dispatch( $fromDate, $toDate )
+            RecomputeCashFlowForDate::dispatch( $fromDate->toDateTimeString(), $toDate->toDateTimeString() )
                 ->delay( now()->addMinute() );
         }
     }