geer-builder 1.2.640 → 1.2.642
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/GEcomStorePage.vue
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<div class="active__status" v-if="merchant_info.last_login_date">Active {{timeSince( new Date(this.merchant_info.last_login_date.seconds * 1000 + this.merchant_info.last_login_date.nanoseconds/1000000))+" ago"}}</div>
|
|
13
13
|
</div>
|
|
14
14
|
</div>
|
|
15
|
-
<div class="button-holder" v-if="user_info &&
|
|
15
|
+
<div class="button-holder" v-if="user_info && user_info.hasOwnProperty('active_slot')">
|
|
16
16
|
<q-btn class="q-mr-sm hidden open-merchant-btn btn-color" @click="openMerchantPage()">
|
|
17
17
|
<q-icon size="14px" color="gray" class="q-mr-sm" name="fa fa-store"></q-icon>
|
|
18
18
|
View Page
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
<div class="prod_name product-list-name" :style="'max-width:'+width+';'">{{field.product_name}}</div>
|
|
10
10
|
<div class="prod_description">{{field.description}}</div>
|
|
11
11
|
<div class="prod_price price">{{main_currency}} {{$_formatNumber(field.selling_price, { decimal: 2})}}</div>
|
|
12
|
-
<div><q-btn class="full-width" label="Buy Now" color="primary" @click="
|
|
13
|
-
<div style="text-decoration:underline;color:blue;cursor:pointer;" @click="showMore(field)">Show More</div>
|
|
12
|
+
<div><q-btn class="full-width" label="Buy Now" color="primary" @click="showMore(field)"></q-btn></div>
|
|
13
|
+
<!-- <div style="text-decoration:underline;color:blue;cursor:pointer;" @click="showMore(field)">Show More</div> -->
|
|
14
14
|
</div>
|
|
15
15
|
</div>
|
|
16
16
|
</template>
|
|
@@ -51,6 +51,7 @@ export default {
|
|
|
51
51
|
branch_details: {},
|
|
52
52
|
branch:{},
|
|
53
53
|
quantity: 1,
|
|
54
|
+
variant_product_list:[]
|
|
54
55
|
}),
|
|
55
56
|
async mounted()
|
|
56
57
|
{
|
|
@@ -63,6 +64,8 @@ export default {
|
|
|
63
64
|
this.public_settings = await this.$_getData('public_settings');
|
|
64
65
|
this.main_currency = this.public_settings.main_currency;
|
|
65
66
|
await this.$bind('product_list', new DB_PRODUCTS().collection().where("type", "in", ["Membership Kit"]).where("show_on_dashboard", "==", true).where("ecommerce", "==", true).where("country_code", "==", this.country_code ? this.country_code : 'PH'));
|
|
67
|
+
// await this.$bind('variant_product_list', new DB_PRODUCTS().collection().where("type", "in", ["Membership Kit"]).where("show_on_dashboard", "==", true).where("ecommerce", "==", true).where("country_code", "==", this.country_code ? this.country_code : 'PH'));
|
|
68
|
+
// console.log(this.variant_product_list);
|
|
66
69
|
},
|
|
67
70
|
buyNow(product)
|
|
68
71
|
{
|
|
@@ -98,7 +101,7 @@ export default {
|
|
|
98
101
|
if(val.inventory>=this.quantity)
|
|
99
102
|
{
|
|
100
103
|
let array_container = [];
|
|
101
|
-
let details = {product_id: this.product_details.product_id, quantity: this.quantity, selected_branch: this.branch_details}
|
|
104
|
+
let details = {sku: this.product_details.sku ,product_id: this.product_details.product_id, quantity: this.quantity, selected_branch: this.branch_details}
|
|
102
105
|
array_container.push(details);
|
|
103
106
|
this.$emit('buyNow',array_container);
|
|
104
107
|
}
|
package/GRequestProduct.vue
CHANGED
|
@@ -443,7 +443,7 @@
|
|
|
443
443
|
{
|
|
444
444
|
let settings = await this.$_getData('public_settings');
|
|
445
445
|
this.main_currency = settings.main_currency || 'PHP';
|
|
446
|
-
|
|
446
|
+
this.minimum_commission_margin = this.main_currency.hasOwnProperty('minimum_commission_margin') ? this.main_currency.minimum_commission_margin : 5;
|
|
447
447
|
// this.product_details.commission_margin = this.minimum_commission_margin;
|
|
448
448
|
if(settings && settings.hasOwnProperty('referral_commission_earning') && settings.referral_commission_earning.active)
|
|
449
449
|
{
|
|
@@ -516,7 +516,7 @@
|
|
|
516
516
|
this.$q.dialog(
|
|
517
517
|
{
|
|
518
518
|
title: 'Ann Error Has Occured',
|
|
519
|
-
message: "
|
|
519
|
+
message: "The minimum commission fee is "+ this.minimum_commission_margin +"!"
|
|
520
520
|
});
|
|
521
521
|
}
|
|
522
522
|
else if(this.product_details.current_stock<=0)
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
</div>
|
|
95
95
|
<div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:0px 20px 10px 0px;">
|
|
96
96
|
<q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
|
|
97
|
-
<q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay'
|
|
97
|
+
<q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
|
|
98
98
|
</div>
|
|
99
99
|
</div>
|
|
100
100
|
</div>
|
|
@@ -167,7 +167,7 @@
|
|
|
167
167
|
</div>
|
|
168
168
|
<div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:10px">
|
|
169
169
|
<q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
|
|
170
|
-
<q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay'
|
|
170
|
+
<q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
|
|
171
171
|
</div>
|
|
172
172
|
</div>
|
|
173
173
|
</div>
|