geer-builder 1.2.601 → 1.2.602

package/GCheckout.vue

@@ -451,18 +451,19 @@ export default {
             this.payment_method_list = await this.$_getData('payment_method_list');
             this.online_payment_index = this.payment_method_list.map(function(e) { return e.payment_method_id; }).indexOf('online_payment');
             this.payment_account_list = await this.$_getData('payment_account_list');
-            if( this.user_info.slot_owned > 0 && this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.active)
-            {
-                if(this.user_info.hasOwnProperty('sponsor'))
-                {
-                    sessionStorage.setItem('referral_slot_code', this.user_info.sponsor);
-                }
-                else
-                {
-                    sessionStorage.setItem('referral_slot_code', this.public_settings.registration_sponsor.default_sponsor);
-                }
-            }
-            else if(this.user_info.slot_owned >0)
+           
+           // if( this.user_info.slot_owned > 0 && this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.active)
+            // {
+            //     if(this.user_info.hasOwnProperty('sponsor'))
+            //     {
+            //         sessionStorage.setItem('referral_slot_code', this.user_info.sponsor);
+            //     }
+            //     else
+            //     {
+            //         sessionStorage.setItem('referral_slot_code', this.public_settings.registration_sponsor.default_sponsor);
+            //     }
+            // }
+            if(this.user_info.slot_owned >0)
             {
                 if(sessionStorage.referral_slot_code)
                 {
@@ -475,9 +476,29 @@ export default {
                 {
                     sessionStorage.setItem('referral_slot_code', this.user_info.sponsor);
                 }
-                else if(this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.rc_sponsor)
+            }
+
+            if(this.public_settings.hasOwnProperty('registration_sponsor') && this.public_settings.registration_sponsor.active)
+            {
+                if(this.user_info.slot_owned > 0 )
+                {
+                    let slot = await new DB_SLOT().getSponsor(this.user_info.active_slot);
+                    if(slot.length>0)
+                    {
+                        let sponsor = slot[0].sponsor;
+                        sessionStorage.setItem('reseller_slot_code', sponsor);
+                    }
+                }
+                else
                 {
-                    sessionStorage.setItem('referral_slot_code', this.public_settings.registration_sponsor.default_sponsor);
+                    if(this.user_info.hasOwnProperty('sponsor'))
+                    {
+                        sessionStorage.setItem('reseller_slot_code', this.user_info.sponsor);
+                    }
+                    else
+                    {
+                        sessionStorage.setItem('referral_slot_code', this.public_settings.registration_sponsor.default_sponsor);
+                    }
                 }
             }
 
@@ -1891,6 +1912,10 @@ export default {
                     {
                         this.checkout_info.referral_slot_code = sessionStorage.referral_slot_code;
                     }
+                    if(sessionStorage.reseller_slot_code && this.payment_method.payment_method_id != "gc_points")
+                    {
+                        this.checkout_info.reseller_slot_code = sessionStorage.reseller_slot_code;
+                    }
                     if(this.checkout_info.payment_method.payment_method_id == "wallet")
                     {
                         this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)

package/GEcomStorePage.vue

@@ -4,32 +4,83 @@
         <!-- <img :src="this.user_info.profile_picture"/> -->
         <div class="ecom_page_body">
             <div class="profile_holder">
-                <div class="profile_bg" :style="`background-image:url('`+this.merchant_info.profile_picture+`');`">
+                <div class="profile_bg" :style="`background-image:url('`+this.merchant_info.profile_picture+`'); background-size: cover; background-position: center;`">
                     <div class="dp">
-                        <img class="circle_pic" :src="this.merchant_info.profile_picture ? this.merchant_info.profile_picture : require('./assets/statics/default_profile.png')" alt="Avatar">    
-                        <div class="profile_name" style="">{{this.merchant_info.full_name}}</div>
+                        <div class="circle_pic" :style="this.merchant_info.profile_picture ? `background-image: url(${ this.merchant_info.profile_picture }); background-size: cover; background-position: center;` : ``"></div>
+                        <div class="merchant__name">
+                            <div class="profile_name" style="">{{this.merchant_info.full_name}}</div>
+                            <div class="active__status">Active {{timeSince( new Date(this.merchant_info.last_login_date.seconds * 1000 + this.merchant_info.last_login_date.nanoseconds/1000000))+" ago"}}</div>
+                        </div>
                     </div>  
-                </div>
-                <div class="button-holder" v-if="user_info">
-                    <q-btn class="q-mr-sm open-merchant-btn" @click="openMerchantPage()">
-                        <q-icon size="14px" color="primary" class="q-mr-sm" name="fa fa-store"></q-icon>
-                        View Page
-                    </q-btn>
-                    <q-btn class="q-mr-sm open-merchant-chat-btn" @click="openMerchantChat()">
-                        <q-icon size="14px" color="primary" class="q-mr-sm" name="fa fa-paper-plane"></q-icon>
-                        Send Message
-                    </q-btn>
+                    <div class="button-holder" v-if="user_info">
+                        <q-btn class="q-mr-sm hidden open-merchant-btn btn-color" @click="openMerchantPage()">
+                            <q-icon size="14px" color="gray" class="q-mr-sm" name="fa fa-store"></q-icon>
+                            View Page
+                        </q-btn>
+                        <q-btn v-if="!is_following" class="q-mr-sm btn-color open-merchant_follow_btn" @click="followMerchant('follow')">
+                            <q-icon size="14px" color="gray" class="q-mr-sm" name="fa fa-user-plus"></q-icon>
+                            Follow
+                        </q-btn>
+                        <q-btn v-else class="q-mr-sm btn-color open-merchant_follow_btn" @click="followMerchant('unfollow')">
+                            <q-icon size="14px" color="gray" class="q-mr-sm" name="fa fa-user-minus"></q-icon>
+                            Unfollow
+                        </q-btn>
+                        <q-btn class="q-mr-sm btn-color open-merchant-chat-btn" @click="openMerchantChat()">
+                            <q-icon size="14px" color="gray" class="q-mr-sm" name="fa fa-paper-plane"></q-icon>
+                            Send Message
+                        </q-btn>
+                    </div>
                 </div>
             </div>
             <div class="right">
-                <div class="product_list_div">
-                    <q-icon size="14px" class="q-mr-sm" name="fas fa-store"></q-icon>Products:{{product_list.length}}
+                <div class="product_list_div  products">
+                    <q-icon size="14px" class="q-mr-sm" name="fas fa-store"></q-icon>Products : {{product_list.length}}
+                </div>
+                <div class="product_list_div followers">
+                    <q-icon size="14px" class="q-mr-sm" name="fas fa-users"></q-icon> 
+                    Follower(s) : {{merchant_slot.follower ? merchant_slot.follower: 0}}
+                </div>
+                <div class="product_list_div ratings">
+                    <q-icon size="14px" class="q-mr-sm" name="fas fa-star"></q-icon> 
+                    Ratings : {{$_formatNumber(merchant_slot.rating, { decimal: 1})}}
                 </div>
-                <div style="text-align:left;padding:5px;">
-                    <q-icon size="14px" class="q-mr-sm" name="fas fa-user-check"></q-icon> Joined : {{monthDiff( new Date(this.merchant_info.created_date.seconds * 1000 + this.merchant_info.created_date.nanoseconds/1000000),new Date())+" Months Ago"}}
+                <!-- <div class="product_list_div chat-performance">
+                    <q-icon size="14px" class="q-mr-sm" name="fas fa-comments"></q-icon> 
+                    Chat Performance : 100%
+                </div> -->
+                <div class="product_list_div joined">
+                    <q-icon size="14px" class="q-mr-sm" name="fas fa-user-check"></q-icon> Joined : {{timeSince( new Date(this.merchant_info.created_date.seconds * 1000 + this.merchant_info.created_date.nanoseconds/1000000))+" ago "}}
                 </div>
             </div>
         </div>
+        <q-dialog v-model="is_rating_dialog">
+            <q-card class="rating-main-container">
+                <q-card-section class="text-center">
+                    <div class="message text-bold text-h5">Please, give us a rating!</div>
+                    <div class="sub-message">We want to get your to further enhance our service and/or product!</div>
+                    <div class="icon-btn-main-holder q-mt-md">
+                        <span v-if='rate >= 1' @click="rating(1)" class="material-icons star-first">star</span>
+                        <span v-else @click="rating(1)" class="material-icons star-first">star_outline</span>
+                        <span v-if='rate >= 2' @click="rating(2)" class="material-icons star-second">star</span>
+                        <span v-else @click="rating(2)" class="material-icons star-second">star_outline</span>
+                        <span v-if='rate >= 3' @click="rating(3)" class="material-icons star-third">star</span>
+                        <span v-else @click="rating(3)" class="material-icons star-third">star_outline</span>
+                        <span v-if='rate >= 4' @click="rating(4)" class="material-icons star-fourth">star</span>
+                        <span v-else @click="rating(4)" class="material-icons star-fourth">star_outline</span>
+                        <span v-if='rate == 5' @click="rating(5)" class="material-icons star-fifth">star</span>
+                        <span v-else @click="rating(5)" class="material-icons star-fifth">star_outline</span>
+                    </div>
+                </q-card-section>
+                <q-separator class="seperator" />
+                <q-card-section>
+                    <div align="right">
+                        <q-btn @click="ignoreRating('later')" color="secondary" label="I'll Try Later!" class="q-mr-sm"/>
+                        <q-btn v-if="rate != 0" @click="rating(rate, 'confirm')" label="confirm" color="primary"/>
+                        <q-btn v-else @click="ignoreRating('ignored')" label="No, Thanks." color="primary"/>
+                    </div>
+                </q-card-section>
+            </q-card>
+        </q-dialog>
         <!-- <div class="product-list-container">
             <div class="filter" style=""><q-select v-model="category_choice" dense :options="categories_list" option-label="category_identifier" map-options emit-value option-value="category_identifier" outlined></q-select>
             <q-select class="q-ml-sm" dense v-model="sort_choice" :options="['Price: High to Low', 'Price: Low to High']" @input="sortby" option-label="category_identifier" map-options emit-value option-value="category_identifier" outlined></q-select></div>
@@ -55,6 +106,7 @@ import GlobalMixins          from './mixins/global_mixins.js';
 import DB_PRODUCTS           from './models/DB_PRODUCT';
 import DB_CATEGORIES         from './models/DB_CATEGORIES';
 import DB_USER               from './models/DB_USER';
+import DB_SLOT               from './models/DB_SLOT';
 import GProductList          from './GProductList';
 import GProductPage          from './GProductPage';
 
@@ -68,6 +120,8 @@ export default {
     },
     data: () =>
     ({
+        is_rating_dialog: false,
+        rate: 0,
         product_list:"",
         categories_list: [],
         category_choice: "",
@@ -78,19 +132,23 @@ export default {
         openInfo: false,   
         productid: "",
         merchant_info: {created_date:{seconds: "", nanoseconds: ""}},
+        merchant_slot:{},
+        field:{},
+        ratings_data: {},
+        is_following: false,
+        mode:'follow',
     }),
     async mounted()
     {
         if(this.slot_code)
         await this.$bind('product_list', new DB_PRODUCTS().collection().where("type", "in", ["Product", "Membership Kit", "Exclusive"]).where("stockist", "==", this.slot_code).orderBy('created_date', 'desc'));
-        this.getCategories();
-        this.getUserInfo();
+        await this.getCategories();
+        await this.getUserInfo();
     },
     methods:
     {   
         async openMerchantPage()
         {
-            console.log(this.slot_code, 'slot code');
             this.$router.push({ name: 'front_merchant_page', params: { 'stockist': this.slot_code}});
         },
         async openMerchantChat()
@@ -101,14 +159,95 @@ export default {
         {
             if (this.slot_code)
             {
-                this.merchant_info = await new DB_USER().collection().where("slot_list", "array-contains", this.slot_code).get(); 
+                this.merchant_info = await new DB_USER().collection().where("slot_list", "array-contains", this.slot_code).get();
             }
             this.merchant_info = this.merchant_info.docs[0].data();
+            if(this.merchant_info.active_slot)
+            {
+                this.merchant_slot = await new DB_SLOT().collection().where("slot_code", "==", this.merchant_info.active_slot).get(); 
+                this.merchant_slot = this.merchant_slot.docs[0].data();
+                // console.log(this.merchant_slot);
+                // await this.$bind('merchant_slot', new DB_SLOT().collection().where('slot_code', '==', this.merchant_info.active_slot));
+                if(this.merchant_slot.hasOwnProperty('follower_list'))
+                {
+                    this.is_following = false;
+                    if(this.merchant_slot.follower_list.includes(this.user_info.uid)) this.is_following = true;
+                }
+            }
+            if (this.merchant_slot.rate_list) 
+            {
+                let check_user_on_list = this.merchant_slot.rate_list.includes(this.user_info.uid)
+                if (!check_user_on_list) 
+                {
+                    this.is_rating_dialog = true;
+                }
+            }
+            else
+            {
+                this.is_rating_dialog = true;
+            }
         },
-        monthDiff(dateFrom, dateTo) {
-        return dateTo.getMonth() - dateFrom.getMonth() + 
-        (12 * (dateTo.getFullYear() - dateFrom.getFullYear()))
+        timeSince(date) {
+
+            var seconds = Math.floor((new Date() - date) / 1000);
+
+            var interval = seconds / 31536000;
+
+            if (interval > 1) {
+                if ((Math.floor(interval)) > 1) {
+                    return Math.floor(interval) + " years";
+                }
+                else
+                {
+                    return Math.floor(interval) + " year";
+                }
+            }
+            interval = seconds / 2592000;
+            if (interval > 1) {
+                if ((Math.floor(interval)) > 1) {
+                    return Math.floor(interval) + " months";
+                }
+                else
+                {
+                    return Math.floor(interval) + " month";
+                }
+            }
+            interval = seconds / 86400;
+            if (interval > 1) {
+                if ((Math.floor(interval)) > 1) {
+                    return Math.floor(interval) + " days";
+                }
+                else
+                {
+                    return Math.floor(interval) + " day";
+                }
+            }
+            interval = seconds / 3600;
+            if (interval > 1) {
+                if ((Math.floor(interval)) > 1) {
+                    return Math.floor(interval) + " hours";
+                }
+                else
+                {
+                    return Math.floor(interval) + " hour";
+                }
+            }
+            interval = seconds / 60;
+            if (interval > 1) {
+                if ((Math.floor(interval)) > 1) {
+                    return Math.floor(interval) + " minutes";
+                }
+                else
+                {
+                    return Math.floor(interval) + " minute";
+                }
+            }
+            return Math.floor(seconds) + " second(s)";
         },
+        // monthDiff(dateFrom, dateTo) {
+        // return dateTo.getMonth() - dateFrom.getMonth() + 
+        // (12 * (dateTo.getFullYear() - dateFrom.getFullYear()))
+        // },
         async getCategories()
         {
             let getCategories = await new DB_CATEGORIES().collection().get();  
@@ -151,6 +290,96 @@ export default {
         {
             this.openInfo=false;
         },
+        async followMerchant(method)
+        {
+            this.$q.loading.show();
+            try
+            {
+                if(method != 'follow')
+                {
+                    this.mode = 'unfollow';
+                }
+                else
+                {
+                    this.mode = 'follow';
+                }
+                this.field.mode = this.mode;
+                this.field.user_id = this.user_info.uid;
+                this.field.merchant_slot = this.merchant_info.active_slot;
+                // this.$q.loading.show();
+                await this.$_fbCall('memberFollowMerchant', this.field);
+                if (this.mode === 'follow') {
+                    this.$q.dialog({
+                        title: 'Congratulations',
+                        message: `Successfully ${this.mode}.`
+                    })
+                }
+                else
+                {
+                    this.$q.dialog({
+                        title: 'Unfollowed',
+                        message: `Successfully ${this.mode}.`
+                    })
+                }
+                // this.$emit('closeDialog');
+            }
+            catch (error)
+            {
+                this.$q.dialog({ html: true, title: `Something's not quite right`, message: error.message });
+            }
+            this.getUserInfo();
+            this.$q.loading.hide();
+        },
+        async rating(rate, action)
+        {
+            if (this.rate !== 0 && action && action === 'confirm') 
+            {
+                this.$q.loading.show();
+                let merchant_slot = await this.merchant_info.active_slot;
+                try
+                {
+                    this.ratings_data.user_id = this.user_info.uid;
+                    this.ratings_data.rate = this.rate;
+                    this.ratings_data.merchant_slot = merchant_slot;
+                    if (this.ratings_data.merchant_slot != null) 
+                    {
+                        let rate = await this.$_fbCall('memberRateMerchant', this.ratings_data);
+                        this.$q.dialog({
+                            title: 'Thank you!',
+                            message: `You have successfully submitted your response.`
+                        })
+                    }
+                    // this.$emit('closeDialog');
+                }
+                catch (error)
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: error.message });
+                }
+                // this.getUserInfo();
+                this.getUserInfo();
+                this.is_rating_dialog = false;
+                this.$q.loading.hide();
+            }
+            else 
+            {
+                this.rate = rate;
+            }
+        },
+        ignoreRating(user_response)
+        {
+            this.is_rating_dialog = false;
+            if (user_response === later) 
+            {
+                setTimeout(() => 
+                {
+                    this.is_rating_dialog = true;
+                }, 900000);
+            }
+            else 
+            {
+                this.is_rating_dialog = false;
+            }
+        }
     }
 }
 </script>
@@ -161,64 +390,72 @@ export default {
     width: 100%;
     .ecom_page_body{
         display: grid;
-        grid-template-columns:  1fr 1fr;
+        grid-template-columns: 1fr 1fr;
         grid-gap: 10px;
         padding: 10px;
         .profile_holder
         {
-            width: 120px;
+            width: 100%;
+            background-color: rgba(0,0,0,0.6);
+            height: 100%;
+            border-radius: 5px;
+            overflow: hidden;
             .profile_bg
             {
                 position: relative;
                 display: inline-block;
                 line-height: 0;
-                width: 370px;
-                height: 130px;
-                background-size: 90% auto;
-                background-position: center;
+                width: 100%;
                 background-repeat: no-repeat;
-                border: 1px solid #cccccc;
                 border-radius: 5px;
-                margin: 5px;
-                border-radius: 3%;
                 .dp
                 {
                     display:flex;
-                    background-color: rgba(0,0,0,0.6);
                     height:130px;
-                    border-radius: 3%;
                     text-align:left;
                     padding:15px;
+                    background-color: rgba($color: #000000, $alpha: 0.6);
                     .circle_pic
                     {
                         border-radius:50%;
                         height:90px;
-                        border: 4px solid gray;
+                        width: 90px;
+                        border: 3px solid white;
                     }
-                    .profile_name
+                    .merchant__name
                     {
-                        font-size:20px;
-                        font-weight:700;
+                        display: grid;
                         margin-left: 15px;
                         margin-top: 25px;
                         color:white;
+                        .profile_name
+                        {
+                            font-size:20px;
+                            font-weight:700;
+                        }
                     }
                 }
             }
             .button-holder{
+                background-color: rgba($color: #000000, $alpha: 0.8);
                 display: grid;
                 grid-template-columns: 1fr 1fr;
-                width: 370px;
                 padding:10px;
+                .btn-color
+                {
+                    background-color: white;
+                }
             }
         }
         .right
         {
+            display: grid;
+            align-items: center;
+            align-content: space-between;
+            padding: 5px 0;
             .product_list_div
             {
                 text-align:left;
-                padding:5px;
-                padding-top:15px;
             }
         }
     }   
@@ -229,4 +466,24 @@ export default {
     }
     
 }
+.q-dialog
+{
+    .rating-main-container
+    {
+        max-width: 400px;
+        padding: 10px 20px;
+    }
+    .icon-btn-main-holder
+    {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        grid-gap: 10px;
+        .material-icons 
+        {
+            font-size: 40px;
+            cursor: pointer;
+        }
+    }
+}
 </style>

package/models/DB_SLOT.js

@@ -55,6 +55,23 @@ export default class DB_SLOT extends MODEL
             })
         }
 
+        return data;
+    }
+    async getSponsor(slot_code)
+    {
+        let res = await this.collection().where('slot_code', '==', slot_code).get();
+        
+        let data = [];
+
+        if(!res.empty)
+        {
+            res.docs.forEach((d, i) =>
+            {
+                data[i] = d.data();
+                data[i].id = d.id;
+            })
+        }
+
         return data;
     }
 }

package/package.json

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