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
40998bcd
Commit
40998bcd
authored
May 23, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Обработка контрола утверждения сайтов, сбор данных по заказам
parent
c8053b3d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
59 additions
and
4 deletions
+59
-4
styles-feeds-stat.css
src/public/css/styles-feeds-stat.css
+13
-0
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+7
-4
script-feeds-stat.js
src/public/js/script-feeds-stat.js
+32
-0
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+7
-0
No files found.
src/public/css/styles-feeds-stat.css
View file @
40998bcd
...
...
@@ -494,4 +494,16 @@ input[type="checkbox"]
padding-top
:
200px
;
text-align
:
center
;
}
.b-orders_controls
{
margin-bottom
:
10px
;
}
.b-orders_controls
a
.btn.btn-primary.approve
{
border-color
:
#009444
;
background-color
:
#009444
;
}
\ No newline at end of file
src/public/js/script-feeds-stat-table.js
View file @
40998bcd
...
...
@@ -35,8 +35,8 @@ $(document).ready(function(){
// Шаблон ячейки OrderID
var
templateOrderIDContent
=
_
.
template
(
'
\
n'
+
' <span class="order-id">
\
n'
+
' <input type="checkbox" name="order-id"
id="<%=data.orderId %>" data-feed-id="<%=data.feedId %>"
<%=data.confirmed %> <%=data.approved %>>
\
n'
+
' <span class="order-id"
data-order-id="<%=data.orderId %>" data-feed-id="<%=data.feedId %>"
>
\
n'
+
' <input type="checkbox" name="order-id" <%=data.confirmed %> <%=data.approved %>>
\
n'
+
' <a class="orderid-link" href="orderid/<%=data.feedId %>/<%=data.orderId %>" target="_blank"><%=data.orderId %></a>
\
n'
+
' </span>
\
n'
+
''
);
...
...
@@ -145,16 +145,18 @@ $(document).ready(function(){
// Отрисовка таблицы:
dataTableForSort
.
forEach
(
function
(
item
){
$row
=
$
(
'<tr>'
);
if
(
dataLineChartStat
.
report
==
'transactions'
)
{
$row
=
$
(
'<tr class="transaction-item">'
);
var
feedId
=
item
[
'ViewID'
][
0
],
orderId
=
item
[
'period'
],
orderStatus
=
dataLineChartStat
.
ordersStatus
[
feedId
][
orderId
];
$row
.
append
(
$
(
'<td>'
).
append
(
templateOrderIDContent
({
$row
.
append
(
$
(
'<td
class="OrderID"
>'
).
append
(
templateOrderIDContent
({
data
:
{
feedId
:
item
[
'ViewID'
][
0
],
orderId
:
item
[
'period'
],
...
...
@@ -163,6 +165,7 @@ $(document).ready(function(){
}
})));
}
else
{
$row
=
$
(
'<tr>'
);
$row
.
append
(
$
(
'<td>'
).
html
(
item
[
'period'
]));
}
...
...
src/public/js/script-feeds-stat.js
View file @
40998bcd
...
...
@@ -274,4 +274,35 @@ $(document).ready(function(){
}
// Клик на Утвердить заказы:
$
(
'a.btn.approve'
).
on
(
'click'
,
function
(){
var
$tableStat
=
$
(
'table.transactions'
),
$ordersItems
=
$
(
'tbody > tr.transaction-item:not(.total-orders) td.OrderID span.order-id'
,
$tableStat
),
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 ddd '
,
dataOrders
);
return
false
;
});
});
\ No newline at end of file
src/templates/app/user/cabinet-feed.phtml
View file @
40998bcd
...
...
@@ -208,6 +208,13 @@ if (!$error) {
<tbody>
</tbody>
</table>
<?php
if
(
$current_report
==
'transactions'
)
:
?>
<div
class=
"b-orders_controls"
>
<a
class=
"btn btn-primary approve"
href=
"
<?=
$system_link
?>
"
>
Утвердить заказы
</a>
</div>
<?php
endif
;
?>
</div>
</div>
...
...
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