Merge pull request #422 from Blair2004/v4.6.x

V4.6.x

Author: Blair2004

.env.example

@@ -46,4 +46,6 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-SANCTUM_STATEFUL_DOMAINS=http://127.0.0.1:8000/,http://localhost/,http://127.0.0.1/
+SANCTUM_STATEFUL_DOMAINS=http://127.0.0.1:8000/,http://localhost/,http://127.0.0.1/
+NS_ENV=production
+TELESCOPE_ENABLED=false

.gitignore

@@ -34,7 +34,6 @@ public/css/*.map
 public/lang
 public/modules-lang/*
 !public/modules-lang/index.html
-public/mix-manifest.json
 public/mapping.json
 storage/module.zip
 tests/database.sqlite

app/Console/Commands/ModuleMigrations.php

@@ -19,7 +19,7 @@ class ModuleMigrations extends Command
      *
      * @var string
      */
-    protected $signature = 'modules:migration {namespace} {--delete=} {--forget}';
+    protected $signature = 'modules:migration {namespace} {--forget=}';
 
     /**
      * The console command description.
@@ -72,19 +72,7 @@ public function getModule()
      */
     public function passDeleteMigration()
     {
-        /**
-         * if we would like to delete all migrations
-         */
-        if ( $this->option( 'delete' ) == 'all' ) {
-            Storage::disk( 'ns-modules' )->deleteDirectory( $this->module[ 'namespace' ] . DIRECTORY_SEPARATOR . 'Migrations' );
-            Storage::disk( 'ns-modules' )->makeDirectory( $this->module[ 'namespace' ] . DIRECTORY_SEPARATOR . 'Migrations' );
-            $this->info( sprintf( 'All %s migration folders has been deleted !', $this->module[ 'name' ] ) );
-            return false;
-        } else if( $this->option( 'delete' ) != '' ) {
-            Storage::disk( 'ns-modules' )->deleteDirectory( $this->module[ 'namespace' ] . DIRECTORY_SEPARATOR . 'Migrations' . DIRECTORY_SEPARATOR . $this->option( 'delete' ) );
-            $this->info( sprintf( 'The migration directory %s has been deleted.', $this->option( 'delete' ) ) );
-            return false;
-        } else if ( $this->option( 'forget' ) ) {
+        if ( $this->option( 'forget' ) === 'all' ) {
             /**
              * This will revert the migration
              * for a specific module.
@@ -106,6 +94,35 @@ public function passDeleteMigration()
              */
             Artisan::call( 'cache:clear' );
 
+            return false;
+        } else if ( ! empty( $this->option( 'forget' ) ) ) {
+            
+            $path   =   str_replace( 'modules/', '', $this->option( 'forget' ) );
+
+            /**
+             * This will revert the migration
+             * for a specific module.
+             * @var ModulesService
+             */
+            $moduleService  =   app()->make( ModulesService::class );
+            $moduleService->revertMigrations( $this->module, [ $path ]);
+
+            /**
+             * We'll make sure to clear the migration as
+             * being executed on the system.
+             */
+            ModuleMigration::where( 'namespace', $this->module[ 'namespace' ] )
+                ->where( 'file', $path )
+                ->delete();
+
+            $this->info( sprintf( 'The migration "%s" for the module %s has been forgotten.', $path, $this->module[ 'name' ] ) );
+
+            /**
+             * because we use the cache to prevent the system for overusing the
+             * database with too many requests.
+             */
+            Artisan::call( 'cache:clear' );
+
             return false;
         }
 

app/Crud/ExpenseCategoryCrud.php

@@ -20,13 +20,13 @@ class ExpenseCategoryCrud extends CrudService
     /**
      * base route name
      */
-    protected $mainRoute      =   'ns.expenses-categories';
+    protected $mainRoute      =   'ns.accounting-accounts';
 
     /**
      * Define namespace
      * @param  string
      */
-    protected $namespace  =   'ns.expenses-categories';
+    protected $namespace  =   'ns.accounting-accounts';
 
     /**
      * Model Used
@@ -83,15 +83,15 @@ public function __construct()
     public function getLabels()
     {
         return [
-            'list_title'            =>  __( 'Expenses Categories List' ),
-            'list_description'      =>  __( 'Display All Expense Categories.' ),
-            'no_entry'              =>  __( 'No Expense Category has been registered' ),
-            'create_new'            =>  __( 'Add a new Expense Category' ),
-            'create_title'          =>  __( 'Create a new Expense Category' ),
-            'create_description'    =>  __( 'Register a new Expense Category and save it.' ),
-            'edit_title'            =>  __( 'Edit Expense Category' ),
-            'edit_description'      =>  __( 'Modify An Expense Category.' ),
-            'back_to_list'          =>  __( 'Return to Expense Categories' ),
+            'list_title'            =>  __( 'Accounts List' ),
+            'list_description'      =>  __( 'Display All Accounts.' ),
+            'no_entry'              =>  __( 'No Account has been registered' ),
+            'create_new'            =>  __( 'Add a new Account' ),
+            'create_title'          =>  __( 'Create a new Account' ),
+            'create_description'    =>  __( 'Register a new Account and save it.' ),
+            'edit_title'            =>  __( 'Edit Account' ),
+            'edit_description'      =>  __( 'Modify An Account.' ),
+            'back_to_list'          =>  __( 'Return to Accounts' ),
         ];
     }
 
@@ -252,7 +252,7 @@ public function canAccess( $fields )
      * @return  void
      */
     public function beforeDelete( $namespace, $id, $model ) {
-        if ( $namespace == 'ns.expenses-categories' ) {
+        if ( $namespace == 'ns.accounting-accounts' ) {
             $this->allowedTo( 'delete' );
         }
     }
@@ -308,12 +308,12 @@ public function setActions( $entry, $namespace )
                 'namespace'     =>      'edit',
                 'type'          =>      'GOTO',
                 'index'         =>      'id',
-                'url'           =>      ns()->url( '/dashboard/' . 'expenses/categories' . '/edit/' . $entry->id )
+                'url'           =>      ns()->url( '/dashboard/' . 'accounting/accounts' . '/edit/' . $entry->id )
             ], [
                 'label'     =>  __( 'Delete' ),
                 'namespace' =>  'delete',
                 'type'      =>  'DELETE',
-                'url'       => ns()->url( '/api/nexopos/v4/crud/ns.expenses-categories/' . $entry->id ),
+                'url'       => ns()->url( '/api/nexopos/v4/crud/ns.accounting-accounts/' . $entry->id ),
                 'confirm'   =>  [
                     'message'  =>  __( 'Would you like to delete this ?' ),
                 ]
@@ -371,11 +371,11 @@ public function bulkAction( Request $request )
     public function getLinks()
     {
         return  [
-            'list'      => ns()->url( 'dashboard/' . 'expenses/categories' ),
-            'create'    => ns()->url( 'dashboard/' . 'expenses/categories/create' ),
-            'edit'      => ns()->url( 'dashboard/' . 'expenses/categories/edit/' ),
-            'post'      => ns()->url( 'api/nexopos/v4/crud/ns.expenses-categories' ),
-            'put'       => ns()->url( 'api/nexopos/v4/crud/ns.expenses-categories/{id}' ),
+            'list'      => ns()->url( 'dashboard/' . 'accounting/accounts' ),
+            'create'    => ns()->url( 'dashboard/' . 'accounting/accounts/create' ),
+            'edit'      => ns()->url( 'dashboard/' . 'accounting/accounts/edit/' ),
+            'post'      => ns()->url( 'api/nexopos/v4/crud/ns.accounting-accounts' ),
+            'put'       => ns()->url( 'api/nexopos/v4/crud/ns.accounting-accounts/{id}' ),
         ];
     }
 

app/Events/CrudAfterDeleteEvent.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class CrudAfterDeleteEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * @param CrudService
+     */
+    public $resource;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct( $resource )
+    {
+        $this->resource     =   $resource;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return \Illuminate\Broadcasting\Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new PrivateChannel('channel-name');
+    }
+}

app/Http/Controllers/Dashboard/CrudController.php

@@ -4,22 +4,19 @@
  */
 namespace App\Http\Controllers\Dashboard;
 
+use App\Events\CrudAfterDeleteEvent;
 use App\Exceptions\NotFoundException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Exception;
 use App\Http\Controllers\DashboardController;
 use App\Http\Requests\CrudPostRequest;
 use App\Http\Requests\CrudPutRequest;
 use App\Services\CrudService;
 use TorMorten\Eventy\Facades\Events as Hook;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Writer\Csv;
 
 class CrudController extends DashboardController
@@ -62,6 +59,11 @@ public function crudDelete( $namespace, $id )
 
         $model->delete();
 
+        /**
+         * That will trigger everytime an instance is deleted.
+         */
+        CrudAfterDeleteEvent::dispatch( $resource );
+
         return [
             'status'    =>  'success',
             'message'   =>  __( 'The entry has been successfully deleted.' )
@@ -287,6 +289,12 @@ public function getFormConfig( string $namespace, $id = null )
         ], 403 );
     }
 
