geer-builder 1.2.643 → 1.2.645

package/components/HubPage/ManageWallet.vue

@@ -0,0 +1,266 @@
+<template>
+    <div class="manage-wallet">
+        <!-- Table -->
+        <div align="right" class="q-mb-md top-container">
+            <div class="wallet-holder">
+                <span class="label">Wallet Balance : </span> 
+                <span v-if="this.current_slot_info && this.current_slot_info.wallet" class="value">Php {{number(this.current_slot_info.wallet)}}</span>
+            </div>
+            <div class="actions">
+                <q-btn flat label="Open Request Form" @click="is_open_wallet_request_form=true"/>
+                <div class="filters">
+                    <q-input dense style="width: 300px;" label="Search Here" outlined="" v-model="filterr"></q-input>
+                    <q-select dense outlined style="min-width: 200px; width: fit-content" v-model="filter" :options="['All', 'Pending', 'Rejected', 'Completed']" label="Filter" />
+                </div>
+            </div>
+        </div>
+        <q-table    
+            :title="table_title"
+            :loading="table_loading"
+            @row-click= "viewRequest"
+            separator="cell"
+            bordered
+            flat
+            :data="!table_loading ? table_data : []"
+            :columns="table_column"
+            :pagination.sync="pagination"
+            :filter="filterr" >
+        </q-table>
+
+        <!-- Request Form -->
+        <q-dialog v-model="is_open_wallet_request_form">
+            <q-card>
+                <q-card-section>
+                    <q-form @submit.prevent="submitRequest">
+                        <div class="form-label">Request Wallet</div>
+                        <div class="wallet-form-container">
+                            <q-input filled v-model="form.first_name" label="First name" required/>
+                            <q-input filled v-model="form.middle_name" label="Middle name" required/>
+                            <q-input filled v-model="form.last_name" label="Last name" required/>
+                            <q-input filled v-model="form.contact_number" label="Contact Number" type="number" required/>
+                            <q-input filled v-model="form.amount" label="Amount" required/>
+                        </div>
+                        <div class="button-holder" align="right">
+                            <q-btn class="submit-btn" flat :loading="is_submitting" type="submit" label="Submit Request"/>
+                        </div>
+                    </q-form>
+                </q-card-section>
+            </q-card>
+        </q-dialog>
+    </div>
+</template>
+
+<script>
+import GlobalMixins                 from '../../mixins/global_mixins.js';
+import DB_BILLS_PAYMENT             from '../../models/DB_HUB_REQUEST';
+import {formatNumber}               from '../../utilities/NumberUtils';
+import {formatDate}                 from '../../utilities/DateUtils';
+import DB_HUB_REQUEST               from '../../models/DB_HUB_REQUEST';
+export default 
+{
+    filters: { },
+    data:() =>(
+    {
+        table_data: [],
+        table_title: 'All Request',
+        is_open_wallet_request_form: false,
+        table_loading: true,
+        filterr: '',
+        filter: 'All',
+        is_submitting: false,
+        pagination  : { rowsPerPage: 5},
+        form: {
+            first_name: null,
+            middle_name: null,
+            last_name: null,
+            contact_number: null,
+            amount: null,
+        },
+        table_column:
+        [
+            { 
+                name    : 'full_name',
+                label   : 'FULL NAME',
+                field   : row => row.hubs_info.full_name,
+                format  : val => `${val}`,
+                align   : 'left',
+                sortable: true,
+            },
+            { 
+                name    : 'contact_number',
+                label   : 'CONTACT NUMBER',
+                field   :  "contact_number",
+                align   : 'left',
+            },
+            { 
+                name    : 'amount',
+                label   : 'REQUESTED AMOUNT',
+                field   : row => formatNumber(row.amount, { decimal: 2 }),
+                format  : val => `${val}`,
+                align   : 'left',
+            },    
+            { 
+                name    : 'created_date',
+                label   : 'DATE & TIME',
+                field   : row => formatDate(row.created_date, 'MM/DD/YY (hh:mm A)'),
+                format: val => `${val}`,
+                align   : 'left',
+            },    
+            { 
+                name    : 'status',
+                label   : 'STATUS',
+                field   :  "status",
+                align   : 'left',
+            }, 
+
+        ],
+    }),
+    watch: 
+    {
+        filter()
+        {
+            this.getAllRequest();
+        }
+    },
+    async mounted() 
+    { 
+        await this.$_getSlotInfo(); // GET THE CURRENTLY USED SLOT  VARIABLE SAVED ON = this.current_slot_info;
+        await this.getAllRequest();
+        this.dataAutoFill();
+    },
+    methods: 
+    { 
+        async submitRequest()
+        {
+            this.is_submitting = true;
+            if(this.current_slot_info)
+            {
+                try
+                {
+                    this.form.slot_code = this.current_slot_info.slot_code;
+                    let res = await this.$_fbCall('memberHubRequest', this.form);
+                    this.$q.dialog({ title: `Success!`, message: `Your has been succesfully submitted.`, html: true });
+                    await this.resetForm();
+                    await this.getAllRequest();
+
+                }
+                catch (error)
+                {
+                    this.$q.dialog({ title: `Something's not quite right`, message: error.message });
+                }
+            }
+            this.is_open_wallet_request_form = false;
+            this.is_submitting = false;
+        },
+        resetForm()
+        {
+            this.form = 
+            {
+                first_name: null,
+                middle_name: null,
+                last_name: null,
+                contact_number: null,
+                amount: null,
+            }
+        },
+        async getAllRequest()
+        {
+            this.table_loading = true;
+            this.table_title = `${this.filter} Request`;
+            let filter = this.filter.toLowerCase();
+            if (filter === 'all') await this.$bind('table_data', new DB_HUB_REQUEST().collection()
+            .where('hubs_uid', '==', `${this.user_info.uid}`).orderBy('created_date', 'desc'));
+            else await this.$bind('table_data', new DB_HUB_REQUEST().collection()
+            .where('hubs_uid', '==', `${this.user_info.uid}`).where("status", "==", `${filter}`).orderBy('created_date', 'desc'));
+            this.table_loading = false;
+        },
+        dataAutoFill() 
+        {
+            if (this.user_info) 
+            {
+                if(this.user_info.hasOwnProperty('full_name')) 
+                {
+                    let full_name = '';
+                    full_name = this.user_info.full_name;
+                    this.form.first_name = full_name.split(' ')[0];
+                    this.form.middle_name = full_name.split(' ').reverse()[1];
+                    this.form.last_name = full_name.split(' ').pop();
+                    this.form.contact_number = this.user_info.contact_number
+                }
+            }
+        },
+        viewRequest()
+        {
+            
+        },
+        number(amount)
+        {
+            return formatNumber(amount, { decimal: 2 });
+        }
+    },
+    computed: { }
+}
+</script>
+<style lang="scss">
+.manage-wallet
+{
+    display: grid;
+    row-gap: 20px;
+    .actions
+    {
+        display: flex;
+        margin-top: 20px;
+        justify-content: space-between;
+        align-items: center;
+        .q-btn
+        {
+            background-color: #3887d1;
+            color: white;
+        }
+    }
+    .wallet-holder 
+    {
+        margin-top: 20px;
+        .value
+        {
+            font-size: 20px;
+            font-weight: 500;
+        }
+        .label
+        {
+            // font-weight: bold;
+        }
+    }
+    .filters
+    {
+        display: flex;
+        column-gap: 10px;
+        justify-content: flex-end;
+        align-items: center;
+    }
+}
+.q-dialog 
+{
+    .wallet-form-container
+    {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        grid-gap: 20px;
+        margin-bottom: 20px;
+    }
+    .form-label
+    {
+        display: grid;
+        justify-content: flex-start;
+        color: #3887d1;
+        font-size: 20px;
+        font-weight: 500;
+        margin-bottom: 20px;
+    }
+    .submit-btn
+    {
+        background: #3887d1;
+        color: white;
+    }
+}
+</style>

