geer-builder 1.2.545 → 1.2.548

package/GBinaryWidget.vue

@@ -71,7 +71,7 @@
             <pairing-history :slot_info="slot_info" :binary_type="binary_type" :binary_settings="binary_settings" @closePopup="is_open_pairing_history_dialog = false"></pairing-history>
         </q-dialog>
         <q-dialog full-width v-model="is_open_binary_history_dialog">
-            <binary-history :slot_info="slot_info" :flushout_hide="true" :binary_type="binary_type" @closePopup="is_open_binary_history_dialog = false"></binary-history>
+            <binary-history :is_company_succes="is_company_success" :slot_info="slot_info" :flushout_hide="true" :binary_type="binary_type" @closePopup="is_open_binary_history_dialog = false"></binary-history>
         </q-dialog>
         <q-dialog full-width v-model="is_open_point_history_dialog">
             <point-history :slot_info="slot_info" :binary_type="binary_type" @closePopup="is_open_point_history_dialog = false"></point-history>

package/GCheckout.vue

@@ -437,7 +437,8 @@ export default {
         dragon_pay_amount:[],
         filtered_payment_channel:[],
         gcash_fee:0,
-        show_gcash_fee:false
+        show_gcash_fee:false,
+        online_payment_only:false,
     }),
     async mounted()
     {
@@ -504,7 +505,6 @@ export default {
                 }
                 else
                 {
-                    console.log('check online pay');
                     this.check = await this.$_fbCall('memberCheckPendingCheckout', { sale_id: pending_checkout.sale_id, amount:pending_checkout.amount }); 
                 }
                 if(this.check.data)
@@ -556,7 +556,6 @@ export default {
     {
         async dragon_pay_choice()
         {
-            console.log(this.dragon_pay_choice.shortName);
             this.gcash_fee = 0;
             this.show_gcash_fee = false;
             if(this.dragon_pay_choice.shortName == 'GCash' || this.dragon_pay_choice.shortName == 'GCash App')
@@ -1702,6 +1701,10 @@ export default {
                 {
                     this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Insufficient GC" });
                 }
+                else if(this.online_payment_only && this.checkout_info.payment_method.payment_method_id != "dragon_pay" && this.checkout_info.payment_method.payment_method_id != "online_payment")
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Shopper membership can only be purchased using online payment or dragon pay" });
+                }
                 else
                 {
                     if(sessionStorage.referral_slot_code && this.payment_method.payment_method_id != "gc_points")
@@ -1871,6 +1874,26 @@ export default {
                 this.checkout_info.payment_method = this.payment_method_list[0];
                 this.payment_method = this.payment_method_list[0];
 
+                this.product_list.forEach(element => {
+                    if(element.product.hasOwnProperty('membership_kit') && element.product.membership_kit.membership.membership_id == 'shopper_member')
+                    {
+                        this.online_payment_only = true;
+                        for( var i = 0; i < this.payment_method_list.length; i++)
+                        { 
+                            if (this.payment_method_list[i].payment_method_id == 'dragon_pay' || this.payment_method_list[i].payment_method_id == 'online_payment') 
+                            { 
+
+                            }
+                            else
+                            {
+                                this.payment_method_list.splice(i, 1); 
+                                i--; 
+                            }
+                        } 
+                    }
+                });
+
+
             }
         },
         changePaymentMethod(event,index)

package/GManageProduct.vue

@@ -112,6 +112,14 @@ export default
                 required: true,
                 sortable: true, 
             },
+            { 
+                name    : 'merchant discount',
+                label   : 'MERCHANT DISCOUNT %',
+                field   : row => row.merchant_discount_applied ? row.merchant_percentage_discount : 0,
+                align   : 'left',
+                required: true,
+                sortable: true, 
+            },
             
         ],
         slot_code : "",

package/GProductList.vue

@@ -9,9 +9,18 @@
                     <template v-if="show_discount_badge">
                         <div class="discount-badge"  v-if="field.user_discount>0">{{field.user_discount}}% <br/>OFF</div>
                     </template>
+                    <template v-if="show_merchant_discount">
+                        <div class="discount-badge"  v-if="field.merchant_percentage_discount>0">{{field.merchant_percentage_discount}}% <br/>OFF</div>
+                    </template>
                     <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>
+                    <template v-if="show_reseller_commission && field.referral_commission > 0 ">
+                        <div class="commission-badge">
+                            <div class="commission-label">rc: </div>
+                            <div class="commission-value">{{$_formatNumber((field.referral_commission), { decimal: 2})}} </div>
+                        </div>
+                    </template>
                     <div v-if="show_description" class="product-desc" v-html="field.description"></div>
                     <div class="product-list-detail" v-if="sort_by!='gc_price'">
                         <div class="product-list-row">
@@ -50,6 +59,7 @@ 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 {
@@ -75,6 +85,7 @@ export default {
             show_discount_price: Boolean,
             show_discount_badge: Boolean,
             show_original_price:Boolean,
+            show_merchant_discount:Boolean,
         },
     data: () =>
     ({
@@ -91,6 +102,7 @@ export default {
         rank_list: '',
         membership_list:'',
         stockist_list:'',
+        show_reseller_commission:false,
     }),
     async mounted()
     {
@@ -105,7 +117,10 @@ export default {
         this.public_settings = await this.$_getData('public_settings');
         this.main_currency = this.public_settings.main_currency;
         this.prod_per_page = this.product_per_page;
-
+        if(this.public_settings.hasOwnProperty('referral_commission_earning'))
+        {
+            if(this.public_settings.referral_commission_earning) this.show_reseller_commission = true;
+        }
         await this.newGetProduct(Number(this.prod_per_page));
         this.first_load_done=true;
     },

package/GProductPage.vue

@@ -53,6 +53,9 @@
                                 <div class="discount-percent" v-if="show_discount_badge && variant_product_details.user_discount>0">
                                     {{variant_product_details.user_discount}}% OFF
                                 </div>
+                                <div class="discount-percent" v-if="show_merchant_discount_badge && variant_product_details.merchant_percentage_discount>0">
+                                    {{variant_product_details.merchant_percentage_discount}}% OFF
+                                </div>
                             </template>
                             <template v-else>
                                 <div :style="product_details.user_discount>0 ? 'text-decoration-line: line-through;font-weight:400;font-size:15px;color:gray;margin-right:3px;font-size: 10px;' : ''">
@@ -79,6 +82,9 @@
                                 <div class="discount-percent" v-if="show_discount_badge && product_details.user_discount>0">
                                     {{product_details.user_discount}}% OFF
                                 </div>
+                                <div class="discount-percent" v-if="show_merchant_discount_badge && product_details.merchant_percentage_discount>0">
+                                    {{product_details.merchant_percentage_discount}}% OFF
+                                </div>
                             </template>
                         </div>
                         <div class="selling-price" v-if="product_discount>0">
@@ -412,6 +418,7 @@ export default {
         'slot_code',
         'show_discount',
         'show_discount_badge',
+        'show_merchant_discount_badge',
         'show_only',
         'show_pv'
     ],

package/GRegistration.vue

@@ -21,7 +21,10 @@
                 <!-- country -->
                 <div class="g-registration__fields q-mt-md">
                     <div class="label">Country</div>
-                    <div class="input">
+                    <div class="input" v-if="international_country">
+                        <q-select v-model="form_data.international_country"  option-label="name" option-value="code" :options="country_list" dense class="input" outlined stack-label/>
+                    </div>
+                    <div class="input" v-else>
                         <q-select v-model="form_data.country"  option-label="name" option-value="code" :options="[{ name: 'Philippines', code: 'PH' }]" dense class="input" outlined stack-label/>
                     </div>
                 </div>
@@ -114,6 +117,7 @@
 import GlobalMixins from './mixins/global_mixins.js';
 import scss from './GRegistration.scss'
 import axios from 'axios';
+import { truncateSync } from 'fs';
 
 export default
 {
@@ -132,17 +136,22 @@ export default
             password            : '',
             confirm_password    : '',
             gender              : 'Male',
+            international_country:{ name: 'Philippines', code: 'PH' },
             country             : { name: 'Philippines', code: 'PH' },
         },
         gender_options          : ['Male', 'Female'],
         country_options         : [{ name: 'Philippines', code: 'PH' }],
+        country_list            :[],
         is_term_checked         : false,
         is_term_and_condition_open : false,
         terms_and_conditions    : '',
         region_list             : [],
+        international_country:false,
     }),
     async mounted()
     {
+
+        this.country_list = await this.$_getData('country_list');
         //terms and conditions in public settings
         this.terms_and_conditions = await this.$_getData('public_settings');
         if(this.terms_and_conditions.hasOwnProperty('mbot'))
@@ -161,6 +170,10 @@ export default
                 this.form_data.sponsor = sessionStorage.referral_slot_code;
             }
         }
+        if(this.terms_and_conditions.hasOwnProperty('international_country_registration'))
+        {
+            this.international_country= true;
+        }
 
     },
     props:{
@@ -181,6 +194,10 @@ export default
         },
         async submitCreateAccount()
         {
+            if(!this.international_country)
+            {
+                delete this.form_data.international_country;
+            }
             if(this.val == false)
             {
                 this.is_term_and_condition_open = true;
@@ -201,6 +218,7 @@ export default
                     this.is_submitting = true;
                     try
                     {
+                        console.log(this.form_data);
                         let callbackCreateAccount = await this.$_fbCall('frontRegistration', this.form_data);
                         this.$emit('success', this.form_data);     
                         this.is_submitting = false;

package/GRequestProduct.vue

@@ -375,10 +375,10 @@
             vat:0,
             transaction_fee:0,
             product_deductions:false,
+            referral_commission:0,
         }),
         computed:
         {
-
             computedCommision()
             {
                 return this.computed_commission = parseFloat((this.product_details.commission_margin / 100) * this.product_details.selling_price);
@@ -417,6 +417,10 @@
                     this.vat= this.settings.product_deductions.vat;
                     this.product_deductions = true;
                 }
+                if(this.settings && this.settings.hasOwnProperty('referral_commission_earning') && this.settings.referral_commission_earning.active)
+                {
+                    this.referral_commission = this.settings.referral_commission_earning.default_commission ? this.settings.referral_commission_earning.default_commission :  0;
+                }
             },
             async getCategoriesList()
             {
@@ -449,6 +453,10 @@
                 // console.log(this.product_details)
                 try
                 {
+                    if(this.referral_commission>0)
+                    {
+                        this.product_details.referral_commission = this.referral_commission;
+                    }
                     this.product_details.vat = this.vat;
                     this.product_details.transaction_fee = this.transaction_fee;
                     this.product_details.stockist = this.current_slot_info.slot_code;

package/components/GProfile.vue

@@ -18,8 +18,8 @@
             <div  @click="$emit('closePopup')" class="pinfo">
                 <div class="group">
                     <div class="val">{{ prop_user_info.slot_owned }}</div>
-                    <div class="lab" v-if="is_company_ultrapro">Slot Owned</div>
-                    <div class="lab" v-else>Slot Count</div>
+                    <div class="lab" v-if="is_company_ultrapro">Slot Count</div>
+                    <div class="lab" v-else>Slot Owned</div>
                     
                 </div>
                 <div class="group">

package/components/GSlotWallet/WalletLogsDialog.vue

@@ -230,7 +230,16 @@ export default
             },
             async getTableData()
             {
+                // await this.$bind("table_data", new DB_SLOT_LOG().collection().where("recipient_id", "==", this.user_info.active_slot).orderBy('convert_message', 'desc').orderBy('created_date', 'desc'));
                 await this.$bind("table_data", new DB_SLOT_LOG().collection().where("recipient_id", "==", this.user_info.active_slot).orderBy('created_date', 'desc'));
+                for( var i = 0; i < this.table_data.length; i++)
+                { 
+                    if (this.table_data[i].temp_wallet_message) 
+                    { 
+                        this.table_data.splice(i, 1); 
+                        i--; 
+                    }
+                } 
                 this.table_loading = false;
             },
         },

package/components/ManageProduct/Dialogs/AddDiscount.vue

@@ -0,0 +1,143 @@
+<template>
+    <div class="merchant-add-discount">
+        <q-bar class="bg-primary text-white q-pa-lg">
+            <q-icon class="q-mr-sm" name="fa fa-list-alt"></q-icon>
+            <b>Add Discount</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>
+        <div class="content-holder">
+            <div class="input-holder">
+                 <q-input type="number" :disable="disable_input" square filled v-model="discount" label="Enter Percentage" />
+            </div>
+            <div class="discount-holder">
+                <div class="discount" v-for="(discount, i) in discount_button" :key="i" @click="enterDiscount(discount.value)">
+                    <div class="label">
+                        {{ discount.label}}
+                    </div>
+                </div>
+            </div>
+            <div class="button-holder">
+                <q-btn color="primary" @click="updateDiscount" class="full-width q-pa-sm q-mt-sm">Update Discount</q-btn>
+            </div>
+        </div>
+
+    </div>
+</template>
+
+<script>
+export default
+{
+    filters: { },
+    props:['product_information'],
+    data:() =>(
+    {
+
+        disable_input:true,
+        discount:0,
+        discount_button: [{label: '10%', value: 10},{label: '20%', value: 20},{label: '30%', value: 30},{label: '40%', value: 40},{label: '50%', value: 50}, {label: 'Custom Percentage', value: 0}],
+    }),
+    mounted() { },
+    methods: 
+    { 
+        async updateDiscount()
+        {
+            this.$q.loading.show();
+            if(this.product_information)
+            {
+                let update = {};
+                update.merchant_discount = this.discount;
+                update.product_id = this.product_information.product_id;
+
+                try
+                {
+                    await this.$_fbCall('memberUpdateMerchantDiscount', update);
+                    this.$q.dialog({ html: true, title: `Success`, message: 'Discount updated.' });
+                    this.$emit('closePopUp');
+                }
+                catch (error)
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: error.message });
+                }
+            }
+            this.$q.loading.hide();
+
+        },
+        enterDiscount(data)
+        {
+            if(data === 0)
+            {
+                this.disable_input = false;
+            }
+            else
+            {
+                this.discount = data;
+            }
+        }
+    },
+    watch:
+    {
+        discount()
+        {
+            if(this.discount < 1)
+            {
+                this.discount = 1;
+            }
+            if(this.discount >50)
+            {
+                this.discount = 50;
+                this.disable_input = true;
+            }
+        }
+    },
+    computed: 
+    { 
+
+    }
+}
+</script>
+<style lang="scss">
+.merchant-add-discount
+{
+    min-width: 20vw;
+    min-height: 20vh;
+    background: #fafafa;
+    .content-holder
+    {
+        .input-holder
+        {
+            padding: 20px;
+        }
+        .discount-holder
+        {
+            display: grid;
+            grid-template-columns:1fr 1fr;
+            grid-gap: 10px;
+            padding: 0 20px;
+            .discount
+            {
+                background: $primary;
+                border-radius: 2px;
+                color: #fafafa;
+                padding: 20px;
+                .label
+                {
+                    text-align: center;
+                }
+            }
+            .discount:hover{
+                cursor: pointer;
+            }
+
+        }
+        .button-holder{
+            padding: 0 20px 20px 20px;
+        }
+
+
+    }
+}
+</style>

