UPDATE `store_plan` SET `date_edit` = '1970-01-01' WHERE `date_edit` < '1970-01-01';
UPDATE `firms` SET `saldo_data`='1970-01-01' WHERE `saldo_data` < '1970-01-01';
-UPDATE `firms` SET `date_add`='1970-01-01 00:00:01' WHERE `date_add` < '1970-01-01 00:00:01';
+-- UPDATE `firms` SET `date_add`='1970-01-01 00:00:01' WHERE `date_add` < '1970-01-01 00:00:01';
ALTER TABLE `sale_script_items` MODIFY COLUMN `from_to` ENUM('manager', 'client', 'none');
UPDATE `sale_script_items` SET `from_to` = 'none' WHERE `from_to` = '';
UPDATE `store_orders` SET `date_update`='1970-01-01 00:00:01' WHERE `date_update`<'1970-01-01 00:00:01';
UPDATE `store_orders` SET `delivery_date_fact`='1970-01-01' WHERE `delivery_date_fact`<'1970-01-01';
-UPDATE `users_events` SET `date` = '1970-01-01' WHERE `date` < '1970-01-01' AND `date` IS NOT NULL;
\ No newline at end of file
+UPDATE `users_events` SET `date` = '1970-01-01' WHERE `date` < '1970-01-01' AND `date` IS NOT NULL;
+UPDATE `universal_pipeline_triggers` SET `time` = '1970-01-01' WHERE `time` < '1970-01-01' AND `time` IS NOT NULL;
+UPDATE `shipment_waybills` SET `created_at` = '1970-01-01' WHERE `created_at` < '1970-01-01' AND `created_at` IS NOT NULL;
+UPDATE `store_orders` SET `date_add` = '1970-01-01' WHERE `date_add` < '1970-01-01' AND `date_add` IS NOT NULL;
+ALTER TABLE `sales` DROP INDEX `date`;
+
+ALTER TABLE page_statistics ADD PRIMARY KEY (id);
+ALTER TABLE IF EXISTS erp24.page_statistics
+ ADD COLUMN id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 30000 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 );
+SELECT setval('page_statistics_id_seq', max(id)) FROM page_statistics;
+
+ALTER TABLE admin ADD PRIMARY KEY (id);
+ALTER TABLE admin_group ADD PRIMARY KEY (id);
+ALTER TABLE timetable ADD PRIMARY KEY (id);
+ALTER TABLE sales ADD PRIMARY KEY (id);
+ALTER TABLE sales_products ADD PRIMARY KEY (id);
+ALTER TABLE write_offs_erp ADD PRIMARY KEY (id);
+ALTER TABLE store_plan ADD PRIMARY KEY (store_id,month,year);
+ALTER TABLE dashboard_fields_links ADD PRIMARY KEY (dashboard_id,field_id);
+ALTER TABLE products_1c ADD PRIMARY KEY (id);
+ALTER TABLE write_offs_products_erp ADD PRIMARY KEY (id);
+ALTER TABLE dashboard_fields_property ADD PRIMARY KEY (id);
\ No newline at end of file
'dashboard_fields_links.order_num',
'dashboard_fields_links.property_field_id',
])
- ->andWhere(['`dashboard_id`'=> $dashboardId])
- ->innerJoin('`dashboard_fields`','dashboard_fields.id = dashboard_fields_links.field_id AND dashboard_fields.active = 1' )
+ ->andWhere(['dashboard_id'=> $dashboardId])
+ ->innerJoin('dashboard_fields','dashboard_fields.id = dashboard_fields_links.field_id AND dashboard_fields.active = 1' )
->orderBy([
'order_num' => SORT_ASC,
])
$totalRows = DashboardSales::find()
- ->andWhere(['`store_id`'=> $storeId])
- ->andWhere(['`field_id`'=> $dashboardFieldsLinksPreparedIds])
+ ->andWhere(['store_id'=> $storeId])
+ ->andWhere(['field_id'=> $dashboardFieldsLinksPreparedIds])
->joinWith('field')
->andWhere(['>=', 'date', $dateFrom])
->andWhere(['<=', 'date', $dateTo])
$percentFields = DashboardFields::find()
- ->andWhere(['`active`'=> 1])
+ ->andWhere(['active'=> 1])
->andWhere(['not in','type_summ','sum'])
->andWhere(['id' => $fieldsIdsKeysPrepared])
->indexBy('name')
$query = WriteOffsErp::find()
->andWhere([
- '`write_offs_erp`.`id`' => $id,
- '`write_offs_erp`.`active`' => 1,
+ 'write_offs_erp.id' => $id,
+ 'write_offs_erp.active' => 1,
]);
if (!empty($storeIds)) {
$writeOffsProductsErpIds = ArrayHelper::getColumn($model->writeOffsProductsErps,'id');
$query = WriteOffsProductsErp::find()
->andWhere([
- '`write_offs_products_erp`.`id`' => $writeOffsProductsErpIds,
- '`write_offs_products_erp`.`active_product`' => 1,
+ 'write_offs_products_erp.id' => $writeOffsProductsErpIds,
+ 'write_offs_products_erp.active_product' => 1,
]);
$query->joinWith(['imagesWriteOffsErp']);
$query = WriteOffsErp::find()
->andWhere([
- '`write_offs_erp`.`status`' => WriteOffsErp::STATUS_CONFIRM,
+ 'write_offs_erp.status' => WriteOffsErp::STATUS_CONFIRM,
'active' => 1,
]);
try{
$writeOffQuery = "
SELECT
- `id`,
- `guid`,
- `store_guid`,
- `number`,
- `date`,
- `write_offs_type`,
- `comment`,
- `quantity`,
- `summ`
+ id,
+ guid,
+ store_guid,
+ number,
+ date,
+ write_offs_type,
+ comment,
+ quantity,
+ summ
FROM
- `write_offs_erp`
+ write_offs_erp
WHERE
- `status` = 2
+ status = 2
AND
- `active` = 1
+ active = 1
";
// $data = $db::getRows("SELECT * FROM create_checks WHERE status='0'");
$writeOffProductsQuery = "
SELECT
- `write_offs_erp_id`,
- `product_id`,
- `quantity`,
- `price`,
- `summ`
+ write_offs_erp_id,
+ product_id,
+ quantity,
+ price,
+ summ
FROM
- `write_offs_products_erp`
+ write_offs_products_erp
WHERE
- `write_offs_products_erp`.`write_offs_erp_id` IN (" .$writeOffIdsString . ")
+ write_offs_products_erp.write_offs_erp_id IN (" .$writeOffIdsString . ")
AND
- (`active_product` = 1)
+ (active_product = 1)
";
// $products = $db::getRows($writeOffProductsQuery);
$query = WriteOffsErp::find()
->andWhere([
- '`write_offs_erp`.`id`' => $id,
- '`write_offs_erp`.`active`' => 1,
+ 'write_offs_erp.id' => $id,
+ 'write_offs_erp.active' => 1,
])
->andWhere([
'<>', 'status', WriteOffsErp::STATUS_CREATED_1С
$writeOffsProductsErpIds = ArrayHelper::getColumn($model->writeOffsProductsErps,'id');
$query = WriteOffsProductsErp::find()
->andWhere([
- '`write_offs_products_erp`.`id`' => $writeOffsProductsErpIds,
- '`write_offs_products_erp`.`active_product`' => 1,
+ 'write_offs_products_erp.id' => $writeOffsProductsErpIds,
+ 'write_offs_products_erp.active_product' => 1,
]);
$modelArray = WriteOffsErp::find()
->andWhere([
- '`write_offs_erp`.`id`' => $id,
+ 'write_offs_erp.id' => $id,
'active' => 1,
])
->andWhere([
$id = Yii::$app->request->post("id");
$model = WriteOffsErp::find()->andWhere([
- '`write_offs_erp`.`id`' => $id,
+ 'write_offs_erp.id' => $id,
'active' => 1,
'status' => WriteOffsErp::STATUS_CREATED
])
$writeOffsProductsErpIds = ArrayHelper::getColumn($model->writeOffsProductsErps,'id');
$query = WriteOffsProductsErp::find()
->andWhere([
- '`write_offs_products_erp`.`id`' => $writeOffsProductsErpIds,
- '`write_offs_products_erp`.`active_product`' => 1,
+ 'write_offs_products_erp.id' => $writeOffsProductsErpIds,
+ 'write_offs_products_erp.active_product' => 1,
]);
$modelWriteOffsProductsErp = $query->asArray()->All();
$id = Yii::$app->request->post("id");
$model = WriteOffsErp::find()->andWhere([
- '`write_offs_erp`.`id`' => $id,
+ 'write_offs_erp.id' => $id,
'active' => 1,
'status' => [WriteOffsErp::STATUS_SEND,WriteOffsErp::STATUS_ERROR_1С],
])
$writeOffsProductsErpIds = ArrayHelper::getColumn($model->writeOffsProductsErps, 'id');
$query = WriteOffsProductsErp::find()
->andWhere([
- '`write_offs_products_erp`.`id`' => $writeOffsProductsErpIds,
- '`write_offs_products_erp`.`active_product`' => 1,
+ 'write_offs_products_erp.id' => $writeOffsProductsErpIds,
+ 'write_offs_products_erp.active_product' => 1,
]);
$modelWriteOffsProductsErp = $query->asArray()->All();
}
$substr = substr($filename, 0, 2);
$imagePath = self::filepath($filename, 'images');
- $resizePath = "/var/www/erp/uploads/images/resize/{$substr}/{$w}_{$h}_{$quality}";
+ $resizePath = "/var/www/erp24/uploads/images/resize/{$substr}/{$w}_{$h}_{$quality}";
$resizedUrl = "{$resizePath}/{$filename}";
- $resizedPath = "/var/www/erp/uploads/images/resize/{$substr}/{$w}_{$h}_{$quality}";
+ $resizedPath = "/var/www/erp24/uploads/images/resize/{$substr}/{$w}_{$h}_{$quality}";
$resizedFile = "{$resizedPath}/{$filename}";
if (!file_exists($imagePath)) {
sales.date <= :date_to
GROUP BY
sales.id,
+ sales.number,
+ sales.date,
sales.seller_id,
sales.operation
ORDER BY
GROUP BY
sales.id,
sales.seller_id,
+ sales.number,
+ sales.date,
sales.operation
",
/* Конец ФОТ (admin_payroll_days) */
/*
SELECT SUM(admin_payroll_days.day_payroll) AS "payroll_day_sum", SUM(admin_payroll_days.sales_sum) AS "sales_sum"
- FROM `admin_payroll_days`
+ FROM admin_payroll_days
WHERE (date BETWEEN "2023-08-01" AND "2023-08-01");
*/
// endregion
$tip = 'products';
$query = self::find()
- ->select(['name', '`products_1c`.`id`' , 'parent_id'])
+ ->select(['name', 'products_1c.id' , 'parent_id'])
->andWhere('tip=:tip', [':tip' => $tip])
->innerJoin('prices_dynamic', 'products_1c.id = prices_dynamic.product_id')
;
- $listAllProductsPreparedDict = $query->orderBy(['`products_1c`.`name`' => SORT_ASC])->asArray()
+ $listAllProductsPreparedDict = $query->orderBy(['products_1c.name' => SORT_ASC])->asArray()
->all();
return ArrayHelper::map($listAllProductsPreparedDict, 'id', 'name');
use yii_app\records\Sales;
/**
- * SalesSearch represents the model behind the search form of `yii_app\records\Sales`.
+ * SalesSearch represents the model behind the search form of yii_app\records\Sales.
*/
class SalesSearch extends Sales
{
// grid filtering conditions
$query->andFilterWhere([
// 'date' => $this->date,
- '`sales`.`summ`' => $this->summ,
- '`sales`.`skidka`' => $this->skidka,
- '`sales`.`admin_id`' => $this->admin_id,
- '`sales`.`store_id`' => $this->store_id,
- '`sales`.`phone`' => $this->phone,
- '`sales`.`status_check`' => $this->status_check,
- '`sales`.`held`' => $this->held,
- '`sales`.`matrix`' => $this->matrix,
- '`sales`.`date_up`' => $this->date_up,
+ 'sales.summ' => $this->summ,
+ 'sales.skidka' => $this->skidka,
+ 'sales.admin_id' => $this->admin_id,
+ 'sales.store_id' => $this->store_id,
+ 'sales.phone' => $this->phone,
+ 'sales.status_check' => $this->status_check,
+ 'sales.held' => $this->held,
+ 'sales.matrix' => $this->matrix,
+ 'sales.date_up' => $this->date_up,
]);
- $query->andFilterWhere(['>=', '`sales`.`date`', $this->date]);
+ $query->andFilterWhere(['>=', 'sales.date', $this->date]);
$query->andFilterWhere(['like', 'id', $this->id])
->andFilterWhere(['like', 'operation', $this->operation])
*/
public function getWriteOffsProductsErps()
{
- return $this->hasMany(WriteOffsProductsErp::className(), ['write_offs_erp_id' => 'id'])->onCondition(['`write_offs_products_erp`.`active_product`' => 1]);
+ return $this->hasMany(WriteOffsProductsErp::className(), ['write_offs_erp_id' => 'id'])->onCondition(['write_offs_products_erp.active_product' => 1]);
}
}
//
public function getImagesWriteOffsErp() {
- return $this->hasMany(ImageDocumentLink::class, ['document_item_id' => 'id'])->onCondition(['`image_document_link`.`active`' => 1])->onCondition(['`image_document_link`.`document_group_id`' => 1])->via('writeOffsProductsErps');
+ return $this->hasMany(ImageDocumentLink::class, ['document_item_id' => 'id'])->onCondition(['image_document_link.active' => 1])->onCondition(['image_document_link.document_group_id' => 1])->via('writeOffsProductsErps');
}
use yii_app\records\WriteOffsErp;
/**
- * WriteOffsErpSearch represents the model behind the search form of `yii_app\records\WriteOffsErp`.
+ * WriteOffsErpSearch represents the model behind the search form of yii_app\records\WriteOffsErp.
*/
class WriteOffsErpSearch extends WriteOffsErp
{
$query->andFilterWhere(['like', 'guid', $this->guid])
->andFilterWhere(['like', 'store_guid', $this->store_guid])
->andFilterWhere(['like', 'number', $this->number])
- ->andFilterWhere(['like', '`write_offs_erp`.`date`', $this->date])
+ ->andFilterWhere(['like', 'write_offs_erp.date', $this->date])
->andFilterWhere(['like', 'write_offs_type', $this->write_offs_type])
->andFilterWhere(['like', 'based_on', $this->based_on])
->andFilterWhere(['like', 'comment', $this->comment]);
{
return [
[['write_offs_erp_id', 'date', 'name', 'product_id', 'quantity', 'price','cause_id', 'summ', 'created_at', 'created_admin_id'], 'required'],
- [['id', 'write_offs_erp_id', 'num_row', 'active_product', 'created_admin_id', 'cause_id', 'updated_admin_id', 'deleted_admin_id'], 'integer'],
+ [['write_offs_erp_id', 'num_row', 'active_product', 'created_admin_id', 'cause_id', 'updated_admin_id', 'deleted_admin_id'], 'integer'],
[['date', 'color', 'created_at', 'updated_at', 'deleted_at', 'modelsProducts', 'add_image'], 'safe'],
[['price', 'summ', 'price_retail', 'summ_retail', 'quantity'], 'number'],
[['product_id'], 'string', 'max' => 36],
}
//
public function getImagesWriteOffsErp() {
- return $this->hasMany(ImageDocumentLink::class, ['document_item_id' => 'id'])->onCondition(['`image_document_link`.`active`' => 1])->andOnCondition(['`image_document_link`.`document_group_id`' => 1]);
+ return $this->hasMany(ImageDocumentLink::class, ['document_item_id' => 'id'])->onCondition(['image_document_link.active' => 1])->andOnCondition(['image_document_link.document_group_id' => 1]);
}
public function getProduct($productId) {
{
/*
*
- SELECT `admin_id`,MAX(`date`) FROM `timetable` WHERE `admin_group_id` = 45
+ SELECT admin_id,MAX(date) FROM timetable WHERE admin_group_id = 45
-Group BY `admin_id`
+Group BY admin_id
* */
/** @var Timetable[] $timetable */
'sales_products.product_id',
'products_1c.id',
'products_1c.parent_id',
- 'products_1c.`name`',
+ 'products_1c.name',
])
->joinWith('products1c')
;
- $query->andWhere(['>=', '`sales`.`date`', DateHelper::getDateTimeStartDay($dateFrom, true)]);
- $query->andWhere(['<=', '`sales`.`date`', DateHelper::getDateTimeEndDay($dateTo, true)]);
+ $query->andWhere(['>=', 'sales.date', DateHelper::getDateTimeStartDay($dateFrom, true)]);
+ $query->andWhere(['<=', 'sales.date', DateHelper::getDateTimeEndDay($dateTo, true)]);
if (!empty($products)) {
- $query->andWhere(['`products_1c`.`parent_id`' => $products]);// ['`products_1c`.`parent_id`' => $products]
+ $query->andWhere(['products_1c.parent_id' => $products]);// ['products_1c.parent_id' => $products]
}
//
// if (!empty($products)) {
// $query->andWhere([
// 'OR' ,
-// ['`products_1c`.`parent_id`' => $products] ,
-// ['`products_1c`.`id`' => $products]
-// ]);// ['`products_1c`.`parent_id`' => $products]
+// ['products_1c.parent_id' => $products] ,
+// ['products_1c.id' => $products]
+// ]);// ['products_1c.parent_id' => $products]
// }
//
$this->registerCssFile('/css/common/block-info.css');
$this->registerJsFile('/js/common/block-info.js', ['position' => \yii\web\View::POS_END]);
+if (empty($sellerShow)) {
+ $sellerShow = false;
+}
+
if (!empty($arrUsersSalary)) {
$tbl = '';
<div
class="d-flex justify-content-between align-items-center gap-2"
>
- <div class="<?= $styleBackground?> m-2 p-1 ps-2 pe-2 rounded-2"><?= $_SESSION['name_group_admin']?></div>
+ <div class="<?= $styleBackground?> m-2 p-1 ps-2 pe-2 rounded-2"><?= $_SESSION['name_group_admin']?? '-'?></div>
</div>
</div>
<div class="dropdown header-notify d-flex">
</a>
<div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow animated">
<div class="text-center">
- <div class="text-center user pb-0 font-weight-bold"><?= $_SESSION["name_admin"] ?></div>
- <span class="text-center user-semi-title"><?= $_SESSION["admin_group_name"] ?></span>
+ <div class="text-center user pb-0 font-weight-bold"><?= $_SESSION["name_admin"] ?? '-' ?></div>
+ <span class="text-center user-semi-title"><?= $_SESSION["admin_group_name"] ?? '-'?></span>
<div class="dropdown-divider"></div>
</div>
<a class="dropdown-item d-flex" href="/profile/">
if (!empty($data)) {
$query = WriteOffsProductsErp::find()
->andWhere([
- '`write_offs_products_erp`.`id`' => $data['id'],
- '`write_offs_products_erp`.`active_product`' => 1,
+ 'write_offs_products_erp.id' => $data['id'],
+ 'write_offs_products_erp.active_product' => 1,
]);
projects / erp24_rep / yii-erp24 / .git / commitdiff