From: Alexander Smirnov Date: Fri, 7 Jun 2024 13:16:47 +0000 (+0300) Subject: fix part 002 X-Git-Tag: 1.2^2~8^2~17 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d1dd67bebe9130acfdea58522dda9888fb32ac22;p=erp24_rep%2Fyii-erp24%2F.git fix part 002 --- diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php index def5f554..a563e261 100644 --- a/erp24/controllers/OrdersController.php +++ b/erp24/controllers/OrdersController.php @@ -53,6 +53,15 @@ class OrdersController extends Controller public function actionCollation() { return $this->render('collation'); } + public function actionInfoDb2() { return $this->renderPartial('info-db2'); } + + public function actionAjaxOrdersPays() { return $this->renderPartial('ajax-orders-pays'); } + + public function actionAjaxOrderConnectPay() { return $this->renderPartial('ajax-order-connect-pay'); } + + public function actionAjaxCollation() { return $this->renderPartial('ajax-collation'); } + public function actionAjaxCheckDell() { return $this->renderPartial('ajax-check-dell'); } + public function actionDelivery2() { if (!empty($_REQUEST["umoup"])) { diff --git a/erp24/inc/checks.php b/erp24/inc/checks.php index beae7486..94975215 100644 --- a/erp24/inc/checks.php +++ b/erp24/inc/checks.php @@ -5,15 +5,17 @@ function create_order_from_amo($amo_id="") { global $db, $db2,$ACCESS_TOKEN; if(!empty($amo_id)) { -include_once("inc/db.php"); - -if(empty($ACCESS_TOKEN)) include_once"/var/www/www-root/data/www/amo.bazacvetov24.ru/amo/amo_inc.php"; +include_once(__DIR__ . "/db.php"); + +if(empty($ACCESS_TOKEN)) include_once(dirname(__DIR__, 1) . "/inc/amo/amo_inc.php"); $deal = amo_rest($ACCESS_TOKEN, '/api/v4/leads/'.$amo_id.'?with=contacts','GET', []); $id_contact = $deal['_embedded']['contacts'][0]['id']; $custom_fields = $deal['custom_fields_values']; $i=1; +$tags = ''; +$tags_arr = ''; foreach($deal['_embedded']["tags"] as $ud => $tag) { if($i $v) echo"
$k => $v"; //print'
';print_r($deal);echo'
'; $contact = amo_rest($ACCESS_TOKEN, '/api/v4/contacts/' . $id_contact, $method = 'GET', []); //$arr = ['lead' => $deal, 'contact' => $contact]; -$phone=$contact["custom_fields_values"]["0"]["values"]["0"]["value"]; -$email=$contact["custom_fields_values"]["1"]["values"]["0"]["value"]; -$name=$contact["name"]; +$phone=$contact["custom_fields_values"]["0"]["values"]["0"]["value"] ?? ''; +$email=$contact["custom_fields_values"]["1"]["values"]["0"]["value"] ?? ''; +$name=$contact["name"] ?? ''; $row["client"]=$name; $row["phone"]=$phone; $row["email"]=$email; @@ -191,7 +193,9 @@ $summ=0; */ $param=array(); $upper=array("id","price","pay","delivery","store_id","payment_type_id","status_id","florist_id","dostavka_povtor_tip"); -foreach($upper as $pole) $param[$pole]=$row[$pole]; +foreach($upper as $pole) { + $param[$pole] = $row[$pole] ?? ""; +} $param["price"]=$summ; //$param["istochnik_id"]=1; //$uopdet="UPDATE orders_amo SET $sql0 WHERE id=:id "; @@ -266,8 +270,8 @@ return $row["id"]; } } catch (Exception $e0) { - // echo 'Выброшено исключение: ', $e0->getMessage(), "\n"; - file_put_contents('modul/orders/error_create_order.txt', PHP_EOL . $e0->getMessage(), FILE_APPEND); + echo 'Выброшено исключение: ', $e0->getMessage(), $e0->getFile(), $e0->getLine(), $e0->getTraceAsString(), "\n"; +// file_put_contents('modul/orders/error_create_order.txt', PHP_EOL . $e0->getMessage(), FILE_APPEND); return false; } diff --git a/erp24/modul/orders/ajaxOrderConnectPay.php b/erp24/modul/orders/ajaxOrderConnectPay.php index 17350832..51257ff3 100644 --- a/erp24/modul/orders/ajaxOrderConnectPay.php +++ b/erp24/modul/orders/ajaxOrderConnectPay.php @@ -1,11 +1,11 @@ - -
+echo"
"; +echo ''; +echo " @@ -133,7 +136,7 @@ foreach($_REQUEST["statuses"] ?? [] as $is =>$idf) { -$data= $db::getRows("SELECT * FROM orders_cheking WHERE date>=NOW()::date- INTERVAL '17 day'"); +$data= $db::getRows("SELECT amo_id, name, date, delivery_date, admin_id, status FROM orders_cheking WHERE date>=NOW()::date- INTERVAL '17 day'"); foreach($data as $row) { $orders_cheking_array[$row["amo_id"]]=" ".$row["name"]." ".$row["date"]." ".$row["delivery_date"]." ".$users_arr[$row["admin_id"]]." ".$row["status"]." "; $orders_cheking_status_array[$row["amo_id"]]=$row["status"]; @@ -143,7 +146,10 @@ foreach($data as $row) { -$checkarr= $db::getRows("SELECT * FROM sales WHERE date>=NOW()::date - INTERVAL '120 day' order by date DESC"); +$sql = "SELECT id, operation, summ, number, date, store_id_1c, order_id FROM sales WHERE date>='" . $delivery_date + . "'::date - INTERVAL '25 day' AND date<='" . $delivery_date . "' AND operation IN ('Возврат', 'Продажа') order by date DESC"; + +$checkarr= $db::getRows($sql); //$cheks_txt="; foreach($checkarr as $checkr) { $cheks_txt ="
=NOW()::date- INTERVAL '1 day' AND type='Продажа'"); -foreach($data4 as $row4) $create_check_arr[$row4["order_id"]]=$row4; +foreach($data4 ? $data4 : [] as $row4) $create_check_arr[$row4["order_id"]]=$row4; $j=0; $data = $db::getRows("SELECT *,TO_CHAR(delivery_date, 'DD.MM.YYYY') as dated FROM orders_amo WHERE 1 = 1 $where AND delivery_date <= NOW() order by delivery_date DESC LIMIT 750"); echo"
дата доставки:
@@ -414,7 +420,7 @@ echo""; -if(!in_array($row["id"],$counter_no_check_array) and $check_vozvrat_cnt[$row["id"]]>=$check_sale_cnt[$row["id"]]) $conter_false_check++; +if(!in_array($row["id"],$counter_no_check_array ?? []) and $check_vozvrat_cnt[$row["id"]]>=$check_sale_cnt[$row["id"]]) $conter_false_check++; } @@ -447,7 +453,7 @@ function ajax_order_show(id,amo_id,price,delivery_date, phone) { const token3 = $(\"meta[name=csrf-token]\").attr(\"content\"); $.ajax({ - url: '/orders/info_db2/', + url: '/orders/info-db2/', method: 'post', dataType: 'html', data: { id: ''+id+'',amo_id: ''+amo_id+'' ,price: ''+price+'' , delivery_date: ''+delivery_date+'' , phone: ''+phone+'', [param3]: token3}, @@ -507,7 +513,7 @@ function ajax_collation(amo_id) { const token3 = $(\"meta[name=csrf-token]\").attr(\"content\"); $.ajax({ - url: '/orders/ajax_collation/', + url: '/orders/ajax-collation/', method: 'post', dataType: 'html', data: { amo_id: ''+amo_id+'', name: ''+$('#name__'+amo_id+'').val()+'', status: ''+$('#status__'+amo_id+'').val()+'', [param3]: token3 }, @@ -526,7 +532,7 @@ function ajax_return_check_dell(check_id) { const token3 = $(\"meta[name=csrf-token]\").attr(\"content\"); $.ajax({ - url: '/orders/ajax_check_dell/', + url: '/orders/ajax-check-dell/', method: 'post', dataType: 'html', data: { check_id: ''+check_id+'', [param3]: token3 }, @@ -543,7 +549,7 @@ function ajax_return_check(sales_check) { const token3 = $(\"meta[name=csrf-token]\").attr(\"content\"); $.ajax({ - url: '/orders/ajax_return_check/', + url: '/orders/ajax-return-check/', method: 'post', dataType: 'html', data: { sales_check: ''+sales_check+'', [param3]: token3 }, @@ -561,7 +567,7 @@ function ajax_create_check(order_id) { const token3 = $(\"meta[name=csrf-token]\").attr(\"content\"); $.ajax({ - url: '/orders/ajax_create_check/', + url: '/orders/ajax-create-check/', method: 'post', dataType: 'html', data: { order_id: ''+order_id+'', create_check: '2', [param3]: token3 }, diff --git a/erp24/modul/orders/info_db2.php b/erp24/modul/orders/info_db2.php index 3565616a..addc738b 100644 --- a/erp24/modul/orders/info_db2.php +++ b/erp24/modul/orders/info_db2.php @@ -1,8 +1,10 @@ -'.$order["name"].' Сумма'.$order["price"].' Дата доставки: '.$order["delivery_date"].' '.$order["delivery_time"].' Тэги '.$order["tags"].'
Дата заказа '.$order["date"].'
-Текст заказа '.$order["text_order"].'
+Текст заказа '.($order["text_order"] ?? '').'
Телефон'.$order["phone"].'
Клиент'.$order["client"].'
Адрес '.$order["delivery_adress"].' '; echo" -заказ в амо +заказ в амосостав"; -$lid_id7 = $db2::getValue("SELECT lid_id FROM site_order_items_sostav WHERE lid_id=? AND tip=1",[$id]); -if(empty($lid_id7)) { foreach($sql_n2 as $k => $sql) $db::sql($sql);} +$lid_id7 = $db::getValue("SELECT lid_id FROM site_order_items_sostav WHERE lid_id=? AND tip=1",[$id]); +if(empty($lid_id7)) { foreach($sql_n2 ?? [] as $k => $sql) $db::sql($sql);} @@ -40,14 +42,15 @@ if(empty($lid_id7)) { foreach($sql_n2 as $k => $sql) $db::sql($sql);} echo"
"; -$datas = $db::getRows("SELECT item_id FROM info_items_table_shop_0 WHERE cat_items_id='2'"); -foreach($datas as $ro) $usligi[$ro["item_id"]]=$ro["item_id"]; - -$datas = $db::getRows("SELECT item_id,id_1c FROM info_items_table_shop_0 WHERE id_1c!=''"); -foreach($datas as $ro) $guid_arr[$ro["item_id"]]=$ro["id_1c"]; +//$datas = $db::getRows("SELECT item_id FROM info_items_table_shop_0 WHERE cat_items_id='2'"); +//foreach($datas as $ro) $usligi[$ro["item_id"]]=$ro["item_id"]; +// +//$datas = $db::getRows("SELECT item_id,id_1c FROM info_items_table_shop_0 WHERE id_1c!=''"); +//foreach($datas as $ro) $guid_arr[$ro["item_id"]]=$ro["id_1c"]; $begin_step=1; -$datas = $db2::getRows("SELECT *, kol*price as sumn FROM site_order_items_sostav WHERE lid_id='$id' AND tip=1 order by kol DESC, price DESC "); +$datas = $db::getRows("SELECT *, kol*price as sumn FROM site_order_items_sostav WHERE lid_id='$id' AND tip=1 order by kol DESC, price DESC "); +$itogo = 0; foreach($datas as $row3) { $row3["price"]=str_replace(".00","",$row3["price"]); @@ -55,7 +58,7 @@ $row3["kol"]=str_replace(".00","",$row3["kol"]); $row3["sumn"]=ceil($row3["sumn"]); $classi=""; $cl=""; -if(!empty($row3["color_id"])) $cl=" цвет:".$colors[$row3["color_id"]]; +if(!empty($row3["color_id"])) $cl=" цвет:".($colors[$row3["color_id"]] ?? ''); if(!empty($usligi[$row3["item_id"]])) $classi=" class=\"bg-warning\" "; @@ -71,9 +74,3 @@ echo"
if(empty($begin_step)) error_mess("В чеке есть товары которым не присвоен товар из 1с - нужно поставить товар с сайта в соотвкетствие товару из 1с"); - - - - - - diff --git a/erp24/views/orders/ajax-collation.php b/erp24/views/orders/ajax-collation.php new file mode 100644 index 00000000..c44656d9 --- /dev/null +++ b/erp24/views/orders/ajax-collation.php @@ -0,0 +1,5 @@ +