package/components/ManageProduct/Tabs/Information.vue

@@ -23,8 +23,12 @@
                             </div>
                             <!-- FIELD - BARCODE -->
                             <div class="col-3">
-                                <div class="q-mt-sm q-ma-sm"><q-input disable outlined v-model="product_details.barcode" label="Barcode" stack-label></q-input></div>
+                                <div class="q-mt-sm q-ma-sm"><q-input disable outlined v-model="merchant_percentage_discount" label="Merchant Discount %" stack-label></q-input></div>
                             </div>
+                            <!-- FIELD - BARCODE -->
+                            <!-- <div class="col-3">
+                                <div class="q-mt-sm q-ma-sm"><q-input disable outlined v-model="product_details.barcode" label="Barcode" stack-label></q-input></div>
+                            </div> -->
                             <!-- FIELD - CATEGORY -->
                             <div class="col-3">
                                 <div class="q-mt-sm q-ma-sm"><q-select outlined v-model="product_details.category" label="Categories" option-value="category_identifier" option-label="category_identifier" :options="categories_list" stack-label></q-select></div>
@@ -85,6 +89,7 @@
                         <template v-else>
                             <q-btn v-if="product_information" class="q-pa-sm q-ml-sm" unelevated outline color="primary" @click="add_variation_dialog_open=true;update_variant_button=true;"><q-icon size="14px" class="q-mr-sm" name="fa fa-filter"></q-icon> Update Variation</q-btn>
                         </template>