+    /**
+     * Export the entries as a CSV file
+     * @param string $namespace
+     * @param Request $request
+     * @return array $response
+     */
     public function exportCrud( $namespace, Request $request )
     {
         $crudClass          =   Hook::filter( 'ns-crud-resource', $namespace );

app/Http/Controllers/Dashboard/ExpensesCategoriesController.php

@@ -14,8 +14,6 @@
 use App\Services\Options;
 use Illuminate\Support\Facades\View;
 
-// use Tendoo\Core\Services\Page;
-
 class ExpensesCategoriesController extends DashboardController
 {
     public function __construct( Options $options )

app/Http/Controllers/Dashboard/HomeController.php

@@ -17,6 +17,8 @@ class HomeController extends DashboardController
 {
     public function welcome()
     {
-        return View::make( 'welcome' );
+        return View::make( 'welcome', [
+            'title'     =>      sprintf( __( 'Welcome — NexoPOS %s'), config( 'nexopos.version' ) )
+        ]);
     }
 }

app/Http/Controllers/UpdateController.php

@@ -43,7 +43,7 @@ public function runMigration( Request $request )
             $file   =   ns()->update->getMatchingFullPath( 
                 $request->input( 'file' ) 
             );
-    
+                
             Artisan::call( 'migrate --path=' . $file );
         }
 

app/Models/CashFlow.php

@@ -28,11 +28,16 @@ public function expense()
 
     public function scopeFrom( $query, $date )
     {
-        return $query->where( 'created_at', '<=', $date );
+        return $query->where( 'created_at', '>=', $date );
+    }
+
+    public function scopeOperation( $query, $operation )
+    {
+        return $query->where( 'operation', $operation );
     }
 
     public function scopeTo( $query, $date )
     {
-        return $query->where( 'created_at', '>=', $date );
+        return $query->where( 'created_at', '<=', $date );
     }
 }