浏览代码

Merge branch 'develop'

master
Guillaume 2 年前
父节点
当前提交
5951e391ed
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. +1
    -1
      Controller/ControllerTrait.php
  2. +1
    -3
      Transformer/Order/OrderShopTransformer.php

+ 1
- 1
Controller/ControllerTrait.php 查看文件

@@ -94,7 +94,7 @@ trait ControllerTrait
return $this->get(Security::class)->getUser();
}

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

+ 1
- 3
Transformer/Order/OrderShopTransformer.php 查看文件

@@ -3,10 +3,7 @@
namespace Lc\CaracoleBundle\Transformer\Order;

use App\Entity\Order\OrderShop;
use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
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\Solver\Order\OrderShopSolver;
use Lc\CaracoleBundle\Solver\Price\PriceSolver;
@@ -59,6 +56,7 @@ class OrderShopTransformer
$data['total'] = $this->priceSolver->getTotal($orderShop);
$data['totalWithTax'] = $this->priceSolver->getTotalWithTax($orderShop);
$data['totalWithTaxAndReduction'] = $this->priceSolver->getTotalWithTax($orderShop);

$i = 0;

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

正在加载...
取消
保存