From bdfdbbf3552151d64e7ac56f6c8e9516e904132a Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 10 Apr 2024 15:56:14 +0300 Subject: [PATCH] replace unix timestamp with extract epoch --- erp24/actions/shipment/FieldsDataAction.php | 4 ++-- erp24/api1_old/bonus/get_client_info.php | 2 +- erp24/api1_old/client/balance.php | 2 +- erp24/api1_old/client/checkPhone.php | 2 +- erp24/api1_old/client/checkPhoneSms.php | 2 +- erp24/api1_old/client/userAdd.php | 2 +- erp24/api1_old/lottery/users.php | 4 ++-- erp24/api2/controllers/BonusController.php | 2 +- erp24/api2/controllers/ClientController.php | 8 ++++---- erp24/api3/core/services/BonusService.php | 2 +- erp24/api3/core/services/ClientService.php | 8 ++++---- erp24/controllers/OrdersController.php | 8 +++++--- erp24/inc/checks.php | 4 ++-- erp24/inc/functionsFiedlsData.php | 2 +- erp24/inc/functionsFiedlsData_old.php | 2 +- erp24/inc/mail.php | 4 ++-- erp24/modul/money/bank.php | 4 ++-- erp24/modul/orders/ajax_create_check_json.php | 2 +- erp24/modul/orders/soglas.php | 2 +- erp24/modul/shipment/ajaxUpdateStep.php | 2 +- erp24/modul/shipment/divisionStore.php | 2 +- erp24/modul/shipment/functionsShipment.php | 2 +- erp24/modul/time_admin/index.php | 4 ++-- erp24/modul/zakaz/edit/index.php | 2 +- erp24/services/ShipmentService.php | 2 +- erp24/services/SupportService.php | 2 +- erp24/views/shipment_old/ajax-update-step.php | 2 +- 27 files changed, 43 insertions(+), 41 deletions(-) diff --git a/erp24/actions/shipment/FieldsDataAction.php b/erp24/actions/shipment/FieldsDataAction.php index fc39a1d..532eab7 100644 --- a/erp24/actions/shipment/FieldsDataAction.php +++ b/erp24/actions/shipment/FieldsDataAction.php @@ -249,7 +249,7 @@ class FieldsDataAction extends Action // DATE_FORMAT(date_start, '%Y-%m-%d') as date_start, // DATE_FORMAT(date_add, '%Y-%m-%d') as date_add, // DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, -// UNIX_TIMESTAMP(date_update) as date_update, +// extract(epoch FROM date_update) as date_update, // parent_id // FROM // store_orders @@ -269,7 +269,7 @@ class FieldsDataAction extends Action DATE_FORMAT(date_start, '%Y-%m-%d') as date_start, DATE_FORMAT(date_add, '%Y-%m-%d') as date_add, DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, - UNIX_TIMESTAMP(date_update) as date_update, + extract(epoch FROM date_update) as date_update, parent_id FROM store_orders diff --git a/erp24/api1_old/bonus/get_client_info.php b/erp24/api1_old/bonus/get_client_info.php index 0fb647a..acf241e 100644 --- a/erp24/api1_old/bonus/get_client_info.php +++ b/erp24/api1_old/bonus/get_client_info.php @@ -37,7 +37,7 @@ if(!empty($_POSTARR)) { $mess=array(); if(empty($error)) { - $row = $db::getRow("SELECT id, keycode, name, referal_id, bdate, comment, pol, UNIX_TIMESTAMP(date) as date FROM users WHERE phone=? LIMIT 1",[$phone]); + $row = $db::getRow("SELECT id, keycode, name, referal_id, bdate, comment, pol, extract(epoch FROM date) as date FROM users WHERE phone=? LIMIT 1",[$phone]); $user_id=$row["id"]; //AND phone_true='1' $keycode=$row["keycode"]; $name=explode(" ",$row["name"]); diff --git a/erp24/api1_old/client/balance.php b/erp24/api1_old/client/balance.php index cd7cf65..574b637 100644 --- a/erp24/api1_old/client/balance.php +++ b/erp24/api1_old/client/balance.php @@ -56,7 +56,7 @@ if(!empty($row["password"])) $mess["password"]=$row["password"]; $date_last=0; -$date_last=$db::getValue("SELECT UNIX_TIMESTAMP(date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$phone]); +$date_last=$db::getValue("SELECT extract(epoch FROM date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$phone]); if($date_last>=(time()-84600) or empty($date_last)) $editDates=true; else $editDates=false; $mess["editDates"]=$editDates; diff --git a/erp24/api1_old/client/checkPhone.php b/erp24/api1_old/client/checkPhone.php index fbb8324..6318219 100644 --- a/erp24/api1_old/client/checkPhone.php +++ b/erp24/api1_old/client/checkPhone.php @@ -71,7 +71,7 @@ $row=$db::getRow("SELECT name_name,password, keycode FROM users WHERE phone_true if(!empty($row)) $user_yes=true; else $user_yes=false; $date_last=0; -$date_last=$db::getValue("SELECT UNIX_TIMESTAMP(date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$phone]); +$date_last=$db::getValue("SELECT extract(epoch FROM date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$phone]); if($date_last>=(time()-84600) or empty($date_last)) $editDates=true; else $editDates=false; diff --git a/erp24/api1_old/client/checkPhoneSms.php b/erp24/api1_old/client/checkPhoneSms.php index ba3c460..58626ee 100644 --- a/erp24/api1_old/client/checkPhoneSms.php +++ b/erp24/api1_old/client/checkPhoneSms.php @@ -89,7 +89,7 @@ if(!empty($row["password"])) $mess["password"]=$row["password"]; $date_last=0; -$date_last=$db::getValue("SELECT UNIX_TIMESTAMP(date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$phone]); +$date_last=$db::getValue("SELECT extract(epoch FROM date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$phone]); if($date_last>=(time()-84600) or empty($date_last)) $editDates=true; else $editDates=false; diff --git a/erp24/api1_old/client/userAdd.php b/erp24/api1_old/client/userAdd.php index 172c8e8..eeac345 100644 --- a/erp24/api1_old/client/userAdd.php +++ b/erp24/api1_old/client/userAdd.php @@ -89,7 +89,7 @@ $mess["result_edit"]=" $jsn ".$valuesArr["phone"]." "; $mess["result"]=true; $date_last=0; -$date_last=$db::getValue("SELECT UNIX_TIMESTAMP(date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$valuesArr["phone"]]); +$date_last=$db::getValue("SELECT extract(epoch FROM date_add) as date_last FROM users_events WHERE phone=? order by date_add DESC LIMIT 1",[$valuesArr["phone"]]); if($date_last>=(time()-84600) or empty($date_last)) $editDates=true; else $editDates=false; $mess["editDates"]=$editDates; diff --git a/erp24/api1_old/lottery/users.php b/erp24/api1_old/lottery/users.php index a2c4386..af25db7 100644 --- a/erp24/api1_old/lottery/users.php +++ b/erp24/api1_old/lottery/users.php @@ -26,12 +26,12 @@ if(!empty($_POSTARR)) { $mess=array(); try { - // $data=$db::getRows("SELECT number,UNIX_TIMESTAMP(created_at) as created_at, name, phone FROM lottery_users WHERE lottery_id=? order by created_at LIMIT 2000",[$lottery_id]); + // $data=$db::getRows("SELECT number,extract(epoch FROM created_at) as created_at, name, phone FROM lottery_users WHERE lottery_id=? order by created_at LIMIT 2000",[$lottery_id]); - $data=$db::getRows("SELECT sales.phone, users.name_name, users.id, sales.number, sales.summ, UNIX_TIMESTAMP(sales.date) as date FROM sales, users + $data=$db::getRows("SELECT sales.phone, users.name_name, users.id, sales.number, sales.summ, extract(epoch FROM sales.date) as date FROM sales, users WHERE sales.operation='Продажа' AND ( (sales.date>='2023-02-01 00:00:00' AND sales.date<='2023-02-04 00:00:00' AND sales.summ>=1500) diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php index 9e37cbc..d891998 100644 --- a/erp24/api2/controllers/BonusController.php +++ b/erp24/api2/controllers/BonusController.php @@ -927,7 +927,7 @@ class BonusController extends BaseController } $mess = []; - $user = Users::find()->select(['id', 'keycode', 'name', 'referral_id', 'bdate', 'comment', 'pol', 'UNIX_TIMESTAMP(date) as date']) + $user = Users::find()->select(['id', 'keycode', 'name', 'referral_id', 'bdate', 'comment', 'pol', 'extract(epoch FROM date) as date']) ->where(['phone' => $phone])->one(); if (!$user) { $mess["error"] = "Покупателя " . $phone . " нет в бонусной программе!"; diff --git a/erp24/api2/controllers/ClientController.php b/erp24/api2/controllers/ClientController.php index 08bfa33..0f96021 100644 --- a/erp24/api2/controllers/ClientController.php +++ b/erp24/api2/controllers/ClientController.php @@ -93,7 +93,7 @@ class ClientController extends BaseController { $mess["result_edit"] = " $jsn " . $result["phone"] . " "; $mess["result"] = true; - $userEvent = UsersEvents::find()->select(['UNIX_TIMESTAMP(date_add) AS date_last'])->where(['phone' => $result['phone']])->orderBy(['date_add' => SORT_DESC])->one(); + $userEvent = UsersEvents::find()->select(['extract(epoch FROM date_add) AS date_last'])->where(['phone' => $result['phone']])->orderBy(['date_add' => SORT_DESC])->one(); $editDates = (!$userEvent || empty($userEvent->date_last) || $userEvent->date_last >= (time() - 84600)); $mess["editDates"] = $editDates; } @@ -138,7 +138,7 @@ class ClientController extends BaseController { } } - $userEvent = UsersEvents::find()->select(['UNIX_TIMESTAMP(date_add) AS date_last'])->where(['phone' => $result['phone']])->orderBy(['date_add' => SORT_DESC])->one(); + $userEvent = UsersEvents::find()->select(['extract(epoch FROM date_add) AS date_last'])->where(['phone' => $result['phone']])->orderBy(['date_add' => SORT_DESC])->one(); $editDates = (!$userEvent || empty($userEvent->date_last) || $userEvent->date_last >= (time() - 84600)); $mess["editDates"] = $editDates; @@ -739,7 +739,7 @@ class ClientController extends BaseController { $cond = !empty($phone) ? ['phone' => $phone] : ['ref_code' => $ref_code]; $mess = []; - $user = Users::find()->select(['id', 'card', 'phone', 'sale_price', 'keycode', 'name', 'referral_id', 'bdate', 'comment', 'pol', 'UNIX_TIMESTAMP(date) as date', 'ref_code']) + $user = Users::find()->select(['id', 'card', 'phone', 'sale_price', 'keycode', 'name', 'referral_id', 'bdate', 'comment', 'pol', 'extract(epoch FROM date) as date', 'ref_code']) ->where($cond)->one(); if (!$user) { // $mess["error"] = "Покупателя " . $phone . " нет в бонусной программе!"; @@ -778,7 +778,7 @@ class ClientController extends BaseController { $sales_rejected_sum = Sales::find()->where(['phone' => $phone]) ->andWhere(['operation' => Sales::OPERATION_RETURN])->sum('summ'); - $userEvent = UsersEvents::find()->select(['UNIX_TIMESTAMP(date_add) AS date_last'])->where(['phone' => $phone])->orderBy(['date_add' => SORT_DESC])->one(); + $userEvent = UsersEvents::find()->select(['extract(epoch FROM date_add) AS date_last'])->where(['phone' => $phone])->orderBy(['date_add' => SORT_DESC])->one(); $editDates = (!$userEvent || empty($userEvent->date_last) || $userEvent->date_last >= (time() - 84600)); $mess["editDates"] = $editDates; diff --git a/erp24/api3/core/services/BonusService.php b/erp24/api3/core/services/BonusService.php index e37e5fa..c9a294c 100644 --- a/erp24/api3/core/services/BonusService.php +++ b/erp24/api3/core/services/BonusService.php @@ -527,7 +527,7 @@ class BonusService $mess = []; - $user = Users::find()->select(['id', 'keycode', 'name', 'referral_id', 'bdate', 'comment', 'pol', 'UNIX_TIMESTAMP(date) as date']) + $user = Users::find()->select(['id', 'keycode', 'name', 'referral_id', 'bdate', 'comment', 'pol', 'extract(epoch FROM date) as date']) ->where(['phone' => $phone])->one(); if (!$user) { diff --git a/erp24/api3/core/services/ClientService.php b/erp24/api3/core/services/ClientService.php index 191d53b..ee39c7e 100644 --- a/erp24/api3/core/services/ClientService.php +++ b/erp24/api3/core/services/ClientService.php @@ -83,7 +83,7 @@ class ClientService $mess["result_edit"] = " $jsn " . $phone . " "; $mess["result"] = true; - $userEvent = UsersEvents::find()->select(['UNIX_TIMESTAMP(date_add) AS date_last'])->where(['phone' => $phone]) + $userEvent = UsersEvents::find()->select(['extract(epoch FROM date_add) AS date_last'])->where(['phone' => $phone]) ->orderBy(['date_add' => SORT_DESC])->one(); $editDates = (!$userEvent || empty($userEvent->date_last) || $userEvent->date_last >= (time() - 84600)); $mess["editDates"] = $editDates; @@ -125,7 +125,7 @@ class ClientService } } - $userEvent = UsersEvents::find()->select(['UNIX_TIMESTAMP(date_add) AS date_last']) + $userEvent = UsersEvents::find()->select(['extract(epoch FROM date_add) AS date_last']) ->where(['phone' => $phone])->orderBy(['date_add' => SORT_DESC])->one(); $editDates = (!$userEvent || empty($userEvent->date_last) || $userEvent->date_last >= (time() - 84600)); $mess["editDates"] = $editDates; @@ -404,7 +404,7 @@ class ClientService $mess = []; $user = Users::find()->select(['id', 'card', 'phone', 'sale_price', 'keycode', 'name', 'referral_id', 'bdate', - 'comment', 'pol', 'UNIX_TIMESTAMP(date) as date', 'ref_code'])->where($cond)->one(); + 'comment', 'pol', 'extract(epoch FROM date) as date', 'ref_code'])->where($cond)->one(); if (!$user) { return null; } else { @@ -441,7 +441,7 @@ class ClientService $sales_rejected_sum = Sales::find()->where(['phone' => $phone]) ->andWhere(['operation' => Sales::OPERATION_RETURN])->sum('summ'); - $userEvent = UsersEvents::find()->select(['UNIX_TIMESTAMP(date_add) AS date_last']) + $userEvent = UsersEvents::find()->select(['extract(epoch FROM date_add) AS date_last']) ->where(['phone' => $phone])->orderBy(['date_add' => SORT_DESC])->one(); $editDates = (!$userEvent || empty($userEvent->date_last) || $userEvent->date_last >= (time() - 84600)); $mess["editDates"] = $editDates; diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php index ae14484..c571386 100644 --- a/erp24/controllers/OrdersController.php +++ b/erp24/controllers/OrdersController.php @@ -2,6 +2,8 @@ namespace app\controllers; +ini_set("memory_limit", "256M"); + include_once('../inc/base_new.php'); include_once('../inc/amo_inc.php'); @@ -110,7 +112,7 @@ class OrdersController extends Controller $order_id = CreateChecks::find()->select(['order_id'])->where(['check_id' => $id])->asArray()->one()['order_id']; $date = CreateChecks::find()->select([ - 'date' => 'UNIX_TIMESTAMP(date)' + 'date' => 'extract(epoch FROM date)' ]) ->where([ 'AND', @@ -250,7 +252,7 @@ class OrdersController extends Controller $date = CreateChecks::find() ->select([ - 'date' => 'UNIX_TIMESTAMP(date)' + 'date' => 'extract(epoch FROM date)' ]) ->where([ 'AND', @@ -258,7 +260,7 @@ class OrdersController extends Controller ['type' => 'Продажа'] ]) ->orderBy([ - 'UNIX_TIMESTAMP(date)' => SORT_DESC + 'extract(epoch FROM date)' => SORT_DESC ]) ->limit(1) ->asArray() diff --git a/erp24/inc/checks.php b/erp24/inc/checks.php index 2dde8ef..beae748 100644 --- a/erp24/inc/checks.php +++ b/erp24/inc/checks.php @@ -318,7 +318,7 @@ $seller_id=$db::getValue("SELECT export_val FROM export_import_table WHERE entit if(empty($seller_id)) $seller_id="00000000-0000-0000-0000-000000000000"; -$date = $db::getValue("SELECT UNIX_TIMESTAMP(date) as date FROM create_checks WHERE order_id=? AND type='Продажа' order by date desc LIMIT 1",[$lid_id]); +$date = $db::getValue("SELECT extract(epoch FROM date) as date FROM create_checks WHERE order_id=? AND type='Продажа' order by date desc LIMIT 1",[$lid_id]); $error=""; if($date>(time()-60) and !empty($date)) $error="Чек не создан так как чек с таким заказом уже создан"; if(!empty($error)) error_mess($error); @@ -404,7 +404,7 @@ if(!empty($id)) { $order_id = $db::getValue("SELECT order_id FROM create_checks WHERE check_id=? LIMIT 1",[$id]); - $date = $db::getValue("SELECT UNIX_TIMESTAMP(date) as date FROM create_checks WHERE order_id=? AND type='Возврат' order by date desc LIMIT 1",[$order_id]); + $date = $db::getValue("SELECT extract(epoch FROM date) as date FROM create_checks WHERE order_id=? AND type='Возврат' order by date desc LIMIT 1",[$order_id]); $error=""; if($date>(time()-60) and !empty($date)) { diff --git a/erp24/inc/functionsFiedlsData.php b/erp24/inc/functionsFiedlsData.php index 9cd6b66..2052da4 100644 --- a/erp24/inc/functionsFiedlsData.php +++ b/erp24/inc/functionsFiedlsData.php @@ -46,7 +46,7 @@ $status_edit_dostup[$row["id"]]=json_decode($row["status_edit_dostup"],true,512, // данные по закупке - достаем параметры закупки - дата старта продаж - от нее считаем продажи списания и закупки прошлой недели $OrderData=$db::getRow("SELECT name,id,providers_arr, status, city_id, DATE_FORMAT(date_start, '%Y-%m-%d') as date_start, DATE_FORMAT(date_add, '%Y-%m-%d') as date_add, -DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, UNIX_TIMESTAMP(date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); +DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, extract(epoch FROM date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); $providersIdInThisOrder=explode(",",$OrderData["providers_arr"]); $status_order_id=$OrderData["status"]; $date_start_sale=$OrderData["date_start"]; diff --git a/erp24/inc/functionsFiedlsData_old.php b/erp24/inc/functionsFiedlsData_old.php index 6fcb9ad..93b64b1 100644 --- a/erp24/inc/functionsFiedlsData_old.php +++ b/erp24/inc/functionsFiedlsData_old.php @@ -108,7 +108,7 @@ function returnRowCssClassByFieldValue($fieldName,$value){ // данные по закупке - достаем параметры закупки - дата старта продаж - от нее считаем продажи списания и закупки прошлой недели $OrderData=$db::getRow("SELECT name,id,providers_arr, status, city_id, DATE_FORMAT(date_start, '%Y-%m-%d') as date_start, DATE_FORMAT(date_add, '%Y-%m-%d') as date_add, -DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, UNIX_TIMESTAMP(date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); +DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, extract(epoch FROM date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); $providersIdInThisOrder=explode(",",$OrderData["providers_arr"]); $status_order_id=$OrderData["status"]; $date_start_sale=$OrderData["date_start"]; diff --git a/erp24/inc/mail.php b/erp24/inc/mail.php index 55b1d68..8c4ab04 100644 --- a/erp24/inc/mail.php +++ b/erp24/inc/mail.php @@ -933,9 +933,9 @@ $kol_istok=array(); - $query2= "SELECT *,DATE_FORMAT(data, '%d.%m.%Y %H:%i:%s') as data, unix_timestamp(data) as unixdata, + $query2= "SELECT *,DATE_FORMAT(data, '%d.%m.%Y %H:%i:%s') as data, extract(epoch FROM data) as unixdata, DATE_FORMAT(data_add, '%d.%m.%Y %H:%i:%s') as data_add, DATE_FORMAT(data_soglas, '%d.%m.%Y %H:%i:%s') as data_soglas, - unix_timestamp(data_add) as unixdata_add FROM $zakaz_table WHERE 1 $where LIMIT $start, $num"; + extract(epoch FROM data_add) as unixdata_add FROM $zakaz_table WHERE 1 $where LIMIT $start, $num"; $res2 = query_sql($query2); $nums= mysql_num_rows($res2); //echo $query2; diff --git a/erp24/modul/money/bank.php b/erp24/modul/money/bank.php index 98d537d..8ddfc77 100644 --- a/erp24/modul/money/bank.php +++ b/erp24/modul/money/bank.php @@ -18,10 +18,10 @@ echo"='2020-01-".rand(0,12)."' AND data<='2020-".rand(10,12)."-28' AND -,date_format(status_data, '%d.%m.%Y в %H:%i') as status_data,date_format(data, '%d.%m.%Y') as data_f,unix_timestamp(data) as data_unix +,date_format(status_data, '%d.%m.%Y в %H:%i') as status_data,date_format(data, '%d.%m.%Y') as data_f,extract(epoch FROM data) as data_unix */ -$q = "SELECT *,date_format(date_oper, '%d.%m.%Y') as date_oper,unix_timestamp(date_oper) as data_unix +$q = "SELECT *,date_format(date_oper, '%d.%m.%Y') as date_oper,extract(epoch FROM date_oper) as data_unix FROM vipiska_banka WHERE status='1' order by date_oper DESC LIMIT 0, 500"; $data = $db::getRows($q); foreach ($data as $row) { diff --git a/erp24/modul/orders/ajax_create_check_json.php b/erp24/modul/orders/ajax_create_check_json.php index 540568f..64ecdca 100644 --- a/erp24/modul/orders/ajax_create_check_json.php +++ b/erp24/modul/orders/ajax_create_check_json.php @@ -85,7 +85,7 @@ foreach($products as $guid => $colors) { // ставим в соответствие вид оплаты -$date = $db::getValue("SELECT UNIX_TIMESTAMP(date) as date FROM create_checks WHERE order_id=? AND type='Продажа' order by date desc LIMIT 1",[$lid_id]); +$date = $db::getValue("SELECT extract(epoch FROM date) as date FROM create_checks WHERE order_id=? AND type='Продажа' order by date desc LIMIT 1",[$lid_id]); $error=""; if($date>(time()-60) and !empty($date)) $error="Чек не создан так как чек с таким заказом уже создан"; if(!empty($error)) echo($error); diff --git a/erp24/modul/orders/soglas.php b/erp24/modul/orders/soglas.php index 754369b..f6286f9 100644 --- a/erp24/modul/orders/soglas.php +++ b/erp24/modul/orders/soglas.php @@ -16,7 +16,7 @@ foreach ($data as $row) $status_arr[$row["status_id"]]="".$row["name"].""; -$data = $db::getRows("SELECT *, UNIX_TIMESTAMP(florist_peredano) as florist_peredanot FROM orders_amo WHERE +$data = $db::getRows("SELECT *, extract(epoch FROM florist_peredano) as florist_peredanot FROM orders_amo WHERE status_id='38932150' or status_id='38932153' or status_id='38932156' or status_id='38932156' or status_id='38932159' ORDER BY delivery_date, delivery_time "); echo" diff --git a/erp24/modul/shipment/ajaxUpdateStep.php b/erp24/modul/shipment/ajaxUpdateStep.php index e093223..a53261e 100644 --- a/erp24/modul/shipment/ajaxUpdateStep.php +++ b/erp24/modul/shipment/ajaxUpdateStep.php @@ -78,7 +78,7 @@ foreach($data as $row) { // данные по закупке - достаем параметры закупки - дата старта продаж - от нее считаем продажи списания и закупки прошлой недели $OrderData=$db::getRow("SELECT name,id,providers_arr, status, DATE_FORMAT(date_start, '%Y-%m-%d') as date_start, -DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, UNIX_TIMESTAMP(date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); +DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, extract(epoch FROM date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); $providersIdInThisOrder=explode(",",$OrderData["providers_arr"]); $status_order_id=$OrderData["status"]; $date_start_sale=$OrderData["date_start"]; diff --git a/erp24/modul/shipment/divisionStore.php b/erp24/modul/shipment/divisionStore.php index e2d0f8e..f42201c 100644 --- a/erp24/modul/shipment/divisionStore.php +++ b/erp24/modul/shipment/divisionStore.php @@ -31,7 +31,7 @@ if($OrderData["status"]==6) { ]; -$dateup=$db::getRow("SELECT UNIX_TIMESTAMP(date_update) as date_update, date_update as date_update2 +$dateup=$db::getRow("SELECT extract(epoch FROM date_update) as date_update, date_update as date_update2 FROM store_orders_fields_data WHERE order_id=? AND field_name IN ('quantity_zakup_new','division_store_ratio','division_store','division_store_hand','division_store_summ','storehouse_balance_store') AND value!=0 order by date_update DESC LIMIT 1",[$orderId]); diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php index 25815d0..5413558 100644 --- a/erp24/modul/shipment/functionsShipment.php +++ b/erp24/modul/shipment/functionsShipment.php @@ -106,7 +106,7 @@ foreach($data as $row) { // данные по закупке - достаем параметры закупки - дата старта продаж - от нее считаем продажи списания и закупки прошлой недели $OrderData=$db::getRow("SELECT *, DATE_FORMAT(date_start, '%Y-%m-%d') as date_start, DATE_FORMAT(date_add, '%Y-%m-%d') as date_add, -DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, UNIX_TIMESTAMP(date_update) as date_update FROM store_orders WHERE id=?",[$orderId]); +DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, extract(epoch FROM date_update) as date_update FROM store_orders WHERE id=?",[$orderId]); $providersIdInThisOrder=explode(",",$OrderData["providers_arr"]); $status_order_id=$OrderData["status"]; $date_start_sale=$OrderData["date_start"]; diff --git a/erp24/modul/time_admin/index.php b/erp24/modul/time_admin/index.php index 2cb0a4c..253f721 100644 --- a/erp24/modul/time_admin/index.php +++ b/erp24/modul/time_admin/index.php @@ -78,7 +78,7 @@ $dataTIme[$row["admin_id"]][$row["date"]]=$row; } */ //date>NOW()-INTERVAL 10 DAY order -$data=$db::getRows("SELECT admin_id, date, type_id, time, UNIX_TIMESTAMP(time) as time_unix, store_id, photo,d_id, comment, ball FROM admin_checkin +$data=$db::getRows("SELECT admin_id, date, type_id, time, extract(epoch FROM time) as time_unix, store_id, photo,d_id, comment, ball FROM admin_checkin WHERE 1 order BY time DESC"); foreach($data as $row) { $dataTIme[$row["admin_id"]][$row["date"]][$row["type_id"]]=$row; @@ -89,7 +89,7 @@ $dataTIme[$row["admin_id"]][$row["date"]][$row["type_id"]]=$row; //AND date>NOW()-INTERVAL 10 DAY -$data=$db::getRows("SELECT *,UNIX_TIMESTAMP(datetime_end) as datetime_end_unix, UNIX_TIMESTAMP(datetime_start) as datetime_start_unix +$data=$db::getRows("SELECT *,extract(epoch FROM datetime_end) as datetime_end_unix, extract(epoch FROM datetime_start) as datetime_start_unix FROM timetable WHERE tabel='0' order BY date DESC, store_id ASC, datetime_start DESC LIMIT 50"); foreach($data as $row) { diff --git a/erp24/modul/zakaz/edit/index.php b/erp24/modul/zakaz/edit/index.php index a37376c..e8db4eb 100644 --- a/erp24/modul/zakaz/edit/index.php +++ b/erp24/modul/zakaz/edit/index.php @@ -802,7 +802,7 @@ $tipr_array=array("nal"=>"наличные","beznal"=>"безнал"); /// выводим из бухгалтерии движения по заказу $AVANS_ALL=0; - $query231= "SELECT *, DATE_FORMAT(data_add, '%d.%m.%Y %H:%i:%s') as data, unix_timestamp(data_add) as data_unix FROM rashodi WHERE lid_id=".$values["lid_id"]." AND lid_id!='' ORDER BY data_unix ASC "; + $query231= "SELECT *, DATE_FORMAT(data_add, '%d.%m.%Y %H:%i:%s') as data, extract(epoch FROM data_add) as data_unix FROM rashodi WHERE lid_id=".$values["lid_id"]." AND lid_id!='' ORDER BY data_unix ASC "; $res231 = query_sql($query231); $num_avans=mysql_num_rows($res231); if($num_avans>0) { diff --git a/erp24/services/ShipmentService.php b/erp24/services/ShipmentService.php index 68bfe13..6c71918 100755 --- a/erp24/services/ShipmentService.php +++ b/erp24/services/ShipmentService.php @@ -259,7 +259,7 @@ class ShipmentService 'date_start' => "DATE_FORMAT(date_start, '%Y-%m-%d')", 'date_add' => "DATE_FORMAT(date_add, '%Y-%m-%d')", 'division_date' => "DATE_FORMAT(division_date, '%Y-%m-%d')", - 'date_update' => "UNIX_TIMESTAMP(date_update)", + 'date_update' => "extract(epoch FROM date_update)", 'parent_id' ] ) diff --git a/erp24/services/SupportService.php b/erp24/services/SupportService.php index f4968c2..b938984 100644 --- a/erp24/services/SupportService.php +++ b/erp24/services/SupportService.php @@ -10,7 +10,7 @@ class SupportService public static function storeOrdersSelect001($orderId): array { return StoreOrders::find()->select(['name', 'id', 'providers_arr', 'status', "DATE_FORMAT(date_start, '%Y-%m-%d') as date_start", "DATE_FORMAT(date_add, '%Y-%m-%d') as date_add", - "DATE_FORMAT(division_date, '%Y-%m-%d') as division_date", "UNIX_TIMESTAMP(date_update) as date_update", 'parent_id']) + "DATE_FORMAT(division_date, '%Y-%m-%d') as division_date", "extract(epoch FROM date_update) as date_update", 'parent_id']) ->where(['id' => $orderId])->asArray()->one(); } diff --git a/erp24/views/shipment_old/ajax-update-step.php b/erp24/views/shipment_old/ajax-update-step.php index ae0b289..fea8d2a 100644 --- a/erp24/views/shipment_old/ajax-update-step.php +++ b/erp24/views/shipment_old/ajax-update-step.php @@ -77,7 +77,7 @@ foreach($data as $row) { // данные по закупке - достаем параметры закупки - дата старта продаж - от нее считаем продажи списания и закупки прошлой недели $OrderData=$db::getRow("SELECT name,id,providers_arr, status, DATE_FORMAT(date_start, '%Y-%m-%d') as date_start, -DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, UNIX_TIMESTAMP(date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); +DATE_FORMAT(division_date, '%Y-%m-%d') as division_date, extract(epoch FROM date_update) as date_update, parent_id FROM store_orders WHERE id=?",[$orderId]); $providersIdInThisOrder=explode(",",$OrderData["providers_arr"]); $status_order_id=$OrderData["status"]; $date_start_sale=$OrderData["date_start"]; -- 2.39.5
статус ID