geer-builder 1.2.449 → 1.2.453
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 +1 -1
- package/GCheckout.vue +24 -15
- package/GProductPage.vue +1 -1
- package/GSlotBreakdownWidget.vue +9 -0
- package/GTransaction.vue +8 -0
- package/GUserVerification.vue +13 -0
- package/components/MyTransactions/tabs/ApprovalTab.vue +1 -0
- package/components/MyTransactions/tabs/Cancelled.vue +1 -0
- package/components/MyTransactions/tabs/CodManual.vue +1 -0
- package/components/MyTransactions/tabs/CompletedTab.vue +1 -0
- package/components/MyTransactions/tabs/ShippingTab.vue +1 -0
- package/components/MyTransactions/tabs/ToPayTab.vue +1 -0
- package/components/MyTransactions/tabs/ToPickedTab.vue +1 -0
- package/components/MyTransactions/tabs/ToShipTab.vue +1 -0
- package/components/Printable.vue +7 -1
- package/components/ProcessSaleConfirmDialog.vue +1 -0
- package/components/TransactionConfirmDialog.vue +1 -0
- package/components/genealogy/Genealogy.vue +7 -2
- package/models/DB_SALE.js +5 -5
- package/package.json +1 -1
package/GCashOut.vue
CHANGED
|
@@ -134,6 +134,7 @@ export default {
|
|
|
134
134
|
merchant_cashout:false,
|
|
135
135
|
merchant_field:[],
|
|
136
136
|
member_field:[],
|
|
137
|
+
cashout_details_tin:false,
|
|
137
138
|
}),
|
|
138
139
|
mixins:[GlobalMixins],
|
|
139
140
|
components: { GCard , CashoutStatusDialog, TinRegistrationDialog},
|
|
@@ -257,7 +258,6 @@ export default {
|
|
|
257
258
|
},
|
|
258
259
|
async submit()
|
|
259
260
|
{
|
|
260
|
-
console.log(this.user_info);
|
|
261
261
|
if(this.tin_required && !this.user_info.hasOwnProperty('tin_number'))
|
|
262
262
|
{
|
|
263
263
|
if(this.user_info.tin_number == 'N/A')
|
package/GCheckout.vue
CHANGED
|
@@ -887,9 +887,9 @@ export default {
|
|
|
887
887
|
{
|
|
888
888
|
payo_courier_settings = this.courier_settings.courier_list[this.courier_settings.courier_list.map(function(e) { return e.courier_label; }).indexOf(orders.courier_chosen)];
|
|
889
889
|
}
|
|
890
|
-
//this code is for
|
|
891
|
-
let pouch_small_height =
|
|
892
|
-
let pouch_small_width =
|
|
890
|
+
//this code is for 70% dimensions of pouch
|
|
891
|
+
let pouch_small_height = 9.1;
|
|
892
|
+
let pouch_small_width = 7;
|
|
893
893
|
let pouch_small_weight = 1;
|
|
894
894
|
//this code is for 100% dimensions of pouch
|
|
895
895
|
// let pouch_small_height = 13;
|
|
@@ -898,13 +898,13 @@ export default {
|
|
|
898
898
|
|
|
899
899
|
if(payo_courier_settings.hasOwnProperty('dimensions') && payo_courier_settings.dimensions.hasOwnProperty('small') && payo_courier_settings.dimensions.small)
|
|
900
900
|
{
|
|
901
|
-
pouch_small_height = payo_courier_settings.dimensions.small.height ||
|
|
902
|
-
pouch_small_width = payo_courier_settings.dimensions.small.width ||
|
|
901
|
+
pouch_small_height = payo_courier_settings.dimensions.small.height || 9.1;
|
|
902
|
+
pouch_small_width = payo_courier_settings.dimensions.small.width || 7;
|
|
903
903
|
pouch_small_weight = payo_courier_settings.dimensions.small.weight || 1;
|
|
904
904
|
}
|
|
905
|
-
//this code is for
|
|
906
|
-
let pouch_medium_height =
|
|
907
|
-
let pouch_medium_width =
|
|
905
|
+
//this code is for 70% dimensions of pouch
|
|
906
|
+
let pouch_medium_height = 11.2;
|
|
907
|
+
let pouch_medium_width = 8.39;
|
|
908
908
|
let pouch_medium_weight = 2;
|
|
909
909
|
//this code is for 100% dimensions of pouch
|
|
910
910
|
// let pouch_medium_height = 16;
|
|
@@ -912,13 +912,13 @@ export default {
|
|
|
912
912
|
// let pouch_medium_weight = 2;
|
|
913
913
|
if(payo_courier_settings.hasOwnProperty('dimensions') && payo_courier_settings.dimensions.hasOwnProperty('medium') && payo_courier_settings.dimensions.medium)
|
|
914
914
|
{
|
|
915
|
-
pouch_medium_height = payo_courier_settings.dimensions.medium.height ||
|
|
916
|
-
pouch_medium_width = payo_courier_settings.dimensions.medium.width ||
|
|
915
|
+
pouch_medium_height = payo_courier_settings.dimensions.medium.height || 11.2;
|
|
916
|
+
pouch_medium_width = payo_courier_settings.dimensions.medium.width || 8.39;
|
|
917
917
|
pouch_medium_weight = payo_courier_settings.dimensions.medium.weight || 2;
|
|
918
918
|
}
|
|
919
|
-
//this code is for
|
|
920
|
-
let pouch_large_height =
|
|
921
|
-
let pouch_large_width =
|
|
919
|
+
//this code is for 70% dimensions of pouch
|
|
920
|
+
let pouch_large_height = 14;
|
|
921
|
+
let pouch_large_width = 11.89;
|
|
922
922
|
let pouch_large_weight = 3;
|
|
923
923
|
//this code is for 100% dimensions of pouch
|
|
924
924
|
// let pouch_large_height = 20;
|
|
@@ -926,8 +926,8 @@ export default {
|
|
|
926
926
|
// let pouch_large_weight = 3;
|
|
927
927
|
if(payo_courier_settings.hasOwnProperty('dimensions') && payo_courier_settings.dimensions.hasOwnProperty('large') && payo_courier_settings.dimensions.large)
|
|
928
928
|
{
|
|
929
|
-
pouch_large_height = payo_courier_settings.dimensions.large.height ||
|
|
930
|
-
pouch_large_width = payo_courier_settings.dimensions.large.width ||
|
|
929
|
+
pouch_large_height = payo_courier_settings.dimensions.large.height || 14;
|
|
930
|
+
pouch_large_width = payo_courier_settings.dimensions.large.width || 11.89;
|
|
931
931
|
pouch_large_weight = payo_courier_settings.dimensions.large.weight || 3;
|
|
932
932
|
}
|
|
933
933
|
let total_item_width = 0;
|
|
@@ -950,6 +950,15 @@ export default {
|
|
|
950
950
|
total_item_height = Number(total_item_height.toFixed(2));
|
|
951
951
|
total_item_price = Number(total_item_price.toFixed(2));
|
|
952
952
|
|
|
953
|
+
console.log(pouch_small_width, 'small width');
|
|
954
|
+
console.log(pouch_small_height, 'small height');
|
|
955
|
+
console.log(pouch_small_weight, 'small weight');
|
|
956
|
+
|
|
957
|
+
console.log(total_item_width, 'total width');
|
|
958
|
+
console.log(total_item_height, 'total height');
|
|
959
|
+
console.log(total_item_weight, 'total weight');
|
|
960
|
+
console.log(total_item_price, 'total price');
|
|
961
|
+
|
|
953
962
|
let size = "";
|
|
954
963
|
if(total_item_width<= pouch_small_width && total_item_height <=pouch_small_height && Math.ceil(total_item_weight)<=pouch_small_weight)
|
|
955
964
|
{
|
package/GProductPage.vue
CHANGED
|
@@ -204,7 +204,7 @@
|
|
|
204
204
|
<q-btn no-caps class="buy-now q-mr-sm" color="primary" unelevated @click="buyNow">Buy Now</q-btn> -->
|
|
205
205
|
</div>
|
|
206
206
|
|
|
207
|
-
<div v-if="this.user_info.hasOwnProperty('active_slot')" class="share-holder">
|
|
207
|
+
<div v-if="this.user_info && this.user_info.hasOwnProperty('active_slot')" class="share-holder">
|
|
208
208
|
<!-- <template v-if="is_sharing_is_available"> -->
|
|
209
209
|
<div class="share">Replicated Link: </div>
|
|
210
210
|
<div class="share-icons" style="display:flex">
|
package/GSlotBreakdownWidget.vue
CHANGED
|
@@ -169,6 +169,10 @@ export default
|
|
|
169
169
|
{
|
|
170
170
|
.slot-content-holder
|
|
171
171
|
{
|
|
172
|
+
@media screen and (max-width: 768px)
|
|
173
|
+
{
|
|
174
|
+
width: 100vw;
|
|
175
|
+
}
|
|
172
176
|
margin: auto;
|
|
173
177
|
width: 600px;
|
|
174
178
|
background:#fafafa;
|
|
@@ -191,7 +195,12 @@ export default
|
|
|
191
195
|
{
|
|
192
196
|
display: grid;
|
|
193
197
|
grid-template-columns: 1fr 1fr;
|
|
198
|
+
@media screen and (max-width: 768px)
|
|
199
|
+
{
|
|
200
|
+
display: block;
|
|
201
|
+
}
|
|
194
202
|
}
|
|
195
203
|
}
|
|
204
|
+
|
|
196
205
|
}
|
|
197
206
|
</style>
|
package/GTransaction.vue
CHANGED
|
@@ -183,6 +183,14 @@ export default
|
|
|
183
183
|
format : val => formatNumber(val, { decimal: 2 }),
|
|
184
184
|
sortable: true,
|
|
185
185
|
},
|
|
186
|
+
{
|
|
187
|
+
name : 'transaction_refill',
|
|
188
|
+
label : 'Type',
|
|
189
|
+
field : row => row.transaction_refill ? "Branch Refill":"Sale",
|
|
190
|
+
align : 'center',
|
|
191
|
+
required: true,
|
|
192
|
+
sortable: true,
|
|
193
|
+
},
|
|
186
194
|
{
|
|
187
195
|
name : 'status',
|
|
188
196
|
label : 'Status',
|
package/GUserVerification.vue
CHANGED
|
@@ -195,9 +195,18 @@ export default
|
|
|
195
195
|
|
|
196
196
|
<style lang="scss" scoped>
|
|
197
197
|
.product-dialog {
|
|
198
|
+
|
|
199
|
+
@media screen and (max-width: 768px)
|
|
200
|
+
{
|
|
201
|
+
width: 100vw;
|
|
202
|
+
}
|
|
198
203
|
.fields {
|
|
199
204
|
background-color: #fafafa;
|
|
200
205
|
padding: 20px;
|
|
206
|
+
@media screen and (max-width: 768px)
|
|
207
|
+
{
|
|
208
|
+
width: 100vw;
|
|
209
|
+
}
|
|
201
210
|
|
|
202
211
|
.label {
|
|
203
212
|
font-weight: bold;
|
|
@@ -216,6 +225,10 @@ export default
|
|
|
216
225
|
background-color: #fff;
|
|
217
226
|
border-top: 1px dashed #ccc;
|
|
218
227
|
padding: 20px;
|
|
228
|
+
@media screen and (max-width: 768px)
|
|
229
|
+
{
|
|
230
|
+
width: 100vw;
|
|
231
|
+
}
|
|
219
232
|
}
|
|
220
233
|
}
|
|
221
234
|
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
<div class="shipping-number">{{list.shipping_address.phone_number}} </div>
|
|
15
15
|
</div>
|
|
16
16
|
<div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div>
|
|
17
|
+
<div class="email">{{list.customer_email}} </div>
|
|
17
18
|
</div>
|
|
18
19
|
<div class="header__container">
|
|
19
20
|
<div class="header-slot-code">
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
<div class="shipping_details" v-if="list.shipping_address">
|
|
11
11
|
<div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
|
|
12
12
|
<div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div>
|
|
13
|
+
<div class="email">{{list.customer_email}} </div>
|
|
13
14
|
</div>
|
|
14
15
|
<div class="header__container">
|
|
15
16
|
<div class="header-slot-code">
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
<div class="shipping-number">{{list.shipping_address.phone_number}} </div>
|
|
15
15
|
</div>
|
|
16
16
|
<div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div>
|
|
17
|
+
<div class="email">{{list.customer_email}} </div>
|
|
17
18
|
</div>
|
|
18
19
|
<div class="header__container">
|
|
19
20
|
<div class="header-slot-code">
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
<div class="shipping-number">{{list.shipping_address.phone_number}} </div>
|
|
14
14
|
</div>
|
|
15
15
|
<div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div>
|
|
16
|
+
<div class="email">{{list.customer_email}} </div>
|
|
16
17
|
</div>
|
|
17
18
|
<div class="header__container">
|
|
18
19
|
<div class="header-slot-code">
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
<div class="shipping-number">{{list.shipping_address.phone_number}} </div>
|
|
14
14
|
</div>
|
|
15
15
|
<div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div>
|
|
16
|
+
<div class="email">{{list.customer_email}} </div>
|
|
16
17
|
</div>
|
|
17
18
|
<div class="header__container">
|
|
18
19
|
<div class="header-slot-code">
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
<div class="shipping-number">{{list.shipping_address.phone_number}} </div>
|
|
14
14
|
</div>
|
|
15
15
|
<div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div>
|
|
16
|
+
<div class="email">{{list.customer_email}} </div>
|
|
16
17
|
</div>
|
|
17
18
|
<div class="header__container">
|
|
18
19
|
<div class="header-slot-code">
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
</div>
|
|
16
16
|
<!-- <div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div> -->
|
|
17
17
|
<div class="ship_address"> {{list.orders.merchant_details.pickup_address.street}} {{list.orders.merchant_details.pickup_address.barangay.name ? list.orders.merchant_details.pickup_address.barangay.name : list.orders.merchant_details.pickup_address.barangay}}, {{list.orders.merchant_details.pickup_address.city.name ? list.orders.merchant_details.pickup_address.city.name : list.shipping_address.city}}, {{list.orders.merchant_details.pickup_address.region.name ? list.orders.merchant_details.pickup_address.region.name : list.orders.merchant_details.pickup_address.region.region_name}}, {{list.orders.merchant_details.pickup_address.province.name ? list.orders.merchant_details.pickup_address.province.name : list.orders.merchant_details.pickup_address.province.province_name}} </div>
|
|
18
|
+
<div class="email">{{list.customer_email}} </div>
|
|
18
19
|
</div>
|
|
19
20
|
<div class="header__container">
|
|
20
21
|
<div class="header-slot-code">
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
<div class="shipping-number">{{list.shipping_address.phone_number}} </div>
|
|
14
14
|
</div>
|
|
15
15
|
<div class="ship_address"> {{list.shipping_address.street}} {{list.shipping_address.barangay.name ? list.shipping_address.barangay.name : list.shipping_address.barangay}}, {{list.shipping_address.city.name ? list.shipping_address.city.name : list.shipping_address.city}}, {{list.shipping_address.region.name ? list.shipping_address.region.name : list.shipping_address.region.region_name}}, {{list.shipping_address.province.name ? list.shipping_address.province.name : list.shipping_address.province.province_name}} </div>
|
|
16
|
+
<div class="email">{{list.customer_email}} </div>
|
|
16
17
|
</div>
|
|
17
18
|
<div class="header__container">
|
|
18
19
|
<div class="header-slot-code">
|
package/components/Printable.vue
CHANGED
|
@@ -33,6 +33,12 @@
|
|
|
33
33
|
<div class="text-red text-bold">No Slot Selected</div>
|
|
34
34
|
</div>
|
|
35
35
|
</div>
|
|
36
|
+
<div class="row text-left" v-if="transaction_refill">
|
|
37
|
+
<div class="col-4 label">Sale Type:</div>
|
|
38
|
+
<div class="col-4 value" >
|
|
39
|
+
<div class="text-primary">{{ transaction_refill ? 'Transaction Refill' : "Sale"}}</div>
|
|
40
|
+
</div>
|
|
41
|
+
</div>
|
|
36
42
|
|
|
37
43
|
</div>
|
|
38
44
|
</div>
|
|
@@ -157,7 +163,7 @@ import MemoHistory from './MemoHistory';
|
|
|
157
163
|
|
|
158
164
|
|
|
159
165
|
export default {
|
|
160
|
-
props: ['cashier', 'title', 'product_list', 'memo', 'number', 'customer', 'transaction_date','sub_total', 'grand_total', 'manager_discount','discount_type','total_discount','status','claim_code','payment','balance','total_payment', 'payment_method','slot_reference'],
|
|
166
|
+
props: ['cashier', 'title', 'product_list', 'memo', 'number', 'customer', 'transaction_date','sub_total', 'grand_total', 'manager_discount','discount_type','total_discount','status','claim_code','payment','balance','total_payment', 'payment_method','slot_reference', 'transaction_refill'],
|
|
161
167
|
mixins: [GlobalMixins],
|
|
162
168
|
components: { MemoHistory },
|
|
163
169
|
data: () =>
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
:total_discount ="sale.total_discount"
|
|
23
23
|
:payment_method ="sale.payment_method"
|
|
24
24
|
:slot_reference ="sale.slot_reference"
|
|
25
|
+
:transaction_refill ="sale.transaction_refill"
|
|
25
26
|
/>
|
|
26
27
|
</div>
|
|
27
28
|
<div v-else style="min-height: 300px;" class="product-list text-center q-pt-lg">
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
:total_discount ="sale.total_discount"
|
|
23
23
|
:payment_method ="sale.payment_method"
|
|
24
24
|
:slot_reference ="sale.slot_reference"
|
|
25
|
+
:transaction_refill ="sale.transaction_refill"
|
|
25
26
|
/>
|
|
26
27
|
</div>
|
|
27
28
|
<div v-else style="min-height: 300px;" class="product-list text-center q-pt-lg">
|
|
@@ -5,12 +5,12 @@
|
|
|
5
5
|
<q-select outlined v-model="country" @input="changeCountry()" :options="country_options" label="Country" />
|
|
6
6
|
</div>
|
|
7
7
|
</div>
|
|
8
|
-
|
|
8
|
+
<div v-if="show_search" class="" :style="`padding:10px;background-image: url(${require('../../assets/statics/grey.png')});`">
|
|
9
9
|
<div style="width:250px;margin:auto;background:white;display:flex;align-items:center;">
|
|
10
10
|
<div class="" style="margin-right:10px;"> <q-input @keydown.enter.prevent="searchDownline" v-model="search_word" label='Search' dense outlined></q-input></div>
|
|
11
11
|
<div class=""><q-btn color='primary' @click="searchDownline" no-caps dense label="Search"></q-btn></div>
|
|
12
12
|
</div>
|
|
13
|
-
</div>
|
|
13
|
+
</div>
|
|
14
14
|
<div class="tree-container" ref="tree" v-dragscroll :style="`overflow: hidden; width: 100%; height: calc(100vh - 50px);`">
|
|
15
15
|
<div :style="`width: 999999px; height: 999999px; padding-top: 1000px; margin-top: -980px; background-image: url(${require('../../assets/statics/grey.png')})`">
|
|
16
16
|
<div class="tree" style="margin-top: 1000px;">
|
|
@@ -53,6 +53,7 @@
|
|
|
53
53
|
country_options:[],
|
|
54
54
|
multiCountry:false,
|
|
55
55
|
binary_type:'',
|
|
56
|
+
show_search:true,
|
|
56
57
|
}),
|
|
57
58
|
directives: { dragscroll },
|
|
58
59
|
components: { SlotViewDialogGenealogyChildren, MemberGenealogyBinary, SearchTable},
|
|
@@ -83,6 +84,10 @@
|
|
|
83
84
|
this.binary_type = "binary_two";
|
|
84
85
|
}
|
|
85
86
|
|
|
87
|
+
if(public_settings.hasOwnProperty('qdy') && public_settings.qdy)
|
|
88
|
+
{
|
|
89
|
+
this.show_search = false;
|
|
90
|
+
}
|
|
86
91
|
this.default_profile_picture = public_settings.default_profile_picture;
|
|
87
92
|
this.multiCountry = public_settings.genealogy_multi_country;
|
|
88
93
|
|
package/models/DB_SALE.js
CHANGED
|
@@ -12,7 +12,7 @@ export default class DB_SALE extends MODEL
|
|
|
12
12
|
let date_start = new Date(from_date + ' 00:00:00');
|
|
13
13
|
let date_end = new Date(to_date + ' 23:59:59');
|
|
14
14
|
|
|
15
|
-
let res = await this.collection().where('status','==', 'completed').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', '
|
|
15
|
+
let res = await this.collection().where('status','==', 'completed').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', 'asd').get();
|
|
16
16
|
|
|
17
17
|
let data = [];
|
|
18
18
|
|
|
@@ -34,7 +34,7 @@ export default class DB_SALE extends MODEL
|
|
|
34
34
|
let date_end = new Date(to_date + ' 23:59:59');
|
|
35
35
|
let slot_code = branch_slot;
|
|
36
36
|
|
|
37
|
-
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'completed').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', '
|
|
37
|
+
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'completed').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', 'asc').get();
|
|
38
38
|
|
|
39
39
|
let data = [];
|
|
40
40
|
|
|
@@ -56,7 +56,7 @@ export default class DB_SALE extends MODEL
|
|
|
56
56
|
let date_end = new Date(to_date + ' 23:59:59');
|
|
57
57
|
let slot_code = branch_slot;
|
|
58
58
|
|
|
59
|
-
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'pending').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', '
|
|
59
|
+
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'pending').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', 'asc').get();
|
|
60
60
|
|
|
61
61
|
let data = [];
|
|
62
62
|
|
|
@@ -78,7 +78,7 @@ export default class DB_SALE extends MODEL
|
|
|
78
78
|
let date_end = new Date(to_date + ' 23:59:59');
|
|
79
79
|
let slot_code = branch_slot;
|
|
80
80
|
|
|
81
|
-
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'for pick up').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', '
|
|
81
|
+
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'for pick up').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', 'asc').get();
|
|
82
82
|
|
|
83
83
|
let data = [];
|
|
84
84
|
|
|
@@ -100,7 +100,7 @@ export default class DB_SALE extends MODEL
|
|
|
100
100
|
let date_end = new Date(to_date + ' 23:59:59');
|
|
101
101
|
let slot_code = branch_slot;
|
|
102
102
|
|
|
103
|
-
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'void').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', '
|
|
103
|
+
let res = await this.collection().where('stockist','==', slot_code).where('status','==', 'void').where('created_date','>=', date_start).where('created_date','<=', date_end).orderBy('created_date', 'asc').get();
|
|
104
104
|
|
|
105
105
|
let data = [];
|
|
106
106
|
|