From 2828a6f236049f2c1a08098b99b6a5353f0b4cca Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Wed, 7 Sep 2016 21:31:17 +0200
Subject: [PATCH] Fix Detsta Import -> Transfer type cash , when unsuccessful

---
 backend/models/InventoryItemForm.php          |  5 +++-
 backend/views/inventory-item/index.php        | 24 +++++++++++++++----
 common/components/DetStatTetelProcessor.php   |  7 +++---
 .../InventoryConsoleController.php            |  3 ++-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/backend/models/InventoryItemForm.php b/backend/models/InventoryItemForm.php
index afb3991..e0a9c25 100644
--- a/backend/models/InventoryItemForm.php
+++ b/backend/models/InventoryItemForm.php
@@ -151,7 +151,10 @@ class InventoryItemForm extends Model{
 		if ( isset($this->last_inventory_item ) ){
 			$query->andWhere([ '>', 'procurement.created_at' ,$this->last_inventory_item->created_at]);
 		}
-		
+
+		//$query->andWhere([ '>', 'procurement.created_at' ,$this->inventory->created_at]);
+
+
 		if ( $this->type == 'product') {
 			$query->andWhere(['product.id_product' => $this->product->id_product]);
 		}else{
diff --git a/backend/views/inventory-item/index.php b/backend/views/inventory-item/index.php
index cf24c49..6139d9a 100644
--- a/backend/views/inventory-item/index.php
+++ b/backend/views/inventory-item/index.php
@@ -39,6 +39,19 @@ $this->registerJs('inventoryItemIndex.init( ' . json_encode($options) . ' );');
         text-align: right;
     }
 
+    .col-b{
+        /*background-color: #00a157;*/
+    }
+
+    .table-striped > tbody > tr:nth-of-type(even) td.col-b {
+        background-color: #DFE3E8;
+        /*background-color: #D3D7DC;*/
+    }
+    .table-striped > tbody > tr:nth-of-type(odd) td.col-b {
+        /*background-color: #E0E0E0;*/
+        background-color: #ECECEC;
+    }
+
 </style>
 <div class="inventory-item-index">
     <h1><?= Html::encode($this->title) ?></h1>
@@ -101,7 +114,8 @@ $this->registerJs('inventoryItemIndex.init( ' . json_encode($options) . ' );');
         ],
         [
             'attribute' => 'inventory_prev_name',
-            'label' => 'Utolsó leltár'
+            'label' => 'Utolsó leltár',
+            'contentOptions' => ['class' => 'col-b']
         ],
         [
             'attribute' => 'item_count_system',
@@ -112,7 +126,7 @@ $this->registerJs('inventoryItemIndex.init( ' . json_encode($options) . ' );');
         [
             'attribute' => 'item_count',
             'label' => 'Leltározott mennyiség (db)',
-            'contentOptions' => ['class' => 'numeric']
+            'contentOptions' => ['class' => 'numeric col-b']
 
         ],
         [
@@ -124,7 +138,7 @@ $this->registerJs('inventoryItemIndex.init( ' . json_encode($options) . ' );');
         [
             'attribute' => 'item_count_in',
             'label' => 'Beszerzett mennyiség (db)',
-            'contentOptions' => ['class' => 'numeric']
+            'contentOptions' => ['class' => 'numeric col-b'  ]
 
         ],
         [
@@ -136,7 +150,7 @@ $this->registerJs('inventoryItemIndex.init( ' . json_encode($options) . ' );');
         [
             'attribute' => 'item_difference',
             'label' => 'Különbség (db)',
-            'contentOptions' => ['class' => 'numeric']
+            'contentOptions' => ['class' => 'numeric col-b']
 
         ],
         [
@@ -147,7 +161,7 @@ $this->registerJs('inventoryItemIndex.init( ' . json_encode($options) . ' );');
         [
             'attribute' => 'item_total_price_brutto',
             'label' => 'Összeg (Ft)',
-            'contentOptions' => ['class' => 'numeric']
+            'contentOptions' => ['class' => 'numeric col-b']
         ],
 
 
diff --git a/common/components/DetStatTetelProcessor.php b/common/components/DetStatTetelProcessor.php
index 081a1ed..4c5e3fa 100644
--- a/common/components/DetStatTetelProcessor.php
+++ b/common/components/DetStatTetelProcessor.php
@@ -149,7 +149,8 @@ class DetStatTetelProcessor extends Object {
 					  'discount'=>  $discount,
 					  'contract'=>  $this->contract,
 					  'ticketInstallmentRequest' => $megbizas,
-				      'transferStatus' => Transfer::STATUS_NOT_PAID
+				      'transferStatus' => Transfer::STATUS_NOT_PAID,
+				 	  'paymentMethod' => Transfer::PAYMENT_METHOD_CASH
 			]
 		);
 
@@ -219,7 +220,7 @@ class DetStatTetelProcessor extends Object {
 	 * Szerződés módosítása, ha a detsta üzenetben a  megbízás el lett fogadva
 	 * */
 	protected function updateContractOnSuccess(){
-		\Yii::info('Szerződés frissítése - megbizás elfogadva ' );
+		\Yii::info('Szerződés frissítése - megbízás elfogadva ' );
 		$this->incRequiredParts();
 		$this->contract->part_paid = $this->contract->part_paid +1;
 		$this->updateContractPaidStatus();
@@ -232,7 +233,7 @@ class DetStatTetelProcessor extends Object {
 	}
 	
 	protected function updateContractOnFail(){
-		\Yii::info('Szerződés frissítése - megbizás visszautasítva ' );
+		\Yii::info('Szerződés frissítése - megbízás visszautasítva ' );
 		$this->incRequiredParts();
 		$this->updateContractPaidStatus();
 // 		$this->contract->status = Contract::$STATUS_NOT_PAID;
diff --git a/console/controllers/InventoryConsoleController.php b/console/controllers/InventoryConsoleController.php
index 158e963..9944594 100644
--- a/console/controllers/InventoryConsoleController.php
+++ b/console/controllers/InventoryConsoleController.php
@@ -45,10 +45,11 @@ class InventoryConsoleController  extends Controller{
             $query->innerJoin('product','sale.id_product = product.id_product');
 
             $query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
-            $query->andWhere(['in', 'transfer.type', [Transfer::STATUS_NOT_PAID, Transfer::STATUS_PAID]]);
+            $query->andWhere(['in', 'transfer.status', [Transfer::STATUS_NOT_PAID, Transfer::STATUS_PAID]]);
             $query->andWhere(['product.id_product' => $prev->id_product]);
 
             $query->andWhere([ '>','transfer.created_at',$start ]);
+            $query->andWhere([ '<','transfer.created_at',$end ]);
 
             $products = $query->scalar();