[ERP-370] поправка getPriceDynamic с новым параметром regionId

diff --git a/erp24/records/WriteOffs.php b/erp24/records/WriteOffs.php
index 970346303a83649951d974db346a58c7a87a586d..ed50e996ffd25c81e900ce10b2b52fd43d9ff983 100755 (executable)
--- a/erp24/records/WriteOffs.php
+++ b/erp24/records/WriteOffs.php
@@ -430,15 +430,13 @@ class WriteOffs extends \yii\db\ActiveRecord
         return $writeOffProductsWithoutRetailPriceSetCounter;
     }
 
-    public static function getPriceDynamic($productId, $writeOffDate)
+    public static function getPriceDynamic($productId, $writeOffDate, $regionId = 52)
     {
         $query = PricesDynamic::find()
             ->select(['price'])
-            ->andWhere(['product_id' => $productId])
+            ->where(['region_id' => $regionId, 'product_id' => $productId])
             ->andWhere(['<=', 'date_from', $writeOffDate])
-            ->andWhere(['>=', 'date_to', $writeOffDate])
-            ->andWhere(['<=', 'date_from', $writeOffDate])
-            ->andWhere(['>=', 'date_to', $writeOffDate])
+            ->andWhere(['or', 'date_to IS NULL', ['>=', 'date_to', $writeOffDate]])
         ;
 
         $pricesDynamic = $query->scalar();