geer-builder 1.2.486 → 1.2.490

package/GApplyMerchantNew.vue

@@ -0,0 +1,67 @@
+<template>
+    <div  class="g-apply-product" >
+        <div v-if="user_info.hasOwnProperty('merchant') && !user_info.merchant">
+
+            <h3 class="text-primary" style="margin-top:10px;">Thank you!</h3>
+            <div style="color:gray;font-size:17px;text-align:center">
+                <p>Thanks for taking the time to apply as one of our merchant and for submitting the required documents.</p>
+
+                <p>We're currently in the process of reviewing / approving documents for our Merchant Section.</p>
+
+                <p>For updates, please always check this area for the approval of your application!</p>
+            </div>
+        </div>
+        <div v-if="user_info.hasOwnProperty('merchant') && user_info.merchant">
+                <h3 class="text-primary" style="margin-top:10px;">Thank you!</h3>
+            <div style="color:gray;font-size:17px;text-align:center">
+                <p>Congratulations! your merchant request has been accepted,</p>
+                <p>You are now a merchant!</p>
+            </div>
+        </div>
+        <div v-if="!user_info.hasOwnProperty('merchant')">
+             <div class="q-mb-md message">We have detected that you are not a <b>Merchant</b> yet.</div>
+            <div class="q-mb-md message"><b>Apply</b> to be one now!</div>
+            <q-btn color="primary" @click="is_apply_product_dialog_open=true" label="Apply as a Merchant"/>
+        </div>
+        <q-dialog v-model="is_apply_product_dialog_open">
+            <apply-merchant-dialog :no_slot_merchant="true" @closeDialog="is_apply_product_dialog_open=false"></apply-merchant-dialog>
+        </q-dialog>
+    </div>
+</template>
+<script>
+import ApplyMerchantDialog from "./components/ApplyMerchant/ApplyMerchantDialog";
+import GlobalMixins         from './mixins/global_mixins.js';
+export default
+{
+    mixins: [GlobalMixins],
+    components:{ ApplyMerchantDialog },
+    data:() =>({
+        is_apply_product_dialog_open: false,
+        public_settings: [],
+    }),
+    async mounted() 
+    { 
+        await this.$_getSlotInfo();
+    },
+    methods: { },
+    computed: 
+    {
+        user_slot_info()
+        {
+            if(this.current_slot_info)
+            {
+                return this.current_slot_info;
+            }
+            else
+            {
+                return {};
+            }
+        }
+    }
+}
+</script>
+styl <style lang="scss">
+.g-apply-product{
+}
+
+</style>

package/GRequestProduct.vue

@@ -90,7 +90,15 @@
                                     </tr>
                                     <tr>
                                         <td>COMMISSION FEE</td>
-                                        <td>{{this.product_details.commission_margin ? this.product_details.commission_margin+"%" : "0%"}}</td>
+                                        <td>{{ main_currency }} {{sale_price ? $_formatNumber(computedCommision, { decimal: 2 }) : "0" }}({{this.product_details.commission_margin ? this.product_details.commission_margin+"%" : "0%"}})</td>
+                                    </tr>
+                                    <tr v-if="product_deductions">
+                                        <td>VAT</td>
+                                        <td>{{ main_currency }} {{sale_price ? $_formatNumber(computedVat, { decimal: 2 }) : "0" }}</td>
+                                    </tr>
+                                    <tr v-if="product_deductions">
+                                        <td>TRANSACTION FEE</td>
+                                        <td>{{ main_currency }} {{sale_price ? $_formatNumber(computedTransaction, { decimal: 2 }) : "0" }}</td>
                                     </tr>
                                     <tr>
                                         <td>MERCHANT GROSS</td>
@@ -235,13 +243,22 @@
                                             <td>{{ main_currency }} {{this.product_details.selling_price ? $_formatNumber(this.product_details.selling_price, { decimal: 2 }) : "0" }}</td>
                                         </tr>
                                         <tr>
