Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
addcpm-json
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
addcpm-json
Commits
12dee862
Commit
12dee862
authored
May 24, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Добавил данные о статусах заказа в ajax-запросах
parent
66df5438
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
12 deletions
+20
-12
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+0
-2
script-feeds-stat.js
src/public/js/script-feeds-stat.js
+4
-9
Cabinet.php
src/src/App/Action/User/Cabinet.php
+16
-1
No files found.
src/public/js/script-feeds-stat-table.js
View file @
12dee862
...
@@ -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">'
);
...
...
src/public/js/script-feeds-stat.js
View file @
12dee862
...
@@ -343,21 +343,16 @@ $(document).ready(function(){
...
@@ -343,21 +343,16 @@ $(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
);
...
...
src/src/App/Action/User/Cabinet.php
View file @
12dee862
...
@@ -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
(
!
$res
ult
)
{
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(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment