fix set actual code

diff --git a/erp24/actions/reports/GenerateAction.php b/erp24/actions/reports/GenerateAction.php
index ebee6ec82533fb3c14eb8d2e93b1b1d62d570caf..1fac90c2668f987960fd41c7c09315d51fa9f2f1 100644 (file)
--- a/erp24/actions/reports/GenerateAction.php
+++ b/erp24/actions/reports/GenerateAction.php
@@ -4,7 +4,7 @@ namespace yii_app\actions\reports;
 
 use ParseError, Exception;
 use yii\base\Action;
-use yii_app\controllers\ReportsController;
+use app\controllers\ReportsController;
 use yii_app\helpers\UtilHelper;
 use yii_app\records\DashboardSales;
 use yii_app\records\Reports;

diff --git a/erp24/actions/reports/ShowAction.php b/erp24/actions/reports/ShowAction.php
index 4dc482552b8a518ea3263bd381187fcda365dde5..ba6ec0ce6c142f16781ccaf491fd36ffeb54647e 100644 (file)
--- a/erp24/actions/reports/ShowAction.php
+++ b/erp24/actions/reports/ShowAction.php
@@ -5,7 +5,7 @@ namespace yii_app\actions\reports;
 use Yii;
 use yii\base\Action;
 use yii\base\DynamicModel;
-use yii_app\controllers\ReportsController;
+use app\controllers\ReportsController;
 use yii_app\records\Reports;
 use yii_app\records\ReportsFields;
 use yii_app\records\ReportsGroups;

diff --git a/erp24/records/OrdersAmo.php b/erp24/records/OrdersAmo.php
index e570d3ccfc121d200f94abbaf47c3eeeb1f08cbd..dbda3769526ee3854ad4dc90875f91d3cf687543 100644 (file)
--- a/erp24/records/OrdersAmo.php
+++ b/erp24/records/OrdersAmo.php
@@ -134,6 +134,12 @@ use Yii;
  * @property int $1c_send Отправлено в 1c
  * @property string $check_id_arr
  * @property string $data_md5
+ *
+ * @property Sales $sales
+ * @property CityStore $storeObj
+ * @property Admin $courierObj
+ * @property Admin $floristObj
+ * @property OrdersStatus $status
  */
 class OrdersAmo extends \yii\db\ActiveRecord
 {
@@ -309,4 +315,32 @@ class OrdersAmo extends \yii\db\ActiveRecord
             'data_md5' => 'Data Md5',
         ];
     }
-}
+
+    public function getSales()
+    {
+        return $this->hasMany(Sales::class, ['order_id' => 'id'])
+            ->orderBy([
+                'date' => SORT_ASC
+            ]);
+    }
+
+    public function getStoreObj()
+    {
+        return $this->hasOne(CityStore::class, ['id' => 'store_id']);
+    }
+
+    public function getFloristObj()
+    {
+        return $this->hasOne(Admin::class, ['id' => 'florist_id']);
+    }
+
+    public function getCourierObj()
+    {
+        return $this->hasOne(Admin::class, ['id' => 'courier_id']);
+    }
+
+    public function getStatus()
+    {
+        return $this->hasOne(OrdersStatus::class, ['status_id' => 'status_id']);
+    }
+}
\ No newline at end of file

diff --git a/erp24/views/reports/index.php b/erp24/views/reports/index.php
index 458588eda8a844b898d0d3bea1a5c26d55899722..6c2c12b9e49d086727d9afb413facf1e7506cb3c 100644 (file)
--- a/erp24/views/reports/index.php
+++ b/erp24/views/reports/index.php
@@ -5,7 +5,7 @@ use \yii\helpers\Html;
 
 use dosamigos\datetimepicker\DateTimePicker;
 
-use yii_app\controllers\ReportsController;
+use app\controllers\ReportsController;
 use \yii_app\helpers\PrintBlockHelper;
 
 /** @var \yii\base\DynamicModel $model */