geer-builder 1.2.607 → 1.2.608

package/GProcessSale.vue

@@ -154,10 +154,14 @@
                                 </tr>
                                 <tr v-for="(payment, index) in payment_list" :key="index">
                                     <td>{{payment.payment_type.method_name}}</td>
-                                    <td>
+                                    <td v-if="!up_coin_pay">
                                         {{payment.payment_amount}} {{public_settings.cashier_currency ? public_settings.cashier_currency : ''}}
                                         <q-icon name="fa fa-times" size="14px" class="q-mr-sm" style="color:red" @click="removePayment(index)"></q-icon>
                                     </td>
+                                    <td v-else>
+                                        {{payment.payment_amount}}
+                                        <q-icon name="fa fa-times" size="14px" class="q-mr-sm" style="color:red" @click="removePayment(index)"></q-icon>
+                                    </td>
                                 </tr>
                                 <tr style="border-top:solid 1.5px black">
                                     <td class="subheader">Balance</td>
@@ -168,6 +172,10 @@
                     </div>
 
                     <div class="buttons text-right">
+                        <q-btn v-if="up_coin_button" color="primary" @click="upcoinPay()" unelevated style="margin-right:5px">
+                            <q-icon name="fas fa-coins" size="14px" class="q-mr-sm"></q-icon>
+                            UPCoin Pay
+                        </q-btn>
                         <q-btn color="primary" v-if="!hide_manage_discount" @click=openDiscount unelevated style="margin-right:5px">
                             <q-icon name="fa fa-percent" size="14px" class="q-mr-sm"></q-icon>
                             Add Discount
@@ -176,7 +184,7 @@
                             <q-icon name="fas fa-paper-plane" size="14px" class="q-mr-sm"></q-icon>
                             Add Batch/Lot
                         </q-btn>
-                        <q-btn color="primary" @click=addPayment unelevated style="margin-right:5px">
+                        <q-btn v-if="!hide_receive_payment_button" color="primary" @click=addPayment unelevated style="margin-right:5px">
                             <q-icon name="fa fa-credit-card" size="14px" class="q-mr-sm"></q-icon>
                             Receive Payment
                         </q-btn>
@@ -207,6 +215,11 @@
                     <discount-dialog @closePopup="is_discount_dialog_open = false; sample($event)"></discount-dialog>
                 </q-dialog>    
 
+                <q-dialog v-model="is_change_payment_dialog_open">
+                    <change-payment-method @closePopup="is_discount_dialog_open = false; sample($event)"></change-payment-method>
+                </q-dialog>    
+
+
                  <q-dialog  v-model="is_sale_choose_slot_dialog_open">
                      <sale-choose-slot-dialog :customer_email="field.email" @closePopup="is_sale_choose_slot_dialog_open = false; $emit('closePopup')" @slotSelect="getSelectedSlot"></sale-choose-slot-dialog>
                  </q-dialog> 
@@ -231,6 +244,7 @@ import DB_INVENTORY             from "./models/DB_INVENTORY";
 import DB_COUNTER               from "./models/DB_COUNTER";
 import ProcessSaleConfirmDialog from "./components/ProcessSaleConfirmDialog";
 import AddPaymentDialog         from "./dialogs/AddPaymentDialog";
+import ChangePaymentMethod         from "./dialogs/ChangePaymentMethod";
 import ManagerOverrideDialog         from "./dialogs/ManagerOverrideDialog";
 import DiscountDialog           from "./components/DiscountDialog";
 import AddBatchDialog           from "./components/AddBatchDialog";
@@ -246,6 +260,10 @@ export default
     mixins: [GlobalMixins],
     data: () => 
     ({
+        hide_receive_payment_button:false,
+        is_change_payment_dialog_open:false,
+        up_coin_pay:false,
+        up_coin_button:false,
         hide_manage_discount:true,
         show_batch:false,
         is_batch_number_dialog_open:false,
@@ -292,13 +310,14 @@ export default
         auto_fill_address:'',
         auto_fill_contact:'',
         all_address:[],
+        check_up_coin:false,
     }),
     props: ['stockist'],
