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
6cf4c223
Commit
6cf4c223
authored
May 24, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Обработка логики изменения статуса confirmed
parent
12dee862
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
16 deletions
+57
-16
Cabinet.php
src/src/App/Action/User/Cabinet.php
+50
-10
OrdersStatus.php
src/src/App/Model/Feeds/OrdersStatus.php
+7
-6
No files found.
src/src/App/Action/User/Cabinet.php
View file @
6cf4c223
...
@@ -352,25 +352,65 @@ class Cabinet extends Common
...
@@ -352,25 +352,65 @@ 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'
])
{
if
(
$data_request
[
'toggle_confirmed'
])
{
return
new
JsonResponse
(
$data_request
);
/** @var \App\Model\Feeds $ordersStatusModel */
$ordersStatusModel
=
$this
->
container
->
get
(
OrdersStatus
::
class
);
/*
/** @var DelegatingHydrator $hydrator */
$site->setEnabled($data['is_enabled']);
$hydrator
=
$this
->
container
->
get
(
DelegatingHydrator
::
class
);
$result = $siteModel->save($site);
if(!$result) {
$feed_id
=
$data_request
[
'feedId'
];
if
(
in_array
(
$feed_id
,
$feed_id_list
))
{
$order_id
=
$data_request
[
'orderId'
];
$ordersStatus
=
$ordersStatusModel
->
findOne
([
'feed_id'
=>
$feed_id
,
'order_id'
=>
$order_id
]);
if
(
$ordersStatus
)
{
$order_is_approved
=
$ordersStatus
->
getApproved
();
if
(
!
$order_is_approved
)
{
if
(
$data_request
[
'confirmed'
])
{
// Удаляем запись т.к. подтвержденныс считается по-умолчанию:
$res
=
$ordersStatusModel
->
deleteRetargOrderStatus
(
$ordersStatus
);
if
(
!
$res
)
{
throw
new
\Exception
(
'DB error'
);
}
}
else
{
$data
=
array
(
'feed_id'
=>
$feed_id
,
'order_id'
=>
$order_id
,
'confirmed'
=>
$data_request
[
'confirmed'
],
'approved'
=>
0
);
$orderStatus
=
$hydrator
->
hydrate
(
$data
,
new
OrderStatus
());
$res
=
$ordersStatusModel
->
saveRetargOrderStatus
(
$orderStatus
,
'insert'
);
if
(
!
$res
)
{
throw
new
\Exception
(
'DB error'
);
throw
new
\Exception
(
'DB error'
);
}
}
}
}
return
new
JsonResponse
(
$order_id
);
}
else
{
$response = new JsonResponse(array(
$data
=
array
(
'result' => true,
'feed_id'
=>
$feed_id
,
));
'order_id'
=>
$order_id
,
return $response;
'confirmed'
=>
$data_request
[
'confirmed'
],
*/
'approved'
=>
0
);
$orderStatus
=
$hydrator
->
hydrate
(
$data
,
new
OrderStatus
());
$res
=
$ordersStatusModel
->
saveRetargOrderStatus
(
$orderStatus
,
'insert'
);
if
(
!
$res
)
{
throw
new
\Exception
(
'DB error'
);
}
return
new
JsonResponse
(
$order_id
);
}
}
}
}
// Утверждение заказов:
if
(
$data_request
[
'approved'
])
{
if
(
$data_request
[
'approved'
])
{
/** @var \App\Model\Feeds $ordersStatusModel */
/** @var \App\Model\Feeds $ordersStatusModel */
...
...
src/src/App/Model/Feeds/OrdersStatus.php
View file @
6cf4c223
...
@@ -75,19 +75,19 @@ class OrdersStatus extends Common
...
@@ -75,19 +75,19 @@ class OrdersStatus extends Common
}
}
/*
public
function
deleteRetargOrderStatus
(
$entity
)
public function deleteRetargCatFee($entity)
{
{
$result
=
false
;
$result
=
false
;
$cat_id = $entity->getCatid();
$feed_id
=
$entity
->
getFeedId
();
$order_id
=
$entity
->
getOrderId
();
if
(
$entity
)
{
if
(
$entity
)
{
$result = $this->tableGateway->delete(['
CatID' => $cat
_id]);
$result
=
$this
->
tableGateway
->
delete
([
'
feed_id'
=>
$feed_id
,
'order_id'
=>
$order
_id
]);
}
else
{
}
else
{
throw new \Exception("Record not found ID:" . $
cat
_id);
throw
new
\Exception
(
"Record not found ID:"
.
$
feed_id
.
" "
.
$order
_id
);
}
}
return
$result
;
return
$result
;
}
}
*/
}
}
\ No newline at end of file
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