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
54fa6062
Commit
54fa6062
authored
Jan 31, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Проброс в шаблон Basket-ячейки функции форматирования даты
parent
3e772f8c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
15 deletions
+7
-15
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+7
-15
No files found.
src/public/js/script-feeds-stat-table.js
View file @
54fa6062
...
...
@@ -20,7 +20,7 @@ $(document).ready(function(){
' <tr>
\
n'
+
' <td><a class="basket-link" href="<%=item.URL %>" target="_blank"><%=item.Title %></a></td>
\
n'
+
' <td><span class="quantity"><%=item.Quantity %></span></td>
\
n'
+
' <td><span class="price"><%=
item.Price
%></span></td>
\
n'
+
' <td><span class="price"><%=
formatPrice(item.Price)
%></span></td>
\
n'
+
' </tr>
\
n'
+
' <% }) %>
\
n'
+
' </tbody>
\
n'
+
...
...
@@ -120,13 +120,8 @@ $(document).ready(function(){
activeLines
.
forEach
(
function
(
line
){
if
(
line
==
'Basket'
)
{
var
dataBasket
=
item
[
line
];
//currentActiveLine = 'Price';
currentActiveLine
=
line
;
dataBasket
.
forEach
(
function
(
dataBasketItem
,
ind
){
dataBasket
[
ind
][
'Price'
]
=
valueFormat
(
dataBasketItem
[
'Price'
]);
});
//console.log('AAA dataBasket = ', dataBasket);
$row
.
append
(
$
(
'<td class="'
+
line
+
'">'
).
append
(
templateBasketContent
({
data
:
dataBasket
})));
currentActiveLine
=
'Price'
;
$row
.
append
(
$
(
'<td class="'
+
line
+
'">'
).
append
(
templateBasketContent
({
data
:
dataBasket
,
formatPrice
:
valueFormat
})));
}
else
if
(
line
==
'Timestamp'
)
{
var
dateTimeValue
=
item
[
line
].
split
(
' '
),
...
...
@@ -165,10 +160,7 @@ $(document).ready(function(){
if
(
item
==
'Basket'
)
{
var
dataBasket
=
values
[
item
];
currentActiveLine
=
'Price'
;
dataBasket
.
forEach
(
function
(
dataBasketItem
,
ind
){
dataBasket
[
ind
][
'Price'
]
=
valueFormat
(
dataBasketItem
[
'Price'
]);
});
$row
.
append
(
$
(
'<td class="'
+
item
+
'">'
).
append
(
templateBasketContent
({
data
:
dataBasket
})));
$row
.
append
(
$
(
'<td class="'
+
item
+
'">'
).
append
(
templateBasketContent
({
data
:
dataBasket
,
formatPrice
:
valueFormat
})));
}
else
if
(
item
==
'Timestamp'
)
{
var
dateTimeValue
=
values
[
item
].
split
(
' '
),
...
...
@@ -187,8 +179,8 @@ $(document).ready(function(){
}
}
// Добавляем строку "Итого":
if
(
dataLineChartStat
.
report
!=
'transacti
on'
)
{
// Добавляем строку "Итого"
для отчета 'common'
:
if
(
dataLineChartStat
.
report
==
'comm
on'
)
{
$row
=
$
(
'<tr style="font-weight: bold;">'
);
$row
.
append
(
$
(
'<td>'
).
html
(
"Итого"
));
...
...
@@ -212,7 +204,7 @@ $(document).ready(function(){
}
// Добавляем строку "Всего заказов":
// Добавляем строку "Всего заказов"
для отчета 'transaction'
:
if
(
dataLineChartStat
.
report
==
'transaction'
)
{
$row
=
$
(
'<tr class="total-orders" style="">'
);
...
...
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