-    components: { AddBatchDialog, GProduct, ProcessSaleConfirmDialog, DiscountDialog, AddPaymentDialog, SaleChooseSlotDialog,ManagerOverrideDialog },
-    mounted()
+    components: { ChangePaymentMethod,AddBatchDialog, GProduct, ProcessSaleConfirmDialog, DiscountDialog, AddPaymentDialog, SaleChooseSlotDialog,ManagerOverrideDialog },
+    async mounted()
     {
-        this.getCount();
-        this.getDiscountData();
+        await this.getCount();
+        await this.getDiscountData();
         if(this.stockist)
         {
             this.field.stockist = this.stockist;
@@ -337,6 +356,37 @@ export default
     },
     methods:
     {
+        async upcoinPay()
+        {
+            this.up_coin_pay = true;
+            await this.updateTable();
+
+            if(!this.chosen_slot_info.points.hasOwnProperty('up_coin'))
+            {
+                this.$q.dialog({ title: "Something's not quite right", html:true , message: `${this.chosen_slot_info.slot_code} doesnt have enough UPCoin` });
+            }
+            if(this.chosen_slot_info.points.up_coin < this.grandTotal)
+            {
+                this.$q.dialog({ title: "Something's not quite right", html:true , message: `${this.chosen_slot_info.slot_code} UPCoin is not enough to continue this transaction` });
+            }
+            else
+            {
+                this.hide_receive_payment_button = true;
+                let payment = 
+                {
+                    method_key:'up_coin', 
+                    method_name:'UPCoin'
+                };
+                let field = 
+                {
+                    payment_amount:this.grandTotal,
+                    remarks:"UPCoin Payment", 
+                    payment_type:payment
+                };
+                this.payment_list.push(field);
+                this.up_coin_button = false;
+            }
+        },
         addBatch(batch)
         {
             if(Object.keys(batch).length === 0)
@@ -350,6 +400,7 @@ export default
         },
         unsetSlot()
         {
+            this.payment_list = [];
             this.slot_choose = false;
             this.slot_reference = null;
         },
@@ -363,6 +414,11 @@ export default
             {
                 this.show_batch = true
             }
+            if(this.public_settings.hasOwnProperty('up_coin') && this.public_settings.up_coin.active)
+            {
+                this.check_up_coin = true;
+            }
+            console.log(this.check_up_coin, 'check');
         },
          resetData()
         {
@@ -468,6 +524,7 @@ export default
         },
         async getPayment(field)
         {
+            console.log(field, 'field');
             this.payment_list.push(field)
         },
         async getCount()
@@ -478,7 +535,6 @@ export default
         {
             if(this.public_settings.hasOwnProperty('cashier_auto_fill_address') && this.public_settings.cashier_auto_fill_address)
             {
-
                 let customer_info = await new DB_USER().collection().where("email", "==", this.field.email).get();
                 await this.$bind('all_address', new DB_USER_SHIPPING_ADDRESS(customer_info.docs[0].data().uid).collection().orderBy("default","desc")); 
                 if(this.all_address.length > 0)
@@ -686,6 +742,25 @@ export default
             }
             
         },
+        async checkUpCoin(product_list)
+        {
+            console.log(this.check_up_coin);
+            for(let element of product_list)
+            {
+                if(!element.product.hasOwnProperty('up_coin_price'))
+                {
+                    this.up_coin_button = false;
+                }
+                else if(element.product.hasOwnProperty('up_coin_price') && element.product.up_coin_price < 1)
+                {
+                    this.up_coin_button = false;
+                }
+                else
+                {
+                    this.up_coin_button = true;
+                }
+            }
+        },
         async getSelectedSlot(chosen_slot)
         {
             this.slot_reference = chosen_slot.slot_code;
@@ -693,6 +768,13 @@ export default
             {
                 this.chosen_slot_info = await this.db_slot.get(chosen_slot.slot_code)
                 this.updateTable();
+                if(this.field.product_list.length > 0)
+                {
+                    if(this.check_up_coin)
+                    {
+                        await this.checkUpCoin(this.field.product_list);
+                    }
+                }
             }
            
         },
@@ -787,6 +869,10 @@ export default
         {
             if(this.field.product_list.length > 0)
             {
+                if(this.check_up_coin)
+                {
+                    await this.checkUpCoin(this.field.product_list);
+                }
                 let key = 'product_id'
                 let holder = [...new Map(this.field.product_list.map(item =>
                     [item[key], item])).values()];
@@ -812,9 +898,23 @@ export default
                             // item_discount = await this.getDiscount(element)
                             item_discount = new ProductClass().getProductDiscount( this.membership_list ,this.rank_list, this.chosen_slot_info, this.stockist_list, temp_var);
                         }
-                        amount_holder = amount_holder + ((Number((element.product.selling_price - ((element.product.selling_price * item_discount) / 100))) * Number(element.quantity)))
-                        discount_holder = discount_holder + ((((element.product.selling_price * item_discount) / 100))) * Number(element.quantity);
-                        srp_holder = srp_holder +  ((Number((element.product.selling_price * Number(element.quantity)))));
+
+                        if(this.up_coin_pay)
+                        {
+                            amount_holder = amount_holder + Number((element.product.up_coin_price )* Number(element.quantity))
+                            discount_holder = discount_holder + 0;
+                            srp_holder = srp_holder +  ((Number((element.product.up_coin_price * Number(element.quantity)))));
+
+                            console.log(amount_holder, 'amount_holder');
+                            console.log(discount_holder, 'discount_holder');
+                            console.log(srp_holder, 'srp_holder');
+                        }
+                        else
+                        {
+                            amount_holder = amount_holder + ((Number((element.product.selling_price - ((element.product.selling_price * item_discount) / 100))) * Number(element.quantity)))
+                            discount_holder = discount_holder + ((((element.product.selling_price * item_discount) / 100))) * Number(element.quantity);
+                            srp_holder = srp_holder +  ((Number((element.product.selling_price * Number(element.quantity)))));  
+                        }
                     }
                 };
                 this.subTotal = amount_holder

