add csrf , product and account_state changes

csrf - previous settings were not working on dev1
product - allow sale  , if count > stock
prodcut - admin - allow search by name
account_state - auto sum up money from notes

add csrf , product and account_state changes

csrf - previous settings were not working on dev1
product - allow sale  , if count > stock
prodcut - admin - allow search by name
account_state - auto sum up money from notes
This commit is contained in:
Roland Schneider 2015-11-29 15:04:09 +01:00
parent a40cfb90d3
commit 09cd4660b8
7 changed files with 35 additions and 15 deletions

View File

@ -58,7 +58,7 @@ class AdminMenuStructure{
$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ]; $items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ]; $items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ]; $items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
$items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']]; // $items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']];
// $items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ]; // $items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
$this->menuItems[] = ['label' => 'Törszadatok', 'url' =>$this->emptyUrl, $this->menuItems[] = ['label' => 'Törszadatok', 'url' =>$this->emptyUrl,
'items' => $items 'items' => $items

View File

@ -17,7 +17,6 @@ return [
'request' => [ 'request' => [
'csrfParam' => '_backendCSRF', 'csrfParam' => '_backendCSRF',
'csrfCookie' => [ 'csrfCookie' => [
'httpOnly' => true,
'path' => '/backend/web', 'path' => '/backend/web',
], ],
], ],
@ -26,8 +25,7 @@ return [
'enableAutoLogin' => true, 'enableAutoLogin' => true,
'identityCookie' => [ 'identityCookie' => [
'name' => '_backendUser', // unique for backend 'name' => '_backendUser', // unique for backend
'path'=>'/backend/web', // correct path for the backend app. // 'path' => '/backend/web',
'httpOnly' => true,
] ]
], ],
'session' => [ 'session' => [

View File

@ -20,7 +20,7 @@ class ProductSearch extends Product
{ {
return [ return [
[[ 'id_product_category', 'id_account', 'status'], 'integer'], [[ 'id_product_category', 'id_account', 'status'], 'integer'],
[['product_number', 'barcode' ], 'safe'], [['product_number', 'barcode' ,'name'], 'safe'],
]; ];
} }
@ -68,7 +68,8 @@ class ProductSearch extends Product
]); ]);
$query->andFilterWhere(['like', 'product_number', $this->product_number]) $query->andFilterWhere(['like', 'product_number', $this->product_number])
->andFilterWhere(['like', 'barcode', $this->barcode]); ->andFilterWhere(['like', 'barcode', $this->barcode])
->andFilterWhere(['like', 'name', $this->name]);
return $dataProvider; return $dataProvider;
} }

View File

@ -19,11 +19,11 @@ function mkOptions($options){
return $o; return $o;
} }
$statusOptions = mkOptions( Product::statuses() ); $statusOptions = ['' => "Mind"] + ( Product::statuses() );
$productCategories = mkOptions( ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') ); $productCategories = ['' => "Mind"] + ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') ;
$accounts = mkOptions( ArrayHelper::map( Account::read(null) ,'id_account','name')); $accounts = ['' => "Mind"] + ( ArrayHelper::map( Account::read(null) ,'id_account','name'));
?> ?>
<div class="product-search"> <div class="product-search">
@ -44,12 +44,13 @@ $accounts = mkOptions( ArrayHelper::map( Account::read(null) ,'id_account','nam
<?php echo $form->field($model, 'status')->dropDownList($statusOptions) ?> <?php echo $form->field($model, 'status')->dropDownList($statusOptions) ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<?= $form->field($model, 'product_number') ?> <?= $form->field($model, 'name') ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<?= $form->field($model, 'barcode') ?> <?= $form->field($model, 'barcode') ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<?= $form->field($model, 'product_number') ?>
</div> </div>
</div> </div>

View File

@ -3,5 +3,5 @@ return [
'adminEmail' => 'rocho02@gmail.com', 'adminEmail' => 'rocho02@gmail.com',
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.0.5' 'version' => 'v0.0.6'
]; ];

View File

@ -87,7 +87,7 @@ class ProductSaleForm extends Model
[['comment'], 'string' ,'max' => 255], [['comment'], 'string' ,'max' => 255],
[['cart'], 'string' ,'max' => 20], [['cart'], 'string' ,'max' => 20],
[['id_product' ], 'validateProduct'], [['id_product' ], 'validateProduct'],
[['count' ], 'validateCount'], // [['count' ], 'validateCount'],
[['id_currency' ], 'validateCurrency'], [['id_currency' ], 'validateCurrency'],
[['id_account' ], 'validateAccount'], [['id_account' ], 'validateAccount'],
[['id_discount' ], 'validateDiscount'], [['id_discount' ], 'validateDiscount'],

View File

@ -28,7 +28,7 @@ function AccountState(o){
$.extend(app.defaults, o ); $.extend(app.defaults, o );
notes = $(app.defaults.notes); notes = $(app.defaults.notes);
moneyInput = $(app.defaults.selector_money); moneyInput = $(app.defaults.selector_money);
notes.change(run); notes.change(runNote);
moneyInput.change(run); moneyInput.change(run);
if ( app.defaults.open ){ if ( app.defaults.open ){
ddAccount = $(app.defaults.selector_dd_account); ddAccount = $(app.defaults.selector_dd_account);
@ -40,8 +40,17 @@ function AccountState(o){
function run(){ function runNote(){
run("note");
}
function run(what ){
calcTotal(); calcTotal();
if ( what == 'note' ){
setMoneyAsTotal();
}else{
readMoney();
}
calcDiff(); calcDiff();
calcAccount(); calcAccount();
calcLastDiff(); calcLastDiff();
@ -51,6 +60,7 @@ function AccountState(o){
updateLastMoney(); updateLastMoney();
updateLastDiff(); updateLastDiff();
updatePrevState(); updatePrevState();
} }
function calcAccount(){ function calcAccount(){
@ -68,12 +78,21 @@ function AccountState(o){
app.diff = Math.abs(app.last_money - app.money ); app.diff = Math.abs(app.last_money - app.money );
} }
function calcDiff(){
function setMoneyAsTotal(){
app.money = app.total;
}
function readMoney(){
app.money = 0; app.money = 0;
app.money = +moneyInput.val(); app.money = +moneyInput.val();
if ( isNaN(money)){ if ( isNaN(money)){
app.money = 0; app.money = 0;
} }
}
function calcDiff(){
app.diff = Math.abs(app.total - app.money ); app.diff = Math.abs(app.total - app.money );
} }
@ -103,6 +122,7 @@ function AccountState(o){
var money; var money;
money = accounting.formatNumber(app.money, 0, " "); // 9 876 543.210 money = accounting.formatNumber(app.money, 0, " "); // 9 876 543.210
$('.money').html(money); $('.money').html(money);
$('#accountstate-money').val(money);
} }
function updateLastMoney(){ function updateLastMoney(){