From 7b08280693ee949b3b2408866be1909d66070fca Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Thu, 25 Aug 2022 10:37:14 +0800
Subject: [PATCH] add marhun_desc, fix harga bidaan input

---
 src/components/bid-record/BidRecordList.vue |  2 -
 src/components/cart/CartListNew.vue         | 65 +++++++++++----------
 src/components/list/ListItem.vue            | 56 +++++++++---------
 3 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/src/components/bid-record/BidRecordList.vue b/src/components/bid-record/BidRecordList.vue
index 24bec67..b4bf918 100644
--- a/src/components/bid-record/BidRecordList.vue
+++ b/src/components/bid-record/BidRecordList.vue
@@ -117,7 +117,6 @@
                       <th scope="col">Jenis</th>
                       <th scope="col">Karat</th>
                       <th scope="col">Berat</th>
-                      <th scope="col">Nota</th>
                       <th scope="col">Harga Asas</th>
                     </tr>
                   </thead>
@@ -130,7 +129,6 @@
                       <td>{{ marhun.marhun }}</td>
                       <td>{{ marhun.karat }}</td>
                       <td>{{ marhun.berat }}g</td>
-                      <td>{{ marhun.nota }}</td>
                       <td>RM{{ marhun.hargaasas }}</td>
                     </tr>
                     <tr style="text-transform: uppercase">
diff --git a/src/components/cart/CartListNew.vue b/src/components/cart/CartListNew.vue
index a98d619..b67ec5c 100644
--- a/src/components/cart/CartListNew.vue
+++ b/src/components/cart/CartListNew.vue
@@ -342,7 +342,7 @@
                 <div class="row justify-content-center">
                   <div class="col-6">
                     <label class="col-form-label text-end"
-                      >Jumlah Harga Asas</label
+                      >Jumlah Harga Asas (A)</label
                     >
                   </div>
                   <div class="col-6">
@@ -358,35 +358,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="row justify-content-center mb-3">
-                  <div class="col-6">
-                    <label class="col-form-label">Tambahan Harga Bida</label>
-                  </div>
-                  <div class="col-6">
-                    <div class="input-group">
-                      <span class="input-group-text">RM</span>
-                      <input
-                        type="text"
-                        class="form-control"
-                        v-model="tambahanBidaan"
-                        v-on:keyup="calcTotal()"
-                      />
-                    </div>
-                  </div>
-                  <div class="col-12" v-if="v$.tambahanBidaan.$error">
-                    <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-6">
-                    <label class="col-form-label">Jumlah Harga Bida</label>
+                    <label class="col-form-label">Jumlah Harga Bida (B)</label>
                   </div>
                   <div class="col-6">
                     <div class="input-group mb-3">
@@ -395,10 +369,36 @@
                         type="text"
                         class="form-control"
                         v-model="jumlahBidaan"
+                        v-on:keyup="calcDiff()"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div class="row justify-content-center mb-3">
+                  <div class="col-6">
+                    <label class="col-form-label">Beza (B-A)</label>
+                  </div>
+                  <div class="col-6">
+                    <div class="input-group">
+                      <span class="input-group-text">RM</span>
+                      <input
+                        type="text"
+                        class="form-control"
+                        v-model="tambahanBidaan"
                         disabled
                       />
                     </div>
                   </div>