package/GTransaction.vue

@@ -148,6 +148,15 @@ export default
                 format: val => `${val}`,
                 sortable: true, 
             },
+            { 
+                name    : 'customer_name',
+                label   : 'Customer Name',
+                field   : row => row.customer.name.toUpperCase(),
+                align   : 'left',
+                required: true,
+                format: val => `${val}`,
+                sortable: true, 
+            },
             { 
                 name    : 'date',
                 label   : 'Date',
@@ -230,7 +239,7 @@ export default
         async getTransactionHistory()
         {
            await this.$bind('transaction_history', this.db_sale.collection().where("stockist", "==", this.user_info.branch_slot).where("status", "in", ["for pick up", "pending","completed","void", "transaction refill"]).orderBy('created_date', 'desc'));
-        },
+      },
         open_dialog()
         {
             this.is_sale_history_dialog_open=true;

package/components/Printable.vue

@@ -153,11 +153,11 @@
                 </div>
                 <div class="row">
                     <div class="col-7 label">Total Payment</div>
-                    <div class="col-5 value text-bold">{{payment_method =='gc' ? "GC" : settings.cashier_currency ? settings.cashier_currency : settings.main_currency }}  {{ $_formatNumber(total_payment, { decimal: 2}) }}</div>
+                    <div class="col-5 value text-bold">{{payment_method =='up_coin' ?  'UPCoin': payment_method =='gc' ? "GC" : settings.cashier_currency ? settings.cashier_currency : settings.main_currency }}  {{ $_formatNumber(total_payment, { decimal: 2}) }}</div>
                 </div>
                 <div class="row">
                     <div class="col-7 label">Grand Total</div>
-                    <div class="col-5 value text-primary text-bold">{{payment_method =='gc' ? "GC" : settings.main_currency ? settings.cashier_currency : settings.main_currency}} {{ $_formatNumber(grand_total, { decimal: 2}) }}</div>
+                    <div class="col-5 value text-primary text-bold">{{ payment_method =='up_coin' ?  'UPCoin': payment_method =='gc' ? "GC" : settings.main_currency ? settings.cashier_currency : settings.main_currency}} {{ $_formatNumber(grand_total, { decimal: 2}) }}</div>
                 </div>
                 <div v-if="balance" class="row">
                     <div class="col-7 label">Outstanding Balance</div>

package/components/SalesInvoicePrintable.vue

@@ -58,17 +58,17 @@
                 <div class="bottom-grid">
                     <div class="flex-discount">
                         <div class="discount-title">Subtotal</div>
-                        <div class="discount-value">{{settings.cashier_currency ? settings.cashier_currency : '' }} {{ $_formatNumber(sub_total, { decimal: 2}) }}</div>
+                        <div class="discount-value">{{payment_method =='up_coin' ?  'UPCoin': settings.cashier_currency ? settings.cashier_currency : '' }} {{ $_formatNumber(sub_total, { decimal: 2}) }}</div>
                     </div>
                     <div class="flex-discount" v-if="gc_discount || payment_method != 'gc' ">
                         <div class="discount-title">Total Discount</div>
-                        <div class="discount-value">{{settings.cashier_currency ? settings.cashier_currency : '' }} {{ $_formatNumber(total_discount, { decimal: 2}) }}</div>
+                        <div class="discount-value">{{ payment_method =='up_coin' ?  'UPCoin': settings.cashier_currency ? settings.cashier_currency : '' }} {{ $_formatNumber(total_discount, { decimal: 2}) }}</div>
                     </div>
                     <div class="flex-total">
                         <div class="total-title"><b>Grand Total</b></div>
-                        <div class="total-value"><b>{{settings.cashier_currency ? settings.cashier_currency : '' }} {{ $_formatNumber(grand_total, { decimal: 2}) }}</b></div>
+                        <div class="total-value"><b>{{ payment_method =='up_coin' ?  'UPCoin': settings.cashier_currency ? settings.cashier_currency : '' }} {{ $_formatNumber(grand_total, { decimal: 2}) }}</b></div>
                     </div>
-                    <div class="flex-change"  v-if="payment_method != 'gc'">
+                    <div class="flex-change"  v-if="payment_method != 'gc' && payment_method != 'up_coin'">
                         <div class="change-title">Change</div>
                         <div class="change-value">{{settings.cashier_currency ? settings.cashier_currency : '' }} {{this.change}}</div> 
                     </div>

package/components/TransactionConfirmDialog.vue

@@ -109,7 +109,6 @@ export default {
     {      
         await this.$bind('sale', this.db_sale.doc(this.sale_id));
         await this.$bind('user', this.db_user.doc(this.sale.customer.uid));
-
     },
     methods: 
     {    

package/dialogs/AddPaymentDialog.vue

@@ -1,19 +1,36 @@
 <template>
     <q-card class="discount-dialog" style="width: 500px; max-width: 500px; padding: 20px">
          <q-form @submit="receivePayment()">
-             <div class="fields row">
-                    <div v-if="selected_slot" class="field col-6 text-center text-bold">
-                        Current Wallet: 
+             <div class="fields payment-wallet">
+                <div class="slot-holder">
+                    {{selected_slot_info.slot_code}}
+                </div>
+                <div class="wallet-holder-grid">
+                    <div class="wallet-holder">
+                        <div v-if="selected_slot" class="field col-6 text-center text-bold">
+                            Current Wallet: 
+                        </div>
+                        <div v-if="selected_slot" class="field col-6 text-center">
+                            {{selected_slot_info.hasOwnProperty('wallet') ? selected_slot_info.wallet : 0}}
+                        </div>
                     </div>
-                     <div v-if="selected_slot" class="field col-6 text-center text-bold">
-                        Current GC: 
+                    <div class="gc-holder">
+                        <div v-if="selected_slot" class="field col-6 text-center text-bold">
+                            Current GC: 
+                        </div>
+                        <div v-if="selected_slot" class="field col-6 text-center">
+                            {{selected_slot_info.hasOwnProperty('points') ? selected_slot_info.points.gc : 0}}
+                        </div>
                     </div>
-                    <div v-if="selected_slot" class="field col-6 text-center">
-                        {{selected_slot_info.hasOwnProperty('wallet') ? selected_slot_info.wallet : 0}}
-                    </div>
-                     <div v-if="selected_slot" class="field col-6 text-center">
-                       {{selected_slot_info.hasOwnProperty('points') ? selected_slot_info.points.gc : 0}}
+                    <div class="up-coin-holder" v-if="!hide_up_coin">
+                        <div v-if="selected_slot" class="field col-6 text-center text-bold">
+                            Current UPCoin: 
+                        </div>
+                        <div v-if="selected_slot" class="field col-6 text-center">
+                        {{selected_slot_info.hasOwnProperty('points') ? selected_slot_info.points.up_coin : 0}}
+                        </div>
                     </div>
+                </div>
                     <div class="field col-12 q-mt-sm" style="margin-right:20px">
                         <q-select :option-label="(method) => method.hasOwnProperty('method_name') ? method.method_name   : `Payment Type` " label="Payment Type" option-value="method_key" :options="payment_options" v-model="field.payment_type"  stack-label></q-select>
                     </div>
@@ -50,10 +67,19 @@ export default
             },
             payment_options : [],
             selected_slot_info : {wallet:0,points:{gc:0}},
+            public_setting:null,
+            hide_up_coin:true
     }),
     props: ['selected_slot', 'gc'],
