From 08158f399065ec391f022e4474aba113d3d650b3 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 26 Apr 2024 17:17:15 +0300
Subject: [PATCH] fix bonus users sale update

---
 .../views/cron/bonus-users-sale-update.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/erp24/api1/views/cron/bonus-users-sale-update.php b/erp24/api1/views/cron/bonus-users-sale-update.php
index 9e01c168..a2f21d40 100644
--- a/erp24/api1/views/cron/bonus-users-sale-update.php
+++ b/erp24/api1/views/cron/bonus-users-sale-update.php
@@ -23,7 +23,7 @@ if($_REQUEST["token_cloud"]!=$token) exit();
 $days=1;
 $days2=$days+1;
 $data = $db::getRows("SELECT phone, price, bonus, name, check_id, store_id_1c FROM users_bonus 
-WHERE date>NOW() - INTERVAL $days2 day AND check_id!='' AND tip='plus' AND tip_sale='sale'");
+WHERE date>NOW()::date - INTERVAL '$days2 day' AND check_id!='' AND tip='plus' AND tip_sale='sale'");
 foreach($data as $row) {
     $users_bonus[$row["check_id"]]=$row["bonus"];
 
@@ -35,8 +35,8 @@ foreach($data as $row) {
 
 
 //AND  date<NOW() -INTERVAL 30 day
-$data = $db::getRows("SELECT date, id, phone, summ, store_id_1c, seller_id FROM sales WHERE phone!=''
-AND date>NOW() -INTERVAL $days day    AND operation='Продажа'");
+$data = $db::getRows("SELECT date, id, phone, summ, store_id_1c, seller_id FROM sales WHERE phone!=0
+AND date>NOW()::date -INTERVAL '$days day'    AND operation='Продажа'");
 
 echo" <table class=\"table\"><tbody>  ";
 $i = $back_all = 0;
@@ -49,12 +49,12 @@ foreach($data as $row) {
         $store_id=get_export_id($row["store_id_1c"], "city_store",1);
         $pass=rand(1000,9999) ;
         $setka_id=1;
-        $db::sql("INSERT IGNORE INTO users ( card, kod, pol, keycode, phone, name, name_name, name_last, password, phone_true, bdate, referal_id,
+        $db::sql("INSERT INTO users ( card, kod, pol, keycode, phone, name, name_name, name_last, password, phone_true, bdate, referal_id,
 comment, created_id, created_name, seller_id, created_store_id, created_store, date, sale_store_id,sms_info, reklama_info,  sale_cnt, sale_avg_price, sale_price, store_id, date_last_sale )
 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ? , ?, ?, ?, ?, ?, NOW(), ?, 1, 1,  1, '".$row["summ"]."' , '".$row["summ"]."', '".$row["store_id_1c"]."', '".$row["date"]."'   )",
 
-            [ $row["phone"]*2 + 1608 + $setka_id  ,rand(1000,9999), 'none', rand(1000,9999) , $row["phone"], $name, $first_name, $second_name,  $pass, $birth_day, $referral_phone , 'внесен автоматически',
-                $seller_id, $created_name, $seller_id , $store_id, $created_store, $store_id ]);
+            [ $row["phone"]*2 + 1608 + $setka_id  ,rand(1000,9999), 'none', rand(1000,9999) , $row["phone"], $name ?? 'Новый', $first_name ?? '', $second_name ?? '',  $pass, $birth_day ?? '1971-01-01', $referral_phone ?? '' , 'внесен автоматически',
+                $seller_id, $created_name ?? '', $seller_id , $store_id, $created_store ?? '', $store_id ]);
 
 
 
@@ -85,11 +85,11 @@ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ? , ?, ?, ?, ?, ?, NOW(), ?, 1, 1,
 
 
 
-            $z2="INSERT IGNORE INTO users_bonus 
+            $z2="INSERT INTO users_bonus 
 (tip, tip_sale, date, date_start, date_end, phone, 
 name, check_id, store_id, bonus, ip,   site_id, referal_id, admin_id,
 price, store_id_1c, seller_id_1c) 
- VALUES ('plus', 'sale',  '".$row["date"]."', NOW() + INTERVAL 1 day, NOW() + INTERVAL 365 DAY,
+ VALUES ('plus', 'sale',  '".$row["date"]."', NOW()::date + INTERVAL '1 day', NOW():date + INTERVAL '365 DAY',
  '".$row["phone"]."' 
  ,'$nm'
  , '".$row["id"]."'
@@ -119,7 +119,7 @@ echo"</tbody></table>$i. Всего баллов недоначислено $bac
 
 
 
-$data = $db::getRows("SELECT id, phone FROM sales WHERE phone!='' AND date>NOW() - INTERVAL $days day AND operation='Возврат'");
+$data = $db::getRows("SELECT id, phone FROM sales WHERE phone!=0 AND date>NOW()::date - INTERVAL '$days day' AND operation='Возврат'");
 foreach($data as $row) {
     $db::sql("DELETE FROM users_bonus WHERE check_id=? AND check_id!='' AND phone=? AND phone!=''",[$row["id"],$row["phone"]]);
 
-- 
2.39.5