Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/account-app/payment-method.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
selector: 'app-payment-method',
template: `
<mat-card style="height: 250px">
<mat-card>
<div style="display: flex; justify-content: center">
<img mat-card-image src="{{ logo }}" alt="{{ logo_alt }}" style="margin: 10px 0; width: auto; height: 100px; cursor: pointer" (click)="clicked.emit()">
<img mat-card-image src="{{ logo }}" alt="{{ logo_alt }}" (click)="clicked.emit()">
</div>
<mat-card-content>
<ng-content>
Expand Down
2 changes: 1 addition & 1 deletion src/app/account-app/paypal-payment-dialog.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { RunboxWebmailAPI } from '../rmmapi/rbwebmail';
@Component({
selector: 'app-paypal-payment-dialog-component',
template: `
<h1 mat-dialog-title>PayPal payment</h1>
<h1 mat-dialog-title class="paymentMethodTitle">PayPal payment</h1>
<div mat-dialog-content>
<div *ngIf="!redirect_url">
<div> We're preparing your Paypal payment, please wait...</div>
Expand Down
36 changes: 11 additions & 25 deletions src/app/account-app/shopping-cart.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,48 +120,34 @@ <h2> Payment method </h2>

<div class="paymentMethods">
<app-payment-method
logo="/_img/pay/stripe-logo.png"
logo_alt="Stripe logo"
disable_payment="{{total <= 0}}"
logo="/assets/payment/Credit_Cards_PayPal.png"
logo_alt="Credit card and PayPal logos"
disable_payment="{{total <= 0}}"
(clicked)="initiatePayment('stripe')"
>
<h4>
Pay with a payment card or digital wallet
Pay with a payment card or PayPal
</h4>
<p>
We support all major payment cards and wallets.
All major cards and wallets are accepted.
</p>
</app-payment-method>

<app-payment-method
logo="/_img/pay/bitcoin.png"
logo_alt="Bitcoin logo"
disable_payment="{{total <= 0}}"
logo="/assets/payment/Cryptocurrencies.png"
logo_alt="Cryptocurrency logos"
disable_payment="{{total <= 0}}"
(clicked)="initiatePayment('coinbase')"
>
>
<h4>
Pay with cryptocurrencies using Coinbase
</h4>
<p>
Your transaction is secured by cryptography.
All major cryptocurrencies are accepted.
</p>
</app-payment-method>

<app-payment-method
logo="/_img/pay/paypal_bundle_s.png"
logo_alt="PayPal logo"
disable_payment="{{total <= 0}}"
(click)="initiatePayment('paypal')"
>
<h4>
Pay with a PayPal wallet or payment card
</h4>
<p>
Note that your subscription will not recur automatically with PayPal.
</p>
</app-payment-method>

<mat-expansion-panel style="margin: 50px 10px; text-align: center;">
<mat-expansion-panel [expanded]="true" id="otherPaymentMethods">
<mat-expansion-panel-header>
<mat-panel-title style="text-align: center"> Other payment methods </mat-panel-title>
</mat-expansion-panel-header>
Expand Down
2 changes: 1 addition & 1 deletion src/app/account-app/stripe-payment-dialog.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1 mat-dialog-title>Card payment</h1>
<h1 mat-dialog-title class="paymentMethodTitle">Card payment</h1>
<div mat-dialog-content>
<div [style.display]="state === 'initial' ? 'block' : 'none'">
<div>
Expand Down
Binary file added src/assets/payment/Credit_Cards_PayPal.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this one include Apple / Google Pay ? (also available via Stripe)

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/payment/Cryptocurrencies.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/payment/bitcoin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,32 @@ app-calendar-event-editor-dialog p {
padding: 10px !important;
}

app-payment-method {
mat-card {
height: 300px;
}

img {
margin: 10px 0 20px 0 !important;
width: auto !important;
height: 125px !important;
cursor: pointer;
}
}

#otherPaymentMethods {
margin: 20px 0 50px 0;
max-width: 90%;
text-align: center;

mat-panel-title {
font-size: 20px;
}
}

.paymentMethodTitle {
font-size: 20px !important;
}

/*** Runbox components ***/

Expand Down
Loading