swell-js 3.14.0 → 3.15.0

package/dist/api.js

@@ -177,17 +177,25 @@ function _request() {
               reqBody = JSON.stringify(reqData);
             }
 
-            reqHeaders = _objectSpread(_objectSpread(_objectSpread({
+            reqHeaders = {
+              Accept: 'application/json',
               'Content-Type': 'application/json',
               Authorization: "Basic ".concat(base64Encode(String(allOptions.key)))
-            }, session ? {
-              'X-Session': session
-            } : {}), locale ? {
-              'X-Locale': locale
-            } : {}), currency ? {
-              'X-Currency': currency
-            } : {});
-            _context.next = 18;
+            };
+
+            if (session) {
+              reqHeaders['X-Session'] = session;
+            }
+
+            if (locale) {
+              reqHeaders['X-Locale'] = locale;
+            }
+
+            if (currency) {
+              reqHeaders['X-Currency'] = currency;
+            }
+
+            _context.next = 21;
             return fetch(reqUrl, {
               method: reqMethod,
               headers: reqHeaders,
@@ -196,7 +204,7 @@ function _request() {
               mode: 'cors'
             });
 
-          case 18:
+          case 21:
             response = _context.sent;
             responseSession = response.headers.get('X-Session');
 
@@ -204,14 +212,14 @@ function _request() {
               setCookie('swell-session', responseSession);
             }
 
-            _context.next = 23;
+            _context.next = 26;
             return response.json();
 
-          case 23:
+          case 26:
             result = _context.sent;
 
             if (!(result && result.error)) {
-              _context.next = 32;
+              _context.next = 35;
               break;
             }
 
@@ -221,9 +229,9 @@ function _request() {
             err.param = result.error.param;
             throw err;
 
-          case 32:
+          case 35:
             if (response.ok) {
-              _context.next = 36;
+              _context.next = 39;
               break;
             }
 
@@ -231,10 +239,10 @@ function _request() {
             _err.code = 'connection_error';
             throw _err;
 
-          case 36:
+          case 39:
             return _context.abrupt("return", options.useCamelCase ? toCamel(result) : result);
 
-          case 37:
+          case 40:
           case "end":
             return _context.stop();
         }
@@ -246,7 +254,7 @@ function _request() {
 
 if (typeof window !== 'undefined') {
   window.swell = {
-    version: '3.14.0'
+    version: '3.15.0'
   };
 }
 

package/dist/currency.js

@@ -10,7 +10,8 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _require = require('./utils'),
     get = _require.get,
-    find = _require.find;
+    find = _require.find,
+    round = _require.round;
 
 var _require2 = require('./cookie'),
     getCookie = _require2.getCookie,
@@ -33,16 +34,11 @@ function methods(request, opt) {
             switch (_context.prev = _context.next) {
               case 0:
                 this.set(currency);
-                setCookie('swell-currency', currency);
-                _context.next = 4;
-                return request('put', '/session', {
+                return _context.abrupt("return", request('put', '/session', {
                   currency: currency
-                });
+                }));
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -57,13 +53,11 @@ function methods(request, opt) {
       return select;
     }(),
     selected: function selected() {
-      if (this.code) {
-        return this.code;
+      if (!this.code) {
+        this.set(getCookie('swell-currency') || opt.api.settings.get('store.currency'));
       }
 
-      var storeCurrency = opt.api.settings.get('store.currency');
-      var cookieCurrency = getCookie('swell-currency');
-      return cookieCurrency || storeCurrency;
+      return this.code;
     },
     get: function get() {
       if (!this.code) {
@@ -85,6 +79,7 @@ function methods(request, opt) {
         code: code
       };
       this.locale = String(opt.api.settings.get('store.locale', (typeof navigator === "undefined" ? "undefined" : (0, _typeof2["default"])(navigator)) === 'object' ? navigator.language : 'en-US'));
+      setCookie('swell-currency', code);
       return this.state;
     },
     format: function format(amount) {
@@ -143,13 +138,20 @@ function methods(request, opt) {
       var code = _ref.code,
           locale = _ref.locale,
           decimals = _ref.decimals;
+      locale = String(locale || '').replace('_', '-');
       var key = [code, locale, decimals].join('|');
 
       if (FORMATTERS[key]) {
         return FORMATTERS[key];
       }
 
-      var formatLocale = String(locale || '').replace('_', '-') || 'en-US';
+      var formatLocales = [];
+
+      if (locale) {
+        formatLocales.push(locale);
+      }
+
+      formatLocales.push('en-US');
       var formatDecimals = typeof decimals === 'number' ? decimals : undefined;
       var props = {
         style: 'currency',
@@ -161,7 +163,7 @@ function methods(request, opt) {
 
       try {
         try {
-          FORMATTERS[key] = new Intl.NumberFormat(formatLocale, props);
+          FORMATTERS[key] = new Intl.NumberFormat(formatLocales, props);
         } catch (err) {
           if (err.message.indexOf('Invalid language tag') >= 0) {
             FORMATTERS[key] = new Intl.NumberFormat('en-US', props);
@@ -203,11 +205,7 @@ function methods(request, opt) {
 
       return this.round(roundValue, scale);
     },
-    round: function round(value) {
-      var scale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-      // TODO: this is unrealiable (but only used for display)
-      return Number(Number(value).toFixed(scale));
-    }
+    round: round
   };
 }
 

package/dist/payment.js

@@ -985,7 +985,7 @@ function _paymentTokenize() {
 
           case 17:
             currency = toLower(get(cart, 'currency', 'usd'));
-            amount = stripeAmountByCurrency(currency, totalDue);
+            amount = stripeAmountByCurrency(currency, cart.trial ? cart.trial_initial_capture_total + cart.trial_auth_total : totalDue);
             stripeCustomer = get(cart, 'account.stripe_customer');
             _context14.t0 = toSnake;
             _context14.next = 23;
@@ -1035,9 +1035,11 @@ function _paymentTokenize() {
                 method: 'card',
                 card: paymentMethod,
                 intent: {
-                  stripe: {
+                  stripe: _objectSpread({
                     id: paymentIntent.id
-                  }
+                  }, cart.trial && {
+                    auth_amount: cart.trial_auth_total
+                  })
                 }
               }
             }).then(onSuccess)["catch"](onError);

package/dist/utils/index.js

@@ -18,6 +18,8 @@ var uniq = require('lodash/uniq');
 
 var find = require('lodash/find');
 
+var round = require('lodash/round');
+
 var findIndex = require('lodash/findIndex');
 
 var camelCase = require('lodash/camelCase');
@@ -313,6 +315,7 @@ module.exports = {
   get: get,
   uniq: uniq,
   find: find,
+  round: round,
   findIndex: findIndex,
   camelCase: camelCase,
   cloneDeep: cloneDeep,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swell-js",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "description": "Swell JS library for client-side stores",
   "repository": {
     "type": "git",

package/src/api.js

@@ -135,13 +135,23 @@ async function request(method, url, id = undefined, data = undefined, opt = unde
   }
 
   const reqHeaders = {
+    Accept: 'application/json',
     'Content-Type': 'application/json',
     Authorization: `Basic ${base64Encode(String(allOptions.key))}`,
-    ...(session ? { 'X-Session': session } : {}),
-    ...(locale ? { 'X-Locale': locale } : {}),
-    ...(currency ? { 'X-Currency': currency } : {}),
   };
 
+  if (session) {
+    reqHeaders['X-Session'] = session;
+  }
+
+  if (locale) {
+    reqHeaders['X-Locale'] = locale;
+  }
+
+  if (currency) {
+    reqHeaders['X-Currency'] = currency;
+  }
+
   const response = await fetch(reqUrl, {
     method: reqMethod,
     headers: reqHeaders,
@@ -149,6 +159,7 @@ async function request(method, url, id = undefined, data = undefined, opt = unde
     credentials: 'include',
     mode: 'cors',
   });
+
   const responseSession = response.headers.get('X-Session');
 
   if (typeof responseSession === 'string' && session !== responseSession) {

package/src/api.test.js

@@ -59,7 +59,8 @@ describe('api', () => {
 
       expect(fetch.mock.calls.length).toEqual(1);
       expect(fetch.mock.calls[0][1]).toHaveProperty('headers', {
-        'Content-Type': `application/json`,
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
         Authorization: `Basic ${Buffer.from('pk_test').toString('base64')}`,
       });
     });

package/src/currency.js

@@ -1,4 +1,4 @@
-const { get, find } = require('./utils');
+const { get, find, round } = require('./utils');
 const { getCookie, setCookie } = require('./cookie');
 
 const FORMATTERS = {};
@@ -15,17 +15,19 @@ function methods(request, opt) {
 
     async select(currency) {
       this.set(currency);
-      setCookie('swell-currency', currency);
-      return await request('put', '/session', { currency });
+
+      return request('put', '/session', { currency });
     },
 
     selected() {
-      if (this.code) {
-        return this.code;
+      if (!this.code) {
+        this.set(
+          getCookie('swell-currency') ||
+          opt.api.settings.get('store.currency')
+        );
       }
-      const storeCurrency = opt.api.settings.get('store.currency');
-      const cookieCurrency = getCookie('swell-currency');
-      return cookieCurrency || storeCurrency;
+
+      return this.code;
     },
 
     get() {
@@ -41,12 +43,16 @@ function methods(request, opt) {
     set(code = 'USD') {
       this.code = code;
       this.state = find(this.list(), { code }) || { code };
+
       this.locale = String(
         opt.api.settings.get(
           'store.locale',
           typeof navigator === 'object' ? navigator.language : 'en-US',
         ),
       );
+
+      setCookie('swell-currency', code);
+
       return this.state;
     },
 
@@ -96,13 +102,24 @@ function methods(request, opt) {
     },
 
     formatter({ code, locale, decimals }) {
+      locale = String(locale || '').replace('_', '-');
+
       const key = [code, locale, decimals].join('|');
+
       if (FORMATTERS[key]) {
         return FORMATTERS[key];
       }
 
-      const formatLocale = String(locale || '').replace('_', '-') || 'en-US';
+      const formatLocales = [];
+
+      if (locale) {
+        formatLocales.push(locale);
+      }
+
+      formatLocales.push('en-US');
+
       const formatDecimals = typeof decimals === 'number' ? decimals : undefined;
+
       const props = {
         style: 'currency',
         currency: code,
@@ -113,7 +130,7 @@ function methods(request, opt) {
 
       try {
         try {
-          FORMATTERS[key] = new Intl.NumberFormat(formatLocale, props);
+          FORMATTERS[key] = new Intl.NumberFormat(formatLocales, props);
         } catch (err) {
           if (err.message.indexOf('Invalid language tag') >= 0) {
             FORMATTERS[key] = new Intl.NumberFormat('en-US', props);
@@ -166,10 +183,7 @@ function methods(request, opt) {
       return this.round(roundValue, scale);
     },
 
-    round(value, scale = 0) {
-      // TODO: this is unrealiable (but only used for display)
-      return Number(Number(value).toFixed(scale));
-    },
+    round,
   };
 }
 

package/src/payment.js

@@ -441,6 +441,8 @@ async function paymentTokenize(request, params, payMethods, cart) {
       if (paymentMethod.error) {
         return onError(paymentMethod.error);
       } else if (totalDue < 1) {
+        // should save payment method data when payment amount is less than 1
+        // https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts
         return cartApi
           .methods(request, options)
           .update({
@@ -454,7 +456,10 @@ async function paymentTokenize(request, params, payMethods, cart) {
       }
 
       const currency = toLower(get(cart, 'currency', 'usd'));
-      const amount = stripeAmountByCurrency(currency, totalDue);
+      const amount = stripeAmountByCurrency(
+        currency,
+        cart.trial ? cart.trial_initial_capture_total + cart.trial_auth_total : totalDue,
+      );
       const stripeCustomer = get(cart, 'account.stripe_customer');
       const intent = toSnake(
         await methods(request)
@@ -483,7 +488,12 @@ async function paymentTokenize(request, params, payMethods, cart) {
                   method: 'card',
                   card: paymentMethod,
                   intent: {
-                    stripe: { id: paymentIntent.id },
+                    stripe: {
+                      id: paymentIntent.id,
+                      ...(cart.trial && {
+                        auth_amount: cart.trial_auth_total,
+                      }),
+                    },
                   },
                 },
               })

package/src/utils/index.js

@@ -3,6 +3,7 @@ const set = require('lodash/set');
 const get = require('lodash/get');
 const uniq = require('lodash/uniq');
 const find = require('lodash/find');
+const round = require('lodash/round');
 const findIndex = require('lodash/findIndex');
 const camelCase = require('lodash/camelCase');
 const snakeCase = require('lodash/snakeCase');
@@ -257,6 +258,7 @@ module.exports = {
   get,
   uniq,
   find,
+  round,
   findIndex,
   camelCase,
   cloneDeep,

package/src/utils/stripe.js

@@ -262,7 +262,7 @@ function stripeAmountByCurrency(currency, amount) {
     'MGA', // Malagasy Ariary
     'RWF', // Rwandan Franc
     'VUV', // Vanuatu Vatu
-    'XOF' // West African Cfa Franc
+    'XOF', // West African Cfa Franc
   ];
   if (zeroDecimalCurrencies.includes(currency.toUpperCase())) {
     return amount;

package/test/page/containers/payment/stripe.js

@@ -53,10 +53,6 @@ class Stripe extends React.Component {
     this.renderStripeElements();
   }
 
-  componentDidUpdate() {
-    this.renderStripeElements();
-  }
-
   renderStripeElements() {
     const { type, font } = this.state;
     const options = {
@@ -124,11 +120,11 @@ class Stripe extends React.Component {
   }
 
   onChangeType(event, type) {
-    this.setState({ type });
+    this.setState({ type }, this.renderStripeElements);
   }
 
   onChangeFont(event, font) {
-    this.setState({ font });
+    this.setState({ font }, this.renderStripeElements);
   }
 
   render() {