user auto disable word listening

improve card creation
mobileapi - add ticket usage count
This commit is contained in:
Schneider Roland 2023-07-04 17:42:26 +02:00
parent 5016d8802c
commit 01fc54f7b5
3 changed files with 115 additions and 99 deletions

View File

@ -98,6 +98,13 @@ class CustomerController extends Controller
return $this->redirect([ 'ticket/create', 'number' => $model->card->number ]); return $this->redirect([ 'ticket/create', 'number' => $model->card->number ]);
} }
if ( isset($model->card) ){
$user = User::findOne( [ 'id' => Yii::$app->user->id ] );
$user->key_listener_enabled = 0;
$user->save();
}
return $this->render('reception',['model' => $model]); return $this->render('reception',['model' => $model]);
} }

View File

@ -38,113 +38,118 @@ class ProductController extends Controller {
protected $card; protected $card;
protected $customer; protected $customer;
public function behaviors() { public function behaviors() {
return [ return [
'verbs' => [ 'verbs' => [
'class' => VerbFilter::className (), 'class' => VerbFilter::className (),
'actions' => [ 'actions' => [
'delete' => [ 'delete' => [
'post' 'post'
] ]
] ]
], ],
'access' => [ 'access' => [
'class' => \yii\filters\AccessControl::className (), 'class' => \yii\filters\AccessControl::className (),
'only' => [ 'only' => [
'sale', 'sale',
'payout-customer-cart', 'payout-customer-cart',
'payout-user-cart', 'payout-user-cart',
'lookup', 'lookup',
'find' 'find'
], ],
'rules' => [ 'rules' => [
// allow authenticated users // allow authenticated users
[ [
'allow' => true, 'allow' => true,
'roles' => [ 'roles' => [
'@' '@'
] ]
] ]
] ]
], ],
// everything else is denied // everything else is denied
// named behavior, configuration array // named behavior, configuration array
'defaultAccount' => [ 'defaultAccount' => [
'class' => DefaultAccountBehavior::className () 'class' => DefaultAccountBehavior::className ()
], ],
'cassaIsOpen' => [ 'cassaIsOpen' => [
'class' => CassaOpenBehavior::className () 'class' => CassaOpenBehavior::className ()
] ]
]; ];
} }
public function actionSale($number = null) { public function actionSale($number = null) {
// $this->findByNumber($number); // $this->findByNumber($number);
$receptionForm = new ReceptionForm (); $receptionForm = new ReceptionForm ();
$receptionForm->number = $number; $receptionForm->number = $number;
$receptionForm->readCard (); $receptionForm->readCard ();
$this->card = $receptionForm->card; $this->card = $receptionForm->card;
$this->customer = $receptionForm->customer; $this->customer = $receptionForm->customer;
$model = new ProductSaleForm (); $model = new ProductSaleForm ();
$lookupModel = new ProductLookupForm (); $lookupModel = new ProductLookupForm ();
$currencies = Currency::find ()->all (); $currencies = Currency::find ()->all ();
$accounts = Account::read (); $accounts = Account::read ();
$discounts = Discount::readProductDiscounts(); $discounts = Discount::readProductDiscounts();
$user = User::findOne ( Yii::$app->user->id ); $user = User::findOne ( Yii::$app->user->id );
$model->customer = $this->customer; $model->customer = $this->customer;
$model->card = $this->card; $model->card = $this->card;
$products = Product::readForDefaultAccount (); $products = Product::readForDefaultAccount ();
$products = Product::modelToMapIdName ( $products ); $products = Product::modelToMapIdName ( $products );
$model->products = $products; $model->products = $products;
if (Yii::$app->request->isAjax) { if (Yii::$app->request->isAjax) {
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON; \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
$model->currencies = $currencies; $model->currencies = $currencies;
$model->accounts = $accounts; $model->accounts = $accounts;
$model->discounts = $discounts; $model->discounts = $discounts;
$model->id_account = Account::readDefault (); $model->id_account = Account::readDefault ();
$result = [ ]; $result = [ ];
$result ['code'] = 'unknown'; $result ['code'] = 'unknown';
if ($model->load ( Yii::$app->request->post () )) { if ($model->load ( Yii::$app->request->post () )) {
if ($model->save ()) { if ($model->save ()) {
$result ['code'] = 'success'; $result ['code'] = 'success';
$result ['message'] = Yii::t ( 'common/product', "Sold: {product}", [ $result ['message'] = Yii::t ( 'common/product', "Sold: {product}", [
'product' => $model->transfer->toProductSoldString () 'product' => $model->transfer->toProductSoldString ()
] ); ] );
} else { } else {
$result ['code'] = 'invalid'; $result ['code'] = 'invalid';
$result ['errors'] = $model->getErrors (); $result ['errors'] = $model->getErrors ();
} }
} }
$userTransfers = Transfer::modelsToArray ( Transfer::readUserSoldTransfers ( $user ) ); $userTransfers = Transfer::modelsToArray ( Transfer::readUserSoldTransfers ( $user ) );
$customerCart = Transfer::modelsToArray ( Transfer::readCustomerCart ( $this->customer ) ); $customerCart = Transfer::modelsToArray ( Transfer::readCustomerCart ( $this->customer ) );
$result ['transfers'] = $userTransfers; $result ['transfers'] = $userTransfers;
$result ['customer_cart'] = $customerCart; $result ['customer_cart'] = $customerCart;
return $result; return $result;
} else { } else {
$user = User::findOne( [ 'id' => Yii::$app->user->id ] );
$user->key_listener_enabled = 0;
$user->save();
// $userTransfers = Transfer::readUserSoldTransfers( $user ); // $userTransfers = Transfer::readUserSoldTransfers( $user );
$model->customerCart = Transfer::modelsToArray ( Transfer::readCustomerCart ( $this->customer ) ); $model->customerCart = Transfer::modelsToArray ( Transfer::readCustomerCart ( $this->customer ) );
$userTransfers = Transfer::modelsToArray ( Transfer::readUserSoldTransfers ( $user ) ); $userTransfers = Transfer::modelsToArray ( Transfer::readUserSoldTransfers ( $user ) );
return $this->render ( "sale", [ return $this->render ( "sale", [
'customer' => $this->customer, 'customer' => $this->customer,
'card' => $this->card, 'card' => $this->card,
'model' => $model, 'model' => $model,
@ -153,28 +158,28 @@ class ProductController extends Controller {
'accounts' => $accounts, 'accounts' => $accounts,
'discounts' => $discounts, 'discounts' => $discounts,
'userTransfers' => $userTransfers, 'userTransfers' => $userTransfers,
'receptionForm' => $receptionForm 'receptionForm' => $receptionForm
] ); ] );
} }
} }
public function actionPayoutUserCart() { public function actionPayoutUserCart() {
$model = new UserCartPayoutForm (); $model = new UserCartPayoutForm ();
$user = User::findOne ( Yii::$app->user->id ); $user = User::findOne ( Yii::$app->user->id );
if ($model->load ( Yii::$app->request->post () ) && $model->validate () && isset ( $user ) && count ( $model->transfers ) > 0) { if ($model->load ( Yii::$app->request->post () ) && $model->validate () && isset ( $user ) && count ( $model->transfers ) > 0) {
$connection = \Yii::$app->db; $connection = \Yii::$app->db;
$transaction = $connection->beginTransaction (); $transaction = $connection->beginTransaction ();
try { try {
$tp = new TransferPayout ( [ $tp = new TransferPayout ( [
'idUser' => \Yii::$app->user->id, 'idUser' => \Yii::$app->user->id,
'idTransfers' => $model->transfers, 'idTransfers' => $model->transfers,
'cartType' => 'user', 'cartType' => 'user',
'idAccount' => Account::readDefault () 'idAccount' => Account::readDefault ()
] ); ] );
$tp->payout (); $tp->payout ();
// UserSoldItem::payout ( $user, $model->transfers ); // UserSoldItem::payout ( $user, $model->transfers );
$transaction->commit (); $transaction->commit ();
\Yii::$app->session->setFlash ( 'success', 'Recepicó kosár fizetve' ); \Yii::$app->session->setFlash ( 'success', 'Recepicó kosár fizetve' );
@ -189,37 +194,37 @@ class ProductController extends Controller {
Yii::error ( "faled to save : transfer" ); Yii::error ( "faled to save : transfer" );
\Yii::$app->session->setFlash ( 'warning', 'Nem történt változás' ); \Yii::$app->session->setFlash ( 'warning', 'Nem történt változás' );
} }
return $this->redirect ( Yii::$app->request->referrer ); return $this->redirect ( Yii::$app->request->referrer );
} }
public function actionPayoutCustomerCart($number) { public function actionPayoutCustomerCart($number) {
$cart = [ ]; $cart = [ ];
$code = 'error'; $code = 'error';
$message = 'Hiba történt'; $message = 'Hiba történt';
// post // post
$model = new CustomerCartPayoutForm (); $model = new CustomerCartPayoutForm ();
if ($model->load ( Yii::$app->request->post () ) && $model->validate ()) { if ($model->load ( Yii::$app->request->post () ) && $model->validate ()) {
$this->findByNumber ( $number ); $this->findByNumber ( $number );
if (isset ( $this->customer ) && count ( $model->transfers ) > 0) { if (isset ( $this->customer ) && count ( $model->transfers ) > 0) {
$connection = \Yii::$app->db; $connection = \Yii::$app->db;
$transaction = $connection->beginTransaction (); $transaction = $connection->beginTransaction ();
try { try {
$tp = new TransferPayout ( [ $tp = new TransferPayout ( [
'idUser' => \Yii::$app->user->id, 'idUser' => \Yii::$app->user->id,
'idTransfers' => $model->transfers, 'idTransfers' => $model->transfers,
'cartType' => 'customer', 'cartType' => 'customer',
'idAccount' => Account::readDefault (), 'idAccount' => Account::readDefault (),
'idCustomer' => $this->customer->id_customer 'idCustomer' => $this->customer->id_customer
] ); ] );
$tp->payout (); $tp->payout ();
// UserSoldItem::payout ( $user, $model->transfers ); // UserSoldItem::payout ( $user, $model->transfers );
$transaction->commit (); $transaction->commit ();
\Yii::$app->session->setFlash ( 'success', 'Vendég kosár fizetve : ' . $this->customer->name ); \Yii::$app->session->setFlash ( 'success', 'Vendég kosár fizetve : ' . $this->customer->name );
@ -239,56 +244,56 @@ class ProductController extends Controller {
} }
return $this->redirect ( Yii::$app->request->referrer ); return $this->redirect ( Yii::$app->request->referrer );
} }
/** /**
*/ */
public function actionLookup($query = null) { public function actionLookup($query = null) {
$result = [ ]; $result = [ ];
$product = Product::findProduct ( $query, Account::readDefault () ); $product = Product::findProduct ( $query, Account::readDefault () );
$product = Product::modelToArray ( $product ); $product = Product::modelToArray ( $product );
$result ['product'] = $product; $result ['product'] = $product;
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON; \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return $result; return $result;
} }
/** /**
*/ */
public function actionFind($id = null) { public function actionFind($id = null) {
$result = [ ]; $result = [ ];
$product = Product::findOne ( $id ); $product = Product::findOne ( $id );
$product = Product::modelToArray ( $product ); $product = Product::modelToArray ( $product );
$result ['product'] = $product; $result ['product'] = $product;
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON; \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return $result; return $result;
} }
public function actionInventory() { public function actionInventory() {
$searchModel = new ProductInventorySearch ( [ $searchModel = new ProductInventorySearch ( [
'account' => Account::readDefaultObject () 'account' => Account::readDefaultObject ()
] ); ] );
// $searchModel->search(\Yii::$app->request->params); // $searchModel->search(\Yii::$app->request->params);
$dataProvider = $searchModel->search ( Yii::$app->request->queryParams ); $dataProvider = $searchModel->search ( Yii::$app->request->queryParams );
// $inventory = new ProductInventory([ // $inventory = new ProductInventory([
// ]); // ]);
// if ( $output == 'xls'){ // if ( $output == 'xls'){
// $inventory->pagination = false; // $inventory->pagination = false;
// } // }
// $inventory->createDataProvider(); // $inventory->createDataProvider();
// $dp = $inventory->dataProvider; // $dp = $inventory->dataProvider;
if ($searchModel->output == 'xls') { if ($searchModel->output == 'xls') {
$models = $dataProvider->getModels (); $models = $dataProvider->getModels ();
$objPHPExcel = new \PHPExcel (); $objPHPExcel = new \PHPExcel ();
$sheet = $objPHPExcel->setActiveSheetIndex ( 0 ); $sheet = $objPHPExcel->setActiveSheetIndex ( 0 );
/** /**
* Termék azonosító Termék neve Termék szám Termék vonalkód Termék raktáron Termék eladva * Termék azonosító Termék neve Termék szám Termék vonalkód Termék raktáron Termék eladva
@ -296,29 +301,29 @@ class ProductController extends Controller {
$row = 1; $row = 1;
$sheet->setCellValue ( 'A' . $row, "Termék azonosító" )->setCellValue ( 'B' . $row, "Termék név" )->setCellValue ( 'C' . $row, "Termék szám" )->setCellValue ( 'D' . $row, "Termék vonalkód" )->setCellValue ( 'E' . $row, "Termék raktáron" ); $sheet->setCellValue ( 'A' . $row, "Termék azonosító" )->setCellValue ( 'B' . $row, "Termék név" )->setCellValue ( 'C' . $row, "Termék szám" )->setCellValue ( 'D' . $row, "Termék vonalkód" )->setCellValue ( 'E' . $row, "Termék raktáron" );
// ->setCellValue('F'.$row, "Eladott mennyiség"); // ->setCellValue('F'.$row, "Eladott mennyiség");
foreach ( $models as $model ) { foreach ( $models as $model ) {
$row ++; $row ++;
$sheet->setCellValue ( 'A' . $row, $model ['product_id'] )->setCellValue ( 'B' . $row, $model ['product_name'] )->setCellValue ( 'C' . $row, $model ['product_number'] )->setCellValue ( 'D' . $row, $model ['product_barcode'] )->setCellValue ( 'E' . $row, $model ['product_stock'] ); $sheet->setCellValue ( 'A' . $row, $model ['product_id'] )->setCellValue ( 'B' . $row, $model ['product_name'] )->setCellValue ( 'C' . $row, $model ['product_number'] )->setCellValue ( 'D' . $row, $model ['product_barcode'] )->setCellValue ( 'E' . $row, $model ['product_stock'] );
// ->setCellValue('F'.$row, $model['product_sold']); // ->setCellValue('F'.$row, $model['product_sold']);
} }
$styleArray = array ( $styleArray = array (
'font' => array ( 'font' => array (
'bold' => true 'bold' => true
) )
); );
// 'color' => array('rgb' => 'FF0000'), // 'color' => array('rgb' => 'FF0000'),
// 'size' => 15, // 'size' => 15,
// 'name' => 'Verdana' // 'name' => 'Verdana'
foreach ( range ( 'A', 'E' ) as $columnID ) { foreach ( range ( 'A', 'E' ) as $columnID ) {
$sheet->getColumnDimension ( $columnID )->setAutoSize ( true ); $sheet->getColumnDimension ( $columnID )->setAutoSize ( true );
$sheet->getStyle ( $columnID . '1' )->applyFromArray ( $styleArray ); $sheet->getStyle ( $columnID . '1' )->applyFromArray ( $styleArray );
} }
// Redirect output to a clients web browser (Excel5) // Redirect output to a clients web browser (Excel5)
header ( 'Content-Type: application/vnd.ms-excel' ); header ( 'Content-Type: application/vnd.ms-excel' );
header ( 'Content-Disposition: attachment;filename="leltar.xls"' ); header ( 'Content-Disposition: attachment;filename="leltar.xls"' );
@ -334,18 +339,18 @@ class ProductController extends Controller {
$objWriter->save ( 'php://output' ); $objWriter->save ( 'php://output' );
exit (); exit ();
} }
return $this->render ( 'inventory', [ return $this->render ( 'inventory', [
'searchModel' => $searchModel, 'searchModel' => $searchModel,
'dataProvider' => $dataProvider 'dataProvider' => $dataProvider
] ); ] );
} }
/** /**
* Finds the Product model based on its primary key value. * Finds the Product model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown. * If the model is not found, a 404 HTTP exception will be thrown.
* *
* @param integer $id * @param integer $id
* @return Product the loaded model * @return Product the loaded model
* @throws NotFoundHttpException if the model cannot be found * @throws NotFoundHttpException if the model cannot be found
*/ */
@ -362,8 +367,8 @@ class ProductController extends Controller {
if ($number != null) { if ($number != null) {
$this->card = Card::readCard ( $number ); $this->card = Card::readCard ( $number );
if ($this->card != null) { if ($this->card != null) {
$this->customer = Customer::find ()->innerJoin ( Card::tableName (), "customer.id_customer_card = card.id_card" )->andWhere ( [ $this->customer = Customer::find ()->innerJoin ( Card::tableName (), "customer.id_customer_card = card.id_card" )->andWhere ( [
'customer.id_customer_card' => $this->card->id_card 'customer.id_customer_card' => $this->card->id_card
] )->one (); ] )->one ();
} }
} }
@ -389,7 +394,7 @@ class ProductController extends Controller {
/** /**
* Displays a single Product model. * Displays a single Product model.
* *
* @param integer $id * @param integer $id
* @return mixed * @return mixed
*/ */
/* /*
@ -404,7 +409,7 @@ class ProductController extends Controller {
* Updates an existing Product model. * Updates an existing Product model.
* If update is successful, the browser will be redirected to the 'view' page. * If update is successful, the browser will be redirected to the 'view' page.
* *
* @param integer $id * @param integer $id
* @return mixed * @return mixed
*/ */
/* /*
@ -425,7 +430,7 @@ class ProductController extends Controller {
* Deletes an existing Product model. * Deletes an existing Product model.
* If deletion is successful, the browser will be redirected to the 'index' page. * If deletion is successful, the browser will be redirected to the 'index' page.
* *
* @param integer $id * @param integer $id
* @return mixed * @return mixed
*/ */
/* /*

View File

@ -16,7 +16,7 @@ $(document).ready(
addDocumentKeypressedListener(); addDocumentKeypressedListener();
} }
); );
//10WMVXMZ
function addDocumentKeypressedListener(){ function addDocumentKeypressedListener(){
$( document ).keypress(function( event ) { $( document ).keypress(function( event ) {
@ -43,9 +43,13 @@ function addDocumentKeypressedListener(){
console.info("isWordTypedListenerAllowedOnlyForEmptyCustomer",isWordTypedListenerAllowedOnlyForEmptyCustomer); console.info("isWordTypedListenerAllowedOnlyForEmptyCustomer",isWordTypedListenerAllowedOnlyForEmptyCustomer);
if ( word && word.length > 0){ if ( word && word.length > 0){
var redirectAllowed = userKeyListenerEnabled == 1; var redirectAllowed = userKeyListenerEnabled == 1;
console.info("word typed",data.word)
if ( redirectAllowed){ if ( redirectAllowed){
console.info("redirect allowed");
location.href= reception_card_url +'&number=' + word; location.href= reception_card_url +'&number=' + word;
}else {
console.info("redirect disabled");
} }