Feature: v2 api

.eslintignore

@@ -13,6 +13,8 @@
 # misc
 /coverage/
 !.*
+.*/
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -1,17 +1,21 @@
-"use strict";
+'use strict';
 
 module.exports = {
   root: true,
-  parser: "babel-eslint",
+  parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: "module",
+    sourceType: 'module',
     ecmaFeatures: {
       legacyDecorators: true,
     },
   },
-  plugins: ["ember"],
-  extends: ["eslint:recommended", "plugin:ember/recommended"],
+  plugins: ['ember'],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
+  ],
   env: {
     browser: true,
   },
@@ -20,30 +24,30 @@ module.exports = {
     // node files
     {
       files: [
-        ".eslintrc.js",
-        ".template-lintrc.js",
-        "ember-cli-build.js",
-        "index.js",
-        "testem.js",
-        "blueprints/*/index.js",
-        "config/**/*.js",
-        "tests/dummy/config/**/*.js",
-      ],
-      excludedFiles: [
-        "addon/**",
-        "addon-test-support/**",
-        "app/**",
-        "tests/dummy/app/**",
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
-        sourceType: "script",
+        sourceType: 'script',
       },
       env: {
         browser: false,
         node: true,
       },
-      plugins: ["node"],
-      // extends: ['plugin:node/recommended']
+      plugins: ['node'],
+      extends: ['plugin:node/recommended'],
+    },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
     },
   ],
 };

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

.npmignore

@@ -10,10 +10,13 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
@@ -23,6 +26,7 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 

.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.prettierrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane'
+  extends: 'recommended',
 };

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "10"
+  - "12"
 
 dist: xenial
 
@@ -46,13 +46,15 @@ jobs:
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.20
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.24
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
     - env: EMBER_TRY_SCENARIO=ember-classic
+    - env: EMBER_TRY_SCENARIO=embroider-safe
+    - env: EMBER_TRY_SCENARIO=embroider-optimized
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

CONTRIBUTING.md

@@ -8,9 +8,8 @@
 
 ## Linting
 
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
+* `yarn lint`
+* `yarn lint:fix`
 
 ## Running tests
 

README.md

