geer-builder 1.2.643 → 1.2.644

package/GRegistration.vue

@@ -194,6 +194,7 @@ export default
         },
         async submitCreateAccount()
         {
+            // console.log('account_data: ', this.form_data);
             if(!this.international_country)
             {
                 delete this.form_data.international_country;
@@ -243,7 +244,6 @@ export default
             {
                 let name = await axios.get('https://randomuser.me/api/?nat=us');
                 let info = name.data.results[0];
-
                 this.form_data.full_name = info.name.first + ' ' + info.name.last;
                 this.form_data.gender = info.gender == 'male' ? 'Male' : 'Female';
                 this.form_data.email = info.email;

package/GSlotWallet.vue

@@ -43,14 +43,25 @@
                     <div class="label" v-else>Slot Limit</div>
                     <div class="value">{{user_info.hasOwnProperty('slot_owned') ? user_info.slot_owned : 0}}/{{ slot_limit }}</div>
                 </div>
-                <div v-if="current_slot_info.points.reactivation_fee || is_reactivation_fee_avail == true" class="q-pt-sm q-pb-md section-holder">
+                <div v-if="( current_slot_info.points.binary_two_group_pv || current_slot_info.points.binary_two_personal_pv ) || is_binary_pv_combination == true" class="q-pt-sm q-pb-md section-holder">
+                    <div>
+                         <div class="label">Binary Personal PV</div>
+                        <div class="value">{{current_slot_info.points.binary_two_personal_pv ? current_slot_info.points.binary_two_personal_pv : 0 }}</div>
+                    </div>
+                    <div>
+                         <div class="label">Binary Group PV</div>
+                        <div class="value">{{current_slot_info.points.binary_two_group_pv ? current_slot_info.points.binary_two_group_pv : 0 }}</div>
+                    </div>
+                </div>
+                <div v-else-if=" (current_slot_info.points.reactivation_fee || is_reactivation_fee_avail == true) && is_binary_pv_combination == false " class="q-pt-sm q-pb-md section-holder">
                     <div v-if="!hide_reactivation">
                          <div class="label" v-if="is_company_success">Higher Income Status</div>
                         <div class="label" v-else>Reactivation Fee</div>
                         <div class="value">{{$_formatNumber(current_slot_info.points.hasOwnProperty("reactivation_fee") ? current_slot_info.points.reactivation_fee : 0 , { decimal: 2 }) }}</div>
                     </div>
-                   
                 </div>
+
+
             </div>
             <div class="wallet-grid" :style="is_company_ultrapro? 'display:block': temp_wallet ? 'grid-template-columns: 1fr 1fr 1fr' : 'grid-template-columns:1fr 1fr' && current_slot_info.points.hasOwnProperty('gc')">
                 <div class="section-holder">
@@ -95,6 +106,7 @@
                         </q-btn>
                     </div>
                 </div>
+                
 
                 <div class="section-holder" v-if="current_slot_info.points.hasOwnProperty('gc')">
                     <div class="label" v-if="vortex">Vortex</div>
@@ -209,6 +221,7 @@
         <q-dialog v-model="is_points_logs_dialog_open" :maximized="true"> 
             <points-logs-dialog/>
         </q-dialog>
+
         <q-dialog v-model="is_rc_logs_dialog_open" :maximized="true"> 
             <r-c-logs-dialog/>
         </q-dialog>
@@ -253,10 +266,11 @@ export default
         show_binary_history:Boolean,
         hide_reactivation:Boolean,
         show_product_voucher:Boolean,
-        show_rc_history:Boolean,
+        show_rc_history:Boolean
     },
     data: () =>
     ({
+        is_binary_pv_combination: false,
         is_rc_logs_dialog_open: false,
         is_binary_history_dialog_open: false,
         is_open_add_slot_dialog: false,
@@ -303,7 +317,6 @@ export default
         await this.getGlobalPool();
         await this.getDamayan();
         await this.getReactivation();
-
         if(this.is_company_success == true)
         {
             await this.computeWallet();
@@ -318,6 +331,10 @@ export default
             {
                 this.is_reactivation_fee_avail = true;
             }
+            if(this.settings.active_complan[13] && this.settings.active_complan[13].hasOwnProperty("active") && this.settings.active_complan[13].active && this.settings.active_complan[13].hasOwnProperty("use_binary_pv_combination") && this.settings.active_complan[13].use_binary_pv_combination == true)
+            {
+                this.is_binary_pv_combination = true;
+            }
         },
         async getDamayan()
         {
@@ -427,6 +444,10 @@ export default
             grid-template-columns: 1fr !important; 
         }
     }
+    .rc-holder
+    {
+        width: 100%;
+    }
     .label {
         font-size: 14px;
         // color: $text-color;

package/GTransaction.vue

@@ -157,6 +157,15 @@ export default
                 format: val => `${val}`,
                 sortable: true, 
             },
+            { 
+                name    : 'slot_reference',
+                label   : 'Slot Reference',
+                field   : row => row.slot_reference,
+                align   : 'left',
+                required: true,
+                format: val => `${val}`,
+                sortable: true, 
+            },
             { 
                 name    : 'date',
                 label   : 'Date',
@@ -239,6 +248,7 @@ export default
         async getTransactionHistory()
         {
            await this.$bind('transaction_history', this.db_sale.collection().where("stockist", "==", this.user_info.branch_slot).where("status", "in", ["for pick up", "pending","completed","void", "transaction refill"]).orderBy('created_date', 'desc'));
+           console.log(this.transaction_history)
       },
         open_dialog()
         {

package/GUserVerification.vue

@@ -115,20 +115,25 @@
         <div v-else>
             <span>You need to login to view this component.</span>
         </div>
+        <q-dialog persistent v-model="is_add_address_dialog_open" max-width="1000px">
+            <add-new-address-form @done="updateAddress"></add-new-address-form>
+        </q-dialog>
     </div>
 </template>
 
 <script>
 import GlobalMixins                 from './mixins/global_mixins';
 import KUploader                from './components/KUploader';
+import AddNewAddressForm        from './components/AddNewAddressForm';
 
 export default
 {
-    components: { KUploader },
+    components: { KUploader, AddNewAddressForm },
     mixins: [GlobalMixins],
     filters: { },
     data:() =>(
     {
+        is_add_address_dialog_open: false,
         is_verify_open: false,
         is_dialog_verify_open : false,
         field: {
@@ -152,7 +157,7 @@ export default
     {
         open_dialog()
         {
-            this.is_dialog_verify_open=true;
+            this.is_dialog_verify_open = true;
         },
         check_dialog()
         {
@@ -169,22 +174,33 @@ export default
                     this.is_dialog_verify_open = true;
             }
         },
+        updateAddress()
+        {
+            this.is_add_address_dialog_open = false;
+        },
         async submitVerification()
         {
             this.is_submitting = true;
             this.$q.loading.show();
-            try
+            if (this.user_info && this.user_info.hasOwnProperty('updated_address') && this.user_info.updated_address === true) 
             {
-                this.code_info = await this.$_fbCall('memberUpdateVerification', this.form_data);
-                this.$q.dialog({ title: `Success!`, message: 'Verification details has been succesfully submitted.', html: true });
-                this.is_submitting = false;
-                this.is_dialog_verify_open = false;
-                this.$emit('success');
+                try
+                {
+                    this.code_info = await this.$_fbCall('memberUpdateVerification', this.form_data);
+                    this.$q.dialog({ title: `Success!`, message: 'Verification details has been succesfully submitted.', html: true });
+                    this.is_submitting = false;
+                    this.is_dialog_verify_open = false;
+                    this.$emit('success');
+                }
+                catch (error)
+                {
+                    this.is_submitting = false;
+                    this.$q.dialog({ title: `Something's not quite right`, message: error.message });
+                }
             }
-            catch (error)
+            else 
             {
-                this.is_submitting = false;
-                this.$q.dialog({ title: `Something's not quite right`, message: error.message });
+                this.is_add_address_dialog_open = true;
             }
             this.$q.loading.hide();
         },

package/components/CollectorPages/BillsPaymentRequest.vue

@@ -0,0 +1,281 @@
+<template>
+    <div class="bills-payment">
+        <div align="right" class="q-mb-md filters">
+            <q-input style="width: 300px;" label="Search Here" outlined="" v-model="filterr"></q-input>
+            <q-select outlined style="min-width: 200px; width: fit-content" v-model="filter" :options="['All', 'For Collection', 'For Processing', 'Collected', 'Processed']" label="Filter" />
+        </div>
+        <q-table    
+            :title="table_title"
+            :loading="table_loading"
+            @row-click= "viewRequest"
+            separator="cell"
+            bordered
+            flat
+            :data="!table_loading ? bills_payment : []"
+            :columns="table_column"
+            :pagination.sync="pagination"
+            :filter="filterr"  >
+        </q-table>
+        <q-dialog v-model="dialog_bills_payment_data">
+            <q-card style="max-width: 350px: width: 100%;" v-if="dialog_bills_payment_data">
+                <q-card-section>
+                    <q-card-section>
+                        <div class="text-h6 text-bold text-primary">Request Information</div>
+                    </q-card-section>
+                    <q-card-section class="row-details">
+                        <table>
+                            <tbody>
+                                <tr>
+                                    <td class="label text-bold">Load Amount</td>
+                                    <td> : </td>
+                                    <td>{{bills_payment_data.amount_to_pay}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="label text-bold">Full Name</td>
+                                    <td> : </td>
+                                    <td>{{bills_payment_data.details.full_name}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="label text-bold">Address</td>
+                                    <td> : </td>
+                                    <td>{{bills_payment_data._address_combined}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="label text-bold">Contact Number</td>
+                                    <td> : </td>
+                                    <td>{{bills_payment_data.details.contact_number}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="label text-bold">Status</td>
+                                    <td> : </td>
+                                    <td>{{bills_payment_data.status}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </q-card-section>
+                    <q-card-actions align="right" class="bg-white" v-if="!(bills_payment_data && bills_payment_data.hasOwnProperty('status') && (bills_payment_data.status === 'rejected' || bills_payment_data.status === 'for_processing' || bills_payment_data.status === 'processed'))">
+                        <q-btn v-if="bills_payment_data.status =='for_collection'" color="primary" label="Collect" @click="collectPayment(bills_payment_data)" v-close-popup />
+                    </q-card-actions>
+                </q-card-section>
+            </q-card>
+        </q-dialog>
+    </div>
+</template>
+<script>
+import GlobalMixins          from '../../mixins/global_mixins.js';
+import DB_BILLS_PAYMENT      from '../../models/DB_BILLS_PAYMENT';
+import DB_USER               from '../../models/DB_USER';
+import {formatDate}          from '../../utilities/DateUtils';
+import {formatNumber}        from '../../utilities/NumberUtils';
+
+export default {
+    
+    props:
+    {
+    },
+    components: {  },
+    data: () =>
+    ({
+        pending_request: [],
+        accepted_request: [],
+        collected_request: [],
+        filter_request: "All",
+        bills_payment: [],
+        filterr: '',
+        filter: "For Collection",
+        table_title: 'All Request',
+        pagination  : { rowsPerPage: 5},
+        table_loading: false,
+        dialog_bills_payment_data: false,
+        bills_payment_data: {},
+        table_column:
+        [
+            { 
+                name    : 'status',
+                label   : 'STATUS',
+                field   :  "status",
+                align   : 'left',
+            }, 
+            { 
+                name    : 'full_name',
+                label   : 'Full Name',
+                field   : row => row.details.full_name,
+                align   : 'left',
+                format: val => `${val}`,
+                sortable: true,
+            },
+            { 
+                name    : 'address',
+                label   : 'ADDRESS',
+                field   : "_address_combined",
+                align   : 'center',
+                sortable: true,
+            },
+            { 
+                name    : 'contact_number',
+                label   : 'Contact Number',
+                field   : row => row.details.contact_number,
+                align   : 'left',
+                format: val => `${val}`,
+                sortable: true,
+            },
+            { 
+                name    : 'amount_to_pay',
+                label   : 'AMOUNT REQUEST',
+                field   : row => `Php${formatNumber(row.amount_to_pay, { decimal: 2 })}`,
+                format: val => `${val}`,
+                align   : 'left',
+            },    
+            { 
+                name    : 'created_date',
+                label   : 'Time & Date',
+                field   : row => formatDate(row.created_date, 'MM/DD/YY (hh:mm A)'),
+                format: val => `${val}`,
+                align   : 'left',
+            },    
+            { 
+                name    : 'response_message',
+                label   : 'Response Message',
+                field   : row => row.response_message,
+                format  : val => `${val ? val:'-----'}`,
+                align   : 'left',
+            }
+
+        ],
+        decline_message_dialog: false,
+        reject_message: '',
+        to_be_reject: null,
+    }),
+    watch: 
+    {
+        filter()
+        {
+            this.getAllBillsPaymentRequest();
+        },
+    },
+    async mounted() 
+    { 
+        await this.getAllBillsPaymentRequest();
+        await this.$_getSlotInfo();
+    },
+    methods:
+    {   
+        async getAllBillsPaymentRequest()
+        {
+            this.$q.loading.show();
+            this.table_loading = true;
+            this.table_title = `${this.filter} Request`;
+       
+            let filter;
+            if(this.filter == 'For Collection') filter = 'for_collection';
+            else if(this.filter == 'For Processing') filter = 'for_processing';
+            else filter = this.filter.toLowerCase();
+
+            if (filter === 'all') await this.$bind('bills_payment', new DB_BILLS_PAYMENT().collection()
+            .where('assigned_collector', '==', `${this.user_info.uid}`).where("status", "in", ['for_collection', 'for_processing', 'processed']).orderBy('created_date', 'desc'));
+            else if (filter == "collected") await this.$bind('bills_payment', new DB_BILLS_PAYMENT().collection()
+            .where('assigned_collector', '==', `${this.user_info.uid}`).where('collected', '==', true).orderBy('created_date', 'desc'));
+            else await this.$bind('bills_payment', new DB_BILLS_PAYMENT().collection()
+            .where('assigned_collector', '==', `${this.user_info.uid}`).where('status', '==', `${filter}`).orderBy('created_date', 'desc'));
+
+            if(filter == 'collected')
+            {
+                let new_data = [];
+                this.bills_payment.forEach(element => {
+                    if (element.collected === true) 
+                    {
+                        element.status = 'collected';
+                    }
+                    new_data.push(element)    
+                });
+    
+                this.bills_payment = new_data;
+            }
+
+            this.table_loading = false;
+            this.$q.loading.hide();
+        },
+        viewRequest(evt, row)
+        {
+            this.dialog_bills_payment_data = true;
+            this.bills_payment_data = row;
+        },
+        async collectPayment(request_data) 
+        {
+            this.$q.loading.show();
+            if (this.user_info) 
+            {
+                let collector_response = {};
+                collector_response.collectors_response = 'collected';
+                collector_response.req_id = request_data.id;
+                collector_response.request_data = request_data;
+                collector_response.bills_payment = true;
+                try
+                {
+                    await this.$_fbCall('collectGcashRequestResponse', collector_response);
+                    this.$q.dialog({ title: `Success`, message: `You've collected a payment.`, html: true });
+                }
+                catch (error)
+                {
+                    this.$q.dialog({ title: `Something's not quite right`, message: error.message });
+                }
+            }
+            await this.getAllBillsPaymentRequest();
+            this.dialog_bills_payment_data = false;
+            this.$q.loading.hide();
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+.bills-payment
+{
+    .filters
+    {
+        display: flex;
+        grid-gap: 10px;
+        width: 100%;
+        justify-content: flex-end;
+    }
+}
+.q-dialog 
+{
+    .reject-message-dialog
+    {
+        max-width: 400px;
+        width: 100%;
+    }
+    .user-verification-dialog-holder
+    {
+        display: grid;
+        place-items: center;
+        justify-content: center;
+        .full-width 
+        {
+            max-width: 95vw;
+            width: 100% ;
+            // overflow: scroll;
+        }
+    }
+    .row-details 
+    {
+        .label 
+        {
+            min-width: 150px;
+        }
+        table 
+        {
+            max-width: 400px;
+            tbody 
+            {
+                tr 
+                {
+                    display: flex;
+                    align-items: flex-start;
+                }
+            }
+        }
+    }
+}
+</style>