geer-builder 1.2.437 → 1.2.439

package/GGcClaim.vue

@@ -1,16 +1,13 @@
 <template>
     <div class="cashier-gc-claim" v-if="user_info">
-        <div class="header-holder">
-            <div class="gc-item" v-if="this.current_slot_info.hasOwnProperty('gc_inclusive')">
-                <div class="label">Claimable Product:</div>
-                <div class="value">{{gc_item_name}}</div>
-                <div class="label">GC Price:</div>
-                <div class="value">{{gc_item_price}}</div>
-                <!-- <div class="label">Current Stock:</div>
-                <div class="value">{{current_stock}}</div> -->
+        <div class="header-holder row">
+            <div class="gc-item col-5">
+                <g-product v-model="product_list" :gc="true" :cashier="true" :hide_button="true" @input="selectProduct"></g-product>
+                <div class="gc-price">GC Price: <span class="text-primary">{{gc_item_price}}</span></div>
             </div>
-            <div class="log-holder">
-                <q-input style="width: 350px;" label="Search Name" outlined="" v-model="filterr"><template v-slot:append><q-icon name="search" /></template></q-input>    
+            <div class="col-4"></div>
+            <div class="log-holder col-3">
+                <q-input label="Enter Name or Slot" outlined v-model="filterr"><template v-slot:append><q-icon name="search" /></template></q-input>    
                 <div class="log" @click="is_gc_claim_log_open= true">view claim history</div>
             </div>
         </div>
@@ -26,7 +23,7 @@
             </q-table>
         </div>
         <q-dialog v-model="is_claim_item_dialog_open">
-            <gc-claim-dialog :row="slot_info" :gc_item="gc_item_product" :cashier="cashier_info" @closePopup="is_claim_item_dialog_open = false"></gc-claim-dialog>
+            <gc-claim-dialog :row="slot_info" :gc_item="gc_product[0]" :cashier="cashier_info" @closePopup="is_claim_item_dialog_open = false"></gc-claim-dialog>
         </q-dialog>
 
         <q-dialog v-model="is_gc_claim_log_open">
@@ -40,29 +37,36 @@
 
 <script>
 import DB_SLOT                      from './models/DB_SLOT';
+import DB_PRODUCT                      from './models/DB_PRODUCT';
 import DB_INVENTORY                 from './models/DB_INVENTORY';
 import GlobalMixins                 from './mixins/global_mixins.js';
 import GcClaimDialog                 from './dialogs/GcClaimDIalog.vue';
 import GcClaimLogDialog                 from './dialogs/GcClaimLogDialog.vue';