+                        <q-btn v-if="product_information && product_information.type != 'Pending Approval' " unelevated class="q-pa-sm q-ml-sm" @click="addDiscount" color="primary"><q-icon size="14px" class="q-mr-sm" name="fa fa-percentage"></q-icon> Add Merchant Discount</q-btn>
                         <q-btn v-if="product_information" unelevated class="q-pa-sm q-ml-sm" type="submit" color="primary"><q-icon size="14px" class="q-mr-sm" name="fa fa-save"></q-icon> Update Product Information</q-btn>
                         <q-btn v-if="!product_information" class="q-pa-sm" unelevated outline color="primary"><q-icon size="14px" class="q-mr-sm" name="fa fa-times"></q-icon> Cancel Create Product</q-btn>
                         <q-btn v-if="!product_information" unelevated class="q-pa-sm q-ml-sm" type="submit" color="primary"><q-icon size="14px" class="q-mr-sm" name="fa fa-save"></q-icon> Save New Product Information</q-btn>
@@ -96,6 +101,10 @@
         <q-dialog persistent v-model="add_variation_dialog_open">
             <add-variant-dialog :product_information="product_information" :update="update_variant_button" @addVariant="updateVariant" @closePopUp="add_variation_dialog_open=false"/>
         </q-dialog>
