Merge pull request #60 from ymcatwincities/PRODDEV-207

PRODDEV-207 Archive & Remove Discounts & Add-Ons
ymcatwincities · Apr 23, 2021 · b202a9b · b202a9b
2 parents cf2bc7e + a3dab25
commit b202a9b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -47,3 +47,7 @@ Steps for installation - CI sources https://github.com/ymcatwincities/openy-cibo
 - run ```drush mim --group=openy_demo_nbranch```
 
 - Visit /membership-builder page to check how it works. Step 6 installs demo branches. You can skip it if you are adding Membership Framework to currently installed Open Y.
+
+## Add-ons
+To have Discount Finder step included in Membership builder revert code from this pr https://github.com/ymcatwincities/openy_memberships/pull/60 
+And add DiscountFinder step here /admin/openy/memberships/settings (after "Results" step)
diff --git a/modules/openy_memberships_front/app/src/components/Product.vue b/modules/openy_memberships_front/app/src/components/Product.vue
@@ -15,10 +15,6 @@
           <div class="best-value" v-if="product.variations[variant].field_best_value == 1">Best value</div>
         </div>
       </div>
-      <div>
-        <div class="title">Discounts & Add-Ons</div>
-        <div class="options">Select a membership to update discounts and add-ons.</div>
-      </div>
       <div>
         <div class="title">Cost Summary</div>
         <div class="options">

diff --git a/modules/openy_memberships_front/app/src/router/routes.js b/modules/openy_memberships_front/app/src/router/routes.js
@@ -1,6 +1,5 @@
 import BranchSelector from '../views/BranchSelector.vue'
 import Summary from '../views/Summary.vue'
-import DiscountFinder from '../views/DiscountFinder.vue'
 import Family from '../views/Family.vue'
 import Results from '../views/Results.vue'
 import JoinNow from '../views/JoinNow.vue'
@@ -12,11 +11,6 @@ export default [
     name: 'BranchSelectorHome',
     component: BranchSelector
   },
-  {
-    path: '/discount-finder',
-    name: 'DiscountFinder',
-    component: DiscountFinder
-  },
   {
     path: '/family',
     name: 'Family',

diff --git a/modules/openy_memberships_front/app/src/store/index.js b/modules/openy_memberships_front/app/src/store/index.js
@@ -1,6 +1,6 @@
 import mutations from '../mutations'
 import actions from '../actions'
-const defaultSteps = ['BranchSelectorHome', 'Family', 'Results', 'DiscountFinder', 'Summary']
+const defaultSteps = ['BranchSelectorHome', 'Family', 'Results', 'Summary']
 export default {
     state: {
       step: 0,

diff --git a/modules/openy_memberships_front/app/src/views/Success.vue b/modules/openy_memberships_front/app/src/views/Success.vue
@@ -34,7 +34,8 @@
             >Best value</div>
           </div>
         </div>
-        <div>
+        <!-- Remove condition if Discounts & Add-Ons is needed. -->
+        <div v-if="false">
           <div class="title">Discounts & Add-Ons</div>
           <div class="options">
             <div :key="index" v-for="(discount, index) in discounts" class="item discount">

diff --git a/modules/openy_memberships_front/app/src/views/Summary.vue b/modules/openy_memberships_front/app/src/views/Summary.vue
@@ -36,7 +36,8 @@
             >Best value</div>
           </div>
         </div>
-        <div>
+        <!-- Remove condition if Discounts & Add-Ons is needed. -->
+        <div v-if="false">
           <div class="title">Discounts & Add-Ons</div>
           <div class="options">
             <div :key="index" v-for="(discount, index) in discounts" class="item discount">

diff --git a/modules/openy_memberships_front/config/install/openy_memberships_front.settings.yml b/modules/openy_memberships_front/config/install/openy_memberships_front.settings.yml
@@ -1 +1 @@
-steps: "BranchSelectorHome\r\nFamily\r\nResults\r\nDiscountFinder\r\nSummary"
+steps: "BranchSelectorHome\r\nFamily\r\nResults\r\nSummary"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		steps: "BranchSelectorHome\r\nFamily\r\nResults\r\nDiscountFinder\r\nSummary"
		steps: "BranchSelectorHome\r\nFamily\r\nResults\r\nSummary"