change procurement product selection, keytoggle redirect change
This commit is contained in:
@@ -100,6 +100,9 @@ class ProcurementController extends \backend\controllers\BackendController
|
||||
|
||||
$warehouses = Warehouse::read(null);
|
||||
|
||||
$products = Product::find()->all();
|
||||
$products = Product::modelToMapIdNameLong( $products );
|
||||
|
||||
if ( count($warehouses) <= 0 ){
|
||||
throw new NotFoundHttpException( Yii::t('common/procurement' ,'No active warehouse found.' ));
|
||||
}
|
||||
@@ -112,10 +115,10 @@ class ProcurementController extends \backend\controllers\BackendController
|
||||
|
||||
try {
|
||||
|
||||
$product = Product::findOne( $model->id_product );
|
||||
$product = $model->_product;
|
||||
$model->stock = $product->stock;
|
||||
$result = $model->save(false);
|
||||
|
||||
$model->id_account = $product->id_account;
|
||||
$product->stock = $product->stock + $model->count;
|
||||
$result &= $product->save(false);
|
||||
|
||||
@@ -139,11 +142,17 @@ class ProcurementController extends \backend\controllers\BackendController
|
||||
return $this->redirect(['index' ]);
|
||||
}
|
||||
} else {
|
||||
|
||||
|
||||
|
||||
return $this->render('create', [
|
||||
'model' => $model,
|
||||
'warehouses' =>$warehouses,
|
||||
'accounts' => $accounts
|
||||
'accounts' => $accounts,
|
||||
'products' => $products
|
||||
]);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
/**
|
||||
|
||||
@@ -28,7 +28,7 @@ class ProductController extends \backend\controllers\BackendController
|
||||
'rules' => [
|
||||
// allow authenticated users
|
||||
[
|
||||
'actions' => ['create','index','view','update','statistics'],
|
||||
'actions' => ['create','index','view','update','statistics','find'],
|
||||
'allow' => true,
|
||||
'roles' => ['admin','employee','reception'],
|
||||
],
|
||||
@@ -37,7 +37,19 @@ class ProductController extends \backend\controllers\BackendController
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
public function actionFind($id = null) {
|
||||
$result = [ ];
|
||||
$product = Product::findOne ( $id );
|
||||
$product = Product::modelToArray ( $product );
|
||||
|
||||
$result ['product'] = $product;
|
||||
|
||||
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Lists all Product models.
|
||||
|
||||
Reference in New Issue
Block a user