geer-builder 1.2.752 → 1.2.754

package/GLogin.vue

@@ -31,8 +31,11 @@
 
 
             <div class="g-login__fields q-mt-md" style="margin-top: 20px">
-                <q-btn class="submit-login" :disable="is_submitting" :loading="is_submitting" type="submit" color="primary full-width button-login"  unelevated>Sign In</q-btn>
-                <q-btn v-if="!hide_registration" class="full-width q-mt-sm" @click="openRegistration()" color="primary" outline>Create Account</q-btn>
+                <q-btn v-if="!hide_registration" style="margin-bottom:5px;" class="full-width q-mt-sm" @click="openRegistration()" color="primary" outline>Create Account</q-btn>
+                <q-btn class="submit-login" :disable="is_submitting" style="margin-bottom:5px;" :loading="is_submitting" type="submit" color="primary full-width button-login"  unelevated>Sign In</q-btn>
+                <div style="text-align:center; margin-bottom:5px;" v-if="new_create_account_form">No account? <a style="font-weight:bold" href="javascript:void(0)" @click="openRegistration();" >Sign Up</a></div>
+                <div style="text-align:center" v-if="new_create_account_form"> (YOU CAN LOGIN YOUR EXISTING WEB PORTAL ACCOUNT) </div>
+                
             </div>
 
             <!-- <div class="social-holder">
@@ -100,7 +103,8 @@ export default
         val: Boolean,
         hide_registration: Boolean,
         mbot:Boolean,
-        show_pass_button:Boolean
+        show_pass_button:Boolean,
+        new_create_account_form:Boolean
 
     },
     components: { GRegistration,GForgotPassword },

package/GNoSlot.vue

@@ -2,7 +2,7 @@
     <q-page class="text-center no-slot">
         <!-- NO SLOT -->
         <div>
-            <g-card class="q-pa-lg">
+            <g-card class="q-pa-lg" v-if="!is_enable_refresh && !is_no_code">
                 <div class="q-mb-md message">We have detected that you don't have a <b>slot</b> yet.</div>
                 <div>
                     <q-btn @click="is_open_add_slot_dialog = true" color="primary" unelevated>
@@ -11,6 +11,15 @@
                     </q-btn>
                 </div>
             </g-card>
+            <g-card class="q-pa-lg" v-if="is_enable_refresh || is_no_code">
+                <div class="q-mb-md message">We have detected that you don't have a <b>slot</b> yet.</div>
+                <div>
+                    <q-btn @click="$emit('refreshPage')" color="primary" unelevated>
+                        <q-icon name="fa fa-plus" size="12px" class="q-mr-sm"></q-icon>
+                        Refresh Page
+                    </q-btn>
+                </div>
+            </g-card>
 
             <q-dialog :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_open_add_slot_dialog"> 
                 <add-slot-dialog  @closeDialog="is_open_add_slot_dialog = false"></add-slot-dialog>
@@ -72,6 +81,7 @@ export default
     mixins: [GlobalMixins],
     data: () =>
     ({
+        is_no_code: false,
         is_open_add_slot_dialog: false,
         db_code: new DB_CODE(),
         code_list: [],
@@ -85,6 +95,10 @@ export default
         this.loadCodes();
         this.getSettings();
     },
+    props:
+    {
+        is_enable_refresh:Boolean
+    },
     methods:
     {   
         async getSettings()
@@ -100,6 +114,11 @@ export default
         async loadCodes()
         {
             await this.$bind('code_list', this.db_code.collection().where('recipient', '==', this.user_info.uid));
+            
+            if(this.code_list.length == 0 || !this.code_list.length)
+            {
+                this.is_no_code = true;
+            }
         },
         async addSlot(code)
         {

package/GNoSlotDashboardPackage.vue

@@ -19,7 +19,7 @@
             <g-no-slot/>
         </template>
         <q-dialog v-model="is_select_branch_dialog">
-        <choose-branch-dialog :product_id="product_details.product_id" @chooseBranch="selectBranch" @outOfStock="outOfStock"></choose-branch-dialog>
+        <choose-branch-dialog :product_id="product_details.product_id"></choose-branch-dialog>
     </q-dialog>      
     </div>
 </template>

package/GReplicatedLink.vue

@@ -57,11 +57,6 @@ export default
         {
             this.replicated_link = `https://${this.link}/#/?sponsor=${this.current_slot_info.slot_code}`;
 
-            if(this.is_settings_link_shop)
-            {
-                this.replicated_link = `https://${this.link}/#/shop?sponsor=${this.current_slot_info.slot_code}`;
-            }
-
             if(this.mbot)
             {
                 this.replicated_link = `https://${this.link}/#/registration?sponsor=${this.current_slot_info.slot_code}`;
@@ -75,6 +70,11 @@ export default
         {
             this.replicated_link = `https://${window.location.host}/#/?sponsor=${this.current_slot_info.slot_code}`;
         }
+
+        if(this.is_settings_link_shop)
+        {
+            this.replicated_link = `https://${this.link}/#/shop?sponsor=${this.current_slot_info.slot_code}`;
+        }
         this.loading = false;
     },
     methods: 

package/GTransaction.vue

@@ -151,7 +151,7 @@ export default
             { 
                 name    : 'customer_name',
                 label   : 'Customer Name',
-                field   : row => row.customer.name.toUpperCase(),
+                field   : row => row.update_name ? row.update_name : row.customer.name.toUpperCase(),
                 align   : 'left',
                 required: true,
                 format: val => `${val}`,

package/components/TransactionConfirmDialog.vue

@@ -23,6 +23,7 @@
                             :total_payment="sale.total_payment"
                             :total_discount ="sale.total_discount"
                             :payment_method ="sale.payment_method"
+                            :update_name ="sale.hasOwnProperty('update_name') ? sale.update_name : null"
                             :slot_reference ="sale.slot_reference"
                             :transaction_refill ="sale.transaction_refill"
                             />

package/package.json

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