+
+ field($model, 'start')->widget(DateTimePicker::classname(), [
+ 'pluginOptions' => [
+ 'autoclose'=>true,
+ 'format' => 'yyyy.mm.dd hh:ii'
+ ]
+ ]) ?>
+
+
+ field($model, 'end') ->widget(DateTimePicker::classname(), [
+ 'pluginOptions' => [
+ 'autoclose'=>true,
+ 'format' => 'yyyy.mm.dd hh:ii'
+ ]
+ ]) ?>
+
+
title) ?>
- render('_search', ['model' => $searchModel]); ?>
+ render('_search', ['model' => $searchModel]); ?>
'btn btn-success']) ?>
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index 497226a..602350e 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -8,6 +8,7 @@ use frontend\assets\ProductSellAsset;
use yii\helpers\Url;
use yii\bootstrap\ActiveForm;
use yii\helpers\ArrayHelper;
+use common\models\Discount;
/* @var $this yii\web\View */
/* @var $form yii\bootstrap\ActiveForm */
@@ -20,6 +21,8 @@ $options = [];
$options['lookup_product_url'] = Url::toRoute(['product/lookup']);
$options['clear_list_url'] = Url::toRoute(['product/clear-list']);
$options['sold_items'] = $userTransfers;
+$options['discounts'] = Discount::modelsToArray($discounts);
+
$this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
diff --git a/frontend/views/transfer/_search.php b/frontend/views/transfer/_search.php
index d910cf8..c4ef840 100644
--- a/frontend/views/transfer/_search.php
+++ b/frontend/views/transfer/_search.php
@@ -15,35 +15,25 @@ use yii\widgets\ActiveForm;
'method' => 'get',
]); ?>
- field($model, 'id_transfer') ?>
-
- field($model, 'id_discount') ?>
-
- field($model, 'id_currency') ?>
-
- field($model, 'id_object') ?>
-
- field($model, 'status') ?>
-
- field($model, 'type') ?>
-
- field($model, 'item_price') ?>
-
- field($model, 'count') ?>
-
- field($model, 'money') ?>
-
- field($model, 'money_currency') ?>
-
- field($model, 'rate') ?>
-
- field($model, 'id_user') ?>
-
- field($model, 'comment') ?>
-
- field($model, 'created_at') ?>
-
- field($model, 'updated_at') ?>
+
+
+
+ field($model, 'start')->widget(DatePicker::classname(), [
+ 'pluginOptions' => [
+ 'autoclose'=>true,
+ 'format' => 'yyyy.mm.dd'
+ ]
+ ]) ?>
+
+
+ field($model, 'end') ->widget(DatePicker::classname(), [
+ 'pluginOptions' => [
+ 'autoclose'=>true,
+ 'format' => 'yyyy.mm.dd'
+ ]
+ ]) ?>
+
+
'btn btn-primary']) ?>
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index 93dd66e..0a719b5 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -19,6 +19,7 @@ function ProductSell(o){
message_paid: 'Tételek fizetve',
/**list of sold items by current user*/
sold_items: [],
+ discounts: [],
};
init();
@@ -34,12 +35,17 @@ function ProductSell(o){
setFocus();
addEnterPressedBehaviours();
addBehaviorCountChangedListener();
+ addBehaviourDisocuntChanged();
createUserSoldItemsTable();
addBehaviourBtnPaid();
productChanged();
addDocumentKeypressedListener();
}
+ function addBehaviourDisocuntChanged(){
+ $("#productsaleform-id_discount").change(refreshCalculatedValues);
+ }
+
function addDocumentKeypressedListener(){
$( document ).keypress(function( event ) {
@@ -235,15 +241,23 @@ function ProductSell(o){
}
function refreshCalculatedValues(){
- var count,price;
+ var count,price,id_discount,discount;
var table;
table = $('.table-product');
count = $("#productsaleform-count").val();
+ id_discount = $("#productsaleform-id_discount").val();
+ app.discount = findDiscount( id_discount );
count = +count;
if ( isNaN(count)){
count = 0;
}
price = count * app.product.sale_price;
+
+
+ discount = calcDiscount(price, app.discount);
+ price = deductDiscount(price,discount);
+ price = normalizePrice(price);
+
table.find('.product-count').html(count);
table.find('.product-price').html(price);
}
@@ -345,13 +359,54 @@ function ProductSell(o){
});
}
-
function createUserSoldItemsTable(){
$('.sold-items-container').transferList({
'transfers' : app.defaults.sold_items
});
}
+ function findDiscount(id_discount){
+ var discount;
+ discount = null;
+ $.each( app.defaults.discounts , function(e,i){
+ if ( e.id_discount == id_discount ){
+ discount = e;
+ }
+
+ });
+ return discount;
+ }
+ function calcDiscount(price,discount){
+ var result, discountMoney;
+ result = 0;
+
+ if ( discount ){
+ result = price * ( discount.value / 100 );
+ }
+
+ return result;
+ }
+
+ function deductDiscount( price , discount ){
+ var result;
+ result = price - discount;
+ return result;
+ }
+
+ function normalizePrice( price ){
+ var result;
+ result = hufRound(price);
+ return result;
+ }
+
+ function hufRound(x)
+ {
+ if (x > 0) {
+ return (x % 5) >= 2.5 ? parseInt(x / 5) * 5 + 5 : parseInt(x / 5) * 5;
+ } else {
+ return ((Math.abs(x) % 5) >= 2.5 ? parseInt(Math.abs(x) / 5) * 5 + 5 : parseInt(Math.abs(x) / 5) * 5)*-1;
+ }
+ }
}