Merge pull request #308 from Blair2004/v4.5.x

V4.5.x

Author: Blair2004

.gitignore

@@ -37,3 +37,4 @@ public/mapping.json
 storage/module.zip
 tests/database.sqlite
 tests/database.sqlite-journal
+storage/snapshots/*.sql

app/Console/Kernel.php

@@ -33,6 +33,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
+        $schedule->command( 'telescope:prune' )->daily();
         $schedule->job( new TaskSchedulingPingJob )->hourly();
         $schedule->job( new ExecuteExpensesJob )->daily( '00:01' );
         $schedule->job( new StockProcurementJob() )->daily( '00:05' );        

app/Exceptions/Handler.php

@@ -2,7 +2,9 @@
 
 namespace App\Exceptions;
 
+use App\Exceptions\QueryException as ExceptionsQueryException;
 use Illuminate\Auth\AuthenticationException;
+use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Validation\ValidationException as MainValidationException;
 use Throwable;
@@ -45,6 +47,8 @@ public function report(Throwable $exception)
     /**
      * We want to use our defined route
      * instead of what is provided by laravel.
+     * @return \Illuminate\Routing\Redirector
+     * 
      */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
@@ -71,6 +75,11 @@ public function render($request, Throwable $exception)
                 ->render( $request );
         }
 
+        if ( $exception instanceof QueryException ) {
+            return ( new ExceptionsQueryException( $exception->getMessage() ) )
+                ->render( $request );
+        }
+
         return parent::render($request, $exception);
     }
 }

app/Exceptions/QueryException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class QueryException extends Exception
+{
+    public function render( $message )
+    {
+        $message    =   $this->getMessage();
+        $title      =   __( 'Query Exception' );
+        return response()->view( 'pages.errors.db-exception', compact( 'message', 'title' ), 500 );
+    }
+}

app/Http/Controllers/Dashboard/CustomersController.php

@@ -13,6 +13,7 @@
 use App\Crud\CustomerCrud;
 use App\Crud\CustomerOrderCrud;
 use App\Crud\CustomerRewardCrud;
+use App\Exceptions\NotFoundException;
 use App\Models\Customer;
 
 use Illuminate\Http\Request;
@@ -65,8 +66,12 @@ public function get( $customer_id = null )
     {
         $customer   =   Customer::with( 'group' )->find( $customer_id );
 
-        if ( $customer instanceof Customer ) {
-            return $customer;
+        if ( $customer_id !== null ) {
+            if ( $customer instanceof Customer ) {
+                return $customer;
+            }
+
+            throw new NotFoundException( __( 'The requested customer cannot be fonud.' ) );
         }
 
         return $this->customerService->get();

app/Providers/ModulesServiceProvider.php

@@ -9,6 +9,7 @@
 class ModulesServiceProvider extends ServiceProvider
 {
     protected $modulesCommands  =   [];
+    protected $modules;
 
     /**
      * Bootstrap the application services.
@@ -43,16 +44,16 @@ public function register()
     {
         // register module singleton
         $this->app->singleton( ModulesService::class, function( $app ) {
-            $modules    =   new ModulesService;
-            $modules->load();
-            
-            collect( $modules->getEnabled() )->each( fn( $module ) => $modules->boot( $module ) );
-            
+            $this->modules  =   new ModulesService;
+            $this->modules->load();
+
+            collect( $this->modules->getEnabled() )->each( fn( $module ) => $this->modules->boot( $module ) );
+                
             /**
              * trigger register method only for enabled modules
              * service providers that extends ModulesServiceProvider.
              */
-            collect( $modules->getEnabled() )->each( function( $module ) use ( $modules ) {
+            collect( $this->modules->getEnabled() )->each( function( $module ) {
                 /**
                  * register module commands
                  */
@@ -61,12 +62,12 @@ public function register()
                     array_keys( $module[ 'commands' ] )
                 );
 
-                $modules->triggerServiceProviders( $module, 'register', ServiceProvider::class );
+                $this->modules->triggerServiceProviders( $module, 'register', ServiceProvider::class );
             });
 
-            event( new ModulesLoadedEvent( $modules->get() ) );
+            event( new ModulesLoadedEvent( $this->modules->get() ) );
 
-            return $modules;
+            return $this->modules;
         });
     }
 }

app/Services/Helpers/App.php

@@ -1,9 +1,12 @@
 <?php
 namespace App\Services\Helpers;
 
