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

app/Helpers/MasterFunctionsHelper.php

@@ -71,6 +71,7 @@ class MasterFunctionsHelper {
       // foreach ($gantt as $key => $value) {
       //   Log::info('gantt '.$value.' index '.$key);
       // }
+      if (isset($gantt['calculation_type'])) {
         if($gantt['calculation_type'] == 'simple') {
           // to do
           return MasterFunctionsHelper::calculateProgressBasedOnSimple($gantt);
@@ -79,6 +80,7 @@ class MasterFunctionsHelper {
         }
       }
 		}
+	}
 
 	public function calculateProgressBasedOnReportMaterial($keyGantt)
 	{

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{