From 465000f32626b8d7e240ba7c6ecda1025cf8ccb8 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 7 Sep 2023 11:43:06 +0700 Subject: [PATCH] update approval cardboard detail --- Http/Controllers/ApprovalController.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Http/Controllers/ApprovalController.php b/Http/Controllers/ApprovalController.php index 643052f..72ba6b7 100644 --- a/Http/Controllers/ApprovalController.php +++ b/Http/Controllers/ApprovalController.php @@ -107,18 +107,18 @@ $model = "Modules\\Cetaklabel\\Entities\\$approval->menu"; $model = new $model(); - + //20555012,18 if ($approval->status == 1) { if ($approval->method == 'create') { if ($approval->menu == 'CardboardDetail') { $data = json_decode($approval->new_request, true); - $_data['status'] = 1; - $_data['approved_by'] = $this->user->id; - $_data['approved_at'] = date('Y-m-d H:i:s'); - $_data['cardborad_id'] = $data['cardboard_id']; foreach ($data['document_id'] as $key => $value) { - $_data['document_id'] = $value; + $_data['status'] = 1; + $_data['approved_by'] = $this->user->id; + $_data['approved_at'] = date('Y-m-d H:i:s'); + $_data['cardborad_id'] = $data['cardboard_id']; + $_data['document_id'] = $value; $model->fill($_data); $model->save(); @@ -171,8 +171,9 @@ $approval->save(); $approval->delete(); - echo json_encode(['status' => 'success', - 'message' => 'Approval ' . $approval->description . ' successfully.' + echo json_encode([ + 'status' => 'success', + 'message' => 'Approval ' . $approval->description . ' successfully.' ]); } catch (Exception $e) { echo json_encode(['status' => 'error', 'message' => 'Approval ' . $approval->description . ' failed.']);