geer-builder 1.2.583 → 1.2.586

package/GCompanyToken.vue

@@ -15,6 +15,14 @@
                         </q-btn>
                     </div>
                 </div>
+                <div class="q-pt-sm grid-item" style="cursor:pointer;" @click="is_open_token_history=true" >
+                    <div class="label">
+                        <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
+                            <q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
+                            <div>View Token History</div>
+                        </q-btn>
+                    </div>
+                </div>
             </g-card>
         </div>
         <div class="q-mt-md">
@@ -53,6 +61,10 @@
             <company-token-claim-slot :plan_id="plan_id" @closeDialog="is_open_token_claim_slot = false"></company-token-claim-slot>
         </q-dialog>
 
+        <q-dialog full-width :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_open_token_history">
+            <company-token-history :plan_id="plan_id" @closeDialog="is_open_token_history = false"></company-token-history>
+        </q-dialog>
+
     </div>
     <div v-else>
             <span>You need to login to view this component.</span>
@@ -69,17 +81,19 @@ import DB_COMPANY_TOKEN_PLAN from './models/DB_COMPANY_TOKEN_PLAN';
 import GlobalMixins from './mixins/global_mixins';
 import CompanyTokenClaim     from './dialogs/CompanyTokenClaim';
 import CompanyTokenClaimSlot from './dialogs/CompanyTokenClaimSlot';
