Merge pull request #2250 from Blair2004/v5.0.x

V5.0.x

Author: Blair2004

app/Crud/ProductHistoryCrud.php

@@ -61,9 +61,9 @@ class ProductHistoryCrud extends CrudService
      */
     public $relations = [
         [ 'nexopos_products as products', 'nexopos_products_histories.product_id', '=', 'products.id' ],
-        [ 'nexopos_users as users', 'nexopos_products_histories.author', '=', 'users.id' ],
         [ 'nexopos_units as units', 'nexopos_products_histories.unit_id', '=', 'units.id' ],
         'leftJoin' => [
+            [ 'nexopos_users as users', 'nexopos_products_histories.author', '=', 'users.id' ],
             [ 'nexopos_procurements as procurements', 'nexopos_products_histories.procurement_id', '=', 'procurements.id' ],
             [ 'nexopos_orders as orders', 'nexopos_products_histories.order_id', '=', 'orders.id' ],
         ],

app/Http/Controllers/Dashboard/CrudController.php

@@ -409,7 +409,7 @@ public function exportCrud( $namespace, Request $request )
         $writer->save( $fileName );
 
         /**
-         * We'll hide the asset URL behind random lettes
+         * We'll hide the asset URL behind random letters
          */
         $hash = Str::random( 20 );
 

app/Http/Controllers/Dashboard/ModulesController.php

@@ -135,7 +135,7 @@ public function uploadModule( ModuleUploadRequest $request )
             } else {
                 $validator = Validator::make( $request->all(), [] );
                 $validator->errors()->add( 'module', $result[ 'message' ] );
-    
+
                 return redirect( ns()->route( 'ns.dashboard.modules-upload' ) )->withErrors( $validator );
             }
         }

app/Providers/AppServiceProvider.php

@@ -38,6 +38,7 @@
 use App\Services\Validation;
 use App\Services\WidgetService;
 use Illuminate\Foundation\AliasLoader;
+use Illuminate\Queue\Events\JobProcessing;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Event;
@@ -280,6 +281,14 @@ public function boot()
 
             return "<?php echo ns()->moduleViteAssets( \"{$fileName}\", \"{$module}\" ); ?>";
         } );
+
+        /**
+         * To ensure options are always refreshed
+         * when a job is about to be processed.
+         */
+        Event::listen( JobProcessing::class, function () {
+            ns()->option->rebuild();
+        } );
     }
 
     /**

app/Providers/TelescopeServiceProvider.php

@@ -59,15 +59,15 @@ protected function gate(): void
     {
         if ( Helper::installed() ) {
             $adminRole = Role::namespace( Role::ADMIN );
-            $users  =   collect([]);
-            
+            $users = collect( [] );
+
             if ( $adminRole instanceof Role ) {
-                $users  =   $adminRole->users;
+                $users = $adminRole->users;
             }
-            
+
             Gate::define( 'viewTelescope', function ( $user ) use ( $users ) {
                 return in_array( $user->email, [
-                    $users->map( fn( $__user ) => $__user->email )
+                    $users->map( fn( $__user ) => $__user->email ),
                 ] );
             } );
         }

app/Services/MenuService.php

@@ -480,15 +480,15 @@ public function getMenus()
         $this->menus = Hook::filter( 'ns-dashboard-menus', $this->menus );
         $this->toggleActive();
 
-        return collect( $this->menus )->filter( function( $menu ) {
+        return collect( $this->menus )->filter( function ( $menu ) {
             return ! isset( $menu[ 'permissions' ] ) || Gate::any( $menu[ 'permissions' ] );
-        })->map( function( $menu ) {
-            $menu[ 'childrens' ]    =   collect( $menu[ 'childrens' ] ?? [] )->filter( function( $submenu ) {
+        } )->map( function ( $menu ) {
+            $menu[ 'childrens' ] = collect( $menu[ 'childrens' ] ?? [] )->filter( function ( $submenu ) {
                 return ! isset( $submenu[ 'permissions' ] ) || Gate::any( $submenu[ 'permissions' ] );
-            })->toArray();
+            } )->toArray();
 
             return $menu;
-        });
+        } );
     }
 
     /**

app/Services/ProductService.php

@@ -528,7 +528,7 @@ public function saveSubItems( Product $product, $subItems )
                 $subitem->sale_price = $item[ 'sale_price' ];
                 $subitem->quantity = $item[ 'quantity' ];
                 $subitem->total_price = $item[ 'total_price' ] ?? (float) $item[ 'sale_price' ] * (float) $item[ 'quantity' ];
-                $subitem->author = Auth::id();
+                $subitem->author = $product->author;
                 $subitem->save();
             } else {
                 $subitem = ProductSubItem::find( $item[ 'id' ] );
@@ -544,7 +544,7 @@ public function saveSubItems( Product $product, $subItems )
                 $subitem->sale_price = $item[ 'sale_price' ];
                 $subitem->quantity = $item[ 'quantity' ];
                 $subitem->total_price = $item[ 'total_price' ] ?? (float) $item[ 'sale_price' ] * (float) $item[ 'quantity' ];
-                $subitem->author = Auth::id();
+                $subitem->author = $product->author;
                 $subitem->save();
             }
 
@@ -1178,6 +1178,7 @@ public function stockAdjustment( $action, $data ): ProductHistory|EloquentCollec
          * @param float              $quantity
          * @param string             $sku
          * @param string             $unit_identifier
+         * @param int                $author
          */
         $product = isset( $product_id ) ? Product::find( $product_id ) : Product::usingSKU( $sku )->first();
 
