fix account_state ( collection_money ), display product/ticket on reception only for selected account, add daily transfers (reception/admin)
This commit is contained in:
@@ -84,6 +84,8 @@ class AccountStateController extends Controller
|
||||
*/
|
||||
public function actionClose()
|
||||
{
|
||||
$lastStates = AccountState::readLastForUser(AccountState::TYPE_OPEN );
|
||||
$lastStates = AccountState::modelsToArray($lastStates);
|
||||
$model = new AccountState();
|
||||
$model->type = AccountState::TYPE_CLOSE;
|
||||
$model->id_user = Yii::$app->user->id;
|
||||
@@ -97,6 +99,7 @@ class AccountStateController extends Controller
|
||||
return $this->render('close', [
|
||||
'model' => $model,
|
||||
'accounts' => $accounts,
|
||||
'lastStates' => $lastStates,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ class ProductController extends Controller
|
||||
$model->customer = $this->customer;
|
||||
$model->card = $this->card;
|
||||
|
||||
$products = Product::read();
|
||||
$products = Product::readForDefaultAccount();
|
||||
$products = Product::modelToMapIdName($products);
|
||||
|
||||
$model->products = $products;
|
||||
@@ -199,7 +199,7 @@ class ProductController extends Controller
|
||||
public function actionLookup($query = null)
|
||||
{
|
||||
$result = [];
|
||||
$product = Product::findProduct($query);
|
||||
$product = Product::findProduct($query, Account::readDefault());
|
||||
$product = Product::modelToArray($product);
|
||||
|
||||
$result['product'] = $product;
|
||||
@@ -207,7 +207,6 @@ class ProductController extends Controller
|
||||
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
|
||||
|
||||
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ class TicketController extends FrontendController
|
||||
|
||||
$discounts = Discount::read();
|
||||
|
||||
$ticketTypes = TicketType::read();
|
||||
$ticketTypes = TicketType::read(null, Account::readDefault());
|
||||
|
||||
$accounts = Account::readAccounts();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user