Merge branch 'dev'

backend/controllers/OrderController.php

@@ -109,6 +109,7 @@ class OrderController extends BackendController
                                                                 $productOrder->price = $p->price;
                                                                 $productOrder->unit = $p->unit;
                                                                 $productOrder->step = $p->step;
+                                                                $productOrder->id_tax_rate = $p->taxRate->id ;
                                                                 $productOrder->save();
                                                         }
                                                 }
@@ -144,6 +145,7 @@ class OrderController extends BackendController
                                                                 $productOrder->price = $p->price;
                                                                 $productOrder->unit = $p->unit;
                                                                 $productOrder->step = $p->step;
+                                                                $productOrder->id_tax_rate = $p->taxRate->id ;
                                                                 $productOrder->save();
                                                         }
                                                 }
@@ -863,6 +865,7 @@ class OrderController extends BackendController
                                         $productOrder->unit = $product->unit;
                                         $productOrder->step = $product->step;
                                         $productOrder->price = $product->price;
+                                        $productOrder->id_tax_rate = $product->taxRate->id;
                                         $productOrder->save();
                                 }
                         }
@@ -924,6 +927,7 @@ class OrderController extends BackendController
                                                         $productOrder->unit = $product->unit;
                                                         $productOrder->step = $product->step;
                                                         $productOrder->price = $product->price;
+                                                        $productOrder->id_tax_rate = $product->taxRate->id;
                                                 }
                                         }
 

common/helpers/Price.php

@@ -53,7 +53,7 @@ class Price
 
         public static function getPriceWithTax($priceWithoutTax, $taxRate)
         {
-                return floatval($priceWithoutTax) * ($taxRate + 1) ;
+                return self::numberTwoDecimals(floatval($priceWithoutTax) * ($taxRate + 1)) ;
         }
 
         public static function numberTwoDecimals($number)

common/models/Subscription.php

@@ -246,6 +246,7 @@ class Subscription extends ActiveRecordCommon
                                 $productOrder->price = $productSubscription->product->price;
                                 $productOrder->unit = $productSubscription->product->unit;
                                 $productOrder->step = $productSubscription->product->step;
+                                $productOrder->id_tax_rate = $productSubscription->product->taxRate->id;
                                 $productOrder->save();
                                 $productsAdd = true;
                         }

producer/controllers/OrderController.php

@@ -326,7 +326,7 @@ class OrderController extends ProducerBaseController
                                         $productOrder->id_product = $product->id;
 
                                         $productOrder->price = $product->price;
-                                        $productOrder->id_tax_rate = $product->id_tax_rate;
+                                        $productOrder->id_tax_rate = $product->taxRate->id;
 
                                         $unit = (!is_null($order) && isset($unitsArray[$product->id])) ? $unitsArray[$product->id] : $product->unit;
                                         $coefficient = Product::$unitsArray[$unit]['coefficient'];