geer-builder 1.2.704 → 1.2.706
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/GProcessSale.vue
CHANGED
|
@@ -868,17 +868,20 @@ export default
|
|
|
868
868
|
{
|
|
869
869
|
for(let element of product_list)
|
|
870
870
|
{
|
|
871
|
-
if(
|
|
871
|
+
if(element.product_id !== undefined)
|
|
872
872
|
{
|
|
873
|
-
|
|
874
|
-
|
|
875
|
-
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
|
|
873
|
+
if(!element.product.hasOwnProperty('pv_price'))
|
|
874
|
+
{
|
|
875
|
+
this.point_value_button = false;
|
|
876
|
+
}
|
|
877
|
+
else if(element.product.hasOwnProperty('pv_price') && element.product.pv_price < 1)
|
|
878
|
+
{
|
|
879
|
+
this.point_value_button = false;
|
|
880
|
+
}
|
|
881
|
+
else
|
|
882
|
+
{
|
|
883
|
+
this.point_value_button = true;
|
|
884
|
+
}
|
|
882
885
|
}
|
|
883
886
|
}
|
|
884
887
|
},
|
|
@@ -886,17 +889,20 @@ export default
|
|
|
886
889
|
{
|
|
887
890
|
for(let element of product_list)
|
|
888
891
|
{
|
|
889
|
-
if(
|
|
892
|
+
if(element.product_id !== undefined)
|
|
890
893
|
{
|
|
891
|
-
|
|
892
|
-
|
|
893
|
-
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
894
|
+
if(!element.product.hasOwnProperty('up_coin_price'))
|
|
895
|
+
{
|
|
896
|
+
this.up_coin_button = false;
|
|
897
|
+
}
|
|
898
|
+
else if(element.product.hasOwnProperty('up_coin_price') && element.product.up_coin_price < 1)
|
|
899
|
+
{
|
|
900
|
+
this.up_coin_button = false;
|
|
901
|
+
}
|
|
902
|
+
else
|
|
903
|
+
{
|
|
904
|
+
this.up_coin_button = true;
|
|
905
|
+
}
|
|
900
906
|
}
|
|
901
907
|
}
|
|
902
908
|
},
|
|
@@ -923,7 +929,7 @@ export default
|
|
|
923
929
|
this.special_cd_pay_amount = 0;
|
|
924
930
|
this.special_cd_pay_amount_max = 0;
|
|
925
931
|
this.payment_for_cd = 0;
|
|
926
|
-
cdWalletonCheck();
|
|
932
|
+
this.cdWalletonCheck();
|
|
927
933
|
}
|
|
928
934
|
|
|
929
935
|
this.updateTable();
|
|
@@ -143,7 +143,7 @@ export default
|
|
|
143
143
|
field : row => row.amount,
|
|
144
144
|
align : 'left',
|
|
145
145
|
required: true,
|
|
146
|
-
format : val => formatNumber(val, { decimal: 2 }),
|
|
146
|
+
format : val => (val < 0 ? "-" : "")+formatNumber(val, { decimal: 2 }),
|
|
147
147
|
sortable: true,
|
|
148
148
|
align : "right",
|
|
149
149
|
|
|
@@ -120,7 +120,7 @@ import {formatDate}from '../../utilities/DateUtils';
|
|
|
120
120
|
field : row => row.amount,
|
|
121
121
|
align : 'left',
|
|
122
122
|
required: true,
|
|
123
|
-
format : val => formatNumber(val, { decimal: 2 }),
|
|
123
|
+
format : val => (val < 0 ? "-" : "")+formatNumber(val, { decimal: 2 }),
|
|
124
124
|
sortable: true,
|
|
125
125
|
align : "right",
|
|
126
126
|
|
|
@@ -129,7 +129,7 @@ import {formatDate}from '../../utilities/DateUtils';
|
|
|
129
129
|
field : row => row.amount,
|
|
130
130
|
align : 'left',
|
|
131
131
|
required: true,
|
|
132
|
-
format : val => formatNumber(val, { decimal: 2 }),
|
|
132
|
+
format : val => (val < 0 ? "-" : "")+formatNumber(val, { decimal: 2 }),
|
|
133
133
|
sortable: true,
|
|
134
134
|
align : "right",
|
|
135
135
|
|