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

V4.8.x

Author: Blair2004

app/Crud/ProductHistoryCrud.php

@@ -465,7 +465,6 @@ public function setActions( CrudEntry $entry, $namespace )
                 $entry->{ '$cssClass' } = 'bg-red-100 border-red-200 border text-sm dark:text-slate-300 dark:bg-red-600 dark:border-red-700';
                 break;
             case ProductHistory::ACTION_SOLD:
-            case ProductHistory::ACTION_RETURNED:
             case ProductHistory::ACTION_ADDED:
             case ProductHistory::ACTION_STOCKED:
                 $entry->{ '$cssClass' } = 'bg-green-100 border-green-200 border text-sm dark:text-slate-300 dark:bg-green-700 dark:border-green-800';
@@ -474,6 +473,7 @@ public function setActions( CrudEntry $entry, $namespace )
             case ProductHistory::ACTION_TRANSFER_IN:
                 $entry->{ '$cssClass' } = 'bg-blue-100 border-blue-200 border text-sm dark:text-slate-300 dark:bg-blue-600 dark:border-blue-700';
                 break;
+            case ProductHistory::ACTION_RETURNED:                
             case ProductHistory::ACTION_ADJUSTMENT_RETURN:
             case ProductHistory::ACTION_TRANSFER_REJECTED:
             case ProductHistory::ACTION_TRANSFER_CANCELED:

app/Http/Controllers/Dashboard/ProcurementController.php

@@ -336,7 +336,7 @@ public function searchProcurementProduct( Request $request )
 
         return [
             'from' => 'procurements',
-            'product' => $this->procurementService->searchProcurementProduct( $request->input( 'search' ) ),
+            'product' => $this->procurementService->searchProcurementProduct( $request->input( 'argument' ) ),
         ];
     }
 

app/Services/OrdersService.php

@@ -2128,7 +2128,8 @@ public function deleteOrder(Order $order)
             ->products()
             ->get()
             ->each( function( OrderProduct $orderProduct) {
-                $product = $orderProduct->load( 'product' );
+                $orderProduct->load( 'product' );
+                $product    =   $orderProduct->product;
                 /**
                  * we do proceed by doing an initial return
                  * only if the product is not a quick product/service

config/nexopos.php

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

public/css-manifest.json

@@ -1,10 +1,10 @@
 {
-  "animations.css": "animations.c1fe16891852852b6db8.css",
-  "app.css": "app.06b96c1d69982e57bd47.css",
+  "animations.css": "animations.cb4544d9bb06aeaa8e48.css",
+  "app.css": "app.f9fb82c1b0295a171e9f.css",
   "typography.css": "typography.5d798833a07dd150efa8.css",
   "fonts.css": "fonts.64053e5a2ec1dd65399b.css",
-  "light.css": "light.72bd805dac4d2a328b74.css",
-  "dark.css": "dark.9857705da9beecc1bc09.css",
+  "light.css": "light.9e990100ce36c59d8156.css",
+  "dark.css": "dark.0174d418deda1ce7827a.css",
   "vue2-daterange-picker.css": "vue2-daterange-picker.fe9e4f57ad74c98c9324.css",
   "grid.css": "grid.02de9031306c45f5b9f2.css"
 }