mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-24 12:06:15 +01:00
move to stripe elements
This commit is contained in:
Kyle Spearrin
parent
e45c988637
commit
773f0be84a
@ -151,7 +151,6 @@ export class CreateOrganizationComponent implements OnInit {
|
|||||||
request.additionalStorageGb = this.additionalStorage;
|
request.additionalStorageGb = this.additionalStorage;
|
||||||
request.premiumAccessAddon = this.plans[this.plan].canBuyPremiumAccessAddon &&
|
request.premiumAccessAddon = this.plans[this.plan].canBuyPremiumAccessAddon &&
|
||||||
this.premiumAccessAddon;
|
this.premiumAccessAddon;
|
||||||
request.country = this.paymentComponent.getCountry();
|
|
||||||
if (this.interval === 'month') {
|
if (this.interval === 'month') {
|
||||||
request.planType = this.plans[this.plan].monthPlanType;
|
request.planType = this.plans[this.plan].monthPlanType;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -17,294 +17,25 @@
|
|||||||
</div>
|
</div>
|
||||||
<ng-container *ngIf="method === 'card'">
|
<ng-container *ngIf="method === 'card'">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="form-group col-5">
|
<div class="form-group col-4">
|
||||||
<label for="card_number">{{'number' | i18n}}</label>
|
<label for="stripe-card-number-element">{{'number' | i18n}}</label>
|
||||||
<input id="card_number" class="form-control" type="text" name="card_number" [(ngModel)]="card.number" required pattern="[0-9]*"
|
<div id="stripe-card-number-element" class="form-control"></div>
|
||||||
autocomplete="cc-number">
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-7 d-flex align-items-end">
|
<div class="form-group col-8 d-flex align-items-end">
|
||||||
<img src="../../images/cards.png" alt="Visa, MasterCard, Discover, AmEx, JCB, Diners Club, UnionPay" width="323" height="32">
|
<img src="../../images/cards.png" alt="Visa, MasterCard, Discover, AmEx, JCB, Diners Club, UnionPay" width="323" height="32">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-4">
|
<div class="form-group col-4">
|
||||||
<label for="exp_month">{{'expirationMonth' | i18n}}</label>
|
<label for="stripe-card-expiry-element">{{'expiration' | i18n}}</label>
|
||||||
<select id="exp_month" class="form-control" name="exp_month" [(ngModel)]="card.exp_month" required autocomplete="cc-exp-month">
|
<div id="stripe-card-expiry-element" class="form-control"></div>
|
||||||
<option *ngFor="let o of cardExpMonthOptions" [ngValue]="o.value">{{o.name}}</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-4">
|
<div class="form-group col-4">
|
||||||
<label for="exp_year">{{'expirationYear' | i18n}}</label>
|
<label for="stripe-card-cvc-element" class="d-flex">
|
||||||
<select id="exp_year" class="form-control" name="exp_year" [(ngModel)]="card.exp_year" required autocomplete="cc-exp-year">
|
|
||||||
<option *ngFor="let o of cardExpYearOptions" [ngValue]="o.value">{{o.name}}</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group col-4">
|
|
||||||
<label for="cvc" class="d-flex">
|
|
||||||
{{'securityCode' | i18n}}
|
{{'securityCode' | i18n}}
|
||||||
<a href="https://www.cvvnumber.com/cvv.html" target="_blank" rel="noopener noreferrer" class="ml-auto" title="{{'learnMore' | i18n}}">
|
<a href="https://www.cvvnumber.com/cvv.html" tabindex="-1" target="_blank" rel="noopener noreferrer" class="ml-auto" title="{{'learnMore' | i18n}}">
|
||||||
<i class="fa fa-question-circle-o"></i>
|
<i class="fa fa-question-circle-o"></i>
|
||||||
</a>
|
</a>
|
||||||
</label>
|
</label>
|
||||||
<input id="cvc" class="form-control" type="text" name="cvc" [(ngModel)]="card.cvc" required autocomplete="cc-csc">
|
<div id="stripe-card-cvc-element" class="form-control"></div>
|
||||||
</div>
|
|
||||||
<div class="form-group col-5">
|
|
||||||
<label for="address_country">{{'country' | i18n}}</label>
|
|
||||||
<select id="address_country" class="form-control" [(ngModel)]="card.address_country" required name="address_country" autocomplete="country">
|
|
||||||
<option value="">-- Select --</option>
|
|
||||||
<option value="US">United States</option>
|
|
||||||
<option value="CN">China</option>
|
|
||||||
<option value="FR">France</option>
|
|
||||||
<option value="DE">Germany</option>
|
|
||||||
<option value="CA">Canada</option>
|
|
||||||
<option value="GB">United Kingdom</option>
|
|
||||||
<option value="AU">Australia</option>
|
|
||||||
<option value="IN">India</option>
|
|
||||||
<option value="-" disabled></option>
|
|
||||||
<option value="AF">Afghanistan</option>
|
|
||||||
<option value="AX">Åland Islands</option>
|
|
||||||
<option value="AL">Albania</option>
|
|
||||||
<option value="DZ">Algeria</option>
|
|
||||||
<option value="AS">American Samoa</option>
|
|
||||||
<option value="AD">Andorra</option>
|
|
||||||
<option value="AO">Angola</option>
|
|
||||||
<option value="AI">Anguilla</option>
|
|
||||||
<option value="AQ">Antarctica</option>
|
|
||||||
<option value="AG">Antigua and Barbuda</option>
|
|
||||||
<option value="AR">Argentina</option>
|
|
||||||
<option value="AM">Armenia</option>
|
|
||||||
<option value="AW">Aruba</option>
|
|
||||||
<option value="AT">Austria</option>
|
|
||||||
<option value="AZ">Azerbaijan</option>
|
|
||||||
<option value="BS">Bahamas</option>
|
|
||||||
<option value="BH">Bahrain</option>
|
|
||||||
<option value="BD">Bangladesh</option>
|
|
||||||
<option value="BB">Barbados</option>
|
|
||||||
<option value="BY">Belarus</option>
|
|
||||||
<option value="BE">Belgium</option>
|
|
||||||
<option value="BZ">Belize</option>
|
|
||||||
<option value="BJ">Benin</option>
|
|
||||||
<option value="BM">Bermuda</option>
|
|
||||||
<option value="BT">Bhutan</option>
|
|
||||||
<option value="BO">Bolivia, Plurinational State of</option>
|
|
||||||
<option value="BQ">Bonaire, Sint Eustatius and Saba</option>
|
|
||||||
<option value="BA">Bosnia and Herzegovina</option>
|
|
||||||
<option value="BW">Botswana</option>
|
|
||||||
<option value="BV">Bouvet Island</option>
|
|
||||||
<option value="BR">Brazil</option>
|
|
||||||
<option value="IO">British Indian Ocean Territory</option>
|
|
||||||
<option value="BN">Brunei Darussalam</option>
|
|
||||||
<option value="BG">Bulgaria</option>
|
|
||||||
<option value="BF">Burkina Faso</option>
|
|
||||||
<option value="BI">Burundi</option>
|
|
||||||
<option value="KH">Cambodia</option>
|
|
||||||
<option value="CM">Cameroon</option>
|
|
||||||
<option value="CV">Cape Verde</option>
|
|
||||||
<option value="KY">Cayman Islands</option>
|
|
||||||
<option value="CF">Central African Republic</option>
|
|
||||||
<option value="TD">Chad</option>
|
|
||||||
<option value="CL">Chile</option>
|
|
||||||
<option value="CX">Christmas Island</option>
|
|
||||||
<option value="CC">Cocos (Keeling) Islands</option>
|
|
||||||
<option value="CO">Colombia</option>
|
|
||||||
<option value="KM">Comoros</option>
|
|
||||||
<option value="CG">Congo</option>
|
|
||||||
<option value="CD">Congo, the Democratic Republic of the</option>
|
|
||||||
<option value="CK">Cook Islands</option>
|
|
||||||
<option value="CR">Costa Rica</option>
|
|
||||||
<option value="CI">Côte d'Ivoire</option>
|
|
||||||
<option value="HR">Croatia</option>
|
|
||||||
<option value="CU">Cuba</option>
|
|
||||||
<option value="CW">Curaçao</option>
|
|
||||||
<option value="CY">Cyprus</option>
|
|
||||||
<option value="CZ">Czech Republic</option>
|
|
||||||
<option value="DK">Denmark</option>
|
|
||||||
<option value="DJ">Djibouti</option>
|
|
||||||
<option value="DM">Dominica</option>
|
|
||||||
<option value="DO">Dominican Republic</option>
|
|
||||||
<option value="EC">Ecuador</option>
|
|
||||||
<option value="EG">Egypt</option>
|
|
||||||
<option value="SV">El Salvador</option>
|
|
||||||
<option value="GQ">Equatorial Guinea</option>
|
|
||||||
<option value="ER">Eritrea</option>
|
|
||||||
<option value="EE">Estonia</option>
|
|
||||||
<option value="ET">Ethiopia</option>
|
|
||||||
<option value="FK">Falkland Islands (Malvinas)</option>
|
|
||||||
<option value="FO">Faroe Islands</option>
|
|
||||||
<option value="FJ">Fiji</option>
|
|
||||||
<option value="FI">Finland</option>
|
|
||||||
<option value="GF">French Guiana</option>
|
|
||||||
<option value="PF">French Polynesia</option>
|
|
||||||
<option value="TF">French Southern Territories</option>
|
|
||||||
<option value="GA">Gabon</option>
|
|
||||||
<option value="GM">Gambia</option>
|
|
||||||
<option value="GE">Georgia</option>
|
|
||||||
<option value="GH">Ghana</option>
|
|
||||||
<option value="GI">Gibraltar</option>
|
|
||||||
<option value="GR">Greece</option>
|
|
||||||
<option value="GL">Greenland</option>
|
|
||||||
<option value="GD">Grenada</option>
|
|
||||||
<option value="GP">Guadeloupe</option>
|
|
||||||
<option value="GU">Guam</option>
|
|
||||||
<option value="GT">Guatemala</option>
|
|
||||||
<option value="GG">Guernsey</option>
|
|
||||||
<option value="GN">Guinea</option>
|
|
||||||
<option value="GW">Guinea-Bissau</option>
|
|
||||||
<option value="GY">Guyana</option>
|
|
||||||
<option value="HT">Haiti</option>
|
|
||||||
<option value="HM">Heard Island and McDonald Islands</option>
|
|
||||||
<option value="VA">Holy See (Vatican City State)</option>
|
|
||||||
<option value="HN">Honduras</option>
|
|
||||||
<option value="HK">Hong Kong</option>
|
|
||||||
<option value="HU">Hungary</option>
|
|
||||||
<option value="IS">Iceland</option>
|
|
||||||
<option value="ID">Indonesia</option>
|
|
||||||
<option value="IR">Iran, Islamic Republic of</option>
|
|
||||||
<option value="IQ">Iraq</option>
|
|
||||||
<option value="IE">Ireland</option>
|
|
||||||
<option value="IM">Isle of Man</option>
|
|
||||||
<option value="IL">Israel</option>
|
|
||||||
<option value="IT">Italy</option>
|
|
||||||
<option value="JM">Jamaica</option>
|
|
||||||
<option value="JP">Japan</option>
|
|
||||||
<option value="JE">Jersey</option>
|
|
||||||
<option value="JO">Jordan</option>
|
|
||||||
<option value="KZ">Kazakhstan</option>
|
|
||||||
<option value="KE">Kenya</option>
|
|
||||||
<option value="KI">Kiribati</option>
|
|
||||||
<option value="KP">Korea, Democratic People's Republic of</option>
|
|
||||||
<option value="KR">Korea, Republic of</option>
|
|
||||||
<option value="KW">Kuwait</option>
|
|
||||||
<option value="KG">Kyrgyzstan</option>
|
|
||||||
<option value="LA">Lao People's Democratic Republic</option>
|
|
||||||
<option value="LV">Latvia</option>
|
|
||||||
<option value="LB">Lebanon</option>
|
|
||||||
<option value="LS">Lesotho</option>
|
|
||||||
<option value="LR">Liberia</option>
|
|
||||||
<option value="LY">Libya</option>
|
|
||||||
<option value="LI">Liechtenstein</option>
|
|
||||||
<option value="LT">Lithuania</option>
|
|
||||||
<option value="LU">Luxembourg</option>
|
|
||||||
<option value="MO">Macao</option>
|
|
||||||
<option value="MK">Macedonia, the former Yugoslav Republic of</option>
|
|
||||||
<option value="MG">Madagascar</option>
|
|
||||||
<option value="MW">Malawi</option>
|
|
||||||
<option value="MY">Malaysia</option>
|
|
||||||
<option value="MV">Maldives</option>
|
|
||||||
<option value="ML">Mali</option>
|
|
||||||
<option value="MT">Malta</option>
|
|
||||||
<option value="MH">Marshall Islands</option>
|
|
||||||
<option value="MQ">Martinique</option>
|
|
||||||
<option value="MR">Mauritania</option>
|
|
||||||
<option value="MU">Mauritius</option>
|
|
||||||
<option value="YT">Mayotte</option>
|
|
||||||
<option value="MX">Mexico</option>
|
|
||||||
<option value="FM">Micronesia, Federated States of</option>
|
|
||||||
<option value="MD">Moldova, Republic of</option>
|
|
||||||
<option value="MC">Monaco</option>
|
|
||||||
<option value="MN">Mongolia</option>
|
|
||||||
<option value="ME">Montenegro</option>
|
|
||||||
<option value="MS">Montserrat</option>
|
|
||||||
<option value="MA">Morocco</option>
|
|
||||||
<option value="MZ">Mozambique</option>
|
|
||||||
<option value="MM">Myanmar</option>
|
|
||||||
<option value="NA">Namibia</option>
|
|
||||||
<option value="NR">Nauru</option>
|
|
||||||
<option value="NP">Nepal</option>
|
|
||||||
<option value="NL">Netherlands</option>
|
|
||||||
<option value="NC">New Caledonia</option>
|
|
||||||
<option value="NZ">New Zealand</option>
|
|
||||||
<option value="NI">Nicaragua</option>
|
|
||||||
<option value="NE">Niger</option>
|
|
||||||
<option value="NG">Nigeria</option>
|
|
||||||
<option value="NU">Niue</option>
|
|
||||||
<option value="NF">Norfolk Island</option>
|
|
||||||
<option value="MP">Northern Mariana Islands</option>
|
|
||||||
<option value="NO">Norway</option>
|
|
||||||
<option value="OM">Oman</option>
|
|
||||||
<option value="PK">Pakistan</option>
|
|
||||||
<option value="PW">Palau</option>
|
|
||||||
<option value="PS">Palestinian Territory, Occupied</option>
|
|
||||||
<option value="PA">Panama</option>
|
|
||||||
<option value="PG">Papua New Guinea</option>
|
|
||||||
<option value="PY">Paraguay</option>
|
|
||||||
<option value="PE">Peru</option>
|
|
||||||
<option value="PH">Philippines</option>
|
|
||||||
<option value="PN">Pitcairn</option>
|
|
||||||
<option value="PL">Poland</option>
|
|
||||||
<option value="PT">Portugal</option>
|
|
||||||
<option value="PR">Puerto Rico</option>
|
|
||||||
<option value="QA">Qatar</option>
|
|
||||||
<option value="RE">Réunion</option>
|
|
||||||
<option value="RO">Romania</option>
|
|
||||||
<option value="RU">Russian Federation</option>
|
|
||||||
<option value="RW">Rwanda</option>
|
|
||||||
<option value="BL">Saint Barthélemy</option>
|
|
||||||
<option value="SH">Saint Helena, Ascension and Tristan da Cunha</option>
|
|
||||||
<option value="KN">Saint Kitts and Nevis</option>
|
|
||||||
<option value="LC">Saint Lucia</option>
|
|
||||||
<option value="MF">Saint Martin (French part)</option>
|
|
||||||
<option value="PM">Saint Pierre and Miquelon</option>
|
|
||||||
<option value="VC">Saint Vincent and the Grenadines</option>
|
|
||||||
<option value="WS">Samoa</option>
|
|
||||||
<option value="SM">San Marino</option>
|
|
||||||
<option value="ST">Sao Tome and Principe</option>
|
|
||||||
<option value="SA">Saudi Arabia</option>
|
|
||||||
<option value="SN">Senegal</option>
|
|
||||||
<option value="RS">Serbia</option>
|
|
||||||
<option value="SC">Seychelles</option>
|
|
||||||
<option value="SL">Sierra Leone</option>
|
|
||||||
<option value="SG">Singapore</option>
|
|
||||||
<option value="SX">Sint Maarten (Dutch part)</option>
|
|
||||||
<option value="SK">Slovakia</option>
|
|
||||||
<option value="SI">Slovenia</option>
|
|
||||||
<option value="SB">Solomon Islands</option>
|
|
||||||
<option value="SO">Somalia</option>
|
|
||||||
<option value="ZA">South Africa</option>
|
|
||||||
<option value="GS">South Georgia and the South Sandwich Islands</option>
|
|
||||||
<option value="SS">South Sudan</option>
|
|
||||||
<option value="ES">Spain</option>
|
|
||||||
<option value="LK">Sri Lanka</option>
|
|
||||||
<option value="SD">Sudan</option>
|
|
||||||
<option value="SR">Suriname</option>
|
|
||||||
<option value="SJ">Svalbard and Jan Mayen</option>
|
|
||||||
<option value="SZ">Swaziland</option>
|
|
||||||
<option value="SE">Sweden</option>
|
|
||||||
<option value="CH">Switzerland</option>
|
|
||||||
<option value="SY">Syrian Arab Republic</option>
|
|
||||||
<option value="TW">Taiwan, Province of China</option>
|
|
||||||
<option value="TJ">Tajikistan</option>
|
|
||||||
<option value="TZ">Tanzania, United Republic of</option>
|
|
||||||
<option value="TH">Thailand</option>
|
|
||||||
<option value="TL">Timor-Leste</option>
|
|
||||||
<option value="TG">Togo</option>
|
|
||||||
<option value="TK">Tokelau</option>
|
|
||||||
<option value="TO">Tonga</option>
|
|
||||||
<option value="TT">Trinidad and Tobago</option>
|
|
||||||
<option value="TN">Tunisia</option>
|
|
||||||
<option value="TR">Turkey</option>
|
|
||||||
<option value="TM">Turkmenistan</option>
|
|
||||||
<option value="TC">Turks and Caicos Islands</option>
|
|
||||||
<option value="TV">Tuvalu</option>
|
|
||||||
<option value="UG">Uganda</option>
|
|
||||||
<option value="UA">Ukraine</option>
|
|
||||||
<option value="AE">United Arab Emirates</option>
|
|
||||||
<option value="UM">United States Minor Outlying Islands</option>
|
|
||||||
<option value="UY">Uruguay</option>
|
|
||||||
<option value="UZ">Uzbekistan</option>
|
|
||||||
<option value="VU">Vanuatu</option>
|
|
||||||
<option value="VE">Venezuela, Bolivarian Republic of</option>
|
|
||||||
<option value="VN">Viet Nam</option>
|
|
||||||
<option value="VG">Virgin Islands, British</option>
|
|
||||||
<option value="VI">Virgin Islands, U.S.</option>
|
|
||||||
<option value="WF">Wallis and Futuna</option>
|
|
||||||
<option value="EH">Western Sahara</option>
|
|
||||||
<option value="YE">Yemen</option>
|
|
||||||
<option value="ZM">Zambia</option>
|
|
||||||
<option value="ZW">Zimbabwe</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group col-4">
|
|
||||||
<label for="address_zip">{{'zipPostalCode' | i18n}}</label>
|
|
||||||
<input id="address_zip" class="form-control" type="text" name="address_zip" [(ngModel)]="card.address_zip" required autocomplete="postal-code">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|||||||
@ -4,7 +4,6 @@ import {
|
|||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
|
|
||||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
|
||||||
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
|
||||||
|
|
||||||
const Keys = {
|
const Keys = {
|
||||||
@ -14,6 +13,27 @@ const Keys = {
|
|||||||
btProduction: 'production_qfbsv8kc_njj2zjtyngtjmbjd',
|
btProduction: 'production_qfbsv8kc_njj2zjtyngtjmbjd',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const StripeElementStyle = {
|
||||||
|
base: {
|
||||||
|
color: '#333333',
|
||||||
|
lineHeight: '21px',
|
||||||
|
fontFamily: '"Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif, ' +
|
||||||
|
'"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"',
|
||||||
|
fontSize: '1rem',
|
||||||
|
fontSmoothing: 'antialiased',
|
||||||
|
},
|
||||||
|
invalid: {
|
||||||
|
iconColor: '#dd4b39',
|
||||||
|
color: '#dd4b39',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const StripeElementClasses = {
|
||||||
|
focus: 'is-focused',
|
||||||
|
empty: 'is-empty',
|
||||||
|
invalid: 'is-invalid',
|
||||||
|
};
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-payment',
|
selector: 'app-payment',
|
||||||
templateUrl: 'payment.component.html',
|
templateUrl: 'payment.component.html',
|
||||||
@ -24,13 +44,6 @@ export class PaymentComponent implements OnInit {
|
|||||||
@Input() hideBank = false;
|
@Input() hideBank = false;
|
||||||
@Input() hidePaypal = false;
|
@Input() hidePaypal = false;
|
||||||
|
|
||||||
card: any = {
|
|
||||||
number: null,
|
|
||||||
exp_month: '',
|
|
||||||
exp_year: '',
|
|
||||||
address_country: '',
|
|
||||||
address_zip: null,
|
|
||||||
};
|
|
||||||
bank: any = {
|
bank: any = {
|
||||||
routing_number: null,
|
routing_number: null,
|
||||||
account_number: null,
|
account_number: null,
|
||||||
@ -39,48 +52,29 @@ export class PaymentComponent implements OnInit {
|
|||||||
currency: 'USD',
|
currency: 'USD',
|
||||||
country: 'US',
|
country: 'US',
|
||||||
};
|
};
|
||||||
cardExpMonthOptions: any[];
|
|
||||||
cardExpYearOptions: any[];
|
|
||||||
|
|
||||||
private stripeScript: HTMLScriptElement;
|
|
||||||
private btScript: HTMLScriptElement;
|
private btScript: HTMLScriptElement;
|
||||||
private btInstance: any = null;
|
private btInstance: any = null;
|
||||||
|
private stripeScript: HTMLScriptElement;
|
||||||
|
private stripe: any = null;
|
||||||
|
private stripeElements: any = null;
|
||||||
|
private stripeCardNumberElement: any = null;
|
||||||
|
private stripeCardExpiryElement: any = null;
|
||||||
|
private stripeCardCvcElement: any = null;
|
||||||
|
|
||||||
constructor(i18nService: I18nService, private platformUtilsService: PlatformUtilsService) {
|
constructor(private platformUtilsService: PlatformUtilsService) {
|
||||||
this.stripeScript = window.document.createElement('script');
|
this.stripeScript = window.document.createElement('script');
|
||||||
this.stripeScript.src = 'https://js.stripe.com/v2/';
|
this.stripeScript.src = 'https://js.stripe.com/v3/';
|
||||||
this.stripeScript.async = true;
|
this.stripeScript.async = true;
|
||||||
this.stripeScript.onload = () => {
|
this.stripeScript.onload = () => {
|
||||||
(window as any).Stripe.setPublishableKey(
|
this.stripe = (window as any).Stripe(
|
||||||
this.platformUtilsService.isDev() ? Keys.stripeTest : Keys.stripeLive);
|
this.platformUtilsService.isDev() ? Keys.stripeTest : Keys.stripeLive);
|
||||||
|
this.stripeElements = this.stripe.elements();
|
||||||
|
this.setStripeElement();
|
||||||
};
|
};
|
||||||
this.btScript = window.document.createElement('script');
|
this.btScript = window.document.createElement('script');
|
||||||
this.btScript.src = 'scripts/dropin.js';
|
this.btScript.src = 'scripts/dropin.js';
|
||||||
this.btScript.async = true;
|
this.btScript.async = true;
|
||||||
|
|
||||||
this.cardExpMonthOptions = [
|
|
||||||
{ name: '-- ' + i18nService.t('select') + ' --', value: '' },
|
|
||||||
{ name: '01 - ' + i18nService.t('january'), value: '01' },
|
|
||||||
{ name: '02 - ' + i18nService.t('february'), value: '02' },
|
|
||||||
{ name: '03 - ' + i18nService.t('march'), value: '03' },
|
|
||||||
{ name: '04 - ' + i18nService.t('april'), value: '04' },
|
|
||||||
{ name: '05 - ' + i18nService.t('may'), value: '05' },
|
|
||||||
{ name: '06 - ' + i18nService.t('june'), value: '06' },
|
|
||||||
{ name: '07 - ' + i18nService.t('july'), value: '07' },
|
|
||||||
{ name: '08 - ' + i18nService.t('august'), value: '08' },
|
|
||||||
{ name: '09 - ' + i18nService.t('september'), value: '09' },
|
|
||||||
{ name: '10 - ' + i18nService.t('october'), value: '10' },
|
|
||||||
{ name: '11 - ' + i18nService.t('november'), value: '11' },
|
|
||||||
{ name: '12 - ' + i18nService.t('december'), value: '12' },
|
|
||||||
];
|
|
||||||
|
|
||||||
this.cardExpYearOptions = [
|
|
||||||
{ name: '-- ' + i18nService.t('select') + ' --', value: '' },
|
|
||||||
];
|
|
||||||
const year = (new Date()).getFullYear();
|
|
||||||
for (let i = year; i < (year + 15); i++) {
|
|
||||||
this.cardExpYearOptions.push({ name: i.toString(), value: i.toString().slice(-2) });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
@ -96,26 +90,39 @@ export class PaymentComponent implements OnInit {
|
|||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
window.document.head.removeChild(this.stripeScript);
|
window.document.head.removeChild(this.stripeScript);
|
||||||
|
window.setTimeout(() => {
|
||||||
Array.from(window.document.querySelectorAll('iframe')).forEach((el) => {
|
Array.from(window.document.querySelectorAll('iframe')).forEach((el) => {
|
||||||
if (el.src != null && el.src.indexOf('stripe') > -1) {
|
if (el.src != null && el.src.indexOf('stripe') > -1) {
|
||||||
|
try {
|
||||||
window.document.body.removeChild(el);
|
window.document.body.removeChild(el);
|
||||||
|
} catch { }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}, 200);
|
||||||
if (!this.hidePaypal) {
|
if (!this.hidePaypal) {
|
||||||
window.document.head.removeChild(this.btScript);
|
window.document.head.removeChild(this.btScript);
|
||||||
|
window.setTimeout(() => {
|
||||||
|
Array.from(window.document.head.querySelectorAll('script')).forEach((el) => {
|
||||||
|
if (el.src != null && el.src.indexOf('paypal') > -1) {
|
||||||
|
try {
|
||||||
|
window.document.head.removeChild(el);
|
||||||
|
} catch { }
|
||||||
|
}
|
||||||
|
});
|
||||||
const btStylesheet = window.document.head.querySelector('#braintree-dropin-stylesheet');
|
const btStylesheet = window.document.head.querySelector('#braintree-dropin-stylesheet');
|
||||||
if (btStylesheet != null) {
|
if (btStylesheet != null) {
|
||||||
|
try {
|
||||||
window.document.head.removeChild(btStylesheet);
|
window.document.head.removeChild(btStylesheet);
|
||||||
|
} catch { }
|
||||||
}
|
}
|
||||||
|
}, 200);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
changeMethod() {
|
changeMethod() {
|
||||||
if (this.method !== 'paypal') {
|
|
||||||
this.btInstance = null;
|
this.btInstance = null;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (this.method === 'paypal') {
|
||||||
window.setTimeout(() => {
|
window.setTimeout(() => {
|
||||||
(window as any).braintree.dropin.create({
|
(window as any).braintree.dropin.create({
|
||||||
authorization: this.platformUtilsService.isDev() ? Keys.btSandbox : Keys.btProduction,
|
authorization: this.platformUtilsService.isDev() ? Keys.btSandbox : Keys.btProduction,
|
||||||
@ -139,6 +146,9 @@ export class PaymentComponent implements OnInit {
|
|||||||
this.btInstance = instance;
|
this.btInstance = instance;
|
||||||
});
|
});
|
||||||
}, 250);
|
}, 250);
|
||||||
|
} else {
|
||||||
|
this.setStripeElement();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
createPaymentToken(): Promise<string> {
|
createPaymentToken(): Promise<string> {
|
||||||
@ -150,15 +160,19 @@ export class PaymentComponent implements OnInit {
|
|||||||
reject(err.message);
|
reject(err.message);
|
||||||
});
|
});
|
||||||
} else if (this.method === 'card' || this.method === 'bank') {
|
} else if (this.method === 'card' || this.method === 'bank') {
|
||||||
const isCard = this.method === 'card';
|
let sourceObj: any = null;
|
||||||
const createObj: any = isCard ? (window as any).Stripe.card :
|
let createObj: any = null;
|
||||||
(window as any).Stripe.bankAccount;
|
if (this.method === 'card') {
|
||||||
const sourceObj = isCard ? this.card : this.bank;
|
sourceObj = this.stripeCardNumberElement;
|
||||||
createObj.createToken(sourceObj, (status: number, response: any) => {
|
} else {
|
||||||
if (status === 200 && response.id != null) {
|
sourceObj = 'bank_account';
|
||||||
resolve(response.id);
|
createObj = this.bank;
|
||||||
} else if (response.error != null) {
|
}
|
||||||
reject(response.error.message);
|
this.stripe.createToken(sourceObj, createObj).then((result: any) => {
|
||||||
|
if (result.error) {
|
||||||
|
reject(result.error.message);
|
||||||
|
} else if (result.token && result.token.id != null) {
|
||||||
|
resolve(result.token.id);
|
||||||
} else {
|
} else {
|
||||||
reject();
|
reject();
|
||||||
}
|
}
|
||||||
@ -167,7 +181,33 @@ export class PaymentComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getCountry(): string {
|
private setStripeElement() {
|
||||||
return this.card.address_country;
|
window.setTimeout(() => {
|
||||||
|
if (this.method === 'card') {
|
||||||
|
if (this.stripeCardNumberElement == null) {
|
||||||
|
this.stripeCardNumberElement = this.stripeElements.create('cardNumber', {
|
||||||
|
style: StripeElementStyle,
|
||||||
|
classes: StripeElementClasses,
|
||||||
|
placeholder: '',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (this.stripeCardExpiryElement == null) {
|
||||||
|
this.stripeCardExpiryElement = this.stripeElements.create('cardExpiry', {
|
||||||
|
style: StripeElementStyle,
|
||||||
|
classes: StripeElementClasses,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (this.stripeCardCvcElement == null) {
|
||||||
|
this.stripeCardCvcElement = this.stripeElements.create('cardCvc', {
|
||||||
|
style: StripeElementStyle,
|
||||||
|
classes: StripeElementClasses,
|
||||||
|
placeholder: '',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.stripeCardNumberElement.mount('#stripe-card-number-element');
|
||||||
|
this.stripeCardExpiryElement.mount('#stripe-card-expiry-element');
|
||||||
|
this.stripeCardCvcElement.mount('#stripe-card-cvc-element');
|
||||||
|
}
|
||||||
|
}, 50);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -704,6 +704,14 @@ app-user-billing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.form-control.is-focused {
|
||||||
|
color: $input-focus-color;
|
||||||
|
background-color: $input-focus-bg;
|
||||||
|
border-color: $input-focus-border-color;
|
||||||
|
outline: 0;
|
||||||
|
box-shadow: $input-focus-box-shadow;
|
||||||
|
}
|
||||||
|
|
||||||
.org-nav {
|
.org-nav {
|
||||||
background-color: $input-bg;
|
background-color: $input-bg;
|
||||||
border-bottom: 1px solid $border-color;
|
border-bottom: 1px solid $border-color;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user