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
cfc4c808
Commit
cfc4c808
authored
May 24, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Запросы для смены confirmed approved
parent
40998bcd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
112 additions
and
22 deletions
+112
-22
script-feeds-stat.js
src/public/js/script-feeds-stat.js
+83
-21
Cabinet.php
src/src/App/Action/User/Cabinet.php
+28
-0
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+1
-1
No files found.
src/public/js/script-feeds-stat.js
View file @
cfc4c808
...
@@ -273,36 +273,97 @@ $(document).ready(function(){
...
@@ -273,36 +273,97 @@ $(document).ready(function(){
$chartTable
.
show
();
$chartTable
.
show
();
}
}
// Обработка контролов для таблицы transactions:
// Клик на Утвердить заказы:
(
function
(){
$
(
'a.btn.approve'
).
on
(
'click'
,
function
(){
var
var
$tableStat
=
$
(
'table.transactions'
),
$tableStat
=
$
(
'table.transactions'
);
$ordersItems
=
$
(
'tbody > tr.transaction-item:not(.total-orders) td.OrderID span.order-id'
,
$tableStat
),
dataOrders
=
[];
$ordersItems
.
each
(
function
(){
// Клик на галочку подтверждения заказа:
$tableStat
.
on
(
'change'
,
'td.OrderID input'
,
function
(
e
)
{
var
var
$this
=
$
(
this
),
$this
=
$
(
this
),
dataItem
=
{
$spanWrap
=
$this
.
parent
(
'span.order-id'
),
feedId
:
$this
.
data
(
'feed-id'
),
action
=
$tableStat
.
data
(
'link'
),
orderId
:
$this
.
data
(
'order-id'
),
data
=
{
confirmed
:
(
$
(
'input'
,
$this
).
prop
(
'checked'
))
?
1
:
0
,
'toggle_confirmed'
:
1
,
approved
:
1
'confirmed'
:
$this
.
prop
(
"checked"
)
?
1
:
0
,
'feedId'
:
$spanWrap
.
data
(
'feed-id'
),
'orderId'
:
$spanWrap
.
data
(
'order-id'
),
};
};
dataOrders
.
push
(
dataItem
);
$this
.
prop
(
"disabled"
,
true
);
$
.
ajax
(
action
,
{
type
:
'POST'
,
data
:
data
,
success
:
function
(
data
)
{
$this
.
prop
(
"disabled"
,
false
);
/*
if (data.result) {
if (isEnabled) {
$siteTr.removeClass('disabled');
} else {
$siteTr.addClass('disabled');
}
}
*/
},
error
:
function
(
rew
,
status
,
err
)
{
console
.
log
(
status
,
err
);
$this
.
prop
(
"disabled"
,
false
);
}
});
return
false
;
});
});
// Клик на Утвердить заказы:
$
(
'a.btn.approve'
).
on
(
'click'
,
function
(){
var
action
=
$tableStat
.
data
(
'link'
),
$ordersItems
=
$
(
'tbody > tr.transaction-item:not(.total-orders) td.OrderID span.order-id'
,
$tableStat
),
dataOrders
=
[],
data
=
{
'approved'
:
1
,
'orders'
:
dataOrders
,
};
$ordersItems
.
each
(
function
(){
var
$this
=
$
(
this
),
dataItem
=
{
feedId
:
$this
.
data
(
'feed-id'
),
orderId
:
$this
.
data
(
'order-id'
),
confirmed
:
(
$
(
'input'
,
$this
).
prop
(
'checked'
))
?
1
:
0
,
approved
:
1
};
dataOrders
.
push
(
dataItem
);
});
console
.
log
(
'AAA data = '
,
data
);
$
.
ajax
(
action
,
{
type
:
'POST'
,
data
:
data
,
success
:
function
(
data
)
{
console
.
log
(
status
,
data
);
},
error
:
function
(
rew
,
status
,
err
)
{
console
.
log
(
status
,
err
);
}
});
return
false
;
});
console
.
log
(
'AAA ddd '
,
dataOrders
);
})();
return
false
;
});
});
});
\ No newline at end of file
src/src/App/Action/User/Cabinet.php
View file @
cfc4c808
...
@@ -351,6 +351,34 @@ class Cabinet extends Common
...
@@ -351,6 +351,34 @@ class Cabinet extends Common
$report_type
=
$request
->
getAttribute
(
'report'
);
$report_type
=
$request
->
getAttribute
(
'report'
);
$data_request
=
$request
->
getParsedBody
();
$data_request
=
$request
->
getParsedBody
();
if
(
$data_request
[
'toggle_confirmed'
])
{
return
new
JsonResponse
(
$data_request
);
/*
$site->setEnabled($data['is_enabled']);
$result = $siteModel->save($site);
if(!$result) {
throw new \Exception('DB error');
}
$response = new JsonResponse(array(
'result' => true,
));
return $response;
*/
}
if
(
$data_request
[
'approved'
])
{
return
new
JsonResponse
(
$data_request
);
}
$dates
=
$data_request
[
'period'
];
$dates
=
$data_request
[
'period'
];
$report_conf
=
$this
->
container
->
get
(
'config'
)[
'feed_conf'
][
'reports'
][
$report_type
];
$report_conf
=
$this
->
container
->
get
(
'config'
)[
'feed_conf'
][
'reports'
][
$report_type
];
...
...
src/templates/app/user/cabinet-feed.phtml
View file @
cfc4c808
...
@@ -177,7 +177,7 @@ if (!$error) {
...
@@ -177,7 +177,7 @@ if (!$error) {
<?php
/* Таблица */
?>
<?php
/* Таблица */
?>
<div
id=
"table-stat"
class=
"b-table_wrapp report"
>
<div
id=
"table-stat"
class=
"b-table_wrapp report"
>
<div
class=
"b-content__loading"
></div>
<div
class=
"b-content__loading"
></div>
<table
id=
"table-line"
class=
"table table-striped admin
<?=
$current_report
?>
"
>
<table
id=
"table-line"
class=
"table table-striped admin
<?=
$current_report
?>
"
data-link=
"
<?=
$data_request_link
?>
"
>
<thead
class=
"metric sortable"
>
<thead
class=
"metric sortable"
>
<tr>
<tr>
<th
class=
"period"
data-id=
"period"
>
<th
class=
"period"
data-id=
"period"
>
...
...
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