+                  <div class="col-12" v-if="v$.tambahanBidaan.$error">
+                    <div style="font-size: 15px" class="fst-italic text-danger">
+                      <div class="text-end">
+                        *Minimum beza harga adalah RM1.
+                      </div>
+                      <div class="text-end">
+                        *Gandaan ringgit sahaja dibenarkan.
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -662,7 +662,7 @@ export default {
     openModal(value) {
       this.theSurat = value;
       this.tambahanBidaan = value.hargabida - value.hargaasas;
-      this.jumlahBidaan = value.hargabida;
+      this.jumlahBidaan = parseFloat(value.hargabida);
       this.hargaAsas = value.hargaasas;
     },
     deleteItem(value) {
@@ -694,6 +694,10 @@ export default {
       this.jumlahBidaan =
         parseFloat(this.hargaAsas) + parseFloat(this.tambahanBidaan);
     },
+    calcDiff() {
+      this.tambahanBidaan =
+        parseFloat(this.jumlahBidaan) - parseFloat(this.hargaAsas);
+    },
     updateItem(value) {
       this.v$.$validate();
       if (!this.v$.$error) {
@@ -721,7 +725,6 @@ export default {
     },
     bidderSelectBidItem() {
       if (this.isSuccess == true) {
-        this.$refs.daftarBidaanClose.click();
         this.loading = true;
         axios
           .post("/bidder/biditem", this.formRegisterBid, {
@@ -730,11 +733,13 @@ export default {
             },
           })
           .then((response) => {
+            this.$refs.daftarBidaanClose.click();
             this.loading = false;
             console.log(response);
             this.$emit("reloadComponent");
           })
           .catch((error) => {
+            this.$refs.daftarBidaanClose.click();
             this.loading = false;
             console.log(error);
           });
diff --git a/src/components/list/ListItem.vue b/src/components/list/ListItem.vue
index 63d5d96..218c485 100644
--- a/src/components/list/ListItem.vue
+++ b/src/components/list/ListItem.vue
@@ -8,7 +8,7 @@
     </div>
   </div>
 
-  <div v-else style="min-height: 60vh;" class="row">
+  <div v-else style="min-height: 60vh" class="row">
     <div v-if="this.status">
       <div class="">
         <div class="container">
@@ -132,15 +132,13 @@
                     <th scope="col">Jenis Marhun</th>
                     <th scope="col">Karat</th>
                     <th scope="col">Berat</th>
-                    <th scope="col">Nota</th>
                     <th scope="col">Harga Asas</th>
                   </tr>
                   <tr v-for="(marhun, index) in marhuns" :key="marhun.id">
                     <td>{{ index + 1 }}</td>
-                    <td>{{ marhun.marhun }}</td>
+                    <td>{{ marhun.marhun_desc }}</td>
                     <td>{{ marhun.karat }}</td>
                     <td>{{ marhun.berat }}g</td>
-                    <td>{{ marhun.nota }}</td>
                     <td>RM{{ marhun.hargaasas }}</td>
                   </tr>
                   <tr style="text-transform: uppercase">
@@ -153,7 +151,7 @@
               <div class="row justify-content-center">
                 <div class="col-6">
                   <label class="col-form-label text-end"
-                    >Jumlah Harga Asas</label
+                    >Jumlah Harga Asas (A)</label
                   >
                 </div>
                 <div class="col-6">
@@ -169,9 +167,25 @@
                   </div>
                 </div>
               </div>
+              <div class="row justify-content-center">
+                <div class="col-6">
+                  <label class="col-form-label">Jumlah Harga Bida (B)</label>
+                </div>
+                <div class="col-6">
+                  <div class="input-group mb-3">
+                    <span class="input-group-text">RM</span>
+                    <input
+                      type="text"
+                      class="form-control"
+                      v-model="form.hargabida"
+                      @keyup="calcDiff()"
+                    />
+                  </div>
+                </div>
+              </div>
               <div class="row justify-content-center mb-3">
                 <div class="col-6">
-                  <label class="col-form-label">Tambahan Harga Bida</label>
+                  <label class="col-form-label">Beza (B-A)</label>
                 </div>
                 <div class="col-6">
                   <div class="input-group">
@@ -181,7 +195,7 @@
                       type="text"
                       id="tambahanbida"
                       class="form-control"
-                      @keyup="calcTotal()"
+                      disabled
                     />
                   </div>
                 </div>
@@ -193,7 +207,7 @@
                       v-if="v$.tambahan.$error"
                     >
                       <div class="text-end">
-                        *Minimum tambahan harga bida adalah RM1.
+                        *Minimum beza harga adalah RM1.
                       </div>
                       <div class="text-end">
                         *Gandaan ringgit sahaja dibenarkan.
@@ -202,22 +216,6 @@
                   </div>
                 </div>
               </div>
-              <div class="row justify-content-center">
-                <div class="col-6">
-                  <label class="col-form-label">Jumlah Harga Bida</label>
-                </div>
-                <div class="col-6">
-                  <div class="input-group mb-3">
-                    <span class="input-group-text">RM</span>
-                    <input
-                      type="text"
-                      class="form-control"
-                      v-model="form.hargabida"
-                      disabled
-                    />
-                  </div>
-                </div>
-              </div>
             </div>
           </div>
         </div>
@@ -338,15 +336,17 @@ export default {
       this.norujukan = norujukan;
       this.marhuns = this.norujukan.lelongbidmarhun;
       this.form.lelongbid_id = this.norujukan.id;
-      this.tambahan = '';
-      this.form.hargabida =
-        // parseFloat(this.tambahan) + parseFloat(this.norujukan.hargaasas);
-        parseFloat(this.norujukan.hargaasas);
+      this.tambahan = "";
+      this.form.hargabida = "";
     },
     calcTotal() {
       this.form.hargabida =
         parseFloat(this.tambahan) + parseFloat(this.norujukan.hargaasas);
     },
+    calcDiff() {
+      this.tambahan =
+        parseFloat(this.form.hargabida) - parseFloat(this.norujukan.hargaasas);
+    },
 
     addToCart() {
       this.v$.$validate();