Skip to content

Commit

Permalink
chore(payments): start retiring Amazon Payments
Browse files Browse the repository at this point in the history
  • Loading branch information
Sabe Jones committed Aug 30, 2024
1 parent 0df75b7 commit 700718b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 45 deletions.
16 changes: 0 additions & 16 deletions website/client/src/components/payments/buttons/list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@
:alt="$t('paypal')"
> 
</button>
<amazon-button
v-if="amazonAvailable"
class="payment-item"
:disabled="disabled"
:amazon-data="amazonData"
/>
</div>
</template>

Expand Down Expand Up @@ -92,21 +86,14 @@
</style>

<script>
import amazonButton from '@/components/payments/buttons/amazon';
import creditCardIcon from '@/assets/svg/credit-card-icon.svg';
export default {
components: {
amazonButton,
},
props: {
disabled: {
type: Boolean,
default: false,
},
amazonData: {
type: Object,
},
stripeFn: {
type: Function,
},
Expand All @@ -128,9 +115,6 @@ export default {
paypalAvailable () {
return typeof this.paypalFn === 'function';
},
amazonAvailable () {
return this.amazonData !== undefined;
},
},
};
</script>
34 changes: 5 additions & 29 deletions website/client/src/components/static/groupPlans.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
class="group-plan-page text-center"
:class="{ static: isStaticPage }"
>
<amazon-payments-modal />
<div class="top-left"></div>
<div class="col-6 offset-3 mb-100">
<img
Expand Down Expand Up @@ -95,16 +94,10 @@
:hide-footer="true"
:hide-header="true"
>
<div v-if="modalOption === 'static'">
<div>
<h2>{{ $t('letsMakeAccount') }}</h2>
<auth-form @authenticate="authenticate()" />
</div>
<div v-else>
<payments-buttons
:stripe-fn="() => pay(PAYMENTS.STRIPE)"
:amazon-data="pay(PAYMENTS.AMAZON)"
/>
</div>
</b-modal>
</div>
</div>
Expand Down Expand Up @@ -287,16 +280,12 @@
<script>
import { setup as setupPayments } from '@/libs/payments';
import paymentsMixin from '../../mixins/payments';
import AmazonPaymentsModal from '@/components/payments/amazonModal';
import AuthForm from '../auth/authForm.vue';
import GroupPlanCreationModal from '../group-plans/groupPlanCreationModal.vue';
import PaymentsButtons from '@/components/payments/buttons/list';
export default {
components: {
AuthForm,
AmazonPaymentsModal,
PaymentsButtons,
GroupPlanCreationModal,
},
mixins: [paymentsMixin],
Expand All @@ -305,10 +294,6 @@ export default {
modalOption: '',
modalPage: 'account',
modalTitle: this.$t('register'),
PAYMENTS: {
AMAZON: 'amazon',
STRIPE: 'stripe',
},
};
},
computed: {
Expand Down Expand Up @@ -341,14 +326,13 @@ export default {
return this.$root.$emit('bv::show::modal', 'group-plan');
}
if (this.upgradingGroup._id) {
return this.$root.$emit('bv::show::modal', 'group-plan');
return this.pay();
}
return this.$root.$emit('bv::show::modal', 'create-group');
},
pay (paymentMethod) {
const subscriptionKey = 'group_monthly';
pay () {
const paymentData = {
subscription: subscriptionKey,
subscription: 'group_monthly',
coupon: null,
};
Expand All @@ -359,15 +343,7 @@ export default {
paymentData.groupToCreate = this.newGroup;
}
this.paymentMethod = paymentMethod;
if (this.paymentMethod === this.PAYMENTS.STRIPE) {
this.redirectToStripe(paymentData);
} else if (this.paymentMethod === this.PAYMENTS.AMAZON) {
paymentData.type = 'subscription';
return paymentData;
}
return null;
this.redirectToStripe(paymentData);
},
},
};
Expand Down

0 comments on commit 700718b

Please sign in to comment.