Expenditures corrections

yii2/modules/finance/components/Money.php

@@ -15,7 +15,8 @@
 class Money
 {    
     public static function toCents($amount) {
-        return intval(round($amount*100));
+        //return intval(round($amount*100));
+        return round($amount*100, 0);
     }
 
     public static function toCurrency($amount, $formatted = false){
@@ -31,7 +32,8 @@ public static function toPercentage($dbPercentage, $formatted = true) {
     }
 
     public static function toDbPercentage($percentage) {   
-        return intval(round(str_replace(',', '.', str_replace('%', '', $percentage))*100));; 
+        //return intval(round(str_replace(',', '.', str_replace('%', '', $percentage))*100));
+        return round(str_replace(',', '.', str_replace('%', '', $percentage))*100, 0);
     }
 
     public static function dbPercentagetoDecimal($percentage){

yii2/modules/finance/controllers/FinanceExpenditureController.php

@@ -43,7 +43,7 @@ public function behaviors()
                                 'actions' => ['delete' => ['POST']]],
                 'access' => [   'class' => AccessControl::className(),
                                 'rules' =>  [
-                                            [   'actions' => ['create', 'delete', 'forwardstate', 'updatestate', 'backwardstate'],
+                                            [   'actions' => ['create', 'update', 'delete', 'forwardstate', 'updatestate', 'backwardstate'],
                                                 'allow' => false,
                                                 'roles' => ['@'],
                                                 'matchCallback' => function ($rule, $action) {                                                    
@@ -206,6 +206,13 @@ public function actionUpdate($id)
             Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "The requested expenditure could not be found."));
             return $this->redirect(['/finance/finance-kaewithdrawal/index']);
         }
+
+        $statescount = FinanceExpenditurestate::find()->where(['exp_id' => $id])->count();        
+        if($statescount > 1){
+            Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "The expenditure could not be updated because is not in initial state."));
+            return $this->redirect(['/finance/finance-expenditure/index']);
+        }
+
         $model = $this->findModel($id);
         //$model->exp_amount = Money::toCurrency($model->exp_amount);
 
@@ -308,7 +315,7 @@ private function saveModels($model, $expendwithdrawals_models, $expenddeduction_
             $model->exp_deleted = 0;
             $model->exp_lock = 0;
 
-            if(!$model->save()) throw new Exception();
+            if(!$model->save()) throw new Exception("Error saving in the database.");
 
             if(!$new_expenditure){
                 $old_expdeductions = FinanceExpenddeduction::find()->where(['exp_id' => $model->exp_id])
@@ -321,15 +328,15 @@ private function saveModels($model, $expendwithdrawals_models, $expenddeduction_
 
                     if(!$delete_it)
                         if(!$old_expdeduction->delete()) 
-                            throw new Exception();                        
+                            throw new Exception("Error deleting previous deduction.");                        
                 }
             }
             else {            
                 $expend_state_model = new FinanceExpenditurestate();
                 $expend_state_model->exp_id = $model->exp_id;
                 $expend_state_model->state_id = 1;
                 $expend_state_model->expstate_date = date("Y-m-d H:i:s");
-                if(!$expend_state_model->save()) throw new Exception();
+                if(!$expend_state_model->save()) throw new Exception("Error in setting the state of the expenditure.");
             }
 
             $tmp_array = array();
@@ -339,7 +346,7 @@ private function saveModels($model, $expendwithdrawals_models, $expenddeduction_
 
                 if(isset($tmp) && $tmp != 0 && $tmp != null){
                     if(!$expenddeduction_models[$i]->save()) 
-                        throw new Exception();
+                        throw new Exception("Error in assigning deductions to the expenditure.");
                 }
             }
 
@@ -352,7 +359,17 @@ private function saveModels($model, $expendwithdrawals_models, $expenddeduction_
                 $transaction->rollBack();
                 return false;
             }
-
+
+
+            if(!$new_expenditure){
+                $old_expendwithdrawals = FinanceExpendwithdrawal::findAll(['exp_id' => $model->exp_id]);
+                foreach ($old_expendwithdrawals as $old_expendwithdrawal){
+                    $old_expendwithdrawal->expwithdr_amount = 0;
+                    if(!$old_expendwithdrawal->save()) throw new Exception("Error in deleting old assignment of the expenditure with withdrawals");
+
+                }
+            }
+
             $partial_amount = $model->exp_amount;
             foreach ($expendwithdrawals_models as $expendwithdrawals_model){
                 $expendwithdrawals_model->exp_id = $model->exp_id;
@@ -366,23 +383,26 @@ private function saveModels($model, $expendwithdrawals_models, $expenddeduction_
                     $partial_amount = 0;
 
                     if(!$expendwithdrawals_model->save())
-                        throw new Exception();
+                        throw new Exception("Error in assigning withdrawals to exceptions.");
                     break;
                 }
 
                 if(!$expendwithdrawals_model->save()) 
                     throw new Exception();
 
             }
-            if($partial_amount > 0) throw new Exception();
+            if($partial_amount > 0) throw new Exception("Amount of the expenditure is to high for the available withdrawals.");
 
             $transaction->commit();
-            Yii::$app->session->addFlash('success', Module::t('modules/finance/app', "The expenditure was created successfully."));
+            if($new_expenditure)
+                Yii::$app->session->addFlash('success', Module::t('modules/finance/app', "The expenditure was created successfully."));
+            else
+                Yii::$app->session->addFlash('success', Module::t('modules/finance/app', "The expenditure was updated successfully."));
             return $this->redirect(['index']);
         }
         catch(Exception $e){
             $transaction->rollBack();
-            Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "Failed to create expenditure."));
+            Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', $e->getMessage()));
             return $this->redirect(['index']);
         }
     }
