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

V4.5.3

Author: Blair2004

.do/deploy.template.yaml

@@ -0,0 +1,20 @@
+spec:
+  name: nexopos
+  databases:
+  - name: nexopos
+    engine: MYSQL
+    production: true
+    cluster_name: ns
+  services:
+  - environment_slug: php
+    name: nexopos
+    git:
+      repo_clone_url: https://github.com/blair2004/NexoPOS-4x
+      branch: master
+    build_command: 
+      npm install
+      composer install
+      cp .env.example .env
+      php artisan key:generate
+      php artisan storage:link
+    run_command: heroku-php-apache2 public/

README.md

@@ -1,5 +1,7 @@
 [![Latest Stable Version](https://poser.pugx.org/blair2004/nexopos/v)](//packagist.org/packages/blair2004/nexopos) [![Total Downloads](https://poser.pugx.org/blair2004/nexopos/downloads)](//packagist.org/packages/blair2004/nexopos) [![Latest Unstable Version](https://poser.pugx.org/blair2004/nexopos/v/unstable)](//packagist.org/packages/blair2004/nexopos) [![License](https://poser.pugx.org/blair2004/nexopos/license)](//packagist.org/packages/blair2004/nexopos)
 
+[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/blair2004/NexoPOS-4x/tree/v4.5.x&refcode=ebdb80cb0ec7)
+
 # About NexoPOS 4.x
 NexoPOS 4 is a free point of sale system build using Laravel, TailwindCSS, Vue and other open-source resources. This POS System focuses on utilities and functionalities to offer for most businesses all the tools they need to manage better their store. NexoPOS 4.x include a responsive and beautiful dashboard that ease the interaction either on a smartphone, tables or desktops.
 

app/Console/Commands/GenerateModuleCommand.php

@@ -29,7 +29,7 @@ class GenerateModuleCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Create a new Tendoo module';
+    protected $description = 'Create a new NexoPOS 4.x module';
 
     /**
      * Create a new command instance.
@@ -52,7 +52,7 @@ public function handle()
         if ( ns()->installed() ) {
             $this->askInformations();
         } else {
-            $this->info( 'Tendoo is not yet installed.' );
+            $this->info( 'NexoPOS 4.x is not yet installed.' );
         }
     }
 

app/Crud/CustomerCrud.php

@@ -16,6 +16,7 @@
 use App\Models\CustomerBillingAddress;
 use App\Models\CustomerGroup;
 use App\Models\CustomerShippingAddress;
+use App\Services\Users;
 use Exception;
 use TorMorten\Eventy\Facades\Events as Hook;
 
@@ -565,7 +566,7 @@ public function bulkAction( Request $request )
          * Deleting licence is only allowed for admin
          * and supervisor.
          */
-        $user   =   app()->make( 'Tendoo\Core\Services\Users' );
+        $user   =   app()->make( Users::class );
         if ( ! $user->is([ 'admin', 'supervisor' ]) ) {
             return response()->json([
                 'status'    =>  'failed',

app/Crud/ProductCategoryCrud.php

@@ -393,6 +393,7 @@ public function bulkAction( Request $request )
          * and supervisor.
          */
         $user   =   app()->make( Users::class );
+        
         if ( ! $user->is([ 'admin', 'supervisor' ]) ) {
             return response()->json([
                 'status'    =>  'failed',

app/Http/Controllers/Dashboard/CrudController.php

@@ -382,7 +382,7 @@ public function crudBulkActions( String $namespace, Request $request )
          * assuming we're bulk deleting
          * but the action might be different later
          */
-        $response           =   $resource->bulkAction( $request );
+        $response           =   Hook::filter( get_class( $resource ) . '@bulkAction', $resource->bulkAction( $request ), $request );
 
         return [
             'status'    =>  'success',
@@ -462,9 +462,9 @@ public function getConfig( string $namespace )
                     get_class( $resource ) . '@getColumns', 
                     $resource->getColumns()
                 ),
-                'labels'                =>  $resource->getLabels(),
-                'links'                 =>  $resource->getLinks() ?? [],
-                'bulkActions'           =>  $resource->getBulkActions(),
+                'labels'                =>  Hook::filter( get_class( $resource ) . '@getLabels', $resource->getLabels() ),
+                'links'                 =>  Hook::filter( get_class( $resource ) . '@getLinks', $resource->getLinks() ?? [] ),
+                'bulkActions'           =>  Hook::filter( get_class( $resource ) . '@getBulkActions', $resource->getBulkActions() ),
                 'namespace'             =>  $namespace,
             ];
         } 
@@ -499,8 +499,8 @@ public function getFormConfig( string $namespace, $id = null )
             $form           =   Hook::filter( get_class( $resource )::method( 'getForm' ), $resource->getForm( $model ), compact( 'model' ) );
             $config         =   [
                 'form'                  =>  $form,
-                'labels'                =>  $resource->getLabels(),
-                'links'                 =>  @$resource->getLinks(),
+                'labels'                =>  Hook::filter( get_class( $resource ) . '@getLabels', $resource->getLabels() ),
+                'links'                 =>  Hook::filter( get_class( $resource ) . '@getLinks', $resource->getLinks() ),
                 'namespace'             =>  $namespace,
             ];
 

app/Http/Controllers/Dashboard/CustomersController.php

@@ -268,7 +268,7 @@ public function getCustomersRewards( Customer $customer )
     public function editCustomerReward( Customer $customer, CustomerReward $reward )
     {
         return CustomerRewardCrud::form( $reward, [
-            'returnUrl'     =>  ns()->route( 'ns.dashboard.customers-rewards', [ 'customer' => $customer->id ]),
+            'returnUrl'     =>  ns()->route( 'ns.dashboard.customers-rewards-list', [ 'customer' => $customer->id ]),
             'queryParams'   =>  [
                 'customer_id'   =>  $customer->id
             ]

app/Services/AuthService.php

@@ -510,6 +510,7 @@ public function lostPasswordUnsecured( $fields )
     /**
      * Check recaptcha using predefined 
      * values as POST data
+     * @deprecated
      * @return void
      */
     public function checkReCaptcha( $data = [])

app/Services/CoreService.php

@@ -125,6 +125,18 @@ public function url( $url )
         return url( Hook::filter( 'ns-url', $url ) );
     }
 
+    /**
+     * Returns a filtred URL to which
+     * apply the filter "ns-url" hook.
+     * 
+     * @param string $url
+     * @return string $url
+     */
+    public function asset( $url )
+    {
+        return url( Hook::filter( 'ns-asset', $url ) );
+    }
+
     /**
      * check if a use is allowed to
      * access a page or trigger an error. This should not be used

app/Services/OrdersService.php

@@ -637,10 +637,7 @@ public function __checkDiscountVality( $fields )
                 })->sum();
 
                 if ( $fields['discount'] > $productsTotal ) {
-                    throw new NotAllowedException([
-                        'status'    =>  'failed',
-                        'message'   =>  __('A discount cannot exceed the sub total value of an order.')
-                    ]);
+                    throw new NotAllowedException( __('A discount cannot exceed the sub total value of an order.') );
                 }
             }
         }