Browse Source

Merge branch 'develop'

master
Guillaume 2 years ago
parent
commit
5951e391ed
2 changed files with 2 additions and 4 deletions
  1. +1
    -1
      Controller/ControllerTrait.php
  2. +1
    -3
      Transformer/Order/OrderShopTransformer.php

+ 1
- 1
Controller/ControllerTrait.php View File

return $this->get(Security::class)->getUser(); return $this->get(Security::class)->getUser();
} }


public function getVisitorCurrent(): VisitorInterface
public function getVisitorCurrent(): ?VisitorInterface
{ {
return $this->getVisitorContainer()->getResolver()->getCurrent(); return $this->getVisitorContainer()->getResolver()->getCurrent();
} }

+ 1
- 3
Transformer/Order/OrderShopTransformer.php View File

namespace Lc\CaracoleBundle\Transformer\Order; namespace Lc\CaracoleBundle\Transformer\Order;


use App\Entity\Order\OrderShop; use App\Entity\Order\OrderShop;
use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
use Lc\CaracoleBundle\Model\Order\OrderShopInterface; use Lc\CaracoleBundle\Model\Order\OrderShopInterface;
use Lc\CaracoleBundle\Repository\Order\OrderShopStore;
use Lc\CaracoleBundle\Repository\Reduction\ReductionCreditStore;
use Lc\CaracoleBundle\Resolver\OrderShopResolver; use Lc\CaracoleBundle\Resolver\OrderShopResolver;
use Lc\CaracoleBundle\Solver\Order\OrderShopSolver; use Lc\CaracoleBundle\Solver\Order\OrderShopSolver;
use Lc\CaracoleBundle\Solver\Price\PriceSolver; use Lc\CaracoleBundle\Solver\Price\PriceSolver;
$data['total'] = $this->priceSolver->getTotal($orderShop); $data['total'] = $this->priceSolver->getTotal($orderShop);
$data['totalWithTax'] = $this->priceSolver->getTotalWithTax($orderShop); $data['totalWithTax'] = $this->priceSolver->getTotalWithTax($orderShop);
$data['totalWithTaxAndReduction'] = $this->priceSolver->getTotalWithTax($orderShop); $data['totalWithTaxAndReduction'] = $this->priceSolver->getTotalWithTax($orderShop);

$i = 0; $i = 0;


$orderProductsByParentCategory = $this->orderShopSolver->getOrderProductsByParentCategory($orderShop); $orderProductsByParentCategory = $this->orderShopSolver->getOrderProductsByParentCategory($orderShop);

Loading…
Cancel
Save