@@ -4,11 +4,9 @@ This addon provides an adapter to use with the Goods platform (https://www.goods
 
 ## Compatibility
 
-- Ember.js v3.12 or above
-- Ember CLI v2.13 or above
-- Node.js v10 or above
-
-## Installation
+* Ember.js v3.20 or above
+* Ember CLI v3.20 or above
+* Node.js v12 or above
 
 ```
 ember install ember-goods

addon/adapters/goods.ts

@@ -30,37 +30,6 @@ export default class ApplicationAdapter extends JSONAPIAdapter.extend(
   coalesceFindRequests = true;
   host = config.APP.goods.host;
 
-  modelWhitelist = [
-    "basket",
-    "basket-item",
-    "basket-rule-validation",
-    "brand",
-    "category",
-    "country",
-    "content-entry-operation",
-    "order",
-    "order-line",
-    "order-payment-method",
-    "payment",
-    "payment-method",
-    "price",
-    "product-category",
-    "product-field",
-    "product-image",
-    "product",
-    "promotion",
-    "shop-member",
-    "shop-password-change",
-    "shop-payment-method",
-    "shop-reset-token",
-    "shop-role",
-    "state",
-    "sku-field",
-    "sku-image",
-    "sku",
-    "user",
-  ];
-
   @inject declare session: any;
 
   @computed("session.data.authenticated.access_token")

addon/components/goods/metrics/track-sale/component.ts

@@ -0,0 +1,87 @@
+import Component from '@glimmer/component';
+import Order from 'ember-goods/models/order';
+import config from 'ember-get-config';
+import { isPresent } from '@ember/utils';
+import { inject } from '@ember/service';
+import moment from 'moment';
+import GoodsCommerce from 'ember-goods/services/goods-commerce';
+
+interface GoodsMetricsTrackSaleArgs {
+  metrics: any;
+  order: Order;
+}
+
+export default class GoodsMetricsTrackSale extends Component<GoodsMetricsTrackSaleArgs> {
+  /**
+   *
+   */
+  @inject declare commerce: GoodsCommerce;
+
+  /**
+   *
+   */
+  trackSale() {
+    let metrics = config.APP.goods.commerce.metrics;
+
+    if (metrics.includes('gtm')) {
+      this.gtmTrackSale(this.args.order);
+    }
+  }
+
+  /**
+   *
+   * @param order
+   */
+  gtmTrackSale(order: Order) {
+    //@ts-ignore
+    let dataLayer = window['dataLayer'] || [];
+
+    let products: Array<any> = [];
+    this.args.order.get('orderLines').forEach((orderLine) => {
+      let sku = orderLine.get('sku');
+      let skuName = this.commerce.getSkuName(
+        sku.get('attrs'),
+        sku.get('product').get('skuName')
+      );
+      let bookableDate = '';
+      if (isPresent(sku.get('attrs').bookableDate)) {
+        bookableDate = moment(sku.get('attrs').bookableDate).format(
+          'YYYY-MM-DD'
+        );
+      }
+      products.push({
+        name: sku.get('product').get('name'),
+        id: sku.get('id'),
+        price: orderLine.get('price') / 100,
+        brand: sku.get('product').get('brand').get('name'),
+        category: 'Ticket',
+        quantity: orderLine.get('quantity'),
+        variant: skuName,
+        dimension1: bookableDate,
+        dimension2: sku.get('attrs').sessionStartTime,
+      });
+    });
+
+    dataLayer.push({ ecommerce: null });
+    dataLayer.push({
+      event: 'ecommerce',
+      ecommerce: {
+        purchase: {
+          actionField: {
+            id: order.get('id'),
+            affiliation: 'Online Store',
+            revenue: order.get('total') / 100,
+            tax: '0',
+            shipping: '0',
+          },
+          products,
+        },
+      },
+    });
+  }
+
+  constructor(owner: any, args: any) {
+    super(owner, args);
+    this.trackSale();
+  }
+}

addon/components/goods/metrics/track-sale/template.hbs

@@ -0,0 +1 @@
+{{yield}}

addon/components/payment-challenge/component.ts

@@ -1,34 +1,34 @@
-import Component from "@ember/component";
+import Component from '@ember/component';
 // @ts-ignore: Ignore import of compiled template
-import template from "./template";
-import { notEmpty } from "@ember/object/computed";
-import { computed } from "@ember/object";
-import { get } from "@ember/object";
-import { scheduleOnce } from "@ember/runloop";
-import { isNone } from "@ember/utils";
-import { layout } from "@ember-decorators/component";
+import template from './template';
+import { notEmpty } from '@ember/object/computed';
+import { computed } from '@ember/object';
+import { get } from '@ember/object';
+import { scheduleOnce } from '@ember/runloop';
+import { isNone } from '@ember/utils';
+import { layout } from '@ember-decorators/component';
 
 @layout(template)
 export default class PaymentChallenge extends Component {
   payment!: any;
 
-  @notEmpty("payment.challengeUrl") isChallengingPayment!: boolean;
-  @computed("payment.challengeRequest")
+  @notEmpty('payment.challengeUrl') isChallengingPayment!: boolean;
+  @computed('payment.challengeRequest')
   get challengeRequest() {
-    return Object.entries(get(this.payment, "challengeRequest"));
+    return Object.entries(get(this.payment, 'challengeRequest'));
   }
 
   renderIframeContent() {
-    scheduleOnce("afterRender", this, () => {
+    scheduleOnce('afterRender', this, () => {
       let iframeEl: any = document.getElementById(
-        "goods-payment-challenge-frame"
+        'goods-payment-challenge-frame'
       );
-      scheduleOnce("afterRender", this, () => {
+      scheduleOnce('afterRender', this, () => {
         if (!isNone(iframeEl)) {
           let doc = iframeEl.contentWindow.document;
 
           let formHtml = `<form action=${this.payment.challengeUrl} method="post">`;
-          this.challengeRequest.forEach(param => {
+          this.challengeRequest.forEach((param) => {
             formHtml += `<input type="hidden" name=${param[0]} value=${param[1]} >`;
           });
           formHtml += `
@@ -39,7 +39,7 @@ export default class PaymentChallenge extends Component {
           doc.write(formHtml);
           doc.close();
 
-          doc.getElementById("challenge-frame-trigger").click();
+          doc.getElementById('challenge-frame-trigger').click();
         }
       });
     });