tb

.env-example

@@ -75,8 +75,8 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 LMS_API_URL="http://lmsapi.primaya.id"
 
-DUITKU_MERCHANT_KEY=c61af0a92d8e9b7fff00deecc975d84d
-DUITKU_MERCHANT_CODE=D11810
+DUITKU_MERCHANT_KEY=
+DUITKU_MERCHANT_CODE=
 DUITKU_IS_SANDBOX=TRUE
 
 WKHTML_PDF_BINARY=/var/www/aso/vendor/h4cc/wkhtmltopdf-amd64/bin/wkhtmltopdf-amd64

Modules/Internal/Http/Controllers/Api/Linksehat/PaymentController.php

@@ -20,7 +20,7 @@ class PaymentController extends Controller
     {
         // return $request->toArray();
         $appointments = Appointment::query()
-            ->where('sPaymentStatus', '!=' ,'cod')
+            ->where('sPaymentStatus', 'settlement')
             ->with(['healthCare', 'healthCare.commission', 'detail', 'user', 'doctor', 'doctor.user']);
 
         if ($request->has('search')) {

app/Models/OLDLMS/Appointment.php

@@ -172,4 +172,8 @@ class Appointment extends Model
     {
         return $this->belongsTo(Healthcare::class, 'nIDHealthCare', 'nID');
     }
+
+    public function consulPrice(){
+        return $this->hasOne(JadwalDokter::class, 'nIDDokter', 'nIDDokter');
+    }
 }

frontend/dashboard/src/pages/Report/LinksehatPayments/List.tsx

@@ -343,7 +343,7 @@ export default function List() {
           </TableCell>
           <TableCell align="left">{row.health_care?.sHealthCare ?? '-'}</TableCell>
           <TableCell align="left">{row.detail?.sPaymentDetails?.settlement_time ?? row.detail?.sPaymentDetails?.transaction_time}</TableCell>
-          <TableCell align="left">{row.detail?.dTanggalAppointment ? row.detail?.dTanggalAppointment :  row.detail?.dCreateOn }</TableCell>
+          <TableCell align="left">{row.detail?.dTanggalAppointment == '0000-00-00' ? fDateOnly(row.detail?.dCreateOn) : row.detail?.dTanggalAppointment }</TableCell>
           <TableCell align="left">{row.nID}</TableCell>
           <TableCell align="left">{row.sBookingCode ?? ''}</TableCell>
           <TableCell align="left">{row.doctor?.user?.full_name ?? '-'}</TableCell>

public/dashboard/index.html

@@ -24,15 +24,7 @@
     content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
   <meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
   <meta name="author" content="Minimal UI Kit" />
-<<<<<<< HEAD
-  <script type="module" crossorigin src="/assets/index.551c8d6d.js"></script>
-=======
-<<<<<<< HEAD
-  <script type="module" crossorigin src="/assets/index.9b396686.js"></script>
-=======
-  <script type="module" crossorigin src="/assets/index.da589e84.js"></script>
->>>>>>> a54708abb5d46d7d7319730306a528d33d910895
->>>>>>> origin/staging
+  <script type="module" crossorigin src="/assets/index.2e8356fc.js"></script>
   <link rel="stylesheet" href="/assets/index.c91e36b5.css">
 <link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>