geer-builder 1.2.899 → 1.2.901
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/GProductList.vue
CHANGED
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
<!-- <div class="prod_price price" :class="field.user_discount>0 ? 'has-discount' : ''">{{main_currency}} {{$_formatNumber(field.original_price, { decimal: 2})}}{{field.user}}</div> -->
|
|
56
56
|
<!-- <div class="prod_price price has-discount" v-if="!show_original_price">{{main_currency}} {{$_formatNumber(field.original_price, { decimal: 2})}}{{field.user}}</div> -->
|
|
57
57
|
<div class="prod_price price has-discount" :style="show_discount_price ? 'text-decoration-line: line-through;font-weight:400;font-size:15px;color:gray;margin-right:3px;font-size: 15px;' : ''" v-if="!show_original_price && field.type !='Product' && Number(field.original_price) != Number(field.selling_price)">{{main_currency}} {{field.original_price ? field.original_price + '.00' : 0}}</div>
|
|
58
|
-
<div class="prod_price price has-discount" :style="show_discount_price ? 'text-decoration-line: line-through;font-weight:400;font-size:15px;color:gray;margin-right:3px;font-size: 15px;' : ''" v-else-if="show_original_price && field.type =='Product' && show_discount_price && field.user_discount > 0">{{main_currency}} {{field.selling_price ? field.selling_price + '.00' : 0}}</div>
|
|
58
|
+
<div class="prod_price price has-discount" :style="show_discount_price ? 'text-decoration-line: line-through;font-weight:400;font-size:15px;color:gray;margin-right:3px;font-size: 15px;' : ''" v-else-if="show_original_price && field.type =='Product' && show_discount_price && field.user_discount > 0 && Number(field.original_price) != Number(field.selling_price)">{{main_currency}} {{field.selling_price ? field.selling_price + '.00' : 0}}</div>
|
|
59
59
|
<div class="prod_price discount" v-if="show_discount_price && field.user_discount>0">{{main_currency}} {{ $_formatNumber(field.selling_price - (field.selling_price * (field.user_discount / 100)), { decimal: 2 }) }}</div>
|
|
60
60
|
<div class="prod_price discount" v-else>{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2 }) }}</div>
|
|
61
61
|
</div>
|
|
@@ -159,7 +159,16 @@ export default {
|
|
|
159
159
|
}
|
|
160
160
|
else
|
|
161
161
|
{
|
|
162
|
-
|
|
162
|
+
let warnings = sale && sale.data && sale.data.warnings ? sale.data.warnings : [];
|
|
163
|
+
let slot_limit_warning = warnings.find(w => w.reason === 'slot_limit');
|
|
164
|
+
if(slot_limit_warning)
|
|
165
|
+
{
|
|
166
|
+
swal("Order Processed", "Your order has been processed. However, the membership code could not be auto-activated because you have reached your slot limit. The code has been saved to your Code Vault for manual activation later.", "warning");
|
|
167
|
+
}
|
|
168
|
+
else
|
|
169
|
+
{
|
|
170
|
+
swal("Placement Order Successful!!", `Sale No. ${this.sale_id} has been successfully processed.`, "success");
|
|
171
|
+
}
|
|
163
172
|
}
|
|
164
173
|
|
|
165
174
|
// this.$q.dialog({ title: "Transaction Succesful!", message: `Sale No. ${this.sale_id} has been successfully processed.` });
|
|
@@ -115,7 +115,16 @@ export default {
|
|
|
115
115
|
let sale = await this.$_fbCall('memberCompleteSale', { sale_id: this.sale_id });
|
|
116
116
|
this.$q.loading.hide();
|
|
117
117
|
this.$emit('transactionSuccess');
|
|
118
|
-
|
|
118
|
+
let warnings = sale && sale.data && sale.data.warnings ? sale.data.warnings : [];
|
|
119
|
+
let slot_limit_warning = warnings.find(w => w.reason === 'slot_limit');
|
|
120
|
+
if(slot_limit_warning)
|
|
121
|
+
{
|
|
122
|
+
this.$q.dialog({ title: "Order Processed", message: "The membership code could not be auto-activated because the customer has reached their slot limit. The code has been saved to the Code Vault for manual activation later." });
|
|
123
|
+
}
|
|
124
|
+
else
|
|
125
|
+
{
|
|
126
|
+
this.$q.dialog({ title: "Placement Order Successful!", message: `Sale No. ${this.sale_id} has been successfully processed.` });
|
|
127
|
+
}
|
|
119
128
|
this.is_sale_invoice_open = true;
|
|
120
129
|
|
|
121
130
|
}
|