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

V4.8.x
Blair2004 · Dec 22, 2022 · 5327480 · 5327480
2 parents 3d9ef9b + c6fe5fb
commit 5327480
Show file tree

Hide file tree

Showing 13 changed files with 181 additions and 113 deletions.
diff --git a/app/Console/Commands/ModuleSymlinkCommand.php b/app/Console/Commands/ModuleSymlinkCommand.php
@@ -4,6 +4,7 @@
 
 use App\Services\ModulesService;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
 
 class ModuleSymlinkCommand extends Command
 {
@@ -36,6 +37,12 @@ public function handle()
         } else {
             $modules = $moduleService->get();
 
+            /**
+             * let's clear all existing links
+             */
+            Storage::disk( 'ns' )->deleteDirectory( 'public/modules' );
+            Storage::disk( 'ns' )->makeDirectory( 'public/modules' );
+
             $this->withProgressBar( $modules, function( $module ) use ( $moduleService ) {
                 $moduleService->createSymLink( $module[ 'namespace' ] );
             });

diff --git a/app/Console/Commands/ResetCommand.php b/app/Console/Commands/ResetCommand.php
@@ -15,7 +15,7 @@ class ResetCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'ns:reset {--mode=soft} {--user=default}';
+    protected $signature = 'ns:reset {--mode=soft} {--user=default} {--with-sales} {--with-procurements}';
 
     /**
      * The console command description.
@@ -70,8 +70,8 @@ public function handle()
                 $this->initializeRole();
                 $this->demoService->run([
                     'mode' => 'grocery',
-                    'create_sales' => true,
-                    'create_procurements' => true,
+                    'create_sales' => $this->option( 'with-sales' ) && $this->option( 'with-procurements' ) ? true : false,
+                    'create_procurements' => $this->option( 'with-procurements' ) ? true : false,
                 ]);
                 $this->info( __( 'The demo has been enabled.' ) );
                 break;

diff --git a/app/Models/Provider.php b/app/Models/Provider.php
@@ -2,16 +2,26 @@
 
 namespace App\Models;
 
+use App\Traits\NsDependable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Provider extends NsModel
 {
-    use HasFactory;
+    use HasFactory, NsDependable;
 
     protected $table = 'nexopos_' . 'providers';
 
     protected $guarded = [];
 
+    protected $isDependencyFor = [
+        Procurement::class => [
+            'local_name' => 'name',
+            'local_index' => 'id',
+            'foreign_name' => 'code',
+            'foreign_index' => 'provider_id',
+        ],
+    ];
+
     public function procurements()
     {
         return $this->hasMany( Procurement::class );

diff --git a/app/Services/DemoCoreService.php b/app/Services/DemoCoreService.php
@@ -134,7 +134,7 @@ public function createAccountingAccounts()
             'account' => '008',
         ]);
 
-        ns()->option->set( 'ns_customer_debitting_cashflow_account', AccountType::account( '007' )->first()->id );
+        ns()->option->set( 'ns_customer_debitting_cashflow_account', AccountType::account( '008' )->first()->id );
     }
 
     public function createCustomers()

diff --git a/app/Services/Options.php b/app/Services/Options.php
@@ -44,10 +44,12 @@ public function setDefault( $options = [] ): void
     {
         Option::truncate();
 
+        $types  =   app()->make( OrdersService::class )->getTypeLabels();
+
         $defaultOptions = [
             'ns_registration_enabled' => false,
             'ns_store_name' => 'NexoPOS 4.x',
-            'ns_pos_order_types' => [ 'takeaway', 'delivery' ],
+            'ns_pos_order_types' => array_keys( $types ),
         ];
 
         $options = array_merge( $defaultOptions, $options );
@@ -103,38 +105,7 @@ public function set( $key, $value, $expiration = null )
          * it will save the new value and update
          * the option object.
          */
-        $foundOption = collect( $this->rawOptions )->map( function( $option, $index ) use ( $value, $key, $expiration ) {
-            if ( $key === $index ) {
-                $this->hasFound = true;
-
-                switch ( $value ) {
-                    case is_array( $value ) :
-                        $option->value = json_encode( $value );
-                        break;
-                    case empty( $value ) && ! (bool) preg_match( '/[0-9]{1,}/', $value ) :
-                        $option->value = '';
-                        break;
-                    default:
-                        $option->value = $value;
-                        break;
-                }
-
-                $option->expire_on = $expiration;
-
-                /**
-                 * this should be overridable
-                 * from a user option or any
-                 * extending this class
-                 */
-                $option = $this->beforeSave( $option );
-                $option->save();
-
-                return $option;
-            }
-
-            return false;
-        })
-        ->filter();
+        $foundOption = collect( $this->rawOptions )->filter( fn( $option, $index ) => $index === $key );
 
         /**
          * if the option hasn't been found
@@ -143,33 +114,30 @@ public function set( $key, $value, $expiration = null )
          */
         if ( $foundOption->isEmpty() ) {
             $option = new Option;
-            $option->key = trim( strtolower( $key ) );
-            $option->array = false;
-
-            switch ( $value ) {
-                case is_array( $value ) :
-                    $option->value = json_encode( $value );
-                    break;
-                case empty( $value ) && ! (bool) preg_match( '/[0-9]{1,}/', $value ) :
-                    $option->value = '';
-                    break;
-                default:
-                    $option->value = $value;
-                    break;
-            }
+        } else {
+            $option = $foundOption->first();
+        }
 
-            $option->expire_on = $expiration;
+        $option->key = trim( strtolower( $key ) );
+        $option->array = false;
 
-            /**
-             * this should be overridable
-             * from a user option or any
-             * extending this class
-             */
-            $option = $this->beforeSave( $option );
-            $option->save();
+        if ( is_array( $value ) ) {
+            $option->value  =   json_encode( $value );
+        } else if ( empty( $value ) && ! (bool) preg_match( '/[0-9]{1,}/', $value ) ) {
+            $option->value = '';
         } else {
-            $option = $foundOption->first();
+            $option->value = $value;
         }
+
+        $option->expire_on = $expiration;
+
+        /**
+         * this should be overridable
+         * from a user option or any
+         * extending this class
+         */
+        $option = $this->beforeSave( $option );
+        $option->save();
 
         /**
          * Let's save the new option

diff --git a/app/Services/OrdersService.php b/app/Services/OrdersService.php
@@ -1032,12 +1032,16 @@ private function __saveOrderProducts($order, $products)
         $gross = 0;
 
         $orderProducts = $products->map(function ($product) use (&$subTotal, &$taxes, &$order, &$gross) {
+
+            $previousQuantity    =   0;
+
             /**
              * if the product id is provided
              * then we can use that id as a reference.
              */
             if ( isset( $product[ 'id' ] ) ) {
                 $orderProduct = OrderProduct::find( $product[ 'id' ] );
+                $previousQuantity    =   $orderProduct->quantity;
             } else {
                 $orderProduct = new OrderProduct;
             }
@@ -1113,7 +1117,15 @@ private function __saveOrderProducts($order, $products)
                     'total_price' => $orderProduct->total_price,
                 ];
 