package/components/HubPage/MemberRequest.vue

@@ -0,0 +1,64 @@
+<template>
+    <div class="member-request">
+        <div class="gcash-wallet">
+            <div class="section-title">Gcash & Wallet Request</div>
+            <gcash-and-wallet/>
+        </div>
+        <div class="bills-payment">
+            <div class="section-title">Bills Payment Request</div>
+            <bills-payment/>
+        </div>
+    </div>
+</template>
+
+<script>
+import GcashAndWallet from './GcashAndWallet.vue'
+import BillsPayment from './BillsPayment.vue'
+export default
+{
+  components: { GcashAndWallet, BillsPayment },
+    filters: { },
+    data:() =>(
+    {
+    }),
+    mounted() { },
+    methods: { },
+    computed: { }
+}
+</script>
+<style lang="scss">
+.member-request 
+{
+    .gcash-wallet 
+    {
+        background: rgb(243, 243, 243);
+        padding: 10px;
+        border-radius: 5px;
+        margin-bottom: 20px;
+        .section-title
+        {
+            font-weight: bold;
+            width: max-width;
+            font-size: 17px;
+            display: grid;
+            justify-items: flex-start;
+            margin-bottom: 10px;
+        }
+    }
+    .bills-payment
+    {
+        background: rgb(243, 243, 243);
+        padding: 10px;
+        border-radius: 5px;
+        .section-title
+        {
+            font-weight: bold;
+            width: max-width;
+            font-size: 17px;
+            display: grid;
+            justify-items: flex-start;
+            margin-bottom: 10px;
+        }
+    }
+}
+</style>

