geer-builder 1.2.868 → 1.2.870

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.
Files changed (20) hide show
  1. package/components/ApplyMerchant/ApplyMerchantDialog.vue +9 -4
  2. package/components/MyPurchases/tabs/CodManual.vue +12 -0
  3. package/components/MyPurchases/tabs/CompletedTab.vue +12 -0
  4. package/components/MyPurchases/tabs/ProcessingTab.vue +12 -0
  5. package/components/MyPurchases/tabs/ToPayTab.vue +12 -0
  6. package/components/MyPurchases/tabs/ToPickedTab.vue +12 -0
  7. package/components/MyPurchases/tabs/ToReceiveTab.vue +12 -0
  8. package/components/MyPurchases/tabs/ToShipTab.vue +12 -0
  9. package/components/MyPurchases/tabs/cancelled.vue +12 -0
  10. package/components/MyTransactions/tabs/ApprovalTab.vue +12 -0
  11. package/components/MyTransactions/tabs/Cancelled.vue +12 -0
  12. package/components/MyTransactions/tabs/CodManual.vue +12 -0
  13. package/components/MyTransactions/tabs/CompletedTab.vue +12 -0
  14. package/components/MyTransactions/tabs/ShippingTab.vue +12 -0
  15. package/components/MyTransactions/tabs/ToPayTab.vue +12 -0
  16. package/components/MyTransactions/tabs/ToPickedTab.vue +12 -0
  17. package/components/MyTransactions/tabs/ToShipTab.vue +12 -0
  18. package/components/genealogy/Genealogy.vue +2 -1
  19. package/components/genealogy/GenealogyChildren.vue +6 -0
  20. package/package.json +1 -1
package/components/ApplyMerchant/ApplyMerchantDialog.vue CHANGED
@@ -131,6 +131,7 @@
131
131
  <script>
132
132
  import GlobalMixins from '../../mixins/global_mixins';
133
133
  import ApplyMerchantUploader from './ApplyMerchantUploader';
134
+ import DB_SETTINGS from "../../models/DB_SETTINGS";
134
135
  import phil from 'philippine-location-json-for-geer';
135
136
  import axios from 'axios';
