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
155d0f44
Commit
155d0f44
authored
Apr 12, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Вернул округление до 2-х знаков для суммы и комиссии в таблицах
parent
b5f4aeaa
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
styles-feeds-stat.css
src/public/css/styles-feeds-stat.css
+2
-0
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+6
-1
script-feeds-stat.js
src/public/js/script-feeds-stat.js
+0
-3
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+1
-1
No files found.
src/public/css/styles-feeds-stat.css
View file @
155d0f44
...
@@ -293,11 +293,13 @@ input[type="checkbox"]
...
@@ -293,11 +293,13 @@ input[type="checkbox"]
{
{
font-weight
:
bold
;
font-weight
:
bold
;
text-align
:
right
;
text-align
:
right
;
white-space
:
nowrap
;
}
}
.table.table-striped.admin.transactions
td
.AdMoney
.table.table-striped.admin.transactions
td
.AdMoney
{
{
text-align
:
right
;
text-align
:
right
;
white-space
:
nowrap
;
}
}
.table.table-striped.admin.transactions
td
.Pages
.table.table-striped.admin.transactions
td
.Pages
...
...
src/public/js/script-feeds-stat-table.js
View file @
155d0f44
...
@@ -45,7 +45,12 @@ $(document).ready(function(){
...
@@ -45,7 +45,12 @@ $(document).ready(function(){
var
var
isCurrencyValue
=
currencyFields
.
indexOf
(
currentActiveLine
)
>
-
1
,
isCurrencyValue
=
currencyFields
.
indexOf
(
currentActiveLine
)
>
-
1
,
isNonFormatValue
=
notFormatFields
.
indexOf
(
currentActiveLine
)
>
-
1
,
isNonFormatValue
=
notFormatFields
.
indexOf
(
currentActiveLine
)
>
-
1
,
format
=
(
isCurrencyValue
)
?
d3
.
format
(
',.0f'
)
:
d3
.
format
(
',.0f'
);
format
=
(
isCurrencyValue
)
?
d3
.
format
(
',.2f'
)
:
d3
.
format
(
',.0f'
);
/*
if (currentActiveLine == 'AdMoney') {
format = d3.format(',.2f');
}*/
if
(
isNonFormatValue
)
{
if
(
isNonFormatValue
)
{
return
value
;
return
value
;
...
...
src/public/js/script-feeds-stat.js
View file @
155d0f44
$
(
document
).
ready
(
function
(){
$
(
document
).
ready
(
function
(){
(
function
(){
})();
// Выбор дат для Stat http://t1m0n.name/air-datepicker/docs/index-ru.html
// Выбор дат для Stat http://t1m0n.name/air-datepicker/docs/index-ru.html
var
var
...
...
src/templates/app/user/cabinet-feed.phtml
View file @
155d0f44
...
@@ -35,7 +35,7 @@ $this->headScript()
...
@@ -35,7 +35,7 @@ $this->headScript()
->
appendFile
(
'/js/script-feeds-stat-charts.js'
)
->
appendFile
(
'/js/script-feeds-stat-charts.js'
)
->
appendFile
(
'/js/script-feeds-stat-table.js'
)
->
appendFile
(
'/js/script-feeds-stat-table.js'
)
->
appendFile
(
'/js/script-feeds-stat.js'
)
->
appendFile
(
'/js/script-feeds-stat.js'
)
->
appendFile
(
'/js/adm/service-actions.js'
)
//
->appendFile('/js/adm/service-actions.js')
;
;
...
...
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