-                $this->productService->stockAdjustment( ProductHistory::ACTION_SOLD, $history );
+                /**
+                 * __deleteUntrackedProducts will delete all products that
+                 * already exists and which are edited. We'll here only records
+                 * products that doesn't exists yet.
+                 */
+                if ( $orderProduct->wasRecentlyCreated ) {
+                    $this->productService->stockAdjustment( ProductHistory::ACTION_SOLD, $history );
+                }
+
             }
 
             event( new OrderProductAfterSavedEvent( $orderProduct, $order, $product ) );

diff --git a/app/Services/ProviderService.php b/app/Services/ProviderService.php
@@ -189,14 +189,17 @@ public function cancelPaymentForProcurement( Procurement $procurement )
     {
         $provider = Provider::find( $procurement->provider_id );
 
-        if ( $procurement->payment_status === 'paid' ) {
-            $provider->amount_paid -= $procurement->cost;
-        } else {
-            $provider->amount_due -= $procurement->cost;
+        if ( $provider instanceof Provider ) {
+
+            if ( $procurement->payment_status === 'paid' ) {
+                $provider->amount_paid -= $procurement->cost;
+            } else {
+                $provider->amount_due -= $procurement->cost;
+            }
+
+            $provider->save();
         }
 
-        $provider->save();
-
         return [
             'status' => 'succecss',
             'message' => __( 'The procurement payment has been deducted.' ),

diff --git a/app/Services/Setup.php b/app/Services/Setup.php
@@ -14,6 +14,8 @@
 
 class Setup
 {
+    public Options $options;
+
     /**
      * Attempt database and save db informations
      *

diff --git a/config/nexopos.php b/config/nexopos.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'version' => '4.8.10',
+    'version' => '4.8.11',
     'languages' => [
         'en' => 'English',
         'fr' => 'Français',

diff --git a/database/migrations/create/2021_11_17_215824_update_create_options_for_order_type.php b/database/migrations/create/2021_11_17_215824_update_create_options_for_order_type.php
diff --git a/resources/views/pages/dashboard/orders/templates/_product-name.blade.php b/resources/views/pages/dashboard/orders/templates/_product-name.blade.php
@@ -0,0 +1,3 @@
+<span class="">{{ $product->name }} (x{{ $product->quantity }})</span>
+<br>
+<span class="text-xs text-gray-600">{{ $product->unit->name }}</span>
diff --git a/resources/views/pages/dashboard/orders/templates/_receipt.blade.php b/resources/views/pages/dashboard/orders/templates/_receipt.blade.php
@@ -1,6 +1,8 @@
 <?php
 use App\Models\Order;
 use App\Classes\Hook;
+use Illuminate\Support\Facades\View;
+
 ?>
 <div class="w-full h-full">
     <div class="w-full md:w-1/2 lg:w-1/3 shadow-lg bg-white p-2 mx-auto">
@@ -33,9 +35,8 @@
                     @foreach( Hook::filter( 'ns-receipt-products', $order->combinedProducts ) as $product )
                     <tr>
                         <td colspan="2" class="p-2 border-b border-gray-700">
-                            <span class="">{{ $product->name }} (x{{ $product->quantity }})</span>
-                            <br>
-                            <span class="text-xs text-gray-600">{{ $product->unit->name }}</span>
+                            <?php $productName  =   View::make( 'pages.dashboard.orders.templates._product-name', compact( 'product' ) );?>
+                            <?php echo Hook::filter( 'ns-receipt-product-name', $productName->render(), $product );?>
                         </td>
                         <td class="p-2 border-b border-gray-800 text-right">{{ ns()->currency->define( $product->total_price ) }}</td>
                     </tr>