From 21633c02a0e66c3930c41d0aaa71182a4e9d79d8 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Mon, 12 Dec 2022 16:01:31 +0800
Subject: [PATCH] Fix cart, remove commented code

---
 src/components/bid-record/BidRecordList.vue |   2 +-
 src/components/cart/CartListNew.vue         | 272 +++-----------------
 src/components/list/TheList.vue             |   2 +-
 src/components/result/ResultMain.vue        |   2 +-
 4 files changed, 33 insertions(+), 245 deletions(-)

diff --git a/src/components/bid-record/BidRecordList.vue b/src/components/bid-record/BidRecordList.vue
index a3319f6..2d195a5 100644
--- a/src/components/bid-record/BidRecordList.vue
+++ b/src/components/bid-record/BidRecordList.vue
@@ -154,7 +154,7 @@
             <span class="text-400"
               >Sila rujuk halaman
               <router-link v-bind:to="{ name: 'home' }">Utama</router-link>
-              untuk jadual lelong.</span
+              untuk jadual lelongan.</span
             >
           </div>
         </div>
diff --git a/src/components/cart/CartListNew.vue b/src/components/cart/CartListNew.vue
index 2ac9331..ee7a7e8 100644
--- a/src/components/cart/CartListNew.vue
+++ b/src/components/cart/CartListNew.vue
@@ -15,108 +15,6 @@
   >
     <div v-if="isSuccess" class="row">
       <div class="col-12 lg:col-9">
-        <!-- <div class="card">
-            <div class="card-header"><h5>SENARAI TROLI</h5></div>
-            <div class="accordion" id="accordionExample">
-              <div
-                v-for="item in listItems"
-                v-bind:key="item"
-                class="accordion-item"
-              >
-                <h2 class="accordion-header" id="headingOne">
-                  <button
-                    class="accordion-button"
-                    type="button"
-                    data-bs-toggle="collapse"
-                    data-bs-target="#collapseOne"
-                    aria-expanded="true"
-                    aria-controls="collapseOne"
-                  >
-                    {{ item.caw_name }}
-                  </button>
-                </h2>
-                <div
-                  id="collapseOne"
-                  class="accordion-collapse collapse show"
-                  aria-labelledby="headingOne"
-                  data-bs-parent="#accordionExample"
-                >
-                  <div class="accordion-body">
-                    <table class="table table-bordered table-hover">
-                      <thead>
-                        <tr>
-                          <th>Bil</th>
-                          <th>No Rujukan</th>
-                          <th>Berat</th>
-                          <th>Harga Asas</th>
-                          <th>Harga Bida</th>
-                          <th>Tindakan</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr
-                          v-for="(surat, index) in item.lelongbid"
-                          v-bind:key="surat"
-                        >
-                          <td>{{ index + 1 }}</td>
-                          <td>
-                            <a
-                              href="#"
-                              data-bs-toggle="modal"
-                              data-bs-target="#marhunModal"
-                              v-on:click="openModal(surat)"
-                            >
-                              {{ surat.norujukan }}
-                            </a>
-                          </td>
-                          <td>{{ surat.berat }}g</td>
-                          <td>
-                            RM{{
-                              surat.hargaasas
-                                ?.toString()
-                                .replace(/\B(?=(\d{3})+(?!\d))/g, ",") || ""
-                            }}
-                          </td>
-                          <td>
-                            RM{{
-                              surat.hargabida
-                                ?.toString()
-                                .replace(/\B(?=(\d{3})+(?!\d))/g, ",") || ""
-                            }}
-                          </td>
-                          <td>
-                            <button
-                              class="btn me-1 ms-1 btn-warning"
-                              data-bs-toggle="modal"
-                              data-bs-target="#editModal"
-                              v-on:click="openModal(surat)"
-                            >
-                              Ubah Bidaan
-                            </button>
-                            <button
-                              class="btn me-1 ms-1 btn-danger"
-                              data-bs-toggle="modal"
-                              data-bs-target="#deleteModal"
-                              v-on:click="openModal(surat)"
-                            >
-                              Padam Surat
-                            </button>
-                          </td>
-                        </tr>
-                        <tr style="text-transform: uppercase">
-                          <th colspan="2">JUMLAH</th>
-                          <th>xxxg</th>
-                          <th></th>
-                          <th>RMxxxxxx</th>
-                          <td></td>
-                        </tr>
-                      </tbody>
-                    </table>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div> -->
         <Card>
           <template #title>
             <div class="font-normal">Senarai Troli</div>
@@ -125,8 +23,18 @@
             <Accordion :multiple="true">
               <AccordionTab v-for="item in listItems" v-bind:key="item">
                 <template #header>
-                  <span>{{ item.caw_name }}</span>
-                  <!-- <span class="ml-2">Jumlah:RMXXXX</span> -->
+                  <div class="flex justify-content-between w-100">
+                    <div class="align-self-center" style="margin: 5px">
+                      {{ item.caw_name }}
+                    </div>
+                    <div class="style-info">
+                      Jumlah RM{{
+                        item.total_bidaan
+                          ?.toString()
+                          .replace(/\B(?=(\d{3})+(?!\d))/g, ",") || ""
+                      }}
+                    </div>
+                  </div>
                 </template>
                 <div class="overflow-x-auto">
                   <table class="table text-center table-bordered table-hover">
@@ -232,12 +140,6 @@
                 }}
               </p>
             </div>
-            <!-- <Button
-              label="Teruskan"
-              class="p-button-sm w-full"
-              data-bs-toggle="modal"
-              data-bs-target="#bidModal"
-            /> -->
             <Button
               label="Teruskan"
               class="p-button-sm w-full"
@@ -311,10 +213,11 @@
                   v-bind:norujukan="theSurat.norujukan"
                   v-bind:filemarhun_id="theSurat.filemarhun[0].id"
                 ></item-master-image-modal>
+                <p v-else style="text-align: center; width: 100%">
+                  Image Unavailable
+                </p>
               </div>
               <div class="col-12 text-center lg:col-6">
-                <!-- <p>Marhun: {{ theSurat.marhun }}</p>
-                <p>Jumlah Berat: {{ theSurat.berat }}g</p> -->
                 <div class="overflow-x-auto">
                   <table class="table table-bordered">
                     <tbody>
@@ -355,62 +258,6 @@
                     </tbody>
                   </table>
                 </div>
-                <!-- <div class="row justify-content-center">
-                  <div class="col-3">
-                    <label class="col-form-label text-end"
-                      >Jumlah Harga Asas</label
-                    >
-                  </div>
-                  <div class="col-4">
-                    <div class="input-group mb-3">
-                      <span class="input-group-text">RM</span>
-                      <div
-                        style="background-color: #e9ecef; padding-bottom: 0px"
-                        class="form-control text-start justify-content-start"
-                        disabled
-                      >
-                        {{ theSurat.hargaasas }}
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div class="row justify-content-center mb-3">
-                  <div class="col-3">
-                    <label class="col-form-label">Tambahan Harga Bida</label>
-                  </div>
-                  <div class="col-4">
-                    <div class="input-group">
-                      <span class="input-group-text">RM</span>
-                      <input
-                        type="text"
-                        id="tambahanbida"
-                        class="form-control"
-                        @keyup="calcTotal()"
-                      />
-                    </div>
-                  </div>
-                  <div class="col-7">
-                    <div style="font-size: 15px" class="fst-italic text-danger">
-                      <div class="text-end">
-                        *Minimum tambahan harga bida adalah RM1.
-                      </div>
-                      <div class="text-end">
-                        *Gandaan ringgit sahaja dibenarkan.
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div class="row justify-content-center">
-                  <div class="col-3">
-                    <label class="col-form-label">Jumlah Harga Bida</label>
-                  </div>
-                  <div class="col-4">
-                    <div class="input-group mb-3">
-                      <span class="input-group-text">RM</span>
-                      <input type="text" class="form-control" disabled />
-                    </div>
-                  </div>
-                </div> -->
                 <div class="row justify-content-center">
                   <div class="col-6">
                     <label class="col-form-label">Jumlah Harga Bida</label>
@@ -444,23 +291,6 @@
                   v-on:click="openModal(theSurat)"
                   class="p-button-warning p-button-text"
                 />
-
-                <!-- <button
-                    class="btn me-1 ms-1 btn-warning"
-                    data-bs-toggle="modal"
-                    data-bs-target="#editModal"
-                    v-on:click="openModal(theSurat)"
-                  >
-                    Ubah Bidaan
-                  </button>
-                  <button
-                    class="btn me-1 ms-1 btn-danger"
-                    data-bs-toggle="modal"
-                    data-bs-target="#deleteModal"
-                    v-on:click="openModal(theSurat)"
-                  >
-                    Padam Surat
-                  </button> -->
               </div>
             </div>
           </div>
