geer-builder 1.2.487 → 1.2.488

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/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/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/package.json

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