+import CompanyTokenHistory from './dialogs/CompanyTokenHistory';
 
 
 export default
 {
-    components: { GHeader, GCard, CompanyTokenClaim, CompanyTokenClaimSlot },
+    components: { GHeader, GCard, CompanyTokenClaim, CompanyTokenClaimSlot, CompanyTokenHistory },
     mixins: [GlobalMixins],
     data: () =>
     ({
         unused_token: 0,
         is_open_token_claim: false,
         is_open_token_claim_slot: false,
+        is_open_token_history: false,
         db_user: new DB_USER(),
         db_slot: new DB_SLOT(),
         plan_list: [],

package/GProductList.vue

@@ -15,6 +15,15 @@
                     <template v-if="cashback">
                         <div class="cashback-badge"  v-if="field.item_pv>0"><div class="cashback-label">Cashback: </div> <div class="cashback-value">{{$_formatNumber((field.item_pv/12), { decimal: 2})}} </div></div>
                     </template>
+                    <div class="product-ratings"v-if="show_ratings" :style="field.ratings <=0 ? 'width:45%' : ''">
+                            <div class="ratings-total" :style="field.ratings <=0 ? 'color: gray;' : ''"><div style="margin-right:3px;">{{field.ratings >0 ? field.ratings : 'No Ratings yet' }}</div><q-rating v-if="field.total_reviews" v-model="field.ratings" size="15px" color="primary" readonly/> </div>
+                        <div class="ratings-count" v-if="field.total_reviews"><div style="margin-right:3px;color:black">{{field.total_reviews? nFormatter(Number(field.total_reviews), 1) : '' }}</div><div>{{field.total_reviews ? 'Ratings' : '' }}</div></div>
+                        <div class="product-sold">
+                            <div style="margin-right:3px;color:black">{{field.sold_count? nFormatter(Number(field.sold_count), 1) : 0 }}</div>
+                            <div>{{'Sold'}}</div>
+                        </div>
+                        <!-- <div class="product-sold"></div> -->
+                    </div>
                     <template v-if="show_reseller_commission && field.referral_commission > 0 ">
                         <div class="commission-badge">
                             <div class="commission-label">rc: </div>
@@ -34,7 +43,7 @@
                             <div v-if="field.gc_price>0" class="gc_price gc">GC {{$_formatNumber(field.gc_price, { decimal: 2})}}</div>
                             <div v-else class="gc_price gc">Not Purchasable by GC</div>
                         </template>
-                        <div class="add-cart">View Product</div>
+                        <div class="add-cart" v-if="show_button">View Product</div>
                     </div>
                     <div v-else class="prod_price price">GC {{$_formatNumber(field.gc_price, { decimal: 2})}}</div>
                 </div>
@@ -60,7 +69,6 @@ import DB_PRODUCTS          from './models/DB_PRODUCT';
 import GlobalMixins         from './mixins/global_mixins';
 import GLoader                  from './components/GlobalLoader';
 import ProductClass            from './classes/ProductClass';
-import { log } from 'console';
 
 
 export default {
@@ -87,6 +95,9 @@ export default {
             show_discount_badge: Boolean,
             show_original_price:Boolean,
             show_merchant_discount:Boolean,
+            show_ratings:Boolean,
+            show_button:Boolean,
+            is_membership_only:Boolean
         },
     data: () =>
     ({
@@ -196,9 +207,32 @@ export default {
     },
     methods:{
 
+        nFormatter(num, digits) {
+        var si = [
+            { value: 1, symbol: "" },
+            { value: 1E3, symbol: "k" },
+            { value: 1E6, symbol: "M" },
+            { value: 1E9, symbol: "G" },
+            { value: 1E12, symbol: "T" },
+            { value: 1E15, symbol: "P" },
+            { value: 1E18, symbol: "E" }
+        ];
+        var rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+        var i;
+        for (i = si.length - 1; i > 0; i--) {
+            if (num >= si[i].value) {
+            break;
+            }
+        }
+        return (num / si[i].value).toFixed(digits).replace(rx, "$1") + si[i].symbol;
+        },
         async newGetProduct(limit,loadmore=false)
         {
             let querry = new DB_PRODUCTS().collection().where("type", "in", ["Product", "Membership Kit", "Exclusive"]).where("ecommerce", "==", true).where("country_code", "==", this.country_code ? this.country_code : 'PH');
+            if(this.is_membership_only)
+            {
+                querry = querry.where("type", "==", "Membership Kit")
+            }
             if (this.category)
             {
                 if(this.category != 'All')
@@ -326,6 +360,7 @@ export default {
                 let filtered = filt.filter(Boolean);
                 this.new_product_list = filtered;
                 this.first_load_done=true;
+                console.log(this.new_product_list);
             }
         },
         openproduct(product){

package/components/UnplacedSlot/ManualPlaceDialog.vue

@@ -133,7 +133,7 @@ import DB_SLOT              from '../../models/DB_SLOT';
                 catch (error)
                 {
                     this.$q.loading.hide();
-                    this.$q.dialog({ title: 'Ann Error Has Occured', message: error.message });
+                    this.$q.dialog({ title: 'An Error Has Occured', message: error.message });
                 }
             }
         },

package/dialogs/AddSlotDialog.vue

@@ -199,7 +199,8 @@ export default
     methods:
     {
         useDefaultSponsor(){
-            if(this.public_settings.hasOwnProperty('no_sponsor')){
+            if(this.public_settings.hasOwnProperty('no_sponsor'))
+            {
                 if(this.public_settings.no_sponsor.active){
                      this.field.sponsor = this.public_settings.no_sponsor.default_sponsor_slot ? this.public_settings.no_sponsor.default_sponsor_slot: 'no set default' ;
                 }

package/dialogs/CompanyTokenClaim.vue

@@ -95,6 +95,7 @@ export default
                 let res                 = await this.$_fbCall('memberClaimCompanyToken', sendData);
                 this.$emit('emitTest',plan.token_required);
                 this.$q.loading.hide();
+                this.$emit('closeDialog');
             }
             catch (error)
             {

package/dialogs/CompanyTokenHistory.vue

@@ -0,0 +1,120 @@
+<template>
+    <q-card >
+        <q-bar class='bg-primary text-white q-pa-lg'>
+           <b>History</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">
+                        <q-table :pagination.sync="pagination" :loading="table_loading" separator="cell" bordered flat :data="!table_loading ? table_data : []" :columns="table_column" row-key="email">
+                            <template v-slot:body-cell-message="cellProperties">
+                                <q-td :props="cellProperties">
+                                    <span v-html="cellProperties.value"></span>
+                                </q-td>
+                            </template>
+                        </q-table>
+                    </div>
+                </div>
+            </div>
+        </q-card-section>
+    </q-card>
+</template>
+
+<script>
+    import DB_POINTS_LOG from '../models/DB_POINTS_LOG';
+    import GlobalMixins from '../mixins/global_mixins.js';
+    import moment               from 'moment';
+    import {formatDate} from '../utilities/DateUtils';
+    import { formatNumber } from '../utilities/NumberUtils';
+    export default
+    {
+        mixins: [GlobalMixins],
+        components:{
+        },
+        data: () =>
+        ({
+            pagination: { rowsPerPage: 8 },
+            table_loading: true,
+            table_data: [],
+            public_settings:[],
+            date_now:null,
+            table_column:
+            [
+                {
+                    name    : 'created_date',
+                    label   : 'Log Date',
+                    field   : row => formatDate(row.created_date, 'MM/DD/YY (hh:mm A)'),
+                    align   : 'left',
+                    required: true,
+                    format: val => `${val}`,
+                    sortable: true,
+
+                },
+                {
+                    name    : 'message',
+                    label   : 'Message',
+                    field   : row => row.message,
+                    align   : 'left',
+                    required: true,
+                    format: val => `${val}`,
+                    sortable: true,
+                },
+                {
+                    name    : 'amount',
+                    label   : 'Amount',
+                    field   : row => row.amount,
+                    align   : 'left',
+                    required: true,
+                    format  : val => formatNumber(val, { decimal: 2 }),
+                    sortable: true,
+                    align   : "right",
+
+                },
+                {
+                    name    : 'plan_taken',
+                    label   : 'Claimed Plan',
+                    field   : row => row.plan_token ? row.plan_token.name : "--",
+                    align   : 'left',
+                    required: true,
+                    format  : val => val,
+                    sortable: true,
+                    align   : "right",
+
+                }
+            ]
+        }),
+        props:
+        {
+            plan_id : String,
+        },
+        async mounted()
+        {        
+            this.date_now = moment();
+
+            await this.$_getSlotInfo();
+            await this.getTableData();
+        },
+        methods:
+        {
+            async getTableData()
+            {
+                await this.$bind("table_data", new DB_POINTS_LOG().collection().where("recipient_id","==",this.current_slot_info.slot_code).where("type","==","company_token").orderBy('created_date', 'desc'));
+                console.log(this.table_data);
+
+                this.table_loading = false;
+            },
+            getHumanDate : function (date) 
+            {
+                return moment(date);
+            }
+        },
+        created()
+        {
+            
+        }
+    }
+</script>

package/package.json

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