From 4d824140cb50420c57167124b42e8cc0e5c5537f Mon Sep 17 00:00:00 2001 From: pavlikov_maxim Date: Mon, 15 Apr 2024 14:24:34 +0300 Subject: [PATCH] =?utf8?q?=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20=D0=B0?= =?utf8?q?=D0=BC=D0=BE=D0=B1=D0=B0=D0=B7=D1=8B=20=D0=B2=20OrdersController?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/OrdersController.php | 4 + erp24/modul/orders/amobaza.php | 353 ++++++++++++------------- erp24/views/orders/amobaza.php | 5 + 3 files changed, 176 insertions(+), 186 deletions(-) create mode 100644 erp24/views/orders/amobaza.php diff --git a/erp24/controllers/OrdersController.php b/erp24/controllers/OrdersController.php index 5964c3c..78e3a8f 100644 --- a/erp24/controllers/OrdersController.php +++ b/erp24/controllers/OrdersController.php @@ -23,6 +23,10 @@ class OrdersController extends Controller return $this->render('couriers'); } + public function actionAmobaza() { + return $this->render('amobaza'); + } + public function actionDelivery() { return $this->render('delivery'); } diff --git a/erp24/modul/orders/amobaza.php b/erp24/modul/orders/amobaza.php index 6a0d9c3..a80729b 100644 --- a/erp24/modul/orders/amobaza.php +++ b/erp24/modul/orders/amobaza.php @@ -1,155 +1,141 @@ -Заказы из amocrm ' . create_guid() . ''; + $products_sort = []; + $products = []; + $payment_types = []; + $data = $db::getRows("SELECT id, tip, name FROM products_1c WHERE tip='products' or tip='payment_types' "); + foreach ($data as $row) { + if ($row["tip"] == "products") $products[$row["id"]] = $row["name"]; + if ($row["tip"] == "payment_types") $payment_types[$row["id"]] = $row["name"]; + } + + $data = $db::getRows("SELECT status_id, color, name FROM orders_status WHERE pipeline_id='4021495'"); + foreach ($data as $row) { + $status_ar[$row["status_id"]] = "" . $row["name"] . ""; + } + + + $data = $db::getRows("SELECT id, name FROM admin WHERE 1=1"); + foreach ($data as $row) $users_arr[$row["id"]] = $row["name"]; + + + $payments_array = [ + "Оплата на сайте (Visa, Mastercard, Мир)" => array("payments_type_id" => "5ee4c07a-36f5-11ec-8900-fc349715dc38", "kkm_id" => "d0d6c742-4db8-11ea-b917-0018f353130f", "terminal_id" => "7909401c-703b-11ea-8b4b-0018f353130f"), // 09 Доставка Букетов + "Перевод на карту Сбербанк" => array("payments_type_id" => "a69ea4d1-feff-11e8-8ae7-1c6f659fb563", "kkm_id" => "d0d6c742-4db8-11ea-b917-0018f353130f"), //, "terminal_id"=>"a22aeb16-1c6a-11ec-88f6-fc349715dc38" //payments_type_id = наличные. kkm_id 09 Доставка + "Наличными курьеру (+100 руб.)" => array("payments_type_id" => "a69ea4d1-feff-11e8-8ae7-1c6f659fb563", "kkm_id" => "d0d6c742-4db8-11ea-b917-0018f353130f"), + "PayPal" => array("payments_type_id" => "5ee4c07a-36f5-11ec-8900-fc349715dc38", "kkm_id" => "a22aeb16-1c6a-11ec-88f6-fc349715dc38", "terminal_id" => "a22aeb16-1c6a-11ec-88f6-fc349715dc38") + ]; + + + $data = $db::getRows("SELECT *, c.status as status_check, c.check_id FROM create_checks as c RIGHT JOIN orders_amo ON orders_amo.id=c.order_id +WHERE c.type='Продажа' order BY c.date DESC LIMIT 350"); //c.status='0' AND + echo ""; + $order___arr = []; + foreach ($data as $row) { + if ($row["status_id"] != "143" and !in_array($row["order_id"], $order___arr)) { + + + $order___arr[] = $row["order_id"]; + + $data2 = $db::getRows("SELECT * FROM site_order_items_sostav WHERE lid_id=? ", [$row["order_id"]]); + $products_old = ""; + $products_items = array(); + $now_items = array(); + $amount_old = 0; + $amount_now = 0; + foreach ($data2 as $row2) { + if ($row2["tip"] == 0) { + $sumy = $row2["kol"] * $row2["price"]; + $amount_old = $amount_old + $sumy; + $products_sort["old"][$row2["guid"]] = $row2["kol"]; + } +// то что по факту внесено + if ($row2["tip"] == 1) { - try { - -include"templates/top.php"; + if (empty($seller_id)) $seller_id = "00000000-0000-0000-0000-000000000000"; //$row["florist_id"] + $now_items[] = array("product_id" => $row2["guid"], "quantity" => (double)$row2["kol"], "seller_id" => $seller_id, "discount" => 0, "price" => (double)$row2["price"], "color" => $row2["color_id"]); + $amount_now = $amount_now + $row2["kol"] * $row2["price"]; + } -echo'

Заказы из amocrm '.create_guid().'

'; - -include_once("inc/db2.php"); + } -$products=array(); $payment_types=array(); -$data = $db2::getRows("SELECT id, tip, name FROM products_1c WHERE tip='products' or tip='payment_types' "); -foreach($data as $row) { - if($row["tip"]=="products") $products[$row["id"]]=$row["name"]; - if($row["tip"]=="payment_types") $payment_types[$row["id"]]=$row["name"]; -} - -$data = $db2::getRows("SELECT status_id, color, name FROM orders_status WHERE pipeline_id='4021495'"); -foreach($data as $row) { - $status_ar[$row["status_id"]]="".$row["name"].""; -} - -$data = $db2::getRows("SELECT admin_id, name_admin FROM admin WHERE 1 "); -foreach($data as $row) $users_arr[$row["admin_id"]]=$row["name_admin"]; - - - $payments_array=[ - "Оплата на сайте (Visa, Mastercard, Мир)"=>array("payments_type_id" =>"5ee4c07a-36f5-11ec-8900-fc349715dc38", "kkm_id"=>"d0d6c742-4db8-11ea-b917-0018f353130f", "terminal_id"=>"7909401c-703b-11ea-8b4b-0018f353130f" ), // 09 Доставка Букетов - "Перевод на карту Сбербанк"=>array("payments_type_id" =>"a69ea4d1-feff-11e8-8ae7-1c6f659fb563", "kkm_id"=>"d0d6c742-4db8-11ea-b917-0018f353130f" ), //, "terminal_id"=>"a22aeb16-1c6a-11ec-88f6-fc349715dc38" //payments_type_id = наличные. kkm_id 09 Доставка - "Наличными курьеру (+100 руб.)"=>array("payments_type_id" =>"a69ea4d1-feff-11e8-8ae7-1c6f659fb563", "kkm_id"=>"d0d6c742-4db8-11ea-b917-0018f353130f" ), - "PayPal"=>array("payments_type_id" =>"5ee4c07a-36f5-11ec-8900-fc349715dc38", "kkm_id"=>"a22aeb16-1c6a-11ec-88f6-fc349715dc38", "terminal_id"=>"a22aeb16-1c6a-11ec-88f6-fc349715dc38" ) -]; - - - -$data = $db2::getRows("SELECT *, c.status as status_check, c.check_id FROM create_checks as c RIGHT JOIN orders_amo ON orders_amo.id=c.order_id -WHERE c.type='Продажа' order BY c.date DESC LIMIT 350"); //c.status='0' AND -echo"
"; -foreach($data as $row) { - -if($row["status_id"]!="143" and !in_array($row["order_id"],$order___arr)) { - - -$order___arr[]=$row["order_id"]; - -$data2 = $db2::getRows("SELECT * FROM site_order_items_sostav WHERE lid_id=? ",[$row["order_id"]]); -$products_old=""; -$products_items=array(); -$products_sort=array(); -$now_items=array(); -$amount_old=0; -$amount_now=0; -foreach($data2 as $row2) { -if($row2["tip"]==0) { - $sumy=$row2["kol"]*$row2["price"]; - $amount_old=$amount_old + $sumy; - $products_sort["old"][$row2["guid"]]=$row2["kol"]; -} + $payments=json_decode($row["payments"],true,512,JSON_UNESCAPED_UNICODE); + //$items=json_decode($row["items"],true,512,JSON_UNESCAPED_UNICODE); -// то что по факту внесено -if($row2["tip"]==1) { - -if(empty($seller_id)) $seller_id="00000000-0000-0000-0000-000000000000"; //$row["florist_id"] -$now_items[]=array("product_id"=>$row2["guid"], "quantity"=>(double)$row2["kol"], "seller_id"=>$seller_id, "discount"=>0, "price"=>(double)$row2["price"], "color"=>$row2["color_id"] ); -$amount_now=$amount_now+$row2["kol"]*$row2["price"]; - -} - - -} +// $seller_id="3d8f7db1-8d67-11eb-bf83-b42e991aff6c"; // продавец +// $store_id="dbd70103-2c7b-11e9-9b87-c85b76f0e893"; // аэродромная +// $kkm_id="965e371d-6762-11ec-b111-14dae9cc3f7f"; //Мочалина Г. М. ИП(Центральный склад) ?? +// $payments_type_id="5ee4c07a-36f5-11ec-8900-fc349715dc38"; // оплата на сайте +// // Оплата на карту ?? +// // оплата наличными курьеру ??? +// $terminal_id="a22aeb16-1c6a-11ec-88f6-fc349715dc38"; //Сбербанк ПАО/Мочалина Г. М. ИП - - - /* -$payments=json_decode($row["payments"],true,512,JSON_UNESCAPED_UNICODE); -//$items=json_decode($row["items"],true,512,JSON_UNESCAPED_UNICODE); -$seller_id="3d8f7db1-8d67-11eb-bf83-b42e991aff6c"; // продавец -$store_id="dbd70103-2c7b-11e9-9b87-c85b76f0e893"; // аэродромная -$kkm_id="965e371d-6762-11ec-b111-14dae9cc3f7f"; //Мочалина Г. М. ИП(Центральный склад) ?? -$payments_type_id="5ee4c07a-36f5-11ec-8900-fc349715dc38"; // оплата на сайте -// Оплата на карту ?? -// оплата наличными курьеру ??? -$terminal_id="a22aeb16-1c6a-11ec-88f6-fc349715dc38"; //Сбербанк ПАО/Мочалина Г. М. ИП -*/ - + $payments2 = array(); + if ($payments_array[$row["payment_type_id"]]) { + $terminal_id = ""; + $parr = $payments_array[$row["payment_type_id"]]; + $payments_type_id = $parr["payments_type_id"]; // оплата на сайте + if (!empty($parr["terminal_id"])) $terminal_id = $parr["terminal_id"]; + $seller_id = "3d8f7db1-8d67-11eb-bf83-b42e991aff6c"; // продавец + $store_id = "dbd70103-2c7b-11e9-9b87-c85b76f0e893"; // аэродромная + $kkm_id = "d0d6c742-4db8-11ea-b917-0018f353130f"; //Мочалина Г. М. ИП(Центральный склад) ?? 965e371d-6762-11ec-b111-14dae9cc3f7f + $pays_arr = array(); + $pays_arr["type_id"] = $payments_type_id; + if (!empty($terminal_id)) $pays_arr["terminal_id"] = $terminal_id; + $pays_arr["summ"] = (double)$amount_now; - $payments2=array(); -if($payments_array[$row["payment_type_id"]]) { - $terminal_id=""; - $parr=$payments_array[$row["payment_type_id"]]; - $payments_type_id=$parr["payments_type_id"]; // оплата на сайте - if(!empty($parr["terminal_id"])) $terminal_id=$parr["terminal_id"]; - $seller_id="3d8f7db1-8d67-11eb-bf83-b42e991aff6c"; // продавец - $store_id="dbd70103-2c7b-11e9-9b87-c85b76f0e893"; // аэродромная - $kkm_id="d0d6c742-4db8-11ea-b917-0018f353130f"; //Мочалина Г. М. ИП(Центральный склад) ?? 965e371d-6762-11ec-b111-14dae9cc3f7f - -$pays_arr=array(); -$pays_arr["type_id"]=$payments_type_id; -if(!empty($terminal_id)) $pays_arr["terminal_id"]=$terminal_id; -$pays_arr["summ"]=(double)$amount_now; + $payments2[] = $pays_arr; -$payments2[]=$pays_arr; + $payments2 = json_encode($payments2, JSON_UNESCAPED_UNICODE); -$payments2 = json_encode($payments2, JSON_UNESCAPED_UNICODE); - -} + } - - -echo" "; - } - - - foreach($products_sort["old"] as $k =>$q) { - $table_0 .=" "; - } - - -$alert=""; - -if($check_amoint!=$amount_old) { $alert="
Было ".$amount_old."₽ != стало ".$check_amoint."₽
"; } - -$result2=array(); -$result2 = array_diff_assoc($products_sort["old"], $products_sort["check"]); -$result3 = array_diff_assoc( $products_sort["check"],$products_sort["old"]); - - - -echo"$alert Разница "; - foreach($result2 as $k =>$kol) { - echo"".$products[$k]."= ".$kol." "; } - foreach($result3 as $k =>$kol) { - echo"".$products[$k]."= ".$kol." "; - } - - -echo" - + + if (isset($products_sort["check"]) && is_array($products_sort["check"])) { + ksort($products_sort["check"]); + foreach ($products_sort["check"] as $k => $q) { + $table_1 .= " "; + } + } + if (isset($products_sort["old"]) && is_array($products_sort["old"])) { + ksort($products_sort["old"]); + foreach ($products_sort["old"] as $k => $q) { + $table_0 .= " "; + } + } + + if (isset($products_sort["old"]) && isset($products_sort["check"])) { + $alert = ""; + + if ($check_amoint != $amount_old) { + $alert = "
Было " . $amount_old . "₽ != стало " . $check_amoint . "₽
"; + } + + $result2 = []; + $result2 = array_diff_assoc($products_sort["old"], $products_sort["check"]); + $result3 = array_diff_assoc($products_sort["check"], $products_sort["old"]); + + + echo "$alert Разница "; + foreach ($result2 as $k => $kol) { + echo "" . $products[$k] . "= " . $kol . " "; + } + foreach ($result3 as $k => $kol) { + echo "" . $products[$k] . "= " . $kol . " "; + } + } + + echo " +"; - -} -} + } -echo"
" . $row["status_check"] . " -echo"\"> ".$row["status_check"]." + - +" . $row["order_id"] . " Дата доставки: " . $row["delivery_date"] . " -".$row["order_id"]." Дата доставки: ".$row["delivery_date"]." +" . (isset($status_ar[$row["status_id"]]) ? $status_ar[$row["status_id"]] : '') . + " Флорист: " . (isset($users_arr[$row["florist_id"]])?$users_arr[$row["florist_id"]]:'') . + " Курьер: " . (isset($users_arr[$row["courier_id"]])?$users_arr[$row["courier_id"]]:'') . " -".$status_ar[$row["status_id"]]." Флорист: ".$users_arr[$row["florist_id"]]." Курьер: ".$users_arr[$row["courier_id"]]." +" . $row["delivery"] . " дата чека " . $row["date"] . " " . $row["delivery_adress"] . " +Комментарий: " . $row["comment"] . " Комментарий логиста: " . $row["dostavka_comment"] . " -".$row["delivery"]." дата чека ".$row["date"]." ".$row["delivery_adress"]." -Комментарий: ".$row["comment"]." Комментарий логиста: ".$row["dostavka_comment"]." + Цена доставки: " . $row["price_dostavka"] . " Вид оплаты: " . $row["payment_type_id"] . " " . $row["pay"] . " Тэги: " . $row["tags"] . " Оператор: " . $row["manager"] . " +ссылка на состав - Цена доставки: ".$row["price_dostavka"]." Вид оплаты: ".$row["payment_type_id"]." ".$row["pay"]." Тэги: ".$row["tags"]." Оператор: ".$row["manager"]." -ссылка на состав +сделка в амо -сделка в амо -26624623
"; @@ -163,100 +149,100 @@ foreach($payments as $k =>$arr) { echo"". $table_0=""; $table_1=""; $check_amoint=0; - foreach($now_items as $k =>$arr) { - $products_sort["check"][$arr["product_id"]]=$arr["quantity"]; + foreach($now_items as $k =>$arr) { + $products_sort["check"][$arr["product_id"]]=$arr["quantity"]; $check_amoint=$check_amoint+$arr["quantity"] * $arr["price"]; // echo"
-- ".$arr["product_id"]." = ".$arr["quantity"]." "; - - } - - -ksort($products_sort["check"]); -ksort($products_sort["old"]); - - foreach($products_sort["check"] as $k =>$q) { - $table_1 .="
".$products[$k]."".$q."
".$products[$k]."".$q."
" . $products[$k] . "" . $q . "
" . $products[$k] . "" . $q . "
+ echo " - + if ($check_amoint != $amount_old) { + $table_0 .= " alert-danger"; + } + echo "\">Было " . $amount_old . "₽
Позиции в чеке на списание$table_1
"; -$items_sql=json_encode($now_items,JSON_UNESCAPED_UNICODE); -$db2::sql("UPDATE create_checks SET items=?, payments=?, kkm_id=? WHERE order_id=?",[$items_sql,$payments2,$kkm_id,$row["order_id"]]); + $items_sql = json_encode($now_items, JSON_UNESCAPED_UNICODE); + $db::sql("UPDATE create_checks SET items=?, payments=?, kkm_id=? WHERE order_id=?", [$items_sql, $payments2, $kkm_id, $row["order_id"]]); - -echo"		 Было$table_0
Чек ".$check_amoint."₽ +
Чек " . $check_amoint . "₽ - + - + "; -if(!empty($row["check_id"])) + if (!empty($row["check_id"])) -echo""; + echo ""; -echo"
+ echo "
Было ".$amount_old."₽
"; - + } - } catch (Exception $e) { - echo 'Выброшено исключение: ', $e->getMessage(), "\n"; -} + echo ""; +} catch (Exception $e) { + echo 'Выброшено исключение: ', $e->getMessage(), "\n"; +} + -$_CONFIG["jscss"]=" +$_CONFIG["jscss"] = " @@ -304,14 +290,10 @@ $.ajax({ } -"; - +"; - - - - echo' +echo '