geer-builder 1.2.724 → 1.2.725
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/GCheckout.vue
CHANGED
|
@@ -750,14 +750,14 @@ export default {
|
|
|
750
750
|
// if(this.product_list.length > 0 )
|
|
751
751
|
// {
|
|
752
752
|
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
753
|
+
// if(this.product_list[0].product.type === 'Membership Kit')
|
|
754
|
+
// {
|
|
755
|
+
// if(this.product_list[0].product.membership_kit.hasOwnProperty('free_shipping') && this.product_list[0].product.membership_kit.free_shipping)
|
|
756
|
+
// {
|
|
757
|
+
// this.package_free_shipping = true;
|
|
758
|
+
// console.log('Free Shipping');
|
|
759
|
+
// }
|
|
760
|
+
// }
|
|
761
761
|
// }
|
|
762
762
|
},
|
|
763
763
|
async addGcashFee(product_list)
|
|
@@ -1203,26 +1203,47 @@ export default {
|
|
|
1203
1203
|
if(orders.hasOwnProperty("products"))
|
|
1204
1204
|
{
|
|
1205
1205
|
orders.products.forEach(pro =>
|
|
1206
|
-
{
|
|
1207
|
-
if(
|
|
1206
|
+
{
|
|
1207
|
+
if(pro.product.type === "Membership Kit")
|
|
1208
1208
|
{
|
|
1209
|
-
|
|
1209
|
+
let check_condition = pro.product.hasOwnProperty("membership_kit") && pro.product.membership_kit && pro.product.membership_kit.free_shipping === true;
|
|
1210
|
+
if(free_shipping_ctr >= 1 && is_merchant_free_shipping !== true && check_condition === true)
|
|
1211
|
+
{
|
|
1212
|
+
this.is_merchant_free_shipping_conflict = true;
|
|
1213
|
+
}
|
|
1214
|
+
else if(free_shipping_ctr >= 1 && is_merchant_free_shipping === true && check_condition !== true)
|
|
1215
|
+
{
|
|
1216
|
+
this.is_merchant_free_shipping_conflict = true;
|
|
1217
|
+
}
|
|
1210
1218
|
}
|
|
1211
|
-
else
|
|
1219
|
+
else
|
|
1212
1220
|
{
|
|
1213
|
-
|
|
1221
|
+
if(free_shipping_ctr >= 1 && is_merchant_free_shipping !== true && pro.product.merchant_free_shipping_applied === true)
|
|
1222
|
+
{
|
|
1223
|
+
this.is_merchant_free_shipping_conflict = true;
|
|
1224
|
+
}
|
|
1225
|
+
else if(free_shipping_ctr >= 1 && is_merchant_free_shipping === true && pro.product.merchant_free_shipping_applied !== true)
|
|
1226
|
+
{
|
|
1227
|
+
this.is_merchant_free_shipping_conflict = true;
|
|
1228
|
+
}
|
|
1214
1229
|
}
|
|
1215
1230
|
|
|
1216
|
-
|
|
1217
1231
|
free_shipping_ctr++;
|
|
1218
1232
|
if(pro.product.merchant_free_shipping_applied === true)
|
|
1219
1233
|
{
|
|
1220
1234
|
is_merchant_free_shipping = true;
|
|
1221
1235
|
}
|
|
1222
|
-
|
|
1223
|
-
|
|
1236
|
+
else if(pro.product.type === 'Membership Kit')
|
|
1237
|
+
{
|
|
1238
|
+
if(pro.product.hasOwnProperty("membership_kit") && pro.product.membership_kit && pro.product.membership_kit.free_shipping === true)
|
|
1239
|
+
{
|
|
1240
|
+
is_merchant_free_shipping = true;
|
|
1241
|
+
}
|
|
1242
|
+
}
|
|
1224
1243
|
});
|
|
1225
1244
|
}
|
|
1245
|
+
|
|
1246
|
+
|
|
1226
1247
|
|
|
1227
1248
|
if(orders.hasOwnProperty('courier_chosen'))
|
|
1228
1249
|
{
|
|
@@ -1991,6 +2012,7 @@ export default {
|
|
|
1991
2012
|
// orders.shipping_fee = shipping_fee;
|
|
1992
2013
|
// this.checkout_info.shipping_total = this.checkout_info.shipping_total + orders.shipping_fee;
|
|
1993
2014
|
// });
|
|
2015
|
+
|
|
1994
2016
|
}
|
|
1995
2017
|
if(this.public_settings.hasOwnProperty('custom_ecommerce_fee') && this.payment_method.payment_method_id != 'gc_points')
|
|
1996
2018
|
{
|
|
@@ -2105,10 +2127,7 @@ export default {
|
|
|
2105
2127
|
this.checkout_info.gcash_fee = 0;
|
|
2106
2128
|
}
|
|
2107
2129
|
|
|
2108
|
-
|
|
2109
|
-
{
|
|
2110
|
-
this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Cannot combine products with shipping fee to a product with free shipping fee please clear your cart.` });
|
|
2111
|
-
}
|
|
2130
|
+
|
|
2112
2131
|
|
|
2113
2132
|
this.checkout_info.payment_method = this.payment_method;
|
|
2114
2133
|
try
|
|
@@ -2129,6 +2148,10 @@ export default {
|
|
|
2129
2148
|
this.is_add_address_dialog_open = true;
|
|
2130
2149
|
});
|
|
2131
2150
|
}
|
|
2151
|
+
else if(this.is_merchant_free_shipping_conflict == true)
|
|
2152
|
+
{
|
|
2153
|
+
this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Cannot combine products with shipping fee to a product with free shipping fee please clear your cart.` });
|
|
2154
|
+
}
|
|
2132
2155
|
else if(!this.checkout_info.shipping_address.first_name ||!this.checkout_info.shipping_address.last_name )
|
|
2133
2156
|
{
|
|
2134
2157
|
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Please Update Shipping Address First Name/Last Name" }).onOk(async data =>
|
|
@@ -2165,7 +2188,7 @@ export default {
|
|
|
2165
2188
|
}
|
|
2166
2189
|
else if(this.online_payment_only && this.public_settings.hasOwnProperty('membership_payment_method') &&!this.public_settings.membership_payment_method.includes(this.checkout_info.payment_method.payment_method_id))
|
|
2167
2190
|
{
|
|
2168
|
-
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Entry
|
|
2191
|
+
this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Entry package can only be purchased using wallet payment, dragon pay or manual pay" });
|
|
2169
2192
|
}
|
|
2170
2193
|
else
|
|
2171
2194
|
{
|
package/GSlotBreakdownWidget.vue
CHANGED
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
<div class="label">
|
|
28
28
|
<q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
|
|
29
29
|
<q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
|
|
30
|
-
<div>GC</div>
|
|
30
|
+
<div>{{ (settings && settings.gc_label) || 'GC' }}</div>
|
|
31
31
|
</q-btn>
|
|
32
32
|
</div>
|
|
33
33
|
</div>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<q-card class="gc-logs-dialog">
|
|
3
3
|
<q-bar class="bg-primary text-white q-pa-lg">
|
|
4
4
|
<q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
|
|
5
|
-
<b>
|
|
5
|
+
<b>{{this.settings && this.settings.gc_label}} Logs</b>
|
|
6
6
|
<q-space />
|
|
7
7
|
|
|
8
8
|
<q-btn dense flat icon="close" v-close-popup>
|
|
@@ -193,6 +193,7 @@ export default
|
|
|
193
193
|
],
|
|
194
194
|
}),
|
|
195
195
|
async mounted() {
|
|
196
|
+
this.settings = await this.$_getData('public_settings');
|
|
196
197
|
await this.getTableData();
|
|
197
198
|
},
|
|
198
199
|
methods:
|
|
@@ -200,6 +201,12 @@ export default
|
|
|
200
201
|
async getTableData()
|
|
201
202
|
{
|
|
202
203
|
await this.$bind("table_data", new DB_POINTS_LOG().collection().where("type","==", "gc").where("recipient_id", "==", this.user_info.active_slot).orderBy('created_date', 'desc'));
|
|
204
|
+
this.table_data.forEach((d, i) =>
|
|
205
|
+
{
|
|
206
|
+
this.table_data[i].message = d.message.replace(" GC ", " "+((this.settings && this.settings.gc_label)+" " || ' GC ' ) )
|
|
207
|
+
this.table_data[i].message = this.table_data[i].message.replace("gc bonus", " "+((this.settings && this.settings.gc_label.toLowerCase())+" " || ' GC ' ) )
|
|
208
|
+
this.table_data[i].type = this.settings && this.settings.gc_label || 'GC';
|
|
209
|
+
})
|
|
203
210
|
this.table_loading = false;
|
|
204
211
|
},
|
|
205
212
|
},
|