Merge remote-tracking branch 'origin/staging' into origin/production

This commit is contained in:
Linksehat Staging Server
2024-01-10 09:46:37 +07:00
3 changed files with 32 additions and 4 deletions

View File

@@ -25,8 +25,6 @@ class RequestLogShowResource extends JsonResource
*/ */
public function toArray($request) public function toArray($request)
{ {
// $requestLog = parent::toArray($request);
// $corporateId = $requestLog['member']['current_plan']['corporate_id'] ?? 0;
$requestLog = parent::toArray($request); $requestLog = parent::toArray($request);
$corporateId = $requestLog['member']['current_plan']['corporate_id'] ?? 0; $corporateId = $requestLog['member']['current_plan']['corporate_id'] ?? 0;
@@ -110,7 +108,6 @@ class RequestLogShowResource extends JsonResource
'medicine' => $medicineData, 'medicine' => $medicineData,
'files' => $requestLog['files'], 'files' => $requestLog['files'],
'provider' => $providerName, 'provider' => $providerName,
'no_identitas' => $requestLog['member']['nric'], 'no_identitas' => $requestLog['member']['nric'],
'keterangan' => $requestLog['keterangan'], 'keterangan' => $requestLog['keterangan'],
'hak_kamar_pasien' => $requestLog['hak_kamar_pasien'], 'hak_kamar_pasien' => $requestLog['hak_kamar_pasien'],

View File

@@ -34,7 +34,6 @@ class RequestLog extends Model
'hak_kamar_pasien', 'hak_kamar_pasien',
'penempatan_kamar', 'penempatan_kamar',
'catatan', 'catatan',
'no_identitas',
'code', 'code',
'approved_by', 'approved_by',
'approved_at', 'approved_at',

View File

@@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('request_logs', function (Blueprint $table) {
$table->dropColumn('no_identitas');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('request_logs', function (Blueprint $table) {
$table->string('no_identitas');
});
}
};