From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 23 Jan 2024 08:42:55 +0000 (+0300)
Subject: replace pdo with ar in uni, uni2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f9c974ad6c69b96390dc03c31934f861e770d239;p=yii-erp24%2F.git

replace pdo with ar in uni, uni2
---

diff --git a/erp24/inc/uni.php b/erp24/inc/uni.php
index 6ae8ee0..f84bb32 100644
--- a/erp24/inc/uni.php
+++ b/erp24/inc/uni.php
@@ -2394,7 +2394,8 @@ elseif(empty($bottom_print)) bottom($txt);
 function get_sql_array($sql_table, $id, $name, $where ) {
 global $db;
 
-$data = $db::getRows("SELECT $id,$name FROM $sql_table  $where");
+$data = Yii::$app->db->createCommand("SELECT $id,$name FROM $sql_table  $where")->queryAll();
+//$data = $db::getRows("SELECT $id,$name FROM $sql_table  $where");
 $array = [];
 foreach ($data as $it) {	
  $array[$it[$id]]=$it[$name];	
diff --git a/erp24/inc/uni2.php b/erp24/inc/uni2.php
index d8d664f..2b2badd 100644
--- a/erp24/inc/uni2.php
+++ b/erp24/inc/uni2.php
@@ -132,12 +132,19 @@ if(!empty($fields_table_edit)) {
 $fields_table_edit="";	
 if(!empty($_POST["position"])) {
 $n=count($_POST["position"]);	
-foreach($_POST["position"] as $v =>$p)	{$db::sql("UPDATE  modules_uni_fields SET posit=? WHERE modul='$modul' AND id=?",[$n,$v]);	$n--;	}
+foreach($_POST["position"] as $v =>$p)	{
+    $item = \yii_app\records\ModulesUniFields::find()->where(['and', ['modul' => $modul], ['id' => $v]])->one();
+    $item->posit = $n;
+    $item->save();
+//    $db::sql("UPDATE  modules_uni_fields SET posit=? WHERE modul='$modul' AND id=?",[$n,$v]);
+    $n--;
+}
 $mess="Сохранили";	
 }
 
-$sel_group=get_sql_array("uni_status", "id", "name", " WHERE type='".$modul."_group' order by posit DESC");	
-$data2=$db::getRows("SELECT * FROM modules_uni_fields WHERE modul='$modul' ORDER BY posit DESC");	
+$sel_group=get_sql_array("uni_status", "id", "name", " WHERE type='".$modul."_group' order by posit DESC");
+$data2 = Yii::$app->db->createCommand("SELECT * FROM modules_uni_fields WHERE modul='$modul' ORDER BY posit DESC")->queryAll();
+//$data2=$db::getRows("SELECT * FROM modules_uni_fields WHERE modul='$modul' ORDER BY posit DESC");
 	
 if(count($data2)>0) {		
 	
@@ -291,10 +298,11 @@ if(!empty($_REQUEST[$idname])) $id=(int)$_REQUEST[$idname];
 if(!empty($id)) { 
  $where_sql="";
 if(!empty($form_parametr["WHERE_SQL"])) $where_sql=$form_parametr["WHERE_SQL"];    
-    
-    
-$q = "SELECT name,id FROM $table_sql WHERE id=? $where_sql LIMIT 1";
-$data = $db::getRows($q,[$id]);
+
+
+$q = "SELECT name,id FROM $table_sql WHERE id=:id $where_sql LIMIT 1";
+$data = Yii::$app->db->createCommand($q, [':id' => $id])->queryAll();
+//$data = $db::getRows($q,[$id]);
 $n=count($data);
 if($n>0) {	
 foreach ($data as $row)  { 
@@ -319,18 +327,25 @@ exit();
 
 
 	
-if(!empty($id)) 
-$q = "SELECT *,v.id as id_value,v.val as val, o.group_id as group_id,o.name, o.image_config FROM modules_uni_fields as o 
-LEFT JOIN uni_fields_value as v ON (o.id=v.field_id AND v.uni_id='$id') WHERE o.modul='$modul' ORDER BY o.posit DESC";
- else 
- $q = "SELECT *,select_val as val FROM modules_uni_fields WHERE modul='$modul' ORDER BY posit DESC";
+if(!empty($id)) {
+    $q = \yii_app\records\ModulesUniFields::find()->alias('o')->select(['*', 'v.id as id_value', 'v.val as val', 'o.group_id as group_id', 'o.name', 'o.image_config'])
+        ->leftJoin('uni_fields_value as v', 'o.id = v.field_id AND v.uni_id = ' . $id)
+        ->where(['o.modul' => $modul])->orderBy(['o.posit' => SORT_DESC])->asArray();
+//    $q = "SELECT *,v.id as id_value, v.val as val, o.group_id as group_id,o.name, o.image_config FROM modules_uni_fields as o
+//LEFT JOIN uni_fields_value as v ON (o.id=v.field_id AND v.uni_id='$id') WHERE o.modul='$modul' ORDER BY o.posit DESC";
+} else {
+    $q = \yii_app\records\ModulesUniFields::find()->select(['*', 'select_val as val'])->where(['modul' => $modul])
+        ->orderBy(['posit' => SORT_DESC])->asArray();
+//    $q = "SELECT *,select_val as val FROM modules_uni_fields WHERE modul='$modul' ORDER BY posit DESC";
+}
 
 
 
 
 if(empty($fields_edit)) {	
-foreach($forma as $key_name => $massiv_k) $no_uni_fields[]=$key_name;	
-$data = $db::getRows($q);
+foreach($forma as $key_name => $massiv_k) $no_uni_fields[]=$key_name;
+$data = $q->all();
+//$data = $db::getRows($q);
 foreach ($data as $row) {	
 if(empty($row["val"]) and !empty($row["select_val"])) $row["val"]=$row["select_val"];	
 
@@ -364,7 +379,8 @@ echo" ++ {$row["name_eng"]}={$row["val"]}";
 }	 
 */
 
-$item = $db::getRow("SELECT * FROM $table_sql WHERE $idname=?  LIMIT 1",[$id]);
+$item = Yii::$app->db->createCommand("SELECT * FROM $table_sql WHERE $idname=:idname  LIMIT 1", [':idname' => $id])->queryAll()[0] ?? '';
+//$item = $db::getRow("SELECT * FROM $table_sql WHERE $idname=?  LIMIT 1",[$id]);
 	
 
 
@@ -377,12 +393,14 @@ $catid=$item["cat_id"];
 
 
 	
-/*заносим свойства для категории товара в массив*/	
-$data = $db::getRows("SELECT id FROM products_cat_property WHERE cat_id=?",[$catid]); 	
+/*заносим свойства для категории товара в массив*/
+$data = \yii_app\records\ProductsCatProperty::find()->select(['id'])->where(['cat_id' => $catid])->asArray()->all();
+//$data = $db::getRows("SELECT id FROM products_cat_property WHERE cat_id=?",[$catid]);
 foreach ($data as $row) $data_items[]=$row["id"];	
 	
 /*заносим все характеристики в общий массив*/
-$data = $db::getRows("SELECT id,name,tip,parent_id FROM cat_property"); 	
+$data = \yii_app\records\CatProperty::find()->select(['id', 'name', 'tip', 'parent_id'])->asArray()->all();
+//$data = $db::getRows("SELECT id,name,tip,parent_id FROM cat_property");
 foreach ($data as $row) { 
 $cat_property[$row["id"]]=$row["name"];
 if($row["tip"]==0)   $select_all[$row["id"]]= $row["name"];
@@ -391,7 +409,8 @@ if($row["tip"]==1)   $selectp[$row["parent_id"]][$row["id"]]= $row["name"];
 						
 	
 /*запрашиваем какие возможные свойства есть у товара в категории  cat_id=$id*/
-$data = $db::getRows("SELECT cat_id,id FROM products_cat_property WHERE cat_id=?",[$catid]); 
+$data = \yii_app\records\ProductsCatProperty::find()->select(['cat_id', 'id'])->where(['cat_id' => $catid])->asArray()->all();
+//$data = $db::getRows("SELECT cat_id,id FROM products_cat_property WHERE cat_id=?",[$catid]);
 foreach ($data as $row){
   $select[$row["id"]]=$cat_property[$row["id"]]; 
   $selec[]=$row["cat_id"];				
@@ -399,16 +418,24 @@ foreach ($data as $row){
 	
 /*сохраняем даные свойств товара */	
 if(!empty($_POST["save"])) {	
-// удаляем старые записи перед записью новых	
-$db::sql("DELETE FROM products_property_value WHERE id=?",[$id]);		
-foreach($_POST["in"] as $v =>$p)	{ 
-if(!empty($p) and !empty($id)) $db::sql("INSERT IGNORE INTO products_property_value VALUES(?,?,?)",[$p,$id,'']);		
-}
-
+    // удаляем старые записи перед записью новых
+    \yii_app\records\ProductsPropertyValue::deleteAll(['id' => $id]);
+    //$db::sql("DELETE FROM products_property_value WHERE id=?",[$id]);
+    foreach($_POST["in"] as $v =>$p)	{
+        if(!empty($p) and !empty($id)) {
+            $item = new \yii_app\records\ProductsPropertyValue;
+            $item->property_id = $p;
+            $item->id = $id;
+            $item->val = '';
+            $item->save();
+//            $db::sql("INSERT IGNORE INTO products_property_value VALUES(?,?,?)",[$p,$id,'']);
+        }
+    }
 }
 
-/*запрашиваем даные свойств товара */		
-$data = $db::getRows("SELECT * FROM products_property_value WHERE id=?",[$id]); 
+/*запрашиваем даные свойств товара */
+$data = \yii_app\records\ProductsPropertyValue::find()->where(['id' => $id])->asArray()->all();
+//$data = $db::getRows("SELECT * FROM products_property_value WHERE id=?",[$id]);
 foreach ($data as $row) $prop_val[$row["property_id"]]=$row["property_id"]; 
 	
 /*вывод свойств у товара*/	
@@ -421,15 +448,19 @@ foreach ($data as $row) $prop_val[$row["property_id"]]=$row["property_id"];
 }
 	
 	
-if(!empty($modul_uni)) {	
-
-$q = "SELECT v.val as val, o.name_eng as name_eng, o.type,o.attr, o.name,o.tip,o.sql_func,o.required,o.leftclass,o.class,o.placeholder,o.class_block,
-o.style, o.html, o.dostup_values,
-o.image_config FROM modules_uni_fields as o   LEFT JOIN uni_fields_value as v ON   o.id=v.field_id AND v.uni_id='$id' WHERE  o.modul='$modul_uni'";
-echo "$q";	
-
+if(!empty($modul_uni)) {
+$q = \yii_app\records\ModulesUniFields::find()->alias('o')
+    ->select(['v.val as val', 'o.name_eng as name_eng', 'o.type', 'o.attr', 'o.name', 'o.tip', 'o.sql_func', 'o.required',
+        'o.leftclass', 'o.class', 'o.placeholder', 'o.class_block', 'o.style', 'o.html', 'o.dostup_values', 'o.image_config'])
+        ->leftJoin('uni_fields_value as v', 'o.id = v.field_id AND v.uni_id = ' . $id)
+        ->where(['o.modul' => $modul_uni])->orderBy(['o.posit' => SORT_DESC])->asArray();
+//$q = "SELECT v.val as val, o.name_eng as name_eng, o.type,o.attr, o.name,o.tip,o.sql_func,o.required,o.leftclass,o.class,o.placeholder,o.class_block,
+//o.style, o.html, o.dostup_values,
+//o.image_config FROM modules_uni_fields as o   LEFT JOIN uni_fields_value as v ON   o.id=v.field_id AND v.uni_id='$id' WHERE  o.modul='$modul_uni'";
+//echo "$q";
 
-$data = $db::getRows($q);
+$data = $q->all();
+//$data = $db::getRows($q);
 $form_field_uni = [];
 foreach ($data as $row) {	
 //echo" ++ {$row["name_eng"]}={$row["val"]} ";
@@ -458,9 +489,13 @@ construct_form_submit_uni($forma, $table_sql,$modul_uni,$form_field_hide_array);
 	
 /////////	
 	
-
-$q = "SELECT *,v.val as val, o.name_eng as name_eng, o.type, o.required,o.attr, o.dostup_values, o.image_config  FROM modules_uni_fields as o  LEFT JOIN uni_fields_value as v ON (o.id=v.field_id AND v.uni_id=?) WHERE o.modul=? ";
-$data = $db::getRows($q,[$id,$modul_uni]);
+$data = \yii_app\records\ModulesUniFields::find()->alias('o')
+    ->select(['*', 'v.val as val', 'o.name_eng as name_eng', 'o.type', 'o.required', 'o.attr', 'o.dostup_values', 'o.image_config'])
+    ->leftJoin('uni_fields_value as v', 'o.id = v.field_id AND v.uni_id = ' . $id)
+    ->where(['o.modul' => $modul_uni])
+    ->asArray()->all();
+//$q = "SELECT *,v.val as val, o.name_eng as name_eng, o.type, o.required,o.attr, o.dostup_values, o.image_config  FROM modules_uni_fields as o  LEFT JOIN uni_fields_value as v ON (o.id=v.field_id AND v.uni_id=?) WHERE o.modul=? ";
+//$data = $db::getRows($q,[$id,$modul_uni]);
 foreach ($data as $row) {	
 $attr=$row["attr"];
 if($row["type"]=="multiple") { $val_2=explode(",",$row["val"]); $row["val"]=$val_2; $tip="array";	 } else $val_err='';
@@ -524,9 +559,9 @@ $sql_up="";
 //foreach($form_field_hide_array as $keys => $vals) { echo"<br>Скрываем поле $keys => $vals"; }
 
 /////////	
-
-$q = "SELECT name_eng FROM modules_uni_fields WHERE modul=?";
-$data = $db::getRows($q,[$modul_uni_fields]);
+$data = \yii_app\records\ModulesUniFields::find()->select(['name_eng'])->where(['modul' => $modul_uni_fields])->asArray()->all();
+//$q = "SELECT name_eng FROM modules_uni_fields WHERE modul=?";
+//$data = $db::getRows($q,[$modul_uni_fields]);
 foreach ($data as $row) {	
 $form_field_hide_array[$row["name_eng"]]=$row["name_eng"];	
 //echo"<br>Скрываем поле {$row["name_eng"]} ";
@@ -2229,7 +2264,8 @@ return $item;
 function construct_modul_form_azea($modul)   {
 global /*$modul,*/$db,$h1,$group_menu,$uni_fields, $_CONFIG,$forma_sql_table;
 
-$data=$db::getRows("SELECT * FROM modules_uni_fields WHERE modul=? ORDER BY posit DESC",[$modul]);
+$data = \yii_app\records\ModulesUniFields::find()->where(['modul' => $modul])->orderBy(['posit' => SORT_DESC])->asArray()->all();
+//$data=$db::getRows("SELECT * FROM modules_uni_fields WHERE modul=? ORDER BY posit DESC",[$modul]);
 foreach ($data as $row) {	
 
     $image_config=json_decode(empty($row["image_config"]) ? '{}' : $row["image_config"], true,JSON_UNESCAPED_UNICODE);
diff --git a/erp24/records/AdminChats.php b/erp24/records/AdminChats.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminDynamic.php b/erp24/records/AdminDynamic.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminDynamicCategoryDict.php b/erp24/records/AdminDynamicCategoryDict.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminGradeHistory.php b/erp24/records/AdminGradeHistory.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminGroupCompanyFunctionVisibility.php b/erp24/records/AdminGroupCompanyFunctionVisibility.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminGroupRbacConfig.php b/erp24/records/AdminGroupRbacConfig.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminPayrollDays.php b/erp24/records/AdminPayrollDays.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminPayrollDaysSearch.php b/erp24/records/AdminPayrollDaysSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminPayrollMonthInfo.php b/erp24/records/AdminPayrollMonthInfo.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminPayrollStat.php b/erp24/records/AdminPayrollStat.php
old mode 100644
new mode 100755
diff --git a/erp24/records/AdminStores.php b/erp24/records/AdminStores.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiCron.php b/erp24/records/ApiCron.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiCronTest.php b/erp24/records/ApiCronTest.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiCronTestSearch.php b/erp24/records/ApiCronTestSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiErrorLog.php b/erp24/records/ApiErrorLog.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiErrorLogSearch.php b/erp24/records/ApiErrorLogSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiIntegrationLogs.php b/erp24/records/ApiIntegrationLogs.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiLogs.php b/erp24/records/ApiLogs.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ApiLogsSearch.php b/erp24/records/ApiLogsSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Assemblies.php b/erp24/records/Assemblies.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Balances.php b/erp24/records/Balances.php
old mode 100644
new mode 100755
diff --git a/erp24/records/BalancesSearch.php b/erp24/records/BalancesSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CalendarAdminLink.php b/erp24/records/CalendarAdminLink.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Cashes.php b/erp24/records/Cashes.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CatProperty.php b/erp24/records/CatProperty.php
new file mode 100644
index 0000000..057b87d
--- /dev/null
+++ b/erp24/records/CatProperty.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace yii_app\records;
+
+use Yii;
+
+/**
+ * This is the model class for table "cat_property".
+ *
+ * @property int $id
+ * @property int $parent_id
+ * @property string $name
+ * @property int $tip
+ * @property int $posit
+ */
+class CatProperty extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'cat_property';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['parent_id', 'name', 'tip', 'posit'], 'required'],
+            [['parent_id', 'tip', 'posit'], 'integer'],
+            [['name'], 'string'],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'parent_id' => 'Parent ID',
+            'name' => 'Name',
+            'tip' => 'Tip',
+            'posit' => 'Posit',
+        ];
+    }
+}
diff --git a/erp24/records/ChartDataSearch.php b/erp24/records/ChartDataSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CheckConduct.php b/erp24/records/CheckConduct.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CheckConductItem.php b/erp24/records/CheckConductItem.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CheckCriteria.php b/erp24/records/CheckCriteria.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CheckCriteriaItem.php b/erp24/records/CheckCriteriaItem.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CheckGroup.php b/erp24/records/CheckGroup.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CheckStatus.php b/erp24/records/CheckStatus.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CheckType.php b/erp24/records/CheckType.php
old mode 100644
new mode 100755
diff --git a/erp24/records/City.php b/erp24/records/City.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CityStoreSearch.php b/erp24/records/CityStoreSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Cluster.php b/erp24/records/Cluster.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ClusterCalendar.php b/erp24/records/ClusterCalendar.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ClusterCalendarCategoryDict.php b/erp24/records/ClusterCalendarCategoryDict.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ClusterCalendarCategoryDictSearch.php b/erp24/records/ClusterCalendarCategoryDictSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ClusterSearch.php b/erp24/records/ClusterSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Comment.php b/erp24/records/Comment.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Companies.php b/erp24/records/Companies.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Company.php b/erp24/records/Company.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CompanyFunctions.php b/erp24/records/CompanyFunctions.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CompanySearch.php b/erp24/records/CompanySearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CompanyStores.php b/erp24/records/CompanyStores.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Contest001.php b/erp24/records/Contest001.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CreateChecks.php b/erp24/records/CreateChecks.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CreateChecks2.php b/erp24/records/CreateChecks2.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CreateChecksBags.php b/erp24/records/CreateChecksBags.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CrmMenuPermission.php b/erp24/records/CrmMenuPermission.php
old mode 100644
new mode 100755
diff --git a/erp24/records/CrmMenuPermissionSearch.php b/erp24/records/CrmMenuPermissionSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/EmployeeOnShift.php b/erp24/records/EmployeeOnShift.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ErrorInfoErp.php b/erp24/records/ErrorInfoErp.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ErrorInfoErpSearch.php b/erp24/records/ErrorInfoErpSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ExportImport.php b/erp24/records/ExportImport.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ExportImportIntegrations.php b/erp24/records/ExportImportIntegrations.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Firms.php b/erp24/records/Firms.php
old mode 100644
new mode 100755
diff --git a/erp24/records/FirmsGroupPrefix.php b/erp24/records/FirmsGroupPrefix.php
old mode 100644
new mode 100755
diff --git a/erp24/records/FunctionRegulations.php b/erp24/records/FunctionRegulations.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Grade.php b/erp24/records/Grade.php
old mode 100644
new mode 100755
diff --git a/erp24/records/GradeGroup.php b/erp24/records/GradeGroup.php
old mode 100644
new mode 100755
diff --git a/erp24/records/GradePrice.php b/erp24/records/GradePrice.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ImageDocumentLink.php b/erp24/records/ImageDocumentLink.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Images.php b/erp24/records/Images.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Incoming.php b/erp24/records/Incoming.php
old mode 100644
new mode 100755
diff --git a/erp24/records/InfoItemsTableShop0.php b/erp24/records/InfoItemsTableShop0.php
old mode 100644
new mode 100755
diff --git a/erp24/records/KikFeedbackCategory.php b/erp24/records/KikFeedbackCategory.php
old mode 100644
new mode 100755
diff --git a/erp24/records/KikFeedbackRequest.php b/erp24/records/KikFeedbackRequest.php
old mode 100644
new mode 100755
diff --git a/erp24/records/KikFeedbackSource.php b/erp24/records/KikFeedbackSource.php
old mode 100644
new mode 100755
diff --git a/erp24/records/KikFeedbackSubcategory.php b/erp24/records/KikFeedbackSubcategory.php
old mode 100644
new mode 100755
diff --git a/erp24/records/KikFeedbackVerdict.php b/erp24/records/KikFeedbackVerdict.php
old mode 100644
new mode 100755
diff --git a/erp24/records/LessonsGroup.php b/erp24/records/LessonsGroup.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MatrixErp.php b/erp24/records/MatrixErp.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MatrixErpMedia.php b/erp24/records/MatrixErpMedia.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MatrixErpProperty.php b/erp24/records/MatrixErpProperty.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MatrixErpPropertySearch.php b/erp24/records/MatrixErpPropertySearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MatrixErpSearch.php b/erp24/records/MatrixErpSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Meeting.php b/erp24/records/Meeting.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MeetingLinkAdmin.php b/erp24/records/MeetingLinkAdmin.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MeetingSearch.php b/erp24/records/MeetingSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/MessagerUser.php b/erp24/records/MessagerUser.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ModulesUniFields.php b/erp24/records/ModulesUniFields.php
new file mode 100644
index 0000000..378a5ec
--- /dev/null
+++ b/erp24/records/ModulesUniFields.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace yii_app\records;
+
+use Yii;
+
+/**
+ * This is the model class for table "modules_uni_fields".
+ *
+ * @property int $id
+ * @property string $modul
+ * @property string $name
+ * @property string $name_eng
+ * @property int $group_id
+ * @property string $type тип поля
+ * @property string $tip тип данных (число,массив,строка, текст,email,дататолкьо eng)
+ * @property string $select_val Список опций
+ * @property string $default_val
+ * @property string $sql_func SQL параметры для запроса в этом поле
+ * @property string $dostup_values Доступ только к определенным значениям в зависисомсти от перменной в сессии
+ * @property int $posit позиция, приоритет
+ * @property int $required Обязательное
+ * @property string $required_status обязательное для статусов воронки
+ * @property string $placeholder
+ * @property string $leftclass
+ * @property string $class
+ * @property string $class_block
+ * @property string $attr атрибуты внутри поля attr
+ * @property string $style
+ * @property string $html
+ * @property string $image_config
+ * @property int $api
+ * @property int $user_dostup Ограничить доступ к списку из настроек по пользователю
+ * @property string $date_add
+ * @property string $dostup_arr Доступы
+ * @property int $admin_id
+ */
+class ModulesUniFields extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'modules_uni_fields';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'name_eng', 'group_id', 'tip', 'select_val', 'default_val', 'sql_func', 'dostup_values', 'posit', 'required_status', 'placeholder', 'leftclass', 'class', 'class_block', 'attr', 'style', 'html', 'image_config', 'user_dostup', 'date_add', 'dostup_arr', 'admin_id'], 'required'],
+            [['group_id', 'posit', 'required', 'api', 'user_dostup', 'admin_id'], 'integer'],
+            [['select_val', 'sql_func', 'dostup_values', 'attr', 'style', 'html', 'image_config', 'dostup_arr'], 'string'],
+            [['date_add'], 'safe'],
+            [['modul', 'type'], 'string', 'max' => 25],
+            [['name', 'placeholder'], 'string', 'max' => 150],
+            [['name_eng', 'tip'], 'string', 'max' => 55],
+            [['default_val', 'leftclass', 'class_block'], 'string', 'max' => 155],
+            [['required_status'], 'string', 'max' => 250],
+            [['class'], 'string', 'max' => 200],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'modul' => 'Modul',
+            'name' => 'Name',
+            'name_eng' => 'Name Eng',
+            'group_id' => 'Group ID',
+            'type' => 'Type',
+            'tip' => 'Tip',
+            'select_val' => 'Select Val',
+            'default_val' => 'Default Val',
+            'sql_func' => 'Sql Func',
+            'dostup_values' => 'Dostup Values',
+            'posit' => 'Posit',
+            'required' => 'Required',
+            'required_status' => 'Required Status',
+            'placeholder' => 'Placeholder',
+            'leftclass' => 'Leftclass',
+            'class' => 'Class',
+            'class_block' => 'Class Block',
+            'attr' => 'Attr',
+            'style' => 'Style',
+            'html' => 'Html',
+            'image_config' => 'Image Config',
+            'api' => 'Api',
+            'user_dostup' => 'User Dostup',
+            'date_add' => 'Date Add',
+            'dostup_arr' => 'Dostup Arr',
+            'admin_id' => 'Admin ID',
+        ];
+    }
+}
diff --git a/erp24/records/MultipleModel.php b/erp24/records/MultipleModel.php
old mode 100644
new mode 100755
diff --git a/erp24/records/NewsLetterDeliveryStatus.php b/erp24/records/NewsLetterDeliveryStatus.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Notification.php b/erp24/records/Notification.php
old mode 100644
new mode 100755
diff --git a/erp24/records/NotificationStatus.php b/erp24/records/NotificationStatus.php
old mode 100644
new mode 100755
diff --git a/erp24/records/OrderStoreSort.php b/erp24/records/OrderStoreSort.php
old mode 100644
new mode 100755
diff --git a/erp24/records/OrdersAmo.php b/erp24/records/OrdersAmo.php
old mode 100644
new mode 100755
diff --git a/erp24/records/OrdersAmoSearch.php b/erp24/records/OrdersAmoSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/OrdersStatus.php b/erp24/records/OrdersStatus.php
old mode 100644
new mode 100755
diff --git a/erp24/records/OurCities.php b/erp24/records/OurCities.php
old mode 100644
new mode 100755
diff --git a/erp24/records/PaymentTypes.php b/erp24/records/PaymentTypes.php
old mode 100644
new mode 100755
diff --git a/erp24/records/PhoneChangeHistory.php b/erp24/records/PhoneChangeHistory.php
old mode 100644
new mode 100755
diff --git a/erp24/records/PlanStore.php b/erp24/records/PlanStore.php
old mode 100644
new mode 100755
diff --git a/erp24/records/PlanStoreGroupSearch.php b/erp24/records/PlanStoreGroupSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/PlanStoreLog.php b/erp24/records/PlanStoreLog.php
old mode 100644
new mode 100755
diff --git a/erp24/records/PlanStoreSearch.php b/erp24/records/PlanStoreSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Prices.php b/erp24/records/Prices.php
old mode 100644
new mode 100755
diff --git a/erp24/records/PricesZakup.php b/erp24/records/PricesZakup.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Products1c.php b/erp24/records/Products1c.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Products1cOptions.php b/erp24/records/Products1cOptions.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ProductsCatProperty.php b/erp24/records/ProductsCatProperty.php
new file mode 100644
index 0000000..6fabc76
--- /dev/null
+++ b/erp24/records/ProductsCatProperty.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace yii_app\records;
+
+use Yii;
+
+/**
+ * This is the model class for table "products_cat_property".
+ *
+ * @property int $cat_id
+ * @property int $id
+ */
+class ProductsCatProperty extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'products_cat_property';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['cat_id', 'id'], 'required'],
+            [['cat_id', 'id'], 'integer'],
+            [['cat_id', 'id'], 'unique', 'targetAttribute' => ['cat_id', 'id']],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'cat_id' => 'Cat ID',
+            'id' => 'ID',
+        ];
+    }
+}
diff --git a/erp24/records/ProductsPropertyValue.php b/erp24/records/ProductsPropertyValue.php
new file mode 100644
index 0000000..2986b11
--- /dev/null
+++ b/erp24/records/ProductsPropertyValue.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace yii_app\records;
+
+use Yii;
+
+/**
+ * This is the model class for table "products_property_value".
+ *
+ * @property int $property_id
+ * @property int $id
+ * @property int $val
+ */
+class ProductsPropertyValue extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'products_property_value';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['property_id', 'id', 'val'], 'required'],
+            [['property_id', 'id', 'val'], 'integer'],
+            [['property_id', 'id'], 'unique', 'targetAttribute' => ['property_id', 'id']],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'property_id' => 'Property ID',
+            'id' => 'ID',
+            'val' => 'Val',
+        ];
+    }
+}
diff --git a/erp24/records/ProductsVarieties.php b/erp24/records/ProductsVarieties.php
old mode 100644
new mode 100755
diff --git a/erp24/records/QualityRating.php b/erp24/records/QualityRating.php
old mode 100644
new mode 100755
diff --git a/erp24/records/QualityRatingLog.php b/erp24/records/QualityRatingLog.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ReferralStatus.php b/erp24/records/ReferralStatus.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Report.php b/erp24/records/Report.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Reports.php b/erp24/records/Reports.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ReportsFields.php b/erp24/records/ReportsFields.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ReportsGroups.php b/erp24/records/ReportsGroups.php
old mode 100644
new mode 100755
diff --git a/erp24/records/RnpAlias.php b/erp24/records/RnpAlias.php
old mode 100644
new mode 100755
diff --git a/erp24/records/RnpData.php b/erp24/records/RnpData.php
old mode 100644
new mode 100755
diff --git a/erp24/records/RnpIndex.php b/erp24/records/RnpIndex.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesGroupSearch.php b/erp24/records/SalesGroupSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesHistory.php b/erp24/records/SalesHistory.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesHistorySearch.php b/erp24/records/SalesHistorySearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesItems.php b/erp24/records/SalesItems.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesProductsHistory.php b/erp24/records/SalesProductsHistory.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesProductsHistorySearch.php b/erp24/records/SalesProductsHistorySearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesProductsUpdate.php b/erp24/records/SalesProductsUpdate.php
old mode 100644
new mode 100755
diff --git a/erp24/records/SalesUpdate.php b/erp24/records/SalesUpdate.php
old mode 100644
new mode 100755
diff --git a/erp24/records/ScriptLauncherLog.php b/erp24/records/ScriptLauncherLog.php
old mode 100644
new mode 100755
diff --git a/erp24/records/StoreDynamic.php b/erp24/records/StoreDynamic.php
old mode 100644
new mode 100755
diff --git a/erp24/records/StoreOrderStatus.php b/erp24/records/StoreOrderStatus.php
old mode 100644
new mode 100755
diff --git a/erp24/records/StoreOrders.php b/erp24/records/StoreOrders.php
old mode 100644
new mode 100755
diff --git a/erp24/records/StoreOrdersFields.php b/erp24/records/StoreOrdersFields.php
old mode 100644
new mode 100755
diff --git a/erp24/records/StoreOrdersFieldsData.php b/erp24/records/StoreOrdersFieldsData.php
old mode 100644
new mode 100755
diff --git a/erp24/records/StoreOrdersFieldsProperty.php b/erp24/records/StoreOrdersFieldsProperty.php
old mode 100644
new mode 100755
diff --git a/erp24/records/StorePlanogram.php b/erp24/records/StorePlanogram.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Task.php b/erp24/records/Task.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TaskSearch.php b/erp24/records/TaskSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TaskTemplates.php b/erp24/records/TaskTemplates.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TeambonusSettings.php b/erp24/records/TeambonusSettings.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TechnicalRequestType.php b/erp24/records/TechnicalRequestType.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TechnicalRequestTypeSearch.php b/erp24/records/TechnicalRequestTypeSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/Terminals.php b/erp24/records/Terminals.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TimeDiffValue.php b/erp24/records/TimeDiffValue.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TimetableShift.php b/erp24/records/TimetableShift.php
old mode 100644
new mode 100755
diff --git a/erp24/records/TimetableWorkbot.php b/erp24/records/TimetableWorkbot.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UniversalCatalog.php b/erp24/records/UniversalCatalog.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UniversalCatalogItem.php b/erp24/records/UniversalCatalogItem.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UniversalCatalogItemSearch.php b/erp24/records/UniversalCatalogItemSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UniversalCatalogSearch.php b/erp24/records/UniversalCatalogSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UsersAuthCallLog.php b/erp24/records/UsersAuthCallLog.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UsersBonus.php b/erp24/records/UsersBonus.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UsersEvents.php b/erp24/records/UsersEvents.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UsersPhones.php b/erp24/records/UsersPhones.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UsersStopList.php b/erp24/records/UsersStopList.php
old mode 100644
new mode 100755
diff --git a/erp24/records/UsersStopListSearch.php b/erp24/records/UsersStopListSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/WriteOffsErp.php b/erp24/records/WriteOffsErp.php
old mode 100644
new mode 100755
diff --git a/erp24/records/WriteOffsErpCauseDict.php b/erp24/records/WriteOffsErpCauseDict.php
old mode 100644
new mode 100755
diff --git a/erp24/records/WriteOffsErpCauseDictSearch.php b/erp24/records/WriteOffsErpCauseDictSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/WriteOffsErpSearch.php b/erp24/records/WriteOffsErpSearch.php
old mode 100644
new mode 100755
diff --git a/erp24/records/WriteOffsProductsErp.php b/erp24/records/WriteOffsProductsErp.php
old mode 100644
new mode 100755
diff --git a/erp24/records/detection.dat b/erp24/records/detection.dat
old mode 100644
new mode 100755