소스 검색

Merge tag 'hotfix_1366' into develop

hotfix_1366
feature/souke
Guillaume Bourgeois 1 년 전
부모
커밋
85829683d0
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. +3
    -3
      backend/controllers/DistributionController.php
  2. +4
    -4
      backend/controllers/OrderController.php

+ 3
- 3
backend/controllers/DistributionController.php 파일 보기

@@ -657,7 +657,7 @@ class DistributionController extends BackendController
public function actionAjaxProcessProductQuantityMax($idDistribution, $idProduct, $quantityMax)
{
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
$productDistributionModule = $this->getProductDistributionManager();
$productDistributionModule = $this->getProductDistributionModule();
$productDistribution = $this->getProductDistribution($idProduct, $idDistribution);
$productDistributionModule->updateProductDistributionQuantityMax($productDistribution, (float) $quantityMax);
return ['success'];
@@ -666,7 +666,7 @@ class DistributionController extends BackendController
public function actionAjaxProcessActiveProduct(int $idDistribution, int $idProduct, int $active)
{
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
$productDistributionModule = $this->getProductDistributionManager();
$productDistributionModule = $this->getProductDistributionModule();
$productDistribution = $this->getProductDistribution($idProduct, $idDistribution);
$productDistributionModule->updateProductDistributionActive($productDistribution, $active);
return ['success'];
@@ -694,7 +694,7 @@ class DistributionController extends BackendController
{
$distributionModule = $this-> getDistributionModule();
$productModule = $this->getProductModule();
$productDistributionModule = $this->getProductDistributionManager();
$productDistributionModule = $this->getProductDistributionModule();

return $productDistributionModule->findOneProductDistribution(
$distributionModule->findOneDistributionById($idDistribution),

+ 4
- 4
backend/controllers/OrderController.php 파일 보기

@@ -174,7 +174,7 @@ class OrderController extends BackendController
$productModule = $this->getProductModule();
$pointSaleModule = $this->getPointSaleModule();
$orderModule = $this->getOrderModule();
$productDistributionModule = $this->getProductDistributionManager();
$productDistributionModule = $this->getProductDistributionModule();

if (!Product::searchCount() || !PointSale::searchCount()) {
$this->redirect(['dashboard/index', 'error_products_points_sale' => 1]);
@@ -421,7 +421,7 @@ class OrderController extends BackendController
$distributionModule = $this-> getDistributionModule();
$pointSaleModule = $this->getPointSaleModule();
$productModule = $this->getProductModule();
$productDistributionModule = $this->getProductDistributionManager();
$productDistributionModule = $this->getProductDistributionModule();

$distribution = $distributionModule->findOneDistribution($date);
$selectedProductsArray = $productDistributionModule->findProductDistributionsByDistribution($distribution);
@@ -544,7 +544,7 @@ class OrderController extends BackendController
{
$orderModule = $this->getOrderModule();
$distributionModule = $this-> getDistributionModule();
$productDistributionModule = $this->getProductDistributionManager();
$productDistributionModule = $this->getProductDistributionModule();

$data = [];
$filename = 'summary_' . $date;
@@ -605,7 +605,7 @@ class OrderController extends BackendController
public function contentPointSaleCSV($date, $products, $pointsSale, $idPointSale)
{
$distributionModule = $this-> getDistributionModule();
$productDistributionModule = $this->getProductDistributionManager();
$productDistributionModule = $this->getProductDistributionModule();

$data = [];
$distribution = $distributionModule->findOneDistribution($date);

Loading…
취소
저장