Merge branch 'v4.8.x' of https://github.com/blair2004/NexoPOS-4x into…

… v4.8.x

app/Http/Controllers/Dashboard/ProductsController.php

@@ -561,6 +561,7 @@ public function searchUsingArgument( $reference )
 
         if ( $procurementProduct instanceof ProcurementProduct ) {
             $product = $procurementProduct->product;
+            $product->load( 'tax_group.taxes' );
 
             /**
              * check if the product has expired
@@ -588,9 +589,11 @@ public function searchUsingArgument( $reference )
 
             $product = Product::find( $productUnitQuantity->product_id );
             $product->load( 'unit_quantities.unit' );
+            $product->load( 'tax_group.taxes' );
             $product->selectedUnitQuantity = $productUnitQuantity;
         } elseif ( $product instanceof Product ) {
             $product->load( 'unit_quantities.unit' );
+            $product->load( 'tax_group.taxes' );
 
             if ( $product->accurate_tracking ) {
                 throw new NotAllowedException( __( 'Unable to add a product that has accurate tracking enabled, using an ordinary barcode.' ) );

app/Services/ProductService.php

@@ -692,7 +692,7 @@ private function __computeUnitQuantities( $fields, $product )
                 }
 
                 /**
-                 * We don't need tos ave all the informations
+                 * We don't need to save all the information
                  * available on the group variable, that's why we define
                  * explicitly how everything is saved here.
                  */
@@ -1785,7 +1785,10 @@ public function searchProduct( $search, $limit = 5, $arguments = [] )
                 ->orWhere( 'sku', 'LIKE', "%{$search}%" )
                 ->orWhere( 'barcode', 'LIKE', "%{$search}%" );
             })
-            ->with( 'unit_quantities.unit' )
+            ->with([ 
+                'unit_quantities.unit',
+                'tax_group.taxes'
+            ])
             ->limit( $limit );
 
         /**

app/Services/TaxService.php

@@ -251,23 +251,13 @@ public function update( $id, $fields )
     public function getComputedTaxGroupValue( $tax_type, $tax_group_id, $price )
     {
         $taxGroup = TaxGroup::find( $tax_group_id );
-        $taxValue = 0;
 
         if ( $taxGroup instanceof TaxGroup ) {
-            $taxValue = $taxGroup->taxes
-                ->map( function( $tax ) use ( $tax_type, $price ) {
-                    $taxValue = $this->getVatValue(
-                        $tax_type,
-                        floatval( $tax[ 'rate' ] ),
-                        $price
-                    );
-
-                    return $taxValue;
-                })
-                ->sum();
+            $summarizedRate = $taxGroup->taxes->sum( 'rate' );
+            return $this->getVatValue( $tax_type, $summarizedRate, $price );
         }
 
-        return $taxValue;
+        return 0;
     }
 
     /**
@@ -306,21 +296,21 @@ public function computeTax( ProductUnitQuantity $product, $tax_group_id, $tax_ty
 
             if ( ( $tax_type ?? $product->tax_type) === 'inclusive' ) {
                 $product->sale_price_with_tax = ( floatval( $product->sale_price_edit ) );
-                $product->sale_price_tax = ( floatval( $this->getVatValue( 'inclusive', $taxRate, $product->sale_price_edit ) ) );
                 $product->sale_price_without_tax = $this->getPriceWithoutTax(
                     type: 'inclusive',
                     rate: $taxRate,
                     value: $product->sale_price_edit
                 );
+                $product->sale_price_tax = ( floatval( $this->getVatValue( 'inclusive', $taxRate, $product->sale_price_edit ) ) );
                 $product->sale_price = $product->sale_price_with_tax;
             } else {
                 $product->sale_price_without_tax = floatval( $product->sale_price_edit );
-                $product->sale_price_tax = ( floatval( $this->getVatValue( 'exclusive', $taxRate, $product->sale_price_edit ) ) );
                 $product->sale_price_with_tax = $this->getPriceWithTax(
                     type: 'exclusive',
                     rate: $taxRate,
                     value: $product->sale_price_edit
                 );
+                $product->sale_price_tax = ( floatval( $this->getVatValue( 'exclusive', $taxRate, $product->sale_price_edit ) ) );
                 $product->sale_price = $product->sale_price_with_tax;
             }
         }
@@ -542,7 +532,7 @@ public function getVatValue( $type, float $rate, float $value )
         if ( $type === 'inclusive' ) {
             return ns()->currency->define( $value )->subtractBy( $this->getPriceWithoutTax( $type, $rate, $value ) )->getRaw();
         } elseif ( $type === 'exclusive' ) {
-            return ns()->currency->define( $this->getPriceWithoutTax( $type, $rate, $value ) )->subtractBy( $value )->getRaw();
+            return ns()->currency->define( $this->getPriceWithTax( $type, $rate, $value ) )->subtractBy( $value )->getRaw();
         }
     }
 

app/Settings/pos/vat.php

@@ -46,6 +46,18 @@
     ];
 }
 
+$fields[] = [
+    'type' => 'select',
+    'name' => 'ns_pos_tax_compute_group_separately',
+    'value' => ns()->option->get( 'ns_pos_tax_compute_group_separately', 'no' ),
+    'options' => Helper::kvToJsOptions([
+        'yes' => __( 'Yes' ),
+        'no' => __( 'No' )
+    ]),
+    'label' => __( 'Tax Group Computing' ),
+    'description' => __( 'If disabled, the rates are summed and computed. Otherwise it\'s computed separately.' ),
+];
+
 return [
     'label' => __( 'VAT Settings' ),
     'fields' => $fields,