Merge branch 'staging' of https://git.oslog.id/ordo/adw-backend into dev-ibnu

app/Helpers/MasterFunctionsHelper.php

@@ -71,12 +71,14 @@ class MasterFunctionsHelper {
       // foreach ($gantt as $key => $value) {
       //   Log::info('gantt '.$value.' index '.$key);
       // }
-			if($gantt['calculation_type'] == 'simple') {
+      if (isset($gantt['calculation_type'])) {
-				// to do
+        if($gantt['calculation_type'] == 'simple') {
-				return MasterFunctionsHelper::calculateProgressBasedOnSimple($gantt);
+          // to do
-			} else {
+          return MasterFunctionsHelper::calculateProgressBasedOnSimple($gantt);
-				return MasterFunctionsHelper::calculateProgressBasedOnReportMaterial($gantt);
+        } else {
-			}
+          return MasterFunctionsHelper::calculateProgressBasedOnReportMaterial($gantt);
+        }
+      }
 		}
 	}
 

app/Http/Controllers/AssignMaterialController.php

@@ -42,7 +42,7 @@ class AssignMaterialController extends Controller
 		$data['budget'] = $checkStock->price;
 		$data['qty_planning'] = $this->sanitizeDecimal($data['qty_planning']);
 
-		if ($planDate > $startDate) {
+	  if ($planDate >= $startDate) {
 			$result = AssignMaterial::create($data);
 			return response()->json(['status'=>'success','message'=>'Data added!', 'code'=>200], 200);
 		}else{