package/components/Points/RCLogs.vue

@@ -186,4 +186,4 @@ import {formatDate}from '../../utilities/DateUtils';
             },
         },
     }
-</script>
+</script>

package/components/SaleInvoice.vue

@@ -15,6 +15,7 @@
                             :manager_discount="sale.manager_discount.total"
                             :discount_type="sale.manager_discount.discount_type"
                             :status="sale.status"
+                            :slot_reference="sale.slot_reference"
                             :cashier="sale.cashier" 
                             :company_name="company_name"
                             :stockist_info="sale.cashier.stockist_info"
@@ -26,7 +27,7 @@
             <div v-else style="min-height: 300px;" class="product-list text-center q-pt-lg">
                 <q-spinner-ball style="margin-top: 50px" class="q-mt-lg" color="primary" size="60px"/>
             </div>
-            <div class="noprint">
+            <div class="noprint q-mt-md q-mb-md">
                 <div v-if="!hide_bottom"  class="buttons text-right">
                         <q-btn @click="close()" color="primary" class="q-mr-sm" outline>
                             <q-icon name="fa fa-trash" size="14px" class="q-mr-sm"></q-icon>

package/components/SalesInvoicePrintable.vue

@@ -14,6 +14,7 @@
                                 <div>EMAIL : {{customer.email}}</div>
                                 <div v-if="show_customer_details">CONTACT : {{customer.contact_number}}</div>
                                 <div v-if="show_customer_details">ADDRESS : {{customer.address}}</div>
+                                <div v-if="show_customer_details">Slot Reference : {{slot_reference}}</div>
                             </div>
                             <div class="col-5 label" style="margin-top:15px;">Order No. Receipt No. : {{ number }}</div>
                         </div>
@@ -102,7 +103,7 @@ import MemoHistory              from './MemoHistory';
 
 
 export default {
-    props: ['refill','cashier', 'title', 'product_list', 'memo', 'batch_number', 'lot_number','number', 'customer', 'transaction_date','sub_total', 'grand_total', 'manager_discount','discount_type','total_discount','status','claim_code', 'company_name', 'stockist_info', 'payment_method'],
+    props: ['refill','cashier', 'slot_reference', 'title', 'product_list', 'memo', 'batch_number', 'lot_number','number', 'customer', 'transaction_date','sub_total', 'grand_total', 'manager_discount','discount_type','total_discount','status','claim_code', 'company_name', 'stockist_info', 'payment_method'],
     mixins: [GlobalMixins],
     components: { MemoHistory },
     data: () =>
@@ -128,6 +129,7 @@ export default {
     {
         // this.address_1 = this.stockist_info.stockist_details.street+" "+this.stockist_info.stockist_details.barangay.name+", "+this.stockist_info.stockist_details.city.name+", "+this.stockist_info.stockist_details.province.name+", "+this.stockist_info.stockist_details.region.name;
         // this.contact = this.stockist_info.stockist_details.phone_number;
+        console.log(this.stockiest_info)
 
         this.settings = await this.$_getData('public_settings');
         if(this.settings.hasOwnProperty("qdy") && this.settings.qdy)

package/dialogs/BillDetailsDialog.vue

@@ -0,0 +1,62 @@
+<template>
+    <q-card >
+        <q-bar class='bg-primary text-white q-pa-lg'>
+           <b>Details</b>
+           <q-space />
+           <q-btn dense flat icon='close' v-close-popup><q-tooltip content-class='bg-white text-primary'>Close</q-tooltip></q-btn>
+        </q-bar>
+        <q-card-section class='content'>
+            <div class="row">
+                <!-- TABLE -->
+                <div class="col-12 text-right q-mb-md">
+                    <div class="q-mt-sm text-left">
+                        <table style="width: 500px; min-width: 500px;">
+                            <tr>
+                                <th></th>
+                                <th></th>
+                                <th style="min-width: 30px;"></th>
+                                <th></th>
+                            </tr>
+                            <tr v-for="(details, i) in row.bills.fields" :key="i">
+                                <td><b>{{details.field_name}}:</b></td>
+                                <td>{{details.value}}</td>
+                                <td></td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </q-card-section>
+    </q-card>
+</template>
+
+<script>
+
+export default
+{    
+    data: () =>
+    ({
+        tab: 'qualified',
+        enable_close:true,
+    }),
+    components: {},
+    props: {
+        row: Object,
+    },
+    mounted()
+    {
+    },
+    methods:
+    {
+        closePopup()
+        {
+            console.log('close popup');
+            this.$emit('closePopup');
+        },
+        formatDate(d)
+        {
+            return formatDate(d)
+        }
+    }
+}
+</script>

package/models/DB_BILLS_PAYMENT.js

@@ -0,0 +1,9 @@
+import MODEL from './MODEL';
+
+export default class DB_BILLS_PAYMENT extends MODEL
+{
+    constructor()
+    {
+        super('bills_payment');
+    }
+}

package/models/DB_GCASH_REQUEST.js

@@ -0,0 +1,9 @@
+import MODEL from './MODEL';
+
+export default class DB_GCASH_REQUEST extends MODEL
+{
+    constructor()
+    {
+        super('gcash_request');
+    }
+}

package/models/DB_HUB_REQUEST.js

@@ -0,0 +1,9 @@
+import MODEL from './MODEL';
+
+export default class DB_HUB_REQUEST extends MODEL
+{
+    constructor()
+    {
+        super('hub_request');
+    }
+}

package/models/DB_RESELLER_LOGS.js

@@ -6,4 +6,5 @@ export default class DB_RESELLER_LOGS extends MODEL
     {
         super('reseller_commission_logs');
     }
-}
+}
+

package/models/DB_USER.js

@@ -6,6 +6,7 @@ export default class DB_USER extends MODEL
     {
         super('users');
     }
+    
     async getTopEarners(limit = 5)
     {
         let res = await this.collection().limit(limit).orderBy('total_earned', 'desc').get();

package/models/DB_USER_SHIPPING_ADDRESS.js

@@ -6,4 +6,5 @@ export default class DB_USER_SHIPPING_ADDRESS extends MODEL
     {
         super(`users/${uid}/address`);
     }
+
 }

package/package.json

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