+import GProduct                 from "./components/GProduct";
+import { networkInterfaces } from 'os';
+
 
 export default
 {
-    components:{GcClaimDialog, GcClaimLogDialog},
+    components:{GcClaimDialog, GcClaimLogDialog, GProduct},
     mixins: [GlobalMixins],
     filters: { },
     data:() =>(
     {
+        db_product: new DB_PRODUCT(),
+        gc_product:[],
+        product_list:[],
         is_gc_claim_log_open:false,
         cashier_info:{},
         slot_info:{},
         is_claim_item_dialog_open:false,
         gc_item_product:{},
         gc_item_name:'',
-        gc_item_price:999999,
+        gc_item_price:0,
         db_slot: new DB_SLOT(),
         db_inventory: new DB_INVENTORY(),
         slot_list:[],
-        loading_table:true,
+        loading_table:false,
         filterr: '',
         pagination: { rowsPerPage: 8 },
         table_column:
@@ -109,9 +113,7 @@ export default
     }),
     watch:
     {
-        slot_list(){
-            this.getInventory();
-        }
+
     },
     computed:
     {
@@ -120,33 +122,26 @@ export default
     async mounted() 
     {
         await this.$_getSlotInfo();
-        await this.getGcPrice();
-        await this.getInventory();
+        await this.$bind('slot_list', this.db_slot.collection().where("points.gc", ">=", 0));
 
         this.cashier_info = this.current_slot_info;
     },
     methods: 
     {   
-        async getInventory()
+        async selectProduct()
         {
-           await this.$bind('inventory', this.db_inventory.collection().where("stockist", "==", this.current_slot_info.stockist_info.slot_code).where('product_id', '==', this.current_slot_info.gc_inclusive[0].product_id));
-           this.current_stock = this.inventory[0].inventory ? this.inventory[0].inventory : 0;
+            await this.$bind('gc_product', this.db_product.collection().where("product_id", "==", this.product_list[0].product_id));
+            if(this.product_list.length > 0)
+            {
+                this.gc_item_price = this.gc_product[0].gc_price;
+                await this.$bind('slot_list', this.db_slot.collection().where("points.gc", ">=", this.gc_product[0].gc_price));
+                this.loading_table = false;
+            }
         },
         async view(event,row)
         {
             this.slot_info = row;
             this.is_claim_item_dialog_open = true;
-        },
-        async getGcPrice()
-        {
-            if(this.current_slot_info && this.current_slot_info.hasOwnProperty('gc_inclusive'))
-            {
-                this.gc_item_price = this.current_slot_info.gc_inclusive[0].product.gc_price;
-                this.gc_item_name = this.current_slot_info.gc_inclusive[0].product.product_name;
-                this.gc_item_product = this.current_slot_info.gc_inclusive[0].product;
-            }
-           await this.$bind('slot_list', this.db_slot.collection().where("points.gc", ">=", this.gc_item_price));
-           this.loading_table = false;
         }
     },
     computed: 
@@ -160,30 +155,21 @@ export default
     width: 900px;
     padding: 30px;
     .header-holder{
-        display: grid;
-        grid-template-columns: 1fr 1fr;
+        .gc-price{
+            text-align: left;
+            padding: 5px 10px;
+            font-size: 18px;
+        }
         .log-holder{
             .log{
-                padding: 5px 5px;
-                text-align: right;
                 color: $primary;
-                cursor: pointer;
-            }
-        }
-        .gc-item{
-            font-size: 16px;
-            padding: 20px;
-            width: 500px;
-            display: grid;
-            grid-template-columns:30% 1fr;
-            text-align: left;
-            .label{
-                font-weight: 500;
-            }
-            .value{
-                color:$primary;
+                text-align: right;
+                padding: 5px 0;
+                font-size: 18px;
+                cursor:pointer;
             }
         }
+        margin: 10px auto;
     }
     .content
     {

package/GTransaction.vue

@@ -69,7 +69,7 @@
                 </q-card-section>
 
                 <q-dialog v-model="is_dialog_printable_open">
-                    <transaction-confirm-dialog :hide_bottom="true" @closePopup="is_dialog_printable_open = false; $emit('closePopup')" :sale_id="row.sale_id" :status="row.status"></transaction-confirm-dialog>
+                    <transaction-confirm-dialog :current_user="user_info" :hide_bottom="true" @closePopup="is_dialog_printable_open = false; $emit('closePopup')" :sale_id="row.sale_id" :status="row.status"></transaction-confirm-dialog>
                 </q-dialog>
                 <q-dialog v-model="is_report_dialog_open">
                     <released-item-report></released-item-report>

package/components/GProduct.vue

@@ -6,10 +6,10 @@
                     <td class="product-name">
                         <q-select outlined @input="emitFields()" v-model="field.product" :option-label="(item) => item.hasOwnProperty('sku') ? `${item.sku} (${item.product_name})` : `[ Select Item ]` " option-value="id" :options="product_list" dense></q-select>
                     </td>
-                    <td class="product-qty" width="150px">
+                    <td class="product-qty" width="150px" v-show="!hide_button">
                         <q-input outlined @input="emitFields()" v-model="field.quantity" dense></q-input>
                     </td>
-                    <td class="product-btn" width="50px" v-if="!incentive_product">
+                    <td class="product-btn" width="50px" v-if="!incentive_product" v-show="!hide_button">
                         <q-btn v-if="fields.length == i+1" @click="addProduct()" class="full-width" outline unelevated color="accent">
                             <q-icon name="fa fa-plus" size="12px"></q-icon>
                         </q-btn>
@@ -40,7 +40,7 @@ export default
             },
         ],
     }),