-                                            <td>COMMISSION FEE</td>
-                                            <td>{{this.product_details.commission_margin ? this.product_details.commission_margin+"%" : "0%"}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>MERCHANT GROSS</td>
-                                            <td>{{ main_currency }} {{sale_price ? $_formatNumber(sale_price, { decimal: 2 }) : "0" }}</td>
-                                        </tr>
+                                    <tr>
+                                        <td>COMMISSION FEE</td>
+                                        <td>{{ main_currency }} {{sale_price ? $_formatNumber(computedCommision, { decimal: 2 }) : "0" }}({{this.product_details.commission_margin ? this.product_details.commission_margin+"%" : "0%"}})</td>
+                                    </tr>
+                                    <tr v-if="product_deductions">
+                                        <td>VAT</td>
+                                        <td>{{ main_currency }} {{sale_price ? $_formatNumber(computedVat, { decimal: 2 }) : "0" }}</td>
+                                    </tr>
+                                    <tr v-if="product_deductions">
+                                        <td>TRANSACTION FEE</td>
+                                        <td>{{ main_currency }} {{sale_price ? $_formatNumber(computedTransaction, { decimal: 2 }) : "0" }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>MERCHANT GROSS</td>
+                                        <td>{{ main_currency }} {{sale_price ? $_formatNumber(sale_price, { decimal: 2 }) : "0" }}</td>
+                                    </tr>
                                     </tbody>
                                 </table>
                             </div>
@@ -332,6 +349,8 @@
                 selling_price       : 0,
                 original_price      : 0,
                 commission_margin 	: 0,
+                vat                 : 0,
+                transaction_fee     : 0,
                 category            : "",
                 product_pictures    : "",
                 description         : "",
@@ -349,16 +368,34 @@
             page : 1,
             categories_list : [],
             product_keywords: [],
-            
+            computed_vat:0,
+            computed_transaction_fee:0,
+            computed_commission:0,
+            settings:{},
+            vat:0,
+            transaction_fee:0,
+            product_deductions:false,
         }),
         computed:
         {
+
+            computedCommision()
+            {
+                return this.computed_commission = parseFloat((this.product_details.commission_margin / 100) * this.product_details.selling_price);
+            },
+            computedTransaction()
+            {
+                return this.computed_transaction_fee =  parseFloat((this.transaction_fee / 100) * this.product_details.selling_price);
+            },
+            computedVat()
+            {
+                return this.computed_vat =  parseFloat((this.vat / 100) * this.computed_commission);
+            },
             sale_price()
             {
-                // return Number(this.product_details.selling_price);
-                return Number(this.product_details.selling_price) - Number(this.product_details.selling_price*(this.product_details.commission_margin/100));
-
-            }
+                let total_deduction = this.computed_commission + this.computed_transaction_fee + this.computed_vat;
+                return Number(this.product_details.selling_price) - Number(total_deduction);
+            },
         },
     
         async mounted()
@@ -367,9 +404,20 @@
             await this.$_getSlotInfo();
             this.getMainCurrency();
             this.getCategoriesList();