@@ -472,17 +302,6 @@
               icon="pi pi-angle-right"
               iconPos="right"
             />
-
-            <!-- <button
-                type="submit"
-                class="btn btn-secondary"
-                data-bs-dismiss="modal"
-              >
-                Kembali
-              </button> -->
-            <!-- <button type="submit" class="btn btn-success" @click="updateItem()">
-              Terima
-            </button> -->
           </div>
         </div>
       </div>
@@ -601,20 +420,6 @@
               :loading="isLoadingUbah"
               @click="updateItem(theSurat)"
             />
-            <!-- <button
-              type="submit"
-              class="btn btn-danger me-2"
-              data-bs-dismiss="modal"
-            >
-              Batal
-            </button>
-            <button
-              type="submit"
-              class="btn btn-success"
-              @click="updateItem(theSurat)"
-            >
-              Ubah
-            </button> -->
           </div>
         </div>
       </div>
@@ -684,20 +489,6 @@
               :loading="isLoadingPadam"
               @click="deleteItem(theSurat)"
             />
-            <!-- <button
-              type="submit"
-              class="btn btn-secondary me-2"
-              data-bs-dismiss="modal"
-            >
-              Kembali
-            </button>
-            <button
-              type="submit"
-              class="btn btn-danger"
-              @click="deleteItem(theSurat)"
-            >
-              Padam
-            </button> -->
           </div>
         </div>
       </div>
@@ -746,19 +537,6 @@
             <p class="text-danger">
               <i>*Bidaan tidak dapat diubah selepas dihantar.</i>
             </p>
-
-            <!-- <table class="table table-bordered">
-              <tbody>
-                <tr class="bg-light">
-                  <th>Jumlah Surat</th>
-                  <th>Jumlah Bidaan</th>
-                </tr>
-                <tr>
-                  <td>{{ total_sag }}</td>
-                  <td>RM{{ total_bidaan }}</td>
-                </tr>
-              </tbody>
-            </table> -->
           </div>
           <div class="modal-footer">
             <button
@@ -778,10 +556,7 @@
             <p
               class="fst-italic mt-3 fw-lighter"
               style="text-align: right; font-size: small"
-            >
-              <!-- *Pelayar akan dialihkan ke halaman pembayaran jika butang 'Bayar'
-              ditekan. -->
-            </p>
+            ></p>
           </div>
         </div>
       </div>
@@ -986,7 +761,6 @@ export default {
       this.jumlahBidaan = parseFloat(value.hargabida);
       this.hargaAsas = value.hargaasas;
       this.reloadImageComponent += 1;
-
     },
     deleteItem(value) {
       this.isLoadingPadam = true;
@@ -1167,4 +941,18 @@ export default {
 .container-height {
   min-height: 70vh;
 }
+
+.style-info {
+  background: #e4f8f0;
+  border: solid #1ea97c;
+  border-width: 0px;
+  color: #1ea97c;
+  font-size: 1rem;
+  align-items: center;
+  display: flex;
+  padding: 0.4rem 0.9rem;
+  margin: 0;
+  border-radius: 6px;
+  font-weight: 400;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/list/TheList.vue b/src/components/list/TheList.vue
index f142984..95a5077 100644
--- a/src/components/list/TheList.vue
+++ b/src/components/list/TheList.vue
@@ -62,7 +62,7 @@
               <span class="text-400"
                 >Sila rujuk halaman
                 <router-link v-bind:to="{ name: 'home' }">Utama</router-link>
-                untuk jadual lelong.</span
+                untuk jadual lelongan.</span
               >
             </div>
           </div>
diff --git a/src/components/result/ResultMain.vue b/src/components/result/ResultMain.vue
index a8a1f78..6124223 100644
--- a/src/components/result/ResultMain.vue
+++ b/src/components/result/ResultMain.vue
@@ -85,7 +85,7 @@
             <span class="text-400"
               >Sila rujuk halaman
               <router-link v-bind:to="{ name: 'home' }">Utama</router-link>
-              untuk jadual lelong</span
+              untuk jadual lelongan.</span
             >
           </div>
         </div>