@hulkapps/app-manager-vue 2.1.5 → 2.1.8

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hulkapps/app-manager-vue",
3
- "version": "2.1.5",
3
+ "version": "2.1.8",
4
4
  "description": "Vue SDK to render app manager contents",
5
5
  "main": "dist/app-manager-vue.ssr.js",
6
6
  "browser": "dist/app-manager-vue.esm.js",
@@ -179,7 +179,7 @@
179
179
  </PDataTable>
180
180
  </template>
181
181
  </template>
182
- <PStack v-if="default_plan_id && onboard && !shop.has_plan" class="choose-plan-btn" alignment="center" distribution="center" vertical>
182
+ <PStack v-if="onboard" class="choose-plan-btn" alignment="center" distribution="center" vertical>
183
183
  <PStackItem fill>
184
184
  <PButton plain @click="activePlan">{{ ('I will choose the plan later') }}</PButton>
185
185
  </PStackItem>
@@ -231,6 +231,7 @@
231
231
  default_plan_id: null,
232
232
  onboard: true,
233
233
  choose_later: false,
234
+ has_active_charge: false,
234
235
  planLoading: false,
235
236
  subtitleContent: '',
236
237
  checkList: [
@@ -316,7 +317,7 @@
316
317
  return [plan.shopify_plans.includes(this.shop.shopify_plan) || !plan.store_base_plan ? {backgroundColor: '#f0f8f5', color: '#257f60'} : {}];
317
318
  },
318
319
  isCurrentPlan(plan) {
319
- return !this.choose_later && this.shop.plan && (plan.id === this.shop.plan.id || (!plan.is_custom && plan.base_plan === this.shop.plan.id));
320
+ return this.has_active_charge && this.shop.plan && (plan.id === this.shop.plan.id || (!plan.is_custom && plan.base_plan === this.shop.plan.id));
320
321
  },
321
322
  isSamePlanInOtherInterval(plan) {
322
323
  return this.shop.plan && (plan.shopify_plans === this.shop.plan.shopify_plans)
@@ -422,8 +423,9 @@
422
423
  }
423
424
  this.shopify_plan = data.shopify_plan;
424
425
  this.default_plan_id = data.default_plan_id;
425
- this.onboard = !this.plan
426
- this.choose_later = data.choose_later
426
+ this.choose_later = data.choose_later;
427
+ this.onboard = this.default_plan_id && this.choose_later;
428
+ this.has_active_charge = data.has_active_charge;
427
429
  }
428
430
  },
429
431
  },
@@ -1,6 +1,6 @@
1
1
  <template>
2
- <AppManagerGroupPlan v-on="$listeners" v-if="group_plan" :shop_domain="shop_domain" ></AppManagerGroupPlan>
3
- <AppManagerSliderPlan v-on="$listeners" v-else :shop_domain="shop_domain" ></AppManagerSliderPlan>
2
+ <AppManagerGroupPlan @handlePlanSelect="handlePlanSelect" v-if="group_plan" :shop_domain="shop_domain" ></AppManagerGroupPlan>
3
+ <AppManagerSliderPlan @handlePlanSelect="handlePlanSelect" v-else :shop_domain="shop_domain" ></AppManagerSliderPlan>
4
4
  </template>
5
5
 
6
6
  <script>
@@ -17,6 +17,11 @@
17
17
  type : Boolean,
18
18
  default : false
19
19
  }
20
+ },
21
+ methods: {
22
+ handlePlanSelect(payload) {
23
+ this.$emit('handlePlanSelect', payload)
24
+ }
20
25
  }
21
26
  }
22
27
  </script>
@@ -161,7 +161,7 @@
161
161
  </PLayoutSection>
162
162
  </PLayout>
163
163
  <!--====================================================================-->
164
- <PStack v-if="default_plan_id && onboard && !shop.has_plan" class="choose-plan-btn" alignment="center" distribution="center" vertical>
164
+ <PStack v-if="onboard" class="choose-plan-btn" alignment="center" distribution="center" vertical>
165
165
  <PStackItem fill>
166
166
  <PButton plain @click="activePlan">{{ ('I will choose the plan later') }}</PButton>
167
167
  </PStackItem>
@@ -214,6 +214,7 @@
214
214
  default_plan_id: null,
215
215
  onboard: true,
216
216
  choose_later: false,
217
+ has_active_charge: false,
217
218
  subtitleContent: '',
218
219
  checkList: [
219
220
  "60 days free trial",
@@ -328,7 +329,7 @@
328
329
  return plan.shopify_plans.includes(this.shop.shopify_plan) || !plan.store_base_plan ? 'active-plan' : '';
329
330
  },
330
331
  isCurrentPlan(plan) {
331
- return !this.choose_later && this.shop.plan && (plan.id === this.shop.plan.id || (!plan.is_custom && plan.base_plan === this.shop.plan.id));
332
+ return this.has_active_charge && this.shop.plan && (plan.id === this.shop.plan.id || (!plan.is_custom && plan.base_plan === this.shop.plan.id));
332
333
  },
333
334
  isSamePlanInOtherInterval(plan) {
334
335
  return this.shop.plan && (plan.shopify_plans === this.shop.plan.shopify_plans)
@@ -476,8 +477,9 @@
476
477
  }
477
478
  this.shopify_plan = data.shopify_plan;
478
479
  this.default_plan_id = data.default_plan_id;
479
- this.onboard = !this.plan
480
- this.choose_later = data.choose_later
480
+ this.choose_later = data.choose_later;
481
+ this.onboard = this.default_plan_id && this.choose_later;
482
+ this.has_active_charge = data.has_active_charge;
481
483
  }
482
484
  },
483
485
  headerClasses(firstColumn) {