+            this.getSettings();
         },
     
         methods:{
+            async getSettings()
+            {
+                this.settings = await this.$_getData('public_settings');
+                if(this.settings && this.settings.hasOwnProperty('product_deductions') && this.settings.product_deductions.active)
+                {   
+                    this.transaction_fee = this.settings.product_deductions.transaction_fee;
+                    this.vat= this.settings.product_deductions.vat;
+                    this.product_deductions = true;
+                }
+            },
             async getCategoriesList()
             {
                 let getCategories = await new DB_CATEGORIES().collection().get();  
@@ -401,7 +449,8 @@
                 // console.log(this.product_details)
                 try
                 {
-                    console.log(this.product_details);
+                    this.product_details.vat = this.vat;
+                    this.product_details.transaction_fee = this.transaction_fee;
                     this.product_details.stockist = this.current_slot_info.slot_code;
                     this.product_details.user_info_uid = this.user_info.uid;
                     this.product_details.primary_picture=this.product_details.product_pictures[0];

package/components/ApplyMerchant/ApplyMerchantDialog.vue

@@ -75,6 +75,7 @@ import ApplyMerchantUploader             from './ApplyMerchantUploader';
 import phil                     from 'philippine-location-json-for-geer';
 export default {
     mixins: [GlobalMixins],
+    props:['no_slot_merchant'],
     components:{ ApplyMerchantUploader },
     data: () =>
     ({ 
@@ -183,7 +184,15 @@ export default {
                         delete this.merchant_details.additional_details;
                     }
                     this.merchant_details.uploaded_documents = this.uploaded_picture;
-                    await this.$_fbCall('memberApplyMerchant', {merchant_details:this.merchant_details, slot_code:this.user_info.active_slot, slot_info:this.current_slot_info});
+
+                    if(this.no_slot_merchant)
+                    {
+                        await this.$_fbCall('memberApplyMerchant', {merchant_details:this.merchant_details, user_info:this.user_info, no_slot_merchant:true});
+                    }
+                    else
+                    {
+                        await this.$_fbCall('memberApplyMerchant', {merchant_details:this.merchant_details, slot_code:this.user_info.active_slot, slot_info:this.current_slot_info});
+                    }
                     this.$emit('closeDialog');
                     this.$q.loading.hide();
                 }

package/components/UnplacedSlot/ManualPlaceDialog.vue

@@ -48,11 +48,16 @@ import DB_SLOT              from '../../models/DB_SLOT';
             unplaced_slots: [],
             disable_submit: false,
             merge_unplaced:[],
+            hide_slot:false,
+            hide_slot_list:[],
+            public_settings:{},
         }),
         async mounted()
         {
             await this.$_getSlotInfo()
             this.loading = true;
+            this.public_settings = await this.$_getData('public_settings');
+            this.getDisableSlotList();
             this.getListOfUnplacedSlots();
             this.field.placement = this.placement;
             this.field.position = this.position;
@@ -62,6 +67,17 @@ import DB_SLOT              from '../../models/DB_SLOT';
             unplaced_slots()
             {
                 this.disable_submit = false;
+
+                if(this.hide_slot)
+                {
+                    for( var i = 0; i < this.unplaced_slots.length; i++)
+                    {
+                        if ( this.hide_slot_list.includes(this.unplaced_slots[i].membership_id)) { 
+                            this.unplaced_slots.splice(i, 1); 
+                            i--; 
+                        }
+                    }
+                }
                 
                 if(this.unplaced_slots.length > 0)
                 {
@@ -90,6 +106,14 @@ import DB_SLOT              from '../../models/DB_SLOT';
         },
         methods:
         {
+            async getDisableSlotList()
+            {
+                if(this.public_settings.hasOwnProperty('disable_slot_placement') && this.public_settings.disable_slot_placement.active)
+                {
+                    this.hide_slot_list = this.public_settings.disable_slot_placement.membership_id ? this.public_settings.disable_slot_placement.membership_id : [];
+                    this.hide_slot = true;
+                }
+            },
             async getListOfUnplacedSlots()
             {
                 await this.$bind('unplaced_slots', new DB_SLOT().collection().where('sponsor', "==", this.current_slot_info.slot_code).where('placed', "==", false));

package/dialogs/AddSlotDialog.vue

@@ -164,17 +164,27 @@ export default
     },
     async mounted()
     {
+        this.public_settings = await this.$_getData('public_settings');
+        
+        if(this.user_info.hasOwnProperty('active_slot'))
+        {
+            this.field.sponsor = this.user_info.active_slot;
+        }
+        
         if(this.code)
         {
             this.field.code = this.code.code;
             this.field.pin = this.code.pin;
+            if(this.code.hasOwnProperty('sale_id') && this.code.sale_id =="apply_merchant")
+            {
+                if(this.public_settings.hasOwnProperty('merchant_default_sponsor'))
+                {
+                    this.field.sponsor = this.public_settings.merchant_default_sponsor;
+                    this.fixed_sponsor = true;
+                }
+            }
         }
 
-        if(this.user_info.hasOwnProperty('active_slot'))
-        {
-            this.field.sponsor = this.user_info.active_slot;
-        }
-        
         if(this.lead_info)
         {
             this.field.owner_email = this.lead_info.lead.email
@@ -184,7 +194,6 @@ export default
             this.field.owner_email = this.user_info.email;
 
         }
-        this.public_settings = await this.$_getData('public_settings');
         this.checkFixSponsor();
     },
     methods:
@@ -219,7 +228,6 @@ export default
         async verifyCode()
         {
             this.submit_loading = true;
-
             try
             {
                 this.code_info = await this.$_fbCall('memberVerifyCode', this.field);
@@ -256,7 +264,6 @@ export default
         async confirmDetails()
         {
             this.submit_loading         = true;
-
             try
             {
                 await this.$_fbCall('memberCreateSlot', this.field);

package/dialogs/SlotPlaceDialog.vue

@@ -29,10 +29,10 @@
 </template>
 
 <script>
-    import SlotTypeOptions      from '../references/refs_slot_type';
+import SlotTypeOptions      from '../references/refs_slot_type';
 import GlobalMixins             from '../mixins/global_mixins.js';
-
-    import DB_SLOT              from '../models/DB_SLOT';
+import DB_SLOT              from '../models/DB_SLOT';
+import { log } from 'console';
     export default
     {
         mixins: [GlobalMixins],
@@ -48,11 +48,16 @@ import GlobalMixins             from '../mixins/global_mixins.js';
             },
             unplaced_slots: [],
             disable_submit: false,
+            hide_slot:false,
+            hide_slot_list:[],
+            public_settings:{},
         }),
         async mounted()
         {
             await this.$_getSlotInfo()
+            this.public_settings = await this.$_getData('public_settings');
             this.loading = true;
+            this.getDisableSlotList();
             this.getListOfUnplacedSlots();
             this.field.placement = this.placement;
             this.field.position = this.position;
@@ -61,6 +66,17 @@ import GlobalMixins             from '../mixins/global_mixins.js';
         {
             unplaced_slots()
             {
+                if(this.hide_slot)
+                {
+                    for( var i = 0; i < this.unplaced_slots.length; i++)
+                    {
+                        if ( this.hide_slot_list.includes(this.unplaced_slots[i].membership_id)) { 
+                            this.unplaced_slots.splice(i, 1); 
+                            i--; 
+                        }
+                    }
+                }
+
                 this.disable_submit = false;
                 
                 if(this.unplaced_slots.length > 0)
@@ -84,6 +100,14 @@ import GlobalMixins             from '../mixins/global_mixins.js';
         },
         methods:
         {
+            async getDisableSlotList()
+            {
+                if(this.public_settings.hasOwnProperty('disable_slot_placement') && this.public_settings.disable_slot_placement.active)
+                {
+                    this.hide_slot_list = this.public_settings.disable_slot_placement.membership_id ? this.public_settings.disable_slot_placement.membership_id : [];
+                    this.hide_slot = true;
+                }
+            },
             async getListOfUnplacedSlots()
             {
                 this.$bind('unplaced_slots', new DB_SLOT().collection().where('sponsor', "==", this.current_slot_info.slot_code).where('placed', "==", false));

package/package.json

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