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
8be75d0c
Commit
8be75d0c
authored
May 15, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Включил логику возможности редактирования категорий по флагу у магазина
parent
5c20245b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
7 deletions
+31
-7
Cabinet.php
src/src/App/Action/User/Cabinet.php
+2
-2
Statistics.php
src/src/App/Model/Statistics.php
+24
-2
cabinet-cats.phtml
src/templates/app/user/cabinet-cats.phtml
+5
-3
No files found.
src/src/App/Action/User/Cabinet.php
View file @
8be75d0c
...
...
@@ -279,8 +279,8 @@ class Cabinet extends Common
$reports_list
[
$report_name
]
=
$report_value
[
'title'
];
}
//
$shop_edit_enable = $shop->getEditEnable();
$shop_edit_enable
=
true
;
$shop_edit_enable
=
$shop
->
getEditEnable
();
//
$shop_edit_enable = true;
$data
[
'lang'
]
=
$request
->
getAttribute
(
'layoutInfo'
)
->
getLang
();
$data
[
'feeds_cats'
]
=
$feeds_cats
;
...
...
src/src/App/Model/Statistics.php
View file @
8be75d0c
...
...
@@ -101,6 +101,17 @@ class Statistics
}
//$data_stats['AdMoney'][] = 224 * $data['Orders']; // временно
}
function
AddDataStatsFixedAdMoney
(
&
$data_stats
,
$data
,
$date_type
)
{
foreach
(
$data
as
$cat
=>
$value
)
{
if
(
$cat
==
'AdMoney'
)
{
$data_stats
[
'AdMoney'
][]
=
224
*
$data
[
'Orders'
];
}
else
{
$data_stats
[
$cat
][]
=
$value
;
}
}
}
// Формируем пустые данные для временного промежутка
function
AddDataStatsNull
(
&
$data_stats
,
$cats
)
...
...
@@ -220,7 +231,12 @@ class Statistics
if
((
$item
>=
$stat_from
))
{
$period
[]
=
$day_item
;
if
(
$stats
[
'data'
][
'Day'
][
$day_item
])
{
AddDataStats
(
$dataStats
,
$stats
[
'data'
][
'Day'
][
$day_item
],
$dataStats
[
'type'
]);
//AddDataStats($dataStats, $stats['data']['Day'][$day_item], $dataStats['type']);
if
(
strtotime
(
$day_item
)
<
strtotime
(
'2019-04-01'
))
{
AddDataStatsFixedAdMoney
(
$dataStats
,
$stats
[
'data'
][
'Day'
][
$day_item
],
$dataStats
[
'type'
]);
}
else
{
AddDataStats
(
$dataStats
,
$stats
[
'data'
][
'Day'
][
$day_item
],
$dataStats
[
'type'
]);
}
}
else
{
AddDataStatsNull
(
$dataStats
,
$stat_cats
);
}
...
...
@@ -245,7 +261,13 @@ class Statistics
$dataStats
[
'Timestamp'
][]
=
$item
[
'Timestamp'
];
$dataStats
[
'OrderSum'
][]
=
$item
[
'OrderSum'
];
$dataStats
[
'Basket'
][]
=
$item
[
'Basket'
];
$dataStats
[
'AdMoney'
][]
=
$item
[
'AdMoney'
];
//$dataStats['AdMoney'][] = $item['AdMoney'];
if
(
strtotime
(
$item
[
'Timestamp'
])
<
strtotime
(
'2019-04-01'
))
{
$dataStats
[
'AdMoney'
][]
=
224
;
}
else
{
$dataStats
[
'AdMoney'
][]
=
$item
[
'AdMoney'
];
}
}
}
...
...
src/templates/app/user/cabinet-cats.phtml
View file @
8be75d0c
...
...
@@ -69,9 +69,11 @@ if (!$error) {
</div>
</div>
<div
style=
"float: right; font-size: 12px; color: #697075; font-style: italic;"
>
Значение указывается с точностью 0.1 %
</div>
<?php
if
(
$edit_enable
)
:
?>
<div
style=
"float: right; font-size: 12px; color: #697075; font-style: italic;"
>
Значение указывается с точностью 0.1 %
</div>
<?php
endif
;
?>
<?php
...
...
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