geer-builder 1.2.608 → 1.2.609
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/GCashOut.vue
CHANGED
|
@@ -119,7 +119,7 @@ import DB_CASHOUT from './models/DB_MEMBER_CASHOUT';
|
|
|
119
119
|
import DB_USER from './models/DB_USER';
|
|
120
120
|
import CashoutStatusDialog from './dialogs/CashoutStatusDialog'
|
|
121
121
|
import TinRegistrationDialog from './dialogs/TinRegistrationDialog'
|
|
122
|
-
import {QSpinnerFacebook }
|
|
122
|
+
import {QSpinnerFacebook } from 'quasar'
|
|
123
123
|
|
|
124
124
|
export default {
|
|
125
125
|
data: () =>
|
package/GEcomStorePage.vue
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<div class="active__status">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">
|
|
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
|
|
@@ -176,17 +176,10 @@ export default {
|
|
|
176
176
|
}
|
|
177
177
|
if (this.merchant_slot.rate_list)
|
|
178
178
|
{
|
|
179
|
-
|
|
179
|
+
let check_user_on_list = this.merchant_slot.rate_list.includes(this.user_info.uid)
|
|
180
|
+
if (!check_user_on_list)
|
|
180
181
|
{
|
|
181
|
-
|
|
182
|
-
if (!check_user_on_list)
|
|
183
|
-
{
|
|
184
|
-
this.is_rating_dialog = true;
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
else
|
|
188
|
-
{
|
|
189
|
-
this.is_rating_dialog = false;
|
|
182
|
+
this.is_rating_dialog = true;
|
|
190
183
|
}
|
|
191
184
|
}
|
|
192
185
|
else
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
<!-- <div style="color:black;">Tracking Number:</div> <div style="color:black;font-weight:600">{{list.tracking_number}}</div> -->
|
|
81
81
|
<!-- <div>Status: {{list.status == "cancelled" ? "Cancelled" : ""}}</div> -->
|
|
82
82
|
<div class="methods">Payment Method: {{list.payment_method.payment_method_label }}</div>
|
|
83
|
-
<div class="methods" v-if="list.hasOwnProperty('
|
|
83
|
+
<div class="methods" v-if="list.hasOwnProperty('cancel_reason')">Cancellation Reason: {{list.cancel_reason}}</div>
|
|
84
84
|
|
|
85
85
|
<!-- <div style="margin-left:auto;padding-left:10px;margin-right:10px;">Shipping Fee: {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
|
|
86
86
|
<div style="padding-left:10px;margin-right:10px;border-left: 1px solid rgb(194, 189, 189);" v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}: {{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
</div>
|
|
78
78
|
<div class="order-total">
|
|
79
79
|
<div class="methods">Payment Method: {{list.payment_method.payment_method_label }}</div>
|
|
80
|
-
<div class="methods" v-if="list.hasOwnProperty('
|
|
80
|
+
<div class="methods" v-if="list.hasOwnProperty('cancel_reason')">Cancellation Reason: {{list.cancel_reason}}</div>
|
|
81
81
|
<!-- <div>Order Total ({{product_list[i].quantity}} Item): {{main_currency}} {{order_total}}</div> -->
|
|
82
82
|
<!-- <div style="color:black;">Tracking Number:</div> <div style="color:black;font-weight:600">{{list.tracking_number}}</div> -->
|
|
83
83
|
<!-- <div style="margin-left:auto;margin-right:10px;">Shipping Fee: {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
|