geer-builder 1.2.798 → 1.2.799

package/GMyTransactions.vue

@@ -3,7 +3,8 @@
         <q-tabs v-model="tab" dense class="text-grey" active-color="primary" no-caps indicator-color="primary" align="justify" >
             <q-tab name="to_pay" icon="fas fa-coins" label="To Pay" > <q-badge color="red" v-if="to_pay_count>0" floating>{{to_pay_count}}{{last_to_pay_doc ? "+": "" }}</q-badge> </q-tab>
             <q-tab name="approval"  icon="fas fa-tasks" label="Approval">  <q-badge color="red" v-if="approval_count>0" floating>{{approval_count}}{{last_approval_doc ? "+": "" }}</q-badge>  </q-tab>
-            <q-tab v-if="payment_method_list.some( payment => payment.payment_method_id=='cod_manual')" name="cod_manual"  icon="fas fa-truck-pickup" label="Cod Manual">  <q-badge color="red" v-if="cod_manual_count>0" floating>{{cod_manual_count}}</q-badge>  </q-tab>
+            <!-- <q-tab v-if="payment_method_list.some( payment => payment.payment_method_id=='cod_manual')" name="cod_manual"  icon="fas fa-truck-pickup" label="Cod Manual">  <q-badge color="red" v-if="cod_manual_count>0" floating>{{cod_manual_count}}</q-badge>  </q-tab> -->
+            <q-tab name="cod_manual" icon="fas fa-box-open" label="COD Manual" ><q-badge color="red" v-if="cod_manual_count>0" floating>{{cod_manual_count}}{{last_codm_doc ? "+": "" }}</q-badge></q-tab>
             <q-tab name="to_ship" icon="fas fa-box-open" label="To Ship" ><q-badge color="red" v-if="to_ship_count>0" floating>{{to_ship_count}}{{last_to_ship_doc ? "+": "" }}</q-badge></q-tab>
             <q-tab name="shipping" icon="fas fa-truck" label="Shipping" > <q-badge color="red" v-if="shipping_count>0" floating>{{shipping_count}}{{last_shipping_doc ? "+": "" }}</q-badge> </q-tab>
             <q-tab name="to_picked" icon="fas fa-store" label="For Pickup" > <q-badge color="red" v-if="to_picked_count>0" floating>{{to_picked_count}}{{last_for_pickup_doc ? "+": "" }}</q-badge> </q-tab>
@@ -21,7 +22,7 @@
                 </div>
             </q-tab-panel>
             <q-tab-panel class="tab-panel" name="cod_manual">
-                <cod-manual v-if="cod_manual_count>0" :order_list="order_list"></cod-manual>
+                <cod-manual v-if="cod_manual_count>0" :order_list="codm_list"></cod-manual>
                 <div v-else>
                     <div class="purchase-title" style="font-size: 20px; margin-top:50px; height:200px; text-align:center">
                       <div>There are no Transaction</div>
@@ -81,6 +82,7 @@ export default {
         for_pickup_list: [],
         completed_list: [],
         cancelled_list: [],
+        codm_list: [],
 
         to_pay_list_limit: 10,
         approval_list_limit: 10,
@@ -89,6 +91,7 @@ export default {
         for_pickup_list_limit: 10,
         completed_list_limit: 10,
         cancelled_list_limit: 10,
+        codm_list_limit: 10,
         
         last_to_pay_doc: null,
         last_approval_doc: null,
@@ -97,6 +100,7 @@ export default {
         last_for_pickup_doc: null,
         last_completed_doc: null,
         last_cancelled_doc: null,
+        last_codm_doc: null,
 
         approval_count: 0,
         to_pay_count: 0,
@@ -137,6 +141,7 @@ export default {
             this.for_pickup_list =  [];
             this.completed_list  =  [];
             this.cancelled_list  =  [];
+            this.codm_list  =  [];
             
             this.approval_count   = 0;
             this.to_pay_count     = 0;
@@ -394,6 +399,41 @@ export default {
             }
 
 
+            //CODM
+            let codm_list = await new DB_MERCHANT_ORDERS().collection()
+                        .orderBy("created_date","desc")
+                        .where("status", "in", ["cod_manual"])
+                        .where("orders.merchant_slot_code", "==", this.user_info["active_slot"] ? this.user_info["active_slot"] :this.user_info["branch_slot"])
+                        .limit(this.codm_list_limit)
+                        .get();
+
+            codm_list.docs.forEach(element => 
+            {
+                this.codm_list.push(element.data());
+            });
+
+            if(codm_list.docs.length != 0)
+            {
+                this.last_codm_doc =  codm_list.docs[codm_list.docs.length-1];
+                let get_last = await new DB_MERCHANT_ORDERS().collection()
+                                     .orderBy("created_date","desc")
+                                     .startAfter(this.last_codm_doc)
+                                     .where("status", "in", ["cod_manual"])
+                                     .where("orders.merchant_slot_code", "==", this.user_info["active_slot"] ? this.user_info["active_slot"] :this.user_info["branch_slot"])
+                                     .limit(1)
+                                     .get();
+                                    
+                if(get_last.docs.length == 0)
+                {
+                    this.last_codm_doc = null;
+                }
+            }
+            else
+            {
+                this.last_codm_doc = null;
+            }
+
+
             this.badgesValues();
        },
        async loadMoreData(status)
@@ -766,6 +806,16 @@ export default {
                 }
             });
 
+            this.codm_list.forEach(async order_list => 
+            {
+                this.cod_manual_count++;
+
+                if(order_list['invoice_number'] && order_list.status != 'completed' && order_list.status != 'delivered' && order_list.status != 'cancelled')
+                {
+                    await this.$_fbCall('memberCheckOrderStatus', order_list);
+                }
+            });
+
             // this.order_list.forEach(async order_list => {
             //     if (order_list.status == "processing" || order_list.status == "pending")
             //     { 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geer-builder",
-  "version": "1.2.798",
+  "version": "1.2.799",
   "description": "",
   "main": "index.js",
   "scripts": {