Merge branch 'feature/fin' into develop

This commit is contained in:
2025-10-30 18:12:34 +08:00
+2
View File
@@ -114,6 +114,7 @@ class FinReceiptService
$data['arrived_at'] = strtotime( $data['arrived_at']); $data['arrived_at'] = strtotime( $data['arrived_at']);
$data['created_by'] = $request->user->uid; $data['created_by'] = $request->user->uid;
$data['updated_by'] = $request->user->uid; $data['updated_by'] = $request->user->uid;
$data['fx_receipt_file'] = json_encode($data['fx_receipt_file']);
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' ) if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' )
$data['fx_receipt_file'] = ''; $data['fx_receipt_file'] = '';
return $data; return $data;
@@ -135,6 +136,7 @@ class FinReceiptService
if(isset($data['received_at'])) if(isset($data['received_at']))
$data['received_at'] = strtotime($data['received_at']); $data['received_at'] = strtotime($data['received_at']);
$data['fx_receipt_file'] = json_encode($data['fx_receipt_file']);
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' ) if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' )
$data['fx_receipt_file'] = ''; $data['fx_receipt_file'] = '';
return $data; return $data;