+
+        <q-dialog persistent v-model="add_discount_dialog_open">
+            <add-discount :product_information="product_information" :update="update_variant_button" @closePopUp="add_discount_dialog_open=false"/>
+        </q-dialog>
     </div>
     
 </template>
@@ -106,16 +115,18 @@
     import PUploader            from '../../PUploader';
     import GlobalMixins         from '../../../mixins/global_mixins.js';
     import AddVariantDialog     from '../Dialogs/AddVariantDialog'
+    import AddDiscount          from '../Dialogs/AddDiscount'
 
     export default
     {
         mixins: [GlobalMixins],
-        components: { PUploader,AddVariantDialog },
+        components: { PUploader,AddVariantDialog, AddDiscount },
         props: { 
             product_information: Object,
         },
         data: () =>
         ({
+            add_discount_dialog_open:false,
             update_variant_button: false,
             add_variation_dialog_open:false,
             succesfullupdate        : false,
@@ -154,14 +165,27 @@
                 seo                 : { title: "", keyword: "", description: "" }
             },
             categories_list             : [],
+            merchant_percentage_discount: 0,
         }),
         mounted()
         {
             this.getMembershipList();
             this.getCategoriesList();
+            this.setDiscount();
         },
         methods:
         {
+            setDiscount()
+            {
+                if(this.product_information.hasOwnProperty('merchant_discount_applied') && this.product_information.merchant_discount_applied)
+                {
+                    this.merchant_percentage_discount = this.product_information.merchant_percentage_discount;
+                }
+            },
+            addDiscount()
+            {
+                this.add_discount_dialog_open = true;
+            }, 
             updateVariant(variant)
             {
                 this.add_variation_dialog_open=false;

package/components/MyPurchases/tabs/CompletedTab.vue

@@ -21,6 +21,7 @@
                 </div>
                 <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                     <div style="font-weight:600;padding:5px;padding-left:10px;width:46%;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
+                    <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;width:20%;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon> {{list.orders.merchant_details.business_contact_number}}</div>
                     <div v-if="list.shipping_details" style="font-weight:600;padding:5px;width:35%;">Tracking Number: {{list.shipping_details.tracking_number}}</div>
                     <div :style="`font-weight:600;padding:5px;${list.shipping_details ? 'width:19%' : 'width:55%'};text-align:right;padding-right:18px;`">Order ID: {{list.order_id}}</div>
                 </div>
@@ -116,8 +117,11 @@
                     <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                         <div style="font-weight:600;padding:5px;padding-left:10px;width:46%;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
                         <div v-if="list.shipping_details" style="font-weight:600;padding:5px;width:35%;">Tracking Number: {{list.shipping_details.tracking_number}}</div>
-                        <div :style="`font-weight:600;padding:5px;text-align:right;${list.shipping_details ? 'width:19%' : 'width:55%'};padding-right:18px;`">Order ID: {{list.order_id}}</div>
-                    </div>   
+                    </div> 
+                    <div class="grid-merchant" style="display:flex">
+                        <div :style="`margin-left:10px;font-weight:600;padding:5px;text-align:left;${list.shipping_details ? 'width:50%' : 'width:50%'};`">Order ID: {{list.order_id}}</div>
+                        <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon>{{list.orders.merchant_details ? list.orders.merchant_details.business_contact_number: ''}}</div>
+                    </div>  
                 </div>
                 <div v-for="(field, i) in list.orders.products" :key="i" class="checkout-container" :id="i" >
                     <div class="inner_container">

package/components/MyPurchases/tabs/ProcessingTab.vue

@@ -21,6 +21,7 @@
                 </div>
                 <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                     <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
+                    <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon> {{list.orders.merchant_details.business_contact_number}}</div>
                     <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;">Order ID: {{list.order_id}}</div>
                 </div>
                 
@@ -111,6 +112,7 @@
                 <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                     <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
                     <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;">Order ID: {{list.order_id}}</div>
+                    <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon>{{list.orders.merchant_details ? list.orders.merchant_details.business_contact_number: ''}}</div>
                 </div>
                 
                 </div>

package/components/MyPurchases/tabs/ToPayTab.vue

@@ -19,8 +19,9 @@
                         <div class="status">Status: <div class="value" :style="list.status == 'to_pay' ? 'color:#a29e9e;' : 'color:darkviolet;'">{{list.status == "to_pay" ||  list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</div></div> 
                     </div>
                 </div>
-                <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
+                <div style="display:flex;background:#eeee;border-top: 1px solid rgb(194, 189, 189);"> 
                     <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
+                    <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon> {{list.orders.merchant_details.business_contact_number}}</div>
                     <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;">Order ID: {{list.order_id}}</div>
                 </div>
                 
@@ -108,6 +109,7 @@
                     <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                         <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
                         <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;">Order ID: {{list.order_id}}</div>
+                        <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon>{{list.orders.merchant_details ? list.orders.merchant_details.business_contact_number: ''}}</div>
                     </div> 
                 </div>
                 <div v-for="(field, i) in list.orders.products" :key="i" class="checkout-container" :id="i" >

package/components/MyPurchases/tabs/ToPickedTab.vue

@@ -21,7 +21,7 @@
                 </div>
                 <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                     <div style="font-weight:600;padding:5px;padding-left:10px;width:46%;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
-                    <!-- <div style="font-weight:600;padding:5px;width:35%;">Tracking Number: {{list.shipping_details.tracking_number}}</div> -->
+                    <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon> {{list.orders.merchant_details.business_contact_number}}</div>
                     <div style="font-weight:600;padding:5px;width:55%;text-align:right;padding-right:18px;">Order ID: {{list.order_id}}</div>
                 </div>
                 
@@ -120,6 +120,7 @@
                     <div style="background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                         <div style="display: grid; grid-template-columns: 1fr 2fr;">
                             <div style="font-weight:600;padding:5px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
+                           <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon>{{list.orders.merchant_details ? list.orders.merchant_details.business_contact_number: ''}}</div>
                             <!-- <div style="font-weight:600;padding:5px;text-align:right">Tracking Number: {{list.shipping_details.tracking_number}}</div> -->
                         </div>
                         <div style="font-weight:600;padding:5px;text-align:right;padding-right:18px;">Order ID: {{list.order_id}}</div>

package/components/MyPurchases/tabs/ToReceiveTab.vue

@@ -20,6 +20,10 @@
                     </div>
                 </div>
                 <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
+                    <!-- <div style="font-weight:600;padding:5px;padding-left:10px;width:40%;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
+                    <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;width:20%;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon> {{list.orders.merchant_details.business_contact_number}}</div>
+                    <div style="font-weight:600;padding:5px;width:25%;">Tracking Number: {{list.shipping_details.tracking_number}}</div>
+                    <div style="font-weight:600;padding:5px;width:15%;text-align:right;padding-right:18px;">Order ID: {{list.order_id}}</div> -->
                     <div style="font-weight:600;padding:5px;padding-left:10px;width:46%;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
                     <div style="font-weight:600;padding:5px;width:35%;">Tracking Number: {{list.shipping_details ?  list.shipping_details.tracking_number : ''}}</div>
                     <div style="font-weight:600;padding:5px;width:19%;text-align:right;padding-right:18px;">Order ID: {{list.order_id}}</div>
@@ -122,7 +126,10 @@
                             <div style="font-weight:600;padding:5px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
                             <div style="font-weight:600;padding:5px;text-align:right">Tracking Number: {{list.shipping_details ?  list.shipping_details.tracking_number : ''}}</div>
                         </div>
-                        <div style="font-weight:600;padding:5px;text-align:right;padding-right:18px;">Order ID: {{list.order_id}}</div>
+                        <div class="grid-merchant" style="display:flex; justify-content:space-between">
+                            <div style="font-weight:600;padding:5px;;padding-right:18px;">Order ID: {{list.order_id}}</div>
+                            <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon>{{list.orders.merchant_details ? list.orders.merchant_details.business_contact_number: ''}}</div>
+                        </div>
                     </div>          
                 </div>
 

package/components/MyPurchases/tabs/ToShipTab.vue

@@ -21,6 +21,7 @@
                 </div>
                 <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                     <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
+                    <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon> {{list.orders.merchant_details.business_contact_number}}</div>
                     <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;">Order ID: {{list.order_id}}</div>
                 </div>
                 
@@ -105,6 +106,7 @@
                     <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
                         <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-store"  class="q-mr-sm"></q-icon>{{list.orders.merchant_name}}</div>
                         <div style="font-weight:600;padding:5px;margin-left:auto;margin-right:10px;">Order ID: {{list.order_id}}</div>
+                        <div style="font-weight:600;padding:5px;margin-left:10px;"><q-icon name="fa fa-phone-alt"  class="q-mr-sm"></q-icon>{{list.orders.merchant_details ? list.orders.merchant_details.business_contact_number: ''}}</div>
                     </div> 
                 </div>
 

package/components/SalesInvoicePrintable.vue

@@ -1,5 +1,5 @@
 <template>
-    <q-card class="sales-invoice-printable">
+    <q-card class="sales-invoice-printable" :style="company_qdy ? `font-family:arial; letter-spacing: 1px; font-size:11px; padding:50px 20px;` : ``">
         <div class="row">
             <div class="col-12">
                 <div class="row">
@@ -17,7 +17,7 @@
                             </div>
                             <div class="col-5 label" style="margin-top:15px;">Order No. Receipt No. : {{ number }}</div>
                         </div>
-                        <div class="row text-left info">
+                        <div class="row text-left info" :style="company_qdy? `line-height:20px`:``">
                             <div class="col-7 label sold" style="margin-top:2"><div>Sold To :{{ customer.name }}</div></div>
                             <div class="col-5 label date">DATE : {{ $_formatDate(transaction_date, 'YYYY-MM-DD mm:ss.s') }}</div>
                         </div>
@@ -122,6 +122,7 @@ export default {
         main_currency:'',
         show_batch:false,
         show_customer_details:false,
+        company_qdy:false,
     }),
    async mounted()
     {
@@ -129,6 +130,10 @@ export default {
         // this.contact = this.stockist_info.stockist_details.phone_number;
 
         this.settings = await this.$_getData('public_settings');
+        if(this.settings.hasOwnProperty("qdy") && this.settings.qdy)
+        {
+            this.company_qdy = true;
+        }
         if(this.settings.hasOwnProperty("cashier_show_batch") && this.settings.cashier_show_batch == true)
         {
             this.show_batch = true;

package/package.json

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