From 9afdf62f5403c1469d82947bdee0ce3c7b0b54b8 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sun, 14 Aug 2022 19:32:07 +0800
Subject: [PATCH] fix bidrecord, off feepayment,

---
 src/components/bid-record/BidRecordList.vue |  7 +++--
 src/components/bid-record/TheBidRecord.vue  |  6 +----
 src/components/cart/CartList.vue            |  6 ++---
 src/components/result/ResultDetail.vue      | 30 +++++++++++++++++----
 src/components/result/ResultMain.vue        |  4 +--
 5 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/components/bid-record/BidRecordList.vue b/src/components/bid-record/BidRecordList.vue
index 1ea9540..f802be7 100644
--- a/src/components/bid-record/BidRecordList.vue
+++ b/src/components/bid-record/BidRecordList.vue
@@ -14,6 +14,7 @@
           <thead>
             <tr>
               <th scope="col">Bil</th>
+              <th scope="col">Cawangan</th>
               <th scope="col">No Rujukan</th>
               <th scope="col">Harga Bida</th>
               <th scope="col">Tarikh/Masa Bidaan</th>
@@ -25,7 +26,8 @@
               v-bind:key="data.id"
             >
               <th scope="row">{{ index + 1 }}</th>
-              <td></td>
+              <td>{{ data.caw_name }}</td>
+              <td>{{ data.norujukan }}</td>
               <td>RM{{ data.hargabida }}</td>
               <td>{{ data.masa_bidaan }}</td>
             </tr>
@@ -55,12 +57,13 @@ export default {
     liveData() {
       this.loading = true;
       axios
-        .get("/bidder/listbiditem", {
+        .get("/bidder/bidrecord", {
           headers: {
             Authorization: "Bearer " + localStorage.getItem("token"),
           },
           params: {
             user_id: this.userId,
+            lelong_id: localStorage.getItem("lelong_id"),
           },
         })
         .then((response) => {
diff --git a/src/components/bid-record/TheBidRecord.vue b/src/components/bid-record/TheBidRecord.vue
index 83f324d..87e411e 100644
--- a/src/components/bid-record/TheBidRecord.vue
+++ b/src/components/bid-record/TheBidRecord.vue
@@ -4,17 +4,13 @@
       <div class="row justify-content-center">
         <div class="col-10">
           <base-card>
-            <h5>REKOD BIDAAN</h5>
             <button
               v-on:click="reloadComponent()"
               class="badge btn-secondary m-2"
             >
               Reload <i class="bi bi-arrow-clockwise"></i>
             </button>
-            <div class="m-2 mt-3">
-              <label for="bid-date">Pilih Tarikh</label>
-              <input type="date" id="bid-date" name="bid-date" />
-            </div>
+            <h5>REKOD BIDAAN HARI INI</h5>
             <bid-record-list v-bind:key="statusComponent"></bid-record-list>
           </base-card>
         </div>
diff --git a/src/components/cart/CartList.vue b/src/components/cart/CartList.vue
index fb22f20..18d7973 100644
--- a/src/components/cart/CartList.vue
+++ b/src/components/cart/CartList.vue
@@ -130,7 +130,7 @@
           <div class="col-3">
             <div
               class="ibox"
-              v-if="feeStatus == 2"
+              v-if="feeStatus == 12"
               style="border: #e7eaec solid 1px"
             >
               <div class="ibox-title" style="padding: 20px">
@@ -181,7 +181,7 @@
             </div>
             <div
               class="ibox"
-              v-if="feeStatus == 1"
+              v-if="feeStatus == 11"
               style="border: #e7eaec solid 1px"
             >
               <!-- <div class="ibox-title" style="padding: 20px">
@@ -253,7 +253,7 @@
                     bidaan.</i
                   >
                 </span> -->
-                <div v-if="feeStatus == 1" class="m-t-sm">
+                <div class="m-t-sm">
                   <div class="btn-group">
                     <button
                       data-bs-toggle="modal"
diff --git a/src/components/result/ResultDetail.vue b/src/components/result/ResultDetail.vue
index c47c6c9..bd223da 100644
--- a/src/components/result/ResultDetail.vue
+++ b/src/components/result/ResultDetail.vue
@@ -70,13 +70,34 @@
                             <td>{{ data.norujukan }}</td>
                             <td>RM {{ data.total_payment }}</td>
                             <td>{{ data.marhun }}</td>
-                            <td class="m-1 badge rounded-pill bg-danger" v-if="data.status_payment === null || data.status_payment == 0">Belum Bayar</td>
-                            <td class="m-1 badge rounded-pill bg-warning" v-if="data.status_payment === 2">Tunggu Pengesahan</td>
-                            <td class="m-1 badge rounded-pill bg-success" v-if="data.status_payment === 1">Selesai</td>
+                            <td
+                              class="m-1 badge rounded-pill bg-danger"
+                              v-if="
+                                data.status_payment === null ||
+                                data.status_payment == 0
+                              "
+                            >
+                              Belum Bayar
+                            </td>
+                            <td
+                              class="m-1 badge rounded-pill bg-warning"
+                              v-if="data.status_payment === 2"
+                            >
+                              Tunggu Pengesahan
+                            </td>
+                            <td
+                              class="m-1 badge rounded-pill bg-success"
+                              v-if="data.status_payment === 1"
+                            >
+                              Selesai
+                            </td>
+                          </tr>
+                          <tr>
+                            <td colspan="5" style="justify-content:end">Muat Turun Penyata <a href="#" class="btn btn-outline-primary"> <i class="bi bi-download"></i></a></td>
                           </tr>
                         </tbody>
                       </table>
-                      <h5 class="mb-5">
+                      <h5 class="mt-4 mb-5">
                         Jumlah Harga Bida: RM{{ list.total_hargabida }}
                       </h5>
                     </div>
@@ -107,7 +128,6 @@ export default {
   },
   methods: {
     liveData() {
-      
       this.loading = true;
       axios
         .get(
diff --git a/src/components/result/ResultMain.vue b/src/components/result/ResultMain.vue
index 288ed5b..f830b83 100644
--- a/src/components/result/ResultMain.vue
+++ b/src/components/result/ResultMain.vue
@@ -13,8 +13,8 @@
       <tbody>
         <tr>
           <td>1</td>
-          <td><router-link v-bind:to="{ name: 'detail' }">10/03/2020</router-link></td>
-          <td>RM1212.00</td>
+          <td><router-link v-bind:to="{ name: 'detail' }">'tarikh'</router-link></td>
+          <td></td>
           <td class="text-danger">Belum Selesai</td>
         </tr>
         <tr>