Changelog

- Fix: double entry on cash flow for procurement that has status updated from list (#1265)

Author: Blair2004

app/Http/Controllers/Dashboard/ProcurementController.php

@@ -142,8 +142,6 @@ public function changePaymentStatus( Procurement $procurement, Request $request
         $procurement->payment_status = $request->input( 'payment_status' );
         $procurement->save();
 
-        event( new ProcurementAfterUpdateEvent( $procurement ) );
-
         return [
             'status' => 'success',
             'message' => __( 'The procurement payment status has been changed successfully.' ),
@@ -166,8 +164,6 @@ public function setAsPaid( Procurement $procurement )
         $procurement->payment_status = Procurement::PAYMENT_PAID;
         $procurement->save();
 
-        event( new ProcurementAfterUpdateEvent( $procurement ) );
-
         return [
             'status' => 'success',
             'message' => __( 'The procurement has been marked as paid.' ),

app/Services/ProcurementService.php

@@ -226,7 +226,7 @@ public function edit( $id, $data )
         }
 
         /**
-         * we want to dispatch the even
+         * we want to dispatch the event
          * only when the product has been created
          */
         event( new ProcurementAfterUpdateEvent( $procurement ) );

app/Services/TestService.php

@@ -141,7 +141,7 @@ public function prepareProcurement( Carbon $date, array $details = [] )
         $taxGroup = TaxGroup::get()->random();
         $margin = 25;
 
-        return array_merge([
+        $config     =   [
             'name' => sprintf( __( 'Sample Procurement %s' ), Str::random(5) ),
             'general' => [
                 'provider_id' => Provider::get()->random()->id,
@@ -201,6 +201,12 @@ public function prepareProcurement( Carbon $date, array $details = [] )
                         'unit_id' => $data->unit->id,
                     ];
                 }),
-        ], $details );
+        ];
+
+        foreach( $details as $key => $value ) {
+            Arr::set( $config, $key, $value );
+        }
+
+        return $config;
     }
 }

tests/Traits/WithProcurementTest.php

@@ -20,17 +20,14 @@ protected function attemptCreateAnUnpaidProcurement()
         $provider = Provider::get()->random();
         $currentExpenseValue = CashFlow::where( 'expense_category_id', ns()->option->get( 'ns_procurement_cashflow_account' ) )->sum( 'value' );
         $procurementsDetails = $testService->prepareProcurement( ns()->date->now(), [
-            'general' => [
-                'payment_status' => 'unpaid',
-                'provider_id' => $provider->id,
-                'delivery_status' => Procurement::DELIVERED,
-            ],
+            'general.payment_status' => 'unpaid',
+            'general.provider_id' => $provider->id,
+            'general.delivery_status' => Procurement::DELIVERED
         ]);
 
         $response = $this->withSession( $this->app[ 'session' ]->all() )
             ->json( 'POST', 'api/nexopos/v4/procurements', $procurementsDetails );
 
-        $response->assertOk();
         $decode = json_decode( $response->getContent(), true );
 
         $newExpensevalue = CashFlow::where( 'expense_category_id', ns()->option->get( 'ns_procurement_cashflow_account' ) )->sum( 'value' );
@@ -56,6 +53,7 @@ protected function attemptCreateAnUnpaidProcurement()
         $newExpensevalue = CashFlow::where( 'expense_category_id', ns()->option->get( 'ns_procurement_cashflow_account' ) )->sum( 'value' );
         $existingExpense = CashFlow::where( 'procurement_id', $procurement[ 'id' ] )->first();
 
+        $this->assertEquals( 1, CashFlow::where( 'procurement_id', $procurement[ 'id' ] )->count(), 'There is more than 1 cash flow created for the same procurement.' );
         $this->assertEquals( ns()->currency->getRaw( $existingExpense->value ), ns()->currency->getRaw( $procurement[ 'cost' ] ), 'The cash flow value doesn\'t match the procurement cost.' );
         $this->assertTrue( $existingExpense instanceof CashFlow, 'No cash flow was created after the procurement was marked as paid.' );
         $this->assertTrue( (float) $currentExpenseValue !== (float) $newExpensevalue, 'The expenses hasn\'t changed for the previously unpaid procurement.' );
@@ -69,13 +67,39 @@ protected function attemptCreateProcurement()
         $testService = app()->make( TestService::class );
 
         $currentExpenseValue = CashFlow::where( 'expense_category_id', ns()->option->get( 'ns_procurement_cashflow_account' ) )->sum( 'value' );
-        $procurementsDetails = $testService->prepareProcurement( ns()->date->now(), [] );
+        $procurementsDetails = $testService->prepareProcurement( ns()->date->now(), [
+            'general.payment_status'    =>  Procurement::PAYMENT_UNPAID,
+            'general.delivery_status'   =>  Procurement::PENDING
+        ]);
 
+        /**
+         * Query: We store the procurement with an unpaid status.
+         */
         $response = $this->withSession( $this->app[ 'session' ]->all() )
             ->json( 'POST', 'api/nexopos/v4/procurements', $procurementsDetails );
 
         $response->assertOk();
 
+        $procurementId  =   $response->json()[ 'data' ][ 'procurement' ][ 'id' ];
+
+        /**
+         * Check: at the point, there shouldn't be any expense recorded.
+         * The procurement is not paid.
+         */
+        $existingExpense = CashFlow::where( 'procurement_id', $procurementId )->first();
+        $this->assertTrue( ! $existingExpense instanceof CashFlow, __( 'A cash flow has been created for an unpaid procurement.' ) );
+
+        /**
+         * Query: we store the procurement now with a paid status
+         */
+        $procurementsDetails[ 'general' ][ 'payment_status' ]   =   Procurement::PAYMENT_PAID;
+        $procurementsDetails[ 'general' ][ 'delivery_status' ]   =   Procurement::DELIVERED;
+
+        $response = $this->withSession( $this->app[ 'session' ]->all() )
+            ->json( 'PUT', 'api/nexopos/v4/procurements/' . $procurementId, $procurementsDetails );
+
+        $response->assertOk();
+
         /**
          * We'll proceed to the verification
          * and check if the accounts are valid.