Merge branch 'master' into fabio_develop

app/Http/Livewire/Member.php

@@ -548,7 +548,7 @@ class Member extends Component
 
         $this->categories = array();
 
-        $this->getCategories(\App\Models\Category::select('id', 'name')->where('parent_id', null)->get(), 0);
+        $this->getCategories(\App\Models\Category::select('id', 'name')->where('parent_id', null)->orderBy('name')->get(), 0);
 
 
 
@@ -1746,7 +1746,14 @@ class Member extends Component
                 $mms = [];
                 $mms[] = date("n", strtotime($start));
                 for ($jj = 1; $jj < $r->months; $jj++) {
-                    $mms[] = date('n', strtotime("+" . $jj . " months", strtotime($start)));
+                    if (date('Ymd', strtotime("+" . $jj . " months", strtotime($start))) < date("Ymd", strtotime($this->course_date_to)))
+                    {
+                        $mms[] = date('n', strtotime("+" . $jj . " months", strtotime($start)));
+                    }
+                    else
+                    {
+                        break;
+                    }
                 }
 
                 $rate = new \App\Models\Rate();

app/Http/Livewire/RecordINOUT.php

@@ -432,8 +432,12 @@ class RecordINOUT extends Component
         $records_in = [];
         $records_out = [];
         $datas = [];
-        if (env('FISCAL_YEAR_MONTH_FROM', 1) > 1) {
-            for ($m = env('FISCAL_YEAR_MONTH_FROM', 1); $m <= 12; $m++) {
+        if (env('FISCAL_YEAR_MONTH_FROM', 1) > 1)
+        {
+            if (date("m") < env('FISCAL_YEAR_MONTH_FROM', 1))
+                $year -= 1;
+            for($m=env('FISCAL_YEAR_MONTH_FROM', 1);$m<=12;$m++)
+            {
                 $datas[] = $m . "-" . $year;
             }
             for ($m = 1; $m <= env('FISCAL_YEAR_MONTH_TO', 12); $m++) {

routes/web.php

@@ -1433,15 +1433,20 @@ Route::get('/get_course_members', function () {
         }
 
         $status = 0;
-        $rates = \App\Models\Rate::where('member_course_id', $r->id)->orderBy('date')->get();
+        $payed = 0;
+        $rates = \App\Models\Rate::where('member_course_id', $r->id)->where('date', '<', date("Y-m-d"))->get();
         foreach($rates as $rate)
         {
             if ($rate->date > date("Y-m-d"))
             {
                 break;
-            }
+            }            
             $status = $rate->status;
+            if ($rate->status == 1)
+                $payed += 1;
         }
+        if ($status == 1 && $payed != sizeof($rates))
+            $status = 0;
 
         $ret[] = array(
             "column_0" => $idx + 1,