@@ -399,6 +419,13 @@ public function actionDelete($id)
             Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "The requested expenditure could not be found."));
             return $this->redirect(['/finance/finance-kaewithdrawal/index']);
         }
+
+        $statescount = FinanceExpenditurestate::find()->where(['exp_id' => $id])->count();
+        if($statescount > 1){
+            Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "The expenditure could not be deleted because is not in initial state."));
+            return $this->redirect(['/finance/finance-expenditure/index']);
+        }
+
         $stopedhere = "";
         $expenditure = $this->findModel($id);        
         try{
@@ -448,7 +475,7 @@ public function actionForwardstate($id)
 
         $exp_model = $this->findModel($id);
         $current_state = FinanceExpenditurestate::find()->where(['exp_id' => $exp_model->exp_id, ])->max('state_id');
-        $current_state_name = FinanceState::findOne(['state_id' => $current_state])['state_name']; 
+        $current_state_name = FinanceState::findOne(['state_id' => $current_state+1])['state_name']; 
 
         $state_model = new FinanceExpenditurestate();
         $state_model->exp_id = $exp_model->exp_id;

yii2/modules/finance/controllers/FinanceKaecreditpercentageController.php

@@ -72,7 +72,7 @@ public function actionIndex()
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
         $kaesListModel = FinanceKae::find()->all();
-
+        
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,

yii2/modules/finance/controllers/FinanceKaewithdrawalController.php

@@ -16,6 +16,7 @@
 use yii\base\Exception;
 use app\modules\finance\components\Integrity;
 use app\modules\finance\components\Money;
+use app\modules\finance\models\FinanceExpendwithdrawal;
 
 /**
  * FinanceKaewithdrawalController implements the CRUD actions for FinanceKaewithdrawal model.
@@ -161,7 +162,9 @@ public function actionUpdate($id)
         $kaeWithdrwals = FinanceKaewithdrawal::find()->where(['kaecredit_id' => $model->kaecredit_id])->all();
 
         if ($model->load(Yii::$app->request->post())){ 
-            try{
+            try{                
+                if($model->kaewithdr_amount < FinanceExpendwithdrawal::getExpendituresSum($id))
+                    throw new Exception();
                 $oldModel = $this->findModel($id);
                 $available = ($kaeCredit->kaecredit_amount)*Money::toPercentage($kaeCreditSumPercentage, false);
                 $balance = $available - FinanceKaewithdrawal::getWithdrawsSum($kaeCredit->kaecredit_id);
@@ -175,7 +178,7 @@ public function actionUpdate($id)
                 return $this->redirect(['index', 'id' => $model->kaewithdr_id]);
             }
             catch(Exception $e){
-                Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "Failure in currying out the RCN withdrawal. Please check the declared the validity of the withdraw amount or contact with the administrator."));
+                Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "Failure in carrying out the RCN withdrawal. Please check the validity of the withdraw amount or contact with the administrator."));
                 return $this->redirect(['/finance/finance-kaewithdrawal/index']);
             }
         }
@@ -198,13 +201,19 @@ public function actionUpdate($id)
      */
     public function actionDelete($id)
     {
-        if(!$this->findModel($id)->delete()){
+        try{
+            if(FinanceExpendwithdrawal::getExpendituresSum($id) > 0)
+                throw new Exception();
+            if(!$this->findModel($id)->delete())
+                throw new Exception();
+
+            Yii::$app->session->addFlash('success', Module::t('modules/finance/app', "The RCN Withdraw was deleted successfylly."));
+            return $this->redirect(['index']);
+        }
+        catch(Exception $e){
             Yii::$app->session->addFlash('danger', Module::t('modules/finance/app', "Failure in deleting the RCN withdrawal. Please try again or contact with the administrator."));
             return $this->redirect(['/finance/finance-kaewithdrawal/index']);
-        }
-
-        Yii::$app->session->addFlash('success', Module::t('modules/finance/app', "The RCN Withdraw was deleted successfylly."));
-        return $this->redirect(['index']);
+        }        
     }
 
     /**

yii2/modules/finance/messages/el-GR/modules/finance/app.php

@@ -17,6 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'The expenditure could not be updated because is not in initial state.' => 'Η δαπάνη δεν μπορεί να ενημερωθεί διότι δεν είναι σε αρχική κατάσταση',
+    'The expenditure could not be deleted because is not in initial state.' => 'Η δαπάνη δεν μπορεί να διαγραφεί διότι δεν είναι σε αρχική κατάσταση',
+    'The expenditure\'s state changed successfully.' => 'Η κατάσταση της δαπάνης άλλαξε επιτυχώς',
+    'Backward to previous state' => 'Επαναφορά σε προηγούμενη κατάσταση',
+    'Forward to next state' => 'Προώθηση στην επόμενη κατάσταση',
+    'Failure in deleting the RCN withdrawal. Please try again or contact with the administrator.' => 'Αποτυχία διαγραφή της ανάληψης από τον ΚΑΕ. Παρακαλώ προσπαθήστε ξανά ή επικοινωνήστε με το διαχειριστή.',
     'The invoice was created successfully.' => 'Το τιμολόγιο δημιουργήθηκε επιτυχώς.',
     'The deduction was updated successfully.' => 'Η κράτηση ενημερώθηκε επιτυχώς',
     'The deduction was created successfully.' => 'Η κράτηση δημιουργήθηκε επιτυχώς',
@@ -32,6 +38,7 @@
     'Update Expenditure' => 'Ενημέρωση Δαπάνης',
     'The expenditure was deleted successfully.' => 'Η δαπάνη διαγράφηκε επιτυχώς',
     'Assigned Amount' => 'Συσχετισμένο Ποσό',
+    'The expenditure was updated successfully.' => 'Η δαπάνη ενημερώθηκε επιτυχώς',
     'The expenditure was created successfully.' => 'Η δαπάνη δημιουργήθηκε επιτυχώς',
     'The new supplier was created successfully.' => 'Ο νέος προμηθευτής δημιουργήθηκε επιτυχώς.',
     'Failure in deleting RCN.' => 'Αποτυχία διαγραφής του ΚΑΕ.',
@@ -162,7 +169,7 @@
     'Failure in deleting the RCN withdrawal. Please try again or contact with the administrator' => 'Σφάλμα κατά την πραγματοποίηση της ανάληψης από τον ΚΑΕ. Παρακαλώ προσπαθήστε ξανά ή επικοινωνήστε με το διαχειριστή.',
     'RCN {kae_id} - Quick Info' => 'ΚΑΕ {kae_id} - Πληροφορίες',
     'RCN Withdrawal' => 'Ανάληψη από ΚΑΕ',
-    'Failure in currying out the RCN withdrawal. Please check the declared the validity of the withdraw amount or contact with the administrator.' => 'Σφάλμα κατά την πραγματοποίηση της ανάληψης από τον ΚΑΕ. Παρακαλώ ελέγξτε την εγκυρότητα του δηλωθέντος ποσού ανάληψης ή επικοινωνήστε με το διαχειριστή.',
+    'Failure in carrying out the RCN withdrawal. Please check the validity of the withdraw amount or contact with the administrator.' => 'Σφάλμα κατά την πραγματοποίηση της ανάληψης από τον ΚΑΕ. Παρακαλώ ελέγξτε την εγκυρότητα του δηλωθέντος ποσού ανάληψης ή επικοινωνήστε με το διαχειριστή.',
     'The RCN for which the process was requested cound not be found.' => 'Ο ΚΑΕ για τον οποίο ζητάτε να εφαρμοστεί η ενέργεια που επιλέξατε δεν βρέθηκε.',
     'Withdrawals from RCN Credits' => 'Αναλήψεις από πιστώσεις ΚΑΕ',
     'Withdrawal' => 'Ανάληψη',
@@ -196,7 +203,7 @@
     'The new RCN was created succesfully. The new RCN has been added with 0 credit to the financial years that have already defined credits for the RCNs' => 'Ο νέος ΚΑΕ δημιουργήθηκε επιτυχώς. Στα οικονομικά έτη που έχουν ήδη καθοριστεί πιστώσεις ΚΑΕ, έχει προστεθεί και ο νέος ΚΑΕ με μηδενική πίστωση.',
     'Failed to create new RCN' => 'Αποτυχία δημιουργίας του νέου ΚΑΕ.',
     'The requested page does not exist.' => 'Η σελίδα δεν βρέθηκε',
-    'Information' => 'Πληροφορίες',
+    'More Information' => 'Περισσότερες Πληροφορίες',
     'Reports of expenditures, invoices, credit etc.' => 'Αναφορές δαπανών, τιμολογίων, πιστώσεων κτλ.',
     'Vouchers administration (create new voucher, update details, delete)' => 'Διαχείριση παραστατικών (δημιουργία νέου παραστατικού, ενημέρωση στοιχείων, διαγραφή)',
     'Expenditures administration features (create, update, delete expenditure)' => 'Λειτουργίες διαχείρισης δαπανών (νέα δαπάνη, ενημέρωση στοιχείων δαπάνης, διαγραφή κτλ.)',

yii2/modules/finance/views/default/infopanel.php

@@ -8,14 +8,6 @@
 use app\modules\finance\models\FinanceKaecreditpercentage;
 use app\modules\finance\models\FinanceKaewithdrawal;
 
-function random_color_part() {
-    return str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT);
-}
-
-function random_color() {
-    return random_color_part() . random_color_part() . random_color_part();
-}
-
 if(Integrity::uniqueCurrentYear()):
 
     $credits = FinanceKaecredit::find()->where(['year' => Yii::$app->session["working_year"]])->all();
@@ -37,37 +29,31 @@ function random_color() {
             $index++;
         }
     }
-    $chart_height = 0;
-    if(count($data) <= 3)
-        $chart_height = 180;
-    else
-        $chart_height = count($data)*40;            
+    $chart_height = 60;
+    //if(count($data) <= 3)
+        //$chart_height = 80;
+    //else
+    //    $chart_height = count($data)*40;            
 ?>
     <div class="row">
 
-    	<div class="col-lg-4">&nbsp;</div>
-    	<div class="col-lg-4">&nbsp;</div>
-    	<div class="col-lg-4">
+    	<!-- div class="col-lg-4">&nbsp;</div-->
+    	<!-- div class="col-lg-4">&nbsp;</div-->
+    	<div class="col-lg-12">
         	<div class="panel panel-default">
             	<div class="panel-heading">
-                  	<span>
+                  	<span class="label label-info">
                   		<?= Module::t('modules/finance/app', 'Currently Working Year');?><strong>: <?= Yii::$app->session["working_year"] ?></strong>
-                  	</span>
-                  	&nbsp;&nbsp;&nbsp;
+                  	</span>&nbsp;
+                  	<span class="label label-info"><strong><?= Module::t('modules/finance/app', 'Initial Credit');?>:</strong>&nbsp;<?= Money::toCurrency(FinanceYear::getYearCredit(Yii::$app->session["working_year"]), true);?></span>
                   	<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#demo">
-                  		<?= Module::t('modules/finance/app', 'Information');?>
+                  		<?= Module::t('modules/finance/app', 'More Information');?>
               		</button>
-            	    <div id="demo" class="collapse">
-                    	<hr />
-                        <div class="row">
-                            <div class="col-lg-6"><strong><?= Module::t('modules/finance/app', 'Initial Credit');?>:</strong></div>
-                            <div class="col-lg-6"><?= Money::toCurrency(FinanceYear::getYearCredit(Yii::$app->session["working_year"]), true);?></div>
-						</div>
+            	    <div id="demo" class="collapse">                   	
 						<hr />
 						<div class="row">
 						    <?= ChartJs::widget([
-                                    'type' => 'horizontalBar',
-						            //'barThickness' => 10,
+                                    'type' => 'bar',
 						            'options' => ['height' => $chart_height],
                                     'data' => [
                                         'labels' => $labels,

yii2/modules/finance/views/finance-expenditure/_forwardstateform.php

@@ -24,6 +24,7 @@
 	       label(Module::t('modules/finance/app', 'Description')); ?>
 
     <div class="form-group  text-right">
+    	<?= Html::a(Yii::t('app', 'Return'), ['index'], ['class' => 'btn btn-default']) ?>
         <?= Html::submitButton($state_model->isNewRecord ? Module::t('modules/finance/app', 'Forward Expenditure State') : Module::t('modules/finance/app', 'Update Expenditure State'), ['class' => 'btn btn-primary']) ?>
     </div>