@@ -1225,7 +1226,8 @@ public function stockAdjustment( $action, $data ): ProductHistory|EloquentCollec
                     orderProductQuantity: $quantity,
                     product: $product,
                     orderProduct: isset( $orderProduct ) ? $orderProduct : null,
-                    parentUnit: $unit
+                    parentUnit: $unit,
+                    author: $author ?? 0,
                 );
             } else {
                 return $this->handleStockAdjustmentRegularProducts(
@@ -1236,7 +1238,8 @@ public function stockAdjustment( $action, $data ): ProductHistory|EloquentCollec
                     total_price: $total_price,
                     unit_price: $unit_price,
                     orderProduct: isset( $orderProduct ) ? $orderProduct : null,
-                    procurementProduct: isset( $procurementProduct ) ? $procurementProduct : null
+                    procurementProduct: isset( $procurementProduct ) ? $procurementProduct : null,
+                    author: $author ?? 0,
                 );
             }
         }
@@ -1256,6 +1259,7 @@ private function handleStockAdjustmentsForGroupedProducts(
         $orderProductQuantity,
         Product $product,
         Unit $parentUnit,
+        int $author = 0,
         ?OrderProduct $orderProduct = null ): EloquentCollection
     {
         $product->load( 'sub_items' );
@@ -1264,7 +1268,7 @@ private function handleStockAdjustmentsForGroupedProducts(
             throw new Exception( __( 'Adjusting grouped product inventory must result of a create, update, delete sale operation.' ) );
         }
 
-        $products = $product->sub_items->map( function ( ProductSubItem $subItem ) use ( $action, $orderProductQuantity, $parentUnit, $orderProduct ) {
+        $products = $product->sub_items->map( function ( ProductSubItem $subItem ) use ( $author, $action, $orderProductQuantity, $parentUnit, $orderProduct ) {
             $finalQuantity = $this->computeSubItemQuantity(
                 subItemQuantity: $subItem->quantity,
                 parentUnit: $parentUnit,
@@ -1314,6 +1318,7 @@ private function handleStockAdjustmentsForGroupedProducts(
             return $this->recordStockHistory(
                 product_id: $subItem->product_id,
                 action: $action,
+                author: $author,
                 unit_id: $subItem->unit_id,
                 unit_price: $subItem->sale_price,
                 quantity: $finalQuantity,
@@ -1332,6 +1337,7 @@ private function handleStockAdjustmentsForGroupedProducts(
         $this->recordStockHistory(
             product_id: $product->id,
             action: $action,
+            author: $author,
             unit_id: $orderProduct->unit_id,
             unit_price: $orderProduct->unit_price,
             quantity: $orderProductQuantity,
@@ -1382,7 +1388,7 @@ private function preventNegativity( $oldQuantity, $quantity )
      * @param  ProcurementProduct $procurementProduct
      * @return ProductHistory
      */
-    private function handleStockAdjustmentRegularProducts( $action, $quantity, $product_id, $unit_id, $orderProduct = null, $unit_price = 0, $total_price = 0, $procurementProduct = null )
+    private function handleStockAdjustmentRegularProducts( $action, $quantity, $product_id, $unit_id, $author = 0, $orderProduct = null, $unit_price = 0, $total_price = 0, $procurementProduct = null )
     {
         /**
          * we would like to verify if
@@ -1433,6 +1439,7 @@ private function handleStockAdjustmentRegularProducts( $action, $quantity, $prod
 
             return $this->recordStockHistory(
                 product_id: $product_id,
+                author: $author,
                 action: $action,
                 unit_id: $unit_id,
                 unit_price: $unit_price,
@@ -1478,6 +1485,7 @@ private function handleStockAdjustmentRegularProducts( $action, $quantity, $prod
             return $this->recordStockHistory(
                 product_id: $product_id,
                 action: $action,
+                author: $author,
                 unit_id: $unit_id,
                 unit_price: $unit_price,
                 quantity: $adjustQuantity,
@@ -1518,6 +1526,7 @@ public function recordStockHistory(
         $unit_price,
         $quantity,
         $total_price,
+        $author = 0,
         $order_id = null,
         $order_product_id = null,
         $procurement_product_id = null,
@@ -1539,7 +1548,7 @@ public function recordStockHistory(
         $history->before_quantity = $old_quantity; // if the stock management is 0, it shouldn't change
         $history->quantity = abs( $quantity );
         $history->after_quantity = $new_quantity; // if the stock management is 0, it shouldn't change
-        $history->author = Auth::id();
+        $history->author = $author ?: Auth::id();
         $history->save();
 
         event( new ProductAfterStockAdjustmentEvent( $history ) );
@@ -1839,7 +1848,7 @@ public function createProductVariation( Product $parent, $fields )
             $this->__fillProductFields( $product, compact( 'field', 'value', 'mode', 'fields' ) );
         }
 
-        $product->author = Auth::id();
+        $product->author = $parent->author;
         $product->parent_id = $parent->id;
         $product->type = $parent->type;
         $product->category_id = $parent->category_id;
@@ -1848,11 +1857,6 @@ public function createProductVariation( Product $parent, $fields )
 
         event( new ProductAfterCreatedEvent( $product ) );
 
-        /**
-         * compute product tax
-         */
-        // $this->taxService->computeTax( $product, $fields[ 'tax_group_id' ] ?? null );
-
         return [
             'status' => 'success',
             'message' => __( 'The product variation has been successfully created.' ),
@@ -1884,7 +1888,7 @@ public function updateProductVariation( $parent, $id, $fields )
             $this->__fillProductFields( $product, compact( 'field', 'value', 'mode', 'fields' ) );
         }
 
-        $product->author = Auth::id();
+        $product->author = $parent->author;
         $product->parent_id = $parent->id;
         $product->type = $parent->type;
         $product->product_type = 'variation';

composer.json

@@ -77,7 +77,8 @@
         "post-install-cmd": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
             "@php artisan key:generate --ansi",
-            "@php -r \"file_exists('public/storage');\" || artisan storage:link --ansi"
+            "@php -r \"file_exists('public/storage');\" || artisan storage:link --ansi",
+            "@php artisan ns:translate --symlink"
         ],
         "post-update-cmd": [
             "@php artisan vendor:publish --tag=laravel-assets --ansi --force"

config/nexopos.php

@@ -9,7 +9,7 @@
      * This is the core version of NexoPOS. This is used to displays on the
      * dashboard and to ensure a compatibility with the modules.
      */
-    'version' => '5.3.6',
+    'version' => '5.3.7',
 
     /**
      * --------------------------------------------------------------------

config/sanctum.php

@@ -15,11 +15,11 @@
     |
     */
 
-    'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf(
+    'stateful' => explode( ',', env( 'SANCTUM_STATEFUL_DOMAINS', sprintf(
         '%s%s',
         'localhost,localhost:3000,127.0.0.1,127.0.0.1:8000,::1',
         Sanctum::currentApplicationUrlWithPort()
-    ))),
+    ) ) ),
 
     /*
     |--------------------------------------------------------------------------
@@ -61,7 +61,7 @@
     |
     */
 
-    'token_prefix' => env('SANCTUM_TOKEN_PREFIX', ''),
+    'token_prefix' => env( 'SANCTUM_TOKEN_PREFIX', '' ),
 
     /*
     |--------------------------------------------------------------------------