136
137
  export default {
@@ -191,11 +192,15 @@ export default {
191
192
  },
192
193
  methods: {
193
194
  async getPhilexAuth() {
194
- let philexResponse = await axios.post(
195
- "https://philex-api-staging-app-9so4o.ondigitalocean.app/api/v1/authenticate",
195
+ let settings = await new DB_SETTINGS().get("philexpress_settings");
196
+ let phx_link = settings.link;
197
+ let phx_email = settings.email;
198
+ let phx_password = settings.password;
199
+ let philexResponse = await axios.post(
200
+ phx_link+"authenticate",
196
201
  {
197
- email: "Successmall@philex.com",
198
- password: "Philex@success123*",
202
+ email: phx_email,
203
+ password: phx_password,
199
204
  },
200
205
  {
201
206
  headers: {
package/components/MyPurchases/tabs/CodManual.vue CHANGED
@@ -189,6 +189,18 @@ export default {
189
189
  this.order_list.forEach(order_list => {
190
190
  if (order_list.status == "cod_manual")
191
191
  {
192
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
193
+ {
194
+ order_list.shipping_address.barangay = {};
195
+ order_list.shipping_address.region = {};
196
+ order_list.shipping_address.city = {};
197
+ order_list.shipping_address.province = {};
198
+
199
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
200
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
201
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
202
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
203
+ }
192
204
  myOrder.push(order_list);
193
205
  }
194
206
  });
package/components/MyPurchases/tabs/CompletedTab.vue CHANGED
@@ -209,6 +209,18 @@ export default {
209
209
  this.order_list.forEach(order_list => {
210
210
  if (order_list.status == "completed")
211
211
  {
212
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
213
+ {
214
+ order_list.shipping_address.barangay = {};
215
+ order_list.shipping_address.region = {};
216
+ order_list.shipping_address.city = {};
217
+ order_list.shipping_address.province = {};
218
+
219
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
220
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
221
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
222
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
223
+ }
212
224
  myOrder.push(order_list);
213
225
  }
214
226
  });
package/components/MyPurchases/tabs/ProcessingTab.vue CHANGED
@@ -198,6 +198,18 @@ export default {
198
198
  this.order_list.forEach(order_list => {
199
199
  if (order_list.status == "processing" || order_list.status == "pending")
200
200
  {
201
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
202
+ {
203
+ order_list.shipping_address.barangay = {};
204
+ order_list.shipping_address.region = {};
205
+ order_list.shipping_address.city = {};
206
+ order_list.shipping_address.province = {};
207
+
208
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
209
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
210
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
211
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
212
+ }
201
213
  myOrder.push(order_list);
202
214
  }
203
215
  });
package/components/MyPurchases/tabs/ToPayTab.vue CHANGED
@@ -199,6 +199,18 @@ export default {
199
199
  this.order_list.forEach(order_list => {
200
200
  if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked" ||order_list.status == "pre_processing" )
201
201
  {
202
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
203
+ {
204
+ order_list.shipping_address.barangay = {};
205
+ order_list.shipping_address.region = {};
206
+ order_list.shipping_address.city = {};
207
+ order_list.shipping_address.province = {};
208
+
209
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
210
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
211
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
212
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
213
+ }
202
214
  myOrder.push(order_list);
203
215
  }
204
216
  });
package/components/MyPurchases/tabs/ToPickedTab.vue CHANGED
@@ -225,6 +225,18 @@ export default {
225
225
  this.order_list.forEach(order_list => {
226
226
  if (order_list.status == "to_picked")
227
227
  {
228
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
229
+ {
230
+ order_list.shipping_address.barangay = {};
231
+ order_list.shipping_address.region = {};
232
+ order_list.shipping_address.city = {};
233
+ order_list.shipping_address.province = {};
234
+
235
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
236
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
237
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
238
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
239
+ }
228
240
  myOrder.push(order_list);
229
241
  }
230
242
  });
package/components/MyPurchases/tabs/ToReceiveTab.vue CHANGED
@@ -231,6 +231,18 @@ export default {
231
231
  this.order_list.forEach(order_list => {
232
232
  if (order_list.status == "shipping" || order_list.status == "delivered")
233
233
  {
234
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
235
+ {
236
+ order_list.shipping_address.barangay = {};
237
+ order_list.shipping_address.region = {};
238
+ order_list.shipping_address.city = {};
239
+ order_list.shipping_address.province = {};
240
+
241
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
242
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
243
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
244
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
245
+ }
234
246
  myOrder.push(order_list);
235
247
  }
236
248
  });
package/components/MyPurchases/tabs/ToShipTab.vue CHANGED
@@ -183,6 +183,18 @@ export default {
183
183
  this.order_list.forEach(order_list => {
184
184
  if (order_list.status == "to_ship")
185
185
  {
186
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
187
+ {
188
+ order_list.shipping_address.barangay = {};
189
+ order_list.shipping_address.region = {};
190
+ order_list.shipping_address.city = {};
191
+ order_list.shipping_address.province = {};
192
+
193
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
194
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
195
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
196
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
197
+ }
186
198
  myOrder.push(order_list);
187
199
  }
188
200
  });
package/components/MyPurchases/tabs/cancelled.vue CHANGED
@@ -193,6 +193,18 @@ export default {
193
193
  this.order_list.forEach(order_list => {
194
194
  if (order_list.status == "cancelled")
195
195
  {
196
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
197
+ {
198
+ order_list.shipping_address.barangay = {};
199
+ order_list.shipping_address.region = {};
200
+ order_list.shipping_address.city = {};
201
+ order_list.shipping_address.province = {};
202
+
203
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
204
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
205
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
206
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
207
+ }
196
208
  myOrder.push(order_list);
197
209
  }
198
210
  });
package/components/MyTransactions/tabs/ApprovalTab.vue CHANGED
@@ -237,6 +237,18 @@ export default {
237
237
  this.order_list.forEach(order_list => {
238
238
  if (order_list.status == "processing" || order_list.status == "pending")
239
239
  {
240
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
241
+ {
242
+ order_list.shipping_address.barangay = {};
243
+ order_list.shipping_address.region = {};
244
+ order_list.shipping_address.city = {};
245
+ order_list.shipping_address.province = {};
246
+
247
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
248
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
249
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
250
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
251
+ }
240
252
  myOrder.push(order_list);
241
253
  }
242
254
  });
package/components/MyTransactions/tabs/Cancelled.vue CHANGED
@@ -199,6 +199,18 @@ export default {
199
199
  this.order_list.forEach(order_list => {
200
200
  if (order_list.status == "cancelled")
201
201
  {
202
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
203
+ {
204
+ order_list.shipping_address.barangay = {};
205
+ order_list.shipping_address.region = {};
206
+ order_list.shipping_address.city = {};
207
+ order_list.shipping_address.province = {};
208
+
209
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
210
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
211
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
212
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
213
+ }
202
214
  myOrder.push(order_list);
203
215
  }
204
216
  });
package/components/MyTransactions/tabs/CodManual.vue CHANGED
@@ -231,6 +231,18 @@ export default {
231
231
  this.order_list.forEach(order_list => {
232
232
  if (order_list.status == "cod_manual")
233
233
  {
234
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
235
+ {
236
+ order_list.shipping_address.barangay = {};
237
+ order_list.shipping_address.region = {};
238
+ order_list.shipping_address.city = {};
239
+ order_list.shipping_address.province = {};
240
+
241
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
242
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
243
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
244
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
245
+ }
234
246
  myOrder.push(order_list);
235
247
  }
236
248
  });
package/components/MyTransactions/tabs/CompletedTab.vue CHANGED
@@ -198,6 +198,18 @@ export default {
198
198
  this.order_list.forEach(order_list => {
199
199
  if (order_list.status == "completed")
200
200
  {
201
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
202
+ {
203
+ order_list.shipping_address.barangay = {};
204
+ order_list.shipping_address.region = {};
205
+ order_list.shipping_address.city = {};
206
+ order_list.shipping_address.province = {};
207
+
208
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
209
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
210
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
211
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
212
+ }
201
213
  myOrder.push(order_list);
202
214
  }
203
215
  });
package/components/MyTransactions/tabs/ShippingTab.vue CHANGED
@@ -227,6 +227,18 @@ export default {
227
227
  this.order_list.forEach(order_list => {
228
228
  if (order_list.status == "shipping" || order_list.status == "delivered")
229
229
  {
230
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
231
+ {
232
+ order_list.shipping_address.barangay = {};
233
+ order_list.shipping_address.region = {};
234
+ order_list.shipping_address.city = {};
235
+ order_list.shipping_address.province = {};
236
+
237
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
238
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
239
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
240
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
241
+ }
230
242
  myOrder.push(order_list);
231
243
  }
232
244
  });
package/components/MyTransactions/tabs/ToPayTab.vue CHANGED
@@ -176,6 +176,18 @@ export default {
176
176
  this.order_list.forEach(order_list => {
177
177
  if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked" || order_list.status == "pre_processing")
178
178
  {
179
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
180
+ {
181
+ order_list.shipping_address.barangay = {};
182
+ order_list.shipping_address.region = {};
183
+ order_list.shipping_address.city = {};
184
+ order_list.shipping_address.province = {};
185
+
186
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
187
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
188
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
189
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
190
+ }
179
191
  myOrder.push(order_list);
180
192
  }
181
193
  });
package/components/MyTransactions/tabs/ToPickedTab.vue CHANGED
@@ -228,6 +228,18 @@ export default {
228
228
  this.order_list.forEach(order_list => {
229
229
  if (order_list.status == "to_picked")
230
230
  {
231
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
232
+ {
233
+ order_list.shipping_address.barangay = {};
234
+ order_list.shipping_address.region = {};
235
+ order_list.shipping_address.city = {};
236
+ order_list.shipping_address.province = {};
237
+
238
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
239
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
240
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
241
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
242
+ }
231
243
  myOrder.push(order_list);
232
244
  }
233
245
  });
package/components/MyTransactions/tabs/ToShipTab.vue CHANGED
@@ -200,6 +200,18 @@ export default {
200
200
  this.order_list.forEach(order_list => {
201
201
  if (order_list.status == "to_ship")
202
202
  {
203
+ if(order_list.shipping_address.hasOwnProperty('barangayName'))
204
+ {
205
+ order_list.shipping_address.barangay = {};
206
+ order_list.shipping_address.region = {};
207
+ order_list.shipping_address.city = {};
208
+ order_list.shipping_address.province = {};
209
+
210
+ order_list.shipping_address.barangay.name = order_list.shipping_address.barangayName;
211
+ order_list.shipping_address.region.name = order_list.shipping_address.regionName;
212
+ order_list.shipping_address.city.name = order_list.shipping_address.municipalityName;
213
+ order_list.shipping_address.province.name = order_list.shipping_address.provinceName;
214
+ }
203
215
  myOrder.push(order_list);
204
216
  }
205
217
  });
package/components/genealogy/Genealogy.vue CHANGED
@@ -16,7 +16,7 @@
16
16
  <div :style="`width: 999999px; height: 999999px; padding-top: 1000px; margin-top: -980px; background-image: url(${require('../../assets/statics/grey.png')})`">
17
17
  <div class="tree" :style="`margin-top: 1000px; transform: scale(${ zoomFactor });`">
18
18
  <ul v-if="upline">
19
- <slot-view-dialog-genealogy-children :is_company_success="is_company_success" v-show="method == 'unilevel'" :country="country" :open_level="1" :initial="true" :slot_info="upline" :rank="rank" :membership="membership" :profile_picture="default_profile_picture" />
19
+ <slot-view-dialog-genealogy-children :color_1="color_1" :is_company_success="is_company_success" v-show="method == 'unilevel'" :country="country" :open_level="1" :initial="true" :slot_info="upline" :rank="rank" :membership="membership" :profile_picture="default_profile_picture" />
20
20
  <member-genealogy-binary :hide_wallet="hide_wallet" :is_company_success="is_company_success" v-if="!hide_binary" :sponsor="slot_info" :country="country" v-show="method == 'binary'" :open_level="2" :initial="true" :rank="rank" :membership="membership" :binary_type="binary_type" :slot_info="upline" :profile_picture="default_profile_picture"/>
21
21
  </ul>
22
22
  </div>
@@ -72,6 +72,7 @@
72
72
  open_level: Boolean,
73
73
  method: String,
74
74
  hide_binary: Boolean,
75
+ color_1: String,
75
76
  is_company_success: Boolean,
76
77
  hide_wallet:Boolean
77
78
  },
package/components/genealogy/GenealogyChildren.vue CHANGED
@@ -91,6 +91,11 @@
91
91
  <div class="action">No<br>Downline</div>
92
92
  </div>
93
93
  </a>
94
+ <a v-else-if="color_1" href="javascript:" class="no-downline" :style="{ color: color_1 + ' !important' }">
95
+ <div>
96
+ <div class="action">No<br>Downline</div>
97
+ </div>
98
+ </a>
94
99
  <a v-else href="javascript:" class="no-downline">
95
100
  <div>
96
101
  <div class="action">No<br>Downline</div>
@@ -191,6 +196,7 @@
191
196
  open_level: Number,
192
197
  profile_picture:String,
193
198
  country:String,
199
+ color_1:String,
194
200
  membership: Array,
195
201
  rank: Array,
196
202
  is_company_success: Boolean
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.868",
3
+ "version": "1.2.870",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {