Добавил данные о статусах заказа в ajax-запросах

parent 66df5438
...@@ -146,8 +146,6 @@ $(document).ready(function(){ ...@@ -146,8 +146,6 @@ $(document).ready(function(){
// Отрисовка таблицы: // Отрисовка таблицы:
dataTableForSort.forEach(function(item){ dataTableForSort.forEach(function(item){
if (dataLineChartStat.report == 'transactions') { if (dataLineChartStat.report == 'transactions') {
$row = $('<tr class="transaction-item">'); $row = $('<tr class="transaction-item">');
......
...@@ -344,20 +344,15 @@ $(document).ready(function(){ ...@@ -344,20 +344,15 @@ $(document).ready(function(){
dataOrders.push(dataItem); dataOrders.push(dataItem);
}); });
/*
var formData = new FormData();
formData.append('approved', 1);
data: formData,
contentType: false,
processData: false,
*/
$.ajax(action, { $.ajax(action, {
type: 'POST', type: 'POST',
data: data, data: data,
success: function(data) { success: function(data) {
console.log(status, data); console.log(status, data);
dataOrders.forEach(function(item, i){
var $inputItem = $('tbody td.OrderID span.order-id[data-order-id="' + item.orderId + '"][data-feed-id="' + item.feedId + '"] input', $tableStat);
$inputItem.prop("disabled", true);
});
}, },
error: function(rew, status, err) { error: function(rew, status, err) {
console.log(status, err); console.log(status, err);
......
...@@ -392,7 +392,7 @@ class Cabinet extends Common ...@@ -392,7 +392,7 @@ class Cabinet extends Common
if (!$order_is_approved) { if (!$order_is_approved) {
$ordersStatus->setApproved($order_item['approved']); $ordersStatus->setApproved($order_item['approved']);
$res = $ordersStatusModel->saveRetargOrderStatus($ordersStatus, 'update'); $res = $ordersStatusModel->saveRetargOrderStatus($ordersStatus, 'update');
if(!$result) { if(!$res) {
throw new \Exception('DB error'); throw new \Exception('DB error');
} }
$approved_orders[] = $res; $approved_orders[] = $res;
...@@ -441,6 +441,21 @@ class Cabinet extends Common ...@@ -441,6 +441,21 @@ class Cabinet extends Common
return new JsonResponse(null); return new JsonResponse(null);
} }
// Добавляем данные о статусах заказов:
if ($report_type == 'transactions') {
/** @var \App\Model\Feeds $ordersStatusModel */
$ordersStatusModel = $this->container->get(OrdersStatus::class);
$ordersStatus = $ordersStatusModel->findAll(['feed_id' => $feed_id_list])->toArray();
$statuses = [];
foreach($ordersStatus as $order_item) {
$statuses[$order_item['feed_id']][$order_item['order_id']] = array(
'confirmed' => $order_item['confirmed'] ? 1 : 0,
'approved' => $order_item['approved'] ? 1 : 0
);
}
$periodStats['ordersStatus'] = $statuses;
}
/* /*
if ($periodStats || $companyStats) { if ($periodStats || $companyStats) {
$data = array( $data = array(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment