Update 2017-07-29T01:23:55.886Z

app/organization/views/organizationBilling.html

@@ -141,7 +141,7 @@
             </div>
             <div ng-show="!loading && paymentSource">
                 <i class="fa" ng-class="{'fa-credit-card': paymentSource.type === 0,
-                   'fa-university': paymentSource.type === 1}"></i>
+                   'fa-university': paymentSource.type === 1, 'fa-paypal fa-fw text-blue': paymentSource.type === 2}"></i>
                 {{paymentSource.description}}
             </div>
         </div>

app/settings/views/settingsBilling.html

@@ -54,7 +54,7 @@
                 </div>
             </div>
         </div>
-        <div class="box-footer">
+        <div class="box-footer" ng-if="!subscription.cancelled || subscription.markedForCancel">
             <button type="button" class="btn btn-default btn-flat" ng-click="cancel()"
                     ng-if="!subscription.cancelled && !subscription.markedForCancel">
                 Cancel
@@ -82,7 +82,7 @@
                 </div>
             </div>
         </div>
-        <div class="box-footer">
+        <div class="box-footer" ng-if="!subscription.cancelled">
             <button type="button" class="btn btn-default btn-flat" ng-click="adjustStorage(true)">
                 Add Storage
             </button>
@@ -104,7 +104,7 @@
             </div>
             <div ng-show="!loading && paymentSource">
                 <i class="fa" ng-class="{'fa-credit-card': paymentSource.type === 0,
-                   'fa-university': paymentSource.type === 1}"></i>
+                   'fa-university': paymentSource.type === 1, 'fa-paypal fa-fw text-blue': paymentSource.type === 2}"></i>
                 {{paymentSource.description}}
             </div>
         </div>

app/settings/views/settingsBillingChangePayment.html

@@ -13,6 +13,21 @@
                 <li ng-repeat="e in form.$errors">{{e}}</li>
             </ul>
         </div>
+        <div ng-if="showPaymentOptions">
+            <label class="radio-inline radio-boxed">
+                <input type="radio" name="PaymentMethod" value="card" ng-model="paymentMethod"
+                       ng-change="changePaymentMethod('card')"><i class="fa fa-fw fa-credit-card"></i> Credit Card
+            </label>
+            <label class="radio-inline radio-boxed">
+                <input type="radio" name="PaymentMethod" value="paypal" ng-model="paymentMethod"
+                       ng-change="changePaymentMethod('paypal')"><i class="fa fa-fw fa-paypal"></i> PayPal
+            </label>
+            <hr />
+        </div>
+        <div ng-if="paymentMethod === 'paypal'">
+            <div id="bt-dropin-container"></div>
+        </div>
+        <div ng-if="paymentMethod === 'card'">
             <div class="row">
                 <div class="col-md-6">
                     <div class="form-group" show-errors>
@@ -355,6 +370,7 @@
                 </div>
             </div>
         </div>
+    </div>
     <div class="modal-footer">
         <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
             <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit

app/settings/views/settingsPremium.html

@@ -89,6 +89,21 @@
                 <h3 class="box-title">Payment Information</h3>
             </div>
             <div class="box-body">
+                <div ng-if="false">
+                    <label class="radio-inline radio-lg radio-boxed">
+                        <input type="radio" name="PaymentMethod" value="card" ng-model="paymentMethod"
+                               ng-change="changePaymentMethod()"><i class="fa fa-fw fa-credit-card"></i> Credit Card
+                    </label>
+                    <label class="radio-inline radio-lg radio-boxed">
+                        <input type="radio" name="PaymentMethod" value="paypal" ng-model="paymentMethod"
+                               ng-change="changePaymentMethod()"><i class="fa fa-fw fa-paypal"></i> PayPal
+                    </label>
+                    <hr />
+                </div>
+                <div ng-if="paymentMethod === 'paypal'">
+                    <div id="bt-dropin-container"></div>
+                </div>
+                <div ng-if="paymentMethod === 'card'">
                     <div class="row">
                         <div class="col-md-5">
                             <div class="form-group" show-errors>
@@ -434,6 +449,7 @@
                         </div>
                     </div>
                 </div>
+            </div>
             <div class="box-footer">
                 <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
                     <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit

index.html

@@ -7,18 +7,25 @@
             'self';
           script-src
             'self'
+            'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w='
             https://www.google-analytics.com
             https://js.stripe.com
+            https://js.braintreegateway.com
+            https://www.paypalobjects.com
             https://maxcdn.bootstrapcdn.com
             https://ajax.googleapis.com;
           style-src
             'self'
             'unsafe-inline'
             https://maxcdn.bootstrapcdn.com
+            https://assets.braintreegateway.com
+            https://*.paypal.com
             https://fonts.googleapis.com;
           img-src
             'self'
             data:
+            https://*.paypal.com
+            https://www.paypalobjects.com
             https://q.stripe.com
             https://haveibeenpwned.com
             https://chart.googleapis.com
@@ -30,10 +37,14 @@
           child-src
             'self'
             https://js.stripe.com
+            https://assets.braintreegateway.com
+            https://*.paypal.com
             https://*.duosecurity.com;
           frame-src
             'self'
             https://js.stripe.com
+            https://assets.braintreegateway.com
+            https://*.paypal.com
             https://*.duosecurity.com;
           connect-src
             *;">
@@ -43,14 +54,15 @@
     <title page-title>bitwarden.com Password Manager</title>
 
     <script src="https://js.stripe.com/v2/"></script>
+    <script src="https://js.braintreegateway.com/web/dropin/1.4.0/js/dropin.min.js"></script>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
           integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
           integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
     <meta name="x-stylesheet-test" content="" class="fa invisible" />
-    <script src="js/fallback-styles.min.js?v=3m9utp22o6r"></script>
+    <script src="js/fallback-styles.min.js?v=b7fbp5mte29"></script>
 
-    <link rel="stylesheet" href="css/vault.min.css?v=3m9utp22o6r" />
+    <link rel="stylesheet" href="css/vault.min.css?v=b7fbp5mte29" />
 </head>
 <body ng-controller="mainController as main" class="layout-boxed skin-blue sidebar-mini {{main.bodyClass}}"
       ng-class="{'using-control-sidebar': main.usingControlSidebar,
@@ -63,10 +75,10 @@
             integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.3/angular.min.js"
             integrity="sha384-AH/e+s4V4kUifvnNED2x1XZqArO5qTFU4YKRzUXbz4IgPG1H0Xmz6fP1XUmO4vT/" crossorigin="anonymous"></script>
-    <script src="js/fallback-scripts.min.js?v=3m9utp22o6r"></script>
+    <script src="js/fallback-scripts.min.js?v=b7fbp5mte29"></script>
 
-    <script src="js/lib.min.js?v=3m9utp22o6r"></script>
-    <script src="js/bw.min.js?v=3m9utp22o6r"></script>
-    <script src="js/app.min.js?v=3m9utp22o6r"></script>
+    <script src="js/lib.min.js?v=b7fbp5mte29"></script>
+    <script src="js/bw.min.js?v=b7fbp5mte29"></script>
+    <script src="js/app.min.js?v=b7fbp5mte29"></script>
 </body>
 </html>

js/fallback-styles.min.js

@@ -1 +1 @@
-function loadStylesheetIfMissing(e,t,s){var i=document.getElementsByTagName("SCRIPT"),o=i[i.length-1].previousElementSibling,l=document.defaultView&&document.defaultView.getComputedStyle?document.defaultView.getComputedStyle(o):o.currentStyle;if(l&&l[e]!==t)for(var n=0;n<s.length;n++)document.write('<link rel="stylesheet" href="'+s[n]+"?v="+cacheTag+'" />')}var cacheTag="3m9utp22o6r";loadStylesheetIfMissing("visibility","hidden",["lib/bootstrap/css/bootstrap.min.css"]),loadStylesheetIfMissing("fontFamily","FontAwesome",["lib/font-awesome/css/font-awesome.min.css"]);
+function loadStylesheetIfMissing(e,t,s){var i=document.getElementsByTagName("SCRIPT"),l=i[i.length-1].previousElementSibling,n=document.defaultView&&document.defaultView.getComputedStyle?document.defaultView.getComputedStyle(l):l.currentStyle;if(n&&n[e]!==t)for(var o=0;o<s.length;o++)document.write('<link rel="stylesheet" href="'+s[o]+"?v="+cacheTag+'" />')}var cacheTag="b7fbp5mte29";loadStylesheetIfMissing("visibility","hidden",["lib/bootstrap/css/bootstrap.min.css"]),loadStylesheetIfMissing("fontFamily","FontAwesome",["lib/font-awesome/css/font-awesome.min.css"]);

u2f-connector.html

@@ -5,6 +5,6 @@
     <title>U2F Connector</title>
 </head>
 <body>
-    <script src="js/u2f.min.js?v=3m9utp22o6r"></script>
+    <script src="js/u2f.min.js?v=b7fbp5mte29"></script>
 </body>
 </html>