+use App\Classes\Hook;
+use Illuminate\Support\Facades\DB;
 use Jackiedo\DotenvEditor\Facades\DotenvEditor;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
 
 trait App {
     /**
@@ -12,12 +15,13 @@ trait App {
      */
     static function installed()
     {
-        if ( DotenvEditor::keyExists( 'NS_VERSION' ) ) {
-            $version    =   DotenvEditor::getValue( 'NS_VERSION' );
-            return ! in_array( $version, [ null, false ]);
+        try {
+            if( DB::connection()->getPdo() ){
+                return Schema::hasTable( 'nexopos_options' );
+            }
+        } catch (\Exception $e) {
+            return false;
         }
-
-        return false;
     }
 
     /**
@@ -32,6 +36,8 @@ static function LoadInterface( $path, $data = [] )
 
     static function pageTitle( $string )
     {
-        return sprintf( __( '%s &mdash; NexoPOS 4' ), $string );
+        return sprintf( 
+            Hook::filter( 'ns-page-title', __( '%s &mdash; NexoPOS 4' ) ), 
+        $string );
     }
 }

app/Services/OrdersService.php

@@ -752,20 +752,6 @@ public function makeOrderSinglePayment( $payment, Order $order )
             if ( $paymentToday->count() === 0 ) {
                 throw new NotFoundException( __( 'No payment is expected at the moment. If the customer want to pay early, consider adjusting instalment payments date.' ) );
             }
-
-            /**
-             * @todo don't think this restriction is actually necessary.
-             */
-            // if ( 
-            //     ns()->currency->getRaw( $paymentToday->sum( 'amount' ) ) !== 
-            //     ns()->currency->getRaw( $payment[ 'value' ] ) ) {
-            //     throw new NotAllowedException( 
-            //         sprintf(
-            //             __( 'The provided payment doesn\'t match the expected payment : %s. If the customer want to pay a different amount, consider adjusting the instalment amount.' ),
-            //             ( string ) Currency::define( $paymentToday->sum( 'amount' ) )
-            //         )
-            //     );
-            // }
         }        
 
         $this->__saveOrderSinglePayment( $payment, $order );
@@ -1536,7 +1522,7 @@ public function computeOrderTaxes( Order $order )
             $taxType                =   ns()->option->get( 'ns_pos_tax_type' );
             $subTotal               =   $order->products()->sum( 'total_price' );
             $taxValue               =   $order->taxes->map( function( $tax ) use ( $taxType, $subTotal ) {
-                $tax->tax_value     =   $this->taxService->getComputedTaxValue( $taxType, $tax->rate, $subTotal );
+                $tax->tax_value     =   $this->taxService->getVatValue( $taxType, $tax->rate, $subTotal );
                 $tax->save();
 
                 return $tax->tax_value;
@@ -2365,8 +2351,8 @@ public function void( Order $order, $reason )
     public function getPaidSales( $startDate, $endDate )
     {
         return Order::paid()
-            ->where( 'created_at', '>=', Carbon::parse( $startDate )->startOfDay()->toDateTimeString() )
-            ->where( 'created_at', '<=', Carbon::parse( $endDate )->endOfDay()->toDateTimeString() )
+            ->where( 'created_at', '>=', Carbon::parse( $startDate )->toDateTimeString() )
+            ->where( 'created_at', '<=', Carbon::parse( $endDate )->toDateTimeString() )
             ->get();
     }
 
@@ -2378,8 +2364,8 @@ public function getPaidSales( $startDate, $endDate )
      */
     public function getSoldStock( $startDate, $endDate )
     {
-        $rangeStarts    =   Carbon::parse( $startDate )->startOfDay()->toDateTimeString();
-        $rangeEnds      =   Carbon::parse( $endDate )->endOfDay()->toDateTimeString();
+        $rangeStarts    =   Carbon::parse( $startDate )->toDateTimeString();
+        $rangeEnds      =   Carbon::parse( $endDate )->toDateTimeString();
 
         $products       =   OrderProduct::whereHas( 'order', function( Builder $query ) {
             $query->where( 'payment_status', Order::PAYMENT_PAID );

app/Services/ProductCategoryService.php

@@ -39,9 +39,9 @@ public function getUsingName( $name )
      * @param array details
      * @return array
      */
-    public function create( $data )
+    public function create( $data, ProductCategory $productCategory = null )
     {
-        $category                   =   new ProductCategory;
+        $category                   =   $productCategory === null ? new ProductCategory : $productCategory;
         $category->author           =   Auth::id();
         $category->description      =   $data[ 'description' ] ?? '';
         $category->preview_url      =   $data[ 'preview_url' ] ?? '';

config/filesystems.php

@@ -48,6 +48,11 @@
             'root' => storage_path('app'),
         ],
 
+        'snapshots' =>  [
+            'driver'    =>  'local',
+            'root'      =>  storage_path( 'snapshots' )
+        ],
+
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),