From e5e4f69d5d344718a8ec10ea28ca890587db27d5 Mon Sep 17 00:00:00 2001
From: satori <satori302@gmail.com>
Date: Wed, 27 Jul 2022 04:20:40 +0700
Subject: [PATCH] implement decimal

---
 .../.ReportActivityMaterialController.php.swp   | Bin 0 -> 20480 bytes
 .../Controllers/AssignMaterialController.php    |  12 +++++++-----
 .../ReportActivityMaterialController.php        |   9 ++++++++-
 .../Controllers/RequestMaterialController.php   |  10 ++++++++--
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 app/Http/Controllers/.ReportActivityMaterialController.php.swp

diff --git a/app/Http/Controllers/.ReportActivityMaterialController.php.swp b/app/Http/Controllers/.ReportActivityMaterialController.php.swp
new file mode 100644
index 0000000000000000000000000000000000000000..6c4666e885359659e4ceafb411f69fd965acc9c4
GIT binary patch
literal 20480
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
WOS#fI(6-#UJbkXjY`~3J)_(!rbhiKi

literal 0
HcmV?d00001

diff --git a/app/Http/Controllers/AssignMaterialController.php b/app/Http/Controllers/AssignMaterialController.php
index a3a7991..0122c01 100644
--- a/app/Http/Controllers/AssignMaterialController.php
+++ b/app/Http/Controllers/AssignMaterialController.php
@@ -10,6 +10,11 @@ use Datatables;
 
 class AssignMaterialController extends Controller
 {
+	private function sanitizeDecimal($number) {
+		$number = str_replace(".","",$number);
+		$number = str_replace(",",".",$number);
+		return $number;
+	}
 
 	public function add(Request $request){
 		$this->validate($request, [
@@ -20,14 +25,14 @@ class AssignMaterialController extends Controller
 
 		$checkStock = RequestMaterial::where("id", $request->material_id)->first();
 		$currentStock = $checkStock->qty;
-		$price = $checkStock->price;
 		if((int)$currentStock < (int)$request->qty_planning){
 			return response()->json(['status'=>'failed','message'=>'Stock is not enough!','code'=> 500]);
 		}
 
 		$data = $request->all();
 		$data['created_by'] = $this->currentName;
-		$data['budget'] = $price;
+		$data['budget'] = $checkStock->price;
+		$data['qty_planning'] = $this->sanitizeDecimal($data['qty_planning']);
 
 		$result = AssignMaterial::create($data);
 		if(!$result)
@@ -106,9 +111,6 @@ class AssignMaterialController extends Controller
 			->where('assign_material_to_activity.activity_id', $id_activity)
 			->orderBy('plan_date', 'desc')
 			->get();
-		foreach($data as $d){
-			$d->budget = str_replace(".", ",", $d->budget);
-		}
 		return Datatables::of($data)
 			->addIndexColumn()
 			->addColumn('action', function($row){
diff --git a/app/Http/Controllers/ReportActivityMaterialController.php b/app/Http/Controllers/ReportActivityMaterialController.php
index fe726a2..04ae220 100644
--- a/app/Http/Controllers/ReportActivityMaterialController.php
+++ b/app/Http/Controllers/ReportActivityMaterialController.php
@@ -9,7 +9,13 @@ use App\Models\AssignMaterial;
 use Datatables;
 
 class ReportActivityMaterialController extends Controller
-{
+{	
+	private function sanitizeDecimal($number) {
+		$number = str_replace(".","",$number);
+		$number = str_replace(",",".",$number);
+		return $number;
+	}
+	
 
 	public function add(Request $request){
 		$this->validate($request, [
@@ -20,6 +26,7 @@ class ReportActivityMaterialController extends Controller
 		$data = $request->all();
 		$data['created_by'] = $this->currentName;
 		$data['assign_material_id'] = AssignMaterial::where('activity_id', $request->activity_id)->pluck('id')->first();
+		$data['qty'] = $this->sanitizeDecimal($data['qty']);
 
 		if(!ReportActivityMaterial::create($data))
 			return response()->json(['status'=>'failed','message'=>'Input progress report activity failed created','code'=>400]);
diff --git a/app/Http/Controllers/RequestMaterialController.php b/app/Http/Controllers/RequestMaterialController.php
index 2f4ee1a..3ef51db 100644
--- a/app/Http/Controllers/RequestMaterialController.php
+++ b/app/Http/Controllers/RequestMaterialController.php
@@ -8,6 +8,12 @@ use App\Models\MaterialResource;
 
 class RequestMaterialController extends Controller
 {
+	private function sanitizeDecimal($number) {
+		$number = str_replace(".","",$number);
+		$number = str_replace(",",".",$number);
+		return $number;
+	}
+
 	public function add(Request $request){
 		$this->validate($request, [
 			'proyek_id' => 'required',
@@ -19,8 +25,8 @@ class RequestMaterialController extends Controller
 		]);
 
 		$data = $request->all();
-		$data['price'] = str_replace(",", ".", $data['price']);
-		$data['qty'] = str_replace(",", ".", $data['qty']);
+		$data['price'] = $this->sanitizeDecimal($data['price']);
+		$data['qty'] = $this->sanitizeDecimal($data['qty']);
 		$data['status'] = "fom";
 		$data['created_by'] = $this->currentName;