geer-builder 1.2.577 → 1.2.580

package/GLogin.vue

@@ -190,6 +190,7 @@ export default
         },
         async submitLogin()
         {
+            
             /* start login */
             const AccountClass = new FAccountClass();
 
@@ -198,7 +199,7 @@ export default
                 if(!this.is_submitting)
                 {
                     this.is_submitting = true;
-
+                    
                     let slot_info = await this.db_slot.get(this.form_data.email.toUpperCase());
 
                     if(slot_info)
@@ -211,9 +212,15 @@ export default
                         let update = await this.$_fbCall('memberUpdateAuth', this.form_data);
                     }
 
-                    await AccountClass.signIn(this.form_data.email, this.form_data.password).then((res) =>
+                    let disable_verified = false;
+                    if(this.public_settings.hasOwnProperty("disable_login_verified") && this.public_settings.disable_login_verified == true)
+                    {
+                        disable_verified = true;
+                    }
+
+                    await AccountClass.signIn(this.form_data.email, this.form_data.password, disable_verified).then((res) =>
                     {
-                        if(res.hasOwnProperty('verified') && !res.verified)
+                        if(res.hasOwnProperty('verified') && !res.verified && disable_verified == false)
                         {
                             this.is_resend_dialog = true;
                         }

package/GSlotWallet.vue

@@ -63,9 +63,11 @@
 
                 <div class="setion-holder">
                     <q-btn size="12px" class="full-width q-pa-sm text-primary" flat v-if="show_points_history == true" @click="is_points_logs_dialog_open=true;">
-                        <q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
+                        <div class="icon-holder" v-if="!is_company_ultrapro">
+                            <q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
+                        </div>
                         <div v-if="is_company_ultrapro">Points History</div>
-                        <div>Points Logs</div>
+                        <div v-else>Points Logs</div>
                     </q-btn>
                 </div>
 

package/classes/FAccountClass.js

@@ -15,7 +15,7 @@ export default class AccountClass
     {
         console.log("Account Has Been Signed Out");
     }
-    async signIn(email, password)
+    async signIn(email, password, disable_verified = false)
     {
         // await DB.clearPersistence().catch(error =>
         // {
@@ -29,8 +29,17 @@ export default class AccountClass
             user_info = user_info.docs[0].data();
             if(user_info.hasOwnProperty('verified') && !user_info.verified)
             {
-                return {verified: user_info.hasOwnProperty('verified') ? user_info.verified : true};
+                if(disable_verified == true)
+                {
+                    
+                }
+                else
+                {
+                    return {verified: user_info.hasOwnProperty('verified') ? user_info.verified : true};
+                }
             }
+
+            
         }
         return new Promise(async (resolve, reject) =>
         {

package/components/MyPurchases/tabs/cancelled.vue

@@ -80,6 +80,8 @@
                         <!-- <div style="color:black;">Tracking Number:</div> <div style="color:black;font-weight:600">{{list.tracking_number}}</div>  -->
                         <!-- <div>Status: {{list.status == "cancelled" ? "Cancelled" : ""}}</div>  -->
                         <div class="methods">Payment Method: {{list.payment_method.payment_method_label }}</div> 
+                        <div class="methods" v-if="list.hasOwnProperty('reject_reason')">Reject Reason: {{list.reject_reason}}</div> 
+                       
                         <!-- <div style="margin-left:auto;padding-left:10px;margin-right:10px;">Shipping Fee: {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div> 
                         <div style="padding-left:10px;margin-right:10px;border-left: 1px solid rgb(194, 189, 189);" v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}: {{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div> 
                         <div style="padding-left:10px;border-left: 1px solid rgb(194, 189, 189);">Order Total ({{list.orders.total_quantity}} Item): {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>  -->
@@ -375,6 +377,7 @@ export default {
             color:grey;
             background: white;
             width: 100%;
+            justify-content: space-between;
         }
     }
 </style>

package/components/MyTransactions/tabs/Cancelled.vue

@@ -77,6 +77,7 @@
                 </div>
                     <div class="order-total">
                         <div class="methods">Payment Method: {{list.payment_method.payment_method_label }}</div> 
+                        <div class="methods" v-if="list.hasOwnProperty('reject_reason')">Reject Reason: {{list.reject_reason}}</div> 
                         <!-- <div>Order Total ({{product_list[i].quantity}} Item): {{main_currency}} {{order_total}}</div>  -->
                         <!-- <div style="color:black;">Tracking Number:</div> <div style="color:black;font-weight:600">{{list.tracking_number}}</div>  -->
                         <!-- <div style="margin-left:auto;margin-right:10px;">Shipping Fee: {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div> 
@@ -372,6 +373,7 @@ export default {
                 color:grey;
                 background: white;
                 width: 100%;
+                justify-content: space-between;
             }
         }
         .mobile-onlyy{

package/package.json

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