geer-builder 1.2.645 → 1.2.647
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
|
@@ -2166,7 +2166,7 @@ export default {
|
|
|
2166
2166
|
this.payment_method = this.payment_method_list[0];
|
|
2167
2167
|
|
|
2168
2168
|
this.product_list.forEach(element => {
|
|
2169
|
-
if(element.product.hasOwnProperty('membership_kit'))
|
|
2169
|
+
if(element.product.hasOwnProperty('membership_kit') && element.product.membership_kit.membership.membership_name.length > 0)
|
|
2170
2170
|
{
|
|
2171
2171
|
this.online_payment_only = true;
|
|
2172
2172
|
for( var i = 0; i < this.payment_method_list.length; i++)
|
package/GSlotWallet.vue
CHANGED
|
@@ -45,11 +45,11 @@
|
|
|
45
45
|
</div>
|
|
46
46
|
<div v-if="( current_slot_info.points.binary_two_group_pv || current_slot_info.points.binary_two_personal_pv ) || is_binary_pv_combination == true" class="q-pt-sm q-pb-md section-holder">
|
|
47
47
|
<div>
|
|
48
|
-
<div class="label">
|
|
48
|
+
<div class="label">Sales Match Personal PV</div>
|
|
49
49
|
<div class="value">{{current_slot_info.points.binary_two_personal_pv ? current_slot_info.points.binary_two_personal_pv : 0 }}</div>
|
|
50
50
|
</div>
|
|
51
51
|
<div>
|
|
52
|
-
<div class="label">
|
|
52
|
+
<div class="label">Sales Match Group PV</div>
|
|
53
53
|
<div class="value">{{current_slot_info.points.binary_two_group_pv ? current_slot_info.points.binary_two_group_pv : 0 }}</div>
|
|
54
54
|
</div>
|
|
55
55
|
</div>
|
|
@@ -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'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
|
|
97
|
+
<q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='manual_pay' || 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'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
|
|
170
|
+
<q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='manual_pay' || 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>
|
|
@@ -235,6 +235,8 @@ export default {
|
|
|
235
235
|
}
|
|
236
236
|
});
|
|
237
237
|
this.my_order_list = myOrder;
|
|
238
|
+
|
|
239
|
+
console.log(this.my_order_list, 'myOrder');
|
|
238
240
|
},
|
|
239
241
|
async orderReceived(index)
|
|
240
242
|
{
|