-    mounted() 
+    async mounted() 
     {
+        this.public_settings = await this.$_getData('public_settings');
+        if(this.public_settings.hasOwnProperty('up_coin') && this.public_settings.up_coin.active == true)
+        {
+            this.hide_up_coin = false;
+        }
+        console.log(this.public_settings.up_coin);
+        console.log(this.hide_up_coin);
         this.getPaymentMethods()
     },
     methods: 
@@ -124,8 +150,18 @@ export default
 <style lang="scss">
 .discount-dialog{
     .fields {
+        .slot-holder{
+            font-size:1rem;
+            font-weight: bold;
+            text-align: center;
+            color: $primary;
+            margin: 10px auto;
+        }
+        .wallet-holder-grid{
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+        }
         padding: 20px;
-        
         .label {
             font-weight: bold;
             font-size: 12px;

package/dialogs/ChangePaymentMethod.vue

@@ -0,0 +1,81 @@
+<template>
+    <div class="payment-dialog">
+        <div class="payment-holder">
+            <div class="field col-12 q-mt-sm" style="margin-right:20px">
+                <q-select :option-label="(method) => method.hasOwnProperty('method_name') ? method.method_name   : `Payment Type` " label="Payment Type" option-value="method_key" :options="payment_options" v-model="field.payment_type"  stack-label></q-select>
+            </div>
+            <div class="buttons text-right">
+                <q-btn @click="applyPayment" color="primary" class="full-width" unelevated>
+                <q-icon name="fa fa-check" size="14px" class="q-mr-sm"></q-icon>
+                    Appy Payment Type
+                </q-btn>
+            </div>  
+    </div>
+    </div>
+</template>
+
+<script>
+export default
+{
+    filters: { },
+    data:() =>(
+    {
+        payment_options : [],
+        field: {
+            payment_amount:"",     
+            remarks:""
+        },
+        payment_options : [],
+    }),
+    async mounted() 
+    { 
+        await this.getPaymentMethods();
+    },
+    methods: 
+    {
+        applyPayment()
+        {
+            console.log(this.field.payment_type);
+        },
+        async getPaymentMethods()
+        {
+            let value_holder = []
+            let option_holder = await this.$_getData('cashier_payment_methods');
+            option_holder.forEach( (res,index) =>
+            {
+                if(res.method_key == 'wallet' || res.method_key =='gc')
+                {
+                    if(this.selected_slot)
+                    {
+                        value_holder.push(res)
+                    }
+                }
+                else
+                {
+                        value_holder.push(res)
+
+                }
+                
+            })
+            this.payment_options = value_holder;
+
+            // if(this.gc == true)
+            // {
+            //      this.payment_options = [{method_key: "gc", method_name:"GC"}];
+            // }
+            // let slot_code = await this.$_getSlotBySlotCode(this.selected_slot)
+            // this.selected_slot_info =  slot_code != undefined ? slot_code : {}
+            
+        },
+    },
+    computed: { }
+}
+</script>
+<style lang="scss">
+.payment-dialog{
+    padding: 20px;
+    background: #fff;
+    width: 500px;
+    height: 500px;
+}
+</style>

package/package.json

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