-    props: ['value', 'filter', 'cashier', 'gc', 'incentive_product'],
+    props: ['value', 'filter', 'cashier', 'gc', 'incentive_product', 'hide_button'],
     mounted()
     {
         this.emitFields();

package/components/TransactionConfirmDialog.vue

@@ -44,7 +44,7 @@
                     <q-icon name="fa fa-check" size="14px" class="q-mr-sm"></q-icon>
                     Process Sale
                 </q-btn>
-                <q-btn v-if="status == this.pick_up" @click="voidSale()" color="primary" style="margin-right: 5px" unelevated>
+                <q-btn v-if="status == this.pick_up && this.user_info.hasOwnProperty('void') && this.user_info.void == true" @click="voidSale()" color="primary" style="margin-right: 5px" unelevated>
                     <q-icon name="fa fa-trash" size="14px" class="q-mr-sm"></q-icon>
                     Void Sale
                 </q-btn>
@@ -81,6 +81,7 @@ import SlotCodeDialog           from "../components/SlotCodeDialog";
 import SaleChooseSlotDialog     from "../components/SaleChooseSlotDialog";
 import VoidOption               from "../components/VoidOption";
 import SaleInvoice              from "../components/SaleInvoice";
+import { log } from 'util';
 
 
 
@@ -100,12 +101,10 @@ export default {
         pick_up: 'for pick up',
         pending:"pending",
         void:"void",
-
-        
     }),
     props: ['sale_id', 'hide_bottom','status'],
     async mounted()
-    {       
+    {      
         await this.$bind('sale', this.db_sale.doc(this.sale_id));
         await this.$bind('user', this.db_user.doc(this.sale.customer.uid));
 

package/components/VoidOption.vue

@@ -26,6 +26,7 @@
 
 
 <script>
+import { log } from 'util';
 import GlobalMixins             from '../mixins/global_mixins.js';
 
 
@@ -40,29 +41,39 @@ export default
       memo: "",
     }),
 
-    mounted() {
-     
-     },
+    mounted() 
+    {
+
+    },
     methods: { 
-        async voidSale(){
-             this.$q.loading.show();
-            try
+        async voidSale()
+        {
+            if(!this.user_info.hasOwnProperty('void'))
             {
-                this.sale.memo = this.memo;
-                let sale = await this.$_fbCall('memberVoidSale', { sale: this.sale }); 
-                this.$q.dialog({ title: "Successfully Voided!", message: `Sale No. ${this.sale.sale_id} has been successfully void.` });
-                this.$q.loading.hide();
-                this.$emit('closePopup');
-              
-
+                this.$q.dialog({ title: "Something's not quite right", message: 'This account cannot void transaction. Please contact administrator to void.'});
+            }
+            else if(this.user_info.hasOwnProperty('void') && this.user_info.void == false)
+            {
+                this.$q.dialog({ title: "Something's not quite right", message: 'This account cannot void transaction. Please contact administrator to void.'});
             }
-            catch (error)
+            else
             {
-                this.$q.loading.hide();
-                this.$q.dialog({ title: "Something's not quite right", message: error.message });
+                try
+                {
+                    this.sale.memo = this.memo;
+                    this.sale.void_info = this.user_info;
+                    let sale = await this.$_fbCall('memberVoidSale', { sale: this.sale}); 
+                    this.$q.dialog({ title: "Successfully Voided!", message: `Sale No. ${this.sale.sale_id} has been successfully void.` });
+                    this.$q.loading.hide();
+                    this.$emit('closePopup');
+                }
+                catch (error)
+                {
+                    this.$q.loading.hide();
+                    this.$q.dialog({ title: "Something's not quite right", message: error.message });
+                }
             }
         },
- 
     },
     computed: { }
 }

package/dialogs/GcClaimDIalog.vue

@@ -57,7 +57,6 @@ export default
     }),
     mounted() 
     {
-
         this.initialize();
     },
     methods: 

package/package.json

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