@lancom/shared 0.0.354 → 0.0.355

package/assets/js/utils/shop.js

@@ -4,6 +4,10 @@ export function getShopCountrySettings(shop, country) {
 
   return {
     ...shop.settings,
+    contacts: {
+      ...(shop.settings.app || {}),
+      ...settingsValues(countrySetting?.settings?.app)
+    },
     contacts: {
       ...shop.settings.contacts,
       ...settingsValues(countrySetting?.settings?.contacts)

package/components/checkout/order/order-payment-information/order-payment-information.vue

@@ -11,23 +11,31 @@
         <div class="form-row OrderPaymentInformation__form">
           <label
             class="form-label OrderPaymentInformation__checkbox"
-            @click="updatePaymentType(false)">
-            <checked-icon :checked="!isDepositPayment" />
+            @click="updatePaymentType('card')">
+            <checked-icon :checked="paymentMethod === 'card'" />
             <span class="lc_regular12 lc__grey1 OrderPaymentInformation__checkbox-label">
               Credit Card
             </span>
           </label>
           <label
             class="form-label OrderPaymentInformation__checkbox"
-            @click="updatePaymentType(true)">
-            <checked-icon :checked="isDepositPayment" />
+            @click="updatePaymentType('deposit')">
+            <checked-icon :checked="paymentMethod === 'deposit'" />
             <span class="lc_regular12 lc__grey1 OrderPaymentInformation__checkbox-label">
               Bank Transfer
             </span>
           </label>
+          <label
+            class="form-label OrderPaymentInformation__checkbox"
+            @click="updatePaymentType('google')">
+            <checked-icon :checked="paymentMethod === 'google'" />
+            <span class="lc_regular12 lc__grey1 OrderPaymentInformation__checkbox-label">
+              Google Pay
+            </span>
+          </label>
         </div>
         <div
-          v-if="isDepositPayment"
+          v-if="paymentMethod === 'deposit'"
           class="OrderPaymentInformation__direct-deposit">
           <div
             class="OrderPaymentInformation__direct-deposit-info"
@@ -60,6 +68,8 @@
           <payment-card
             v-if="orderData"
             ref="paymentCart"
+            :key="paymentMethod"
+            :google="paymentMethod === 'google'"
             :amount="cartPricing.totalPrice"
             :order="orderData"
             @inited="initedCard">
@@ -108,6 +118,7 @@ export default {
       creating: false,
       submitting: false,
       loadingCard: true,
+      paymentMethod: this.order.paymentMethod || ORDER_PAYMENT_METHOD.CARD,
       isDepositPayment: this.order.paymentMethod === ORDER_PAYMENT_METHOD.DEPOSIT
     };
   },
@@ -162,8 +173,9 @@ export default {
         }
       }
     },
-    updatePaymentType(isDeposit) {
-      this.isDepositPayment = isDeposit;
+    updatePaymentType(paymentMethod) {
+      this.isDepositPayment = paymentMethod === ORDER_PAYMENT_METHOD.DEPOSIT;
+      this.paymentMethod = paymentMethod;
       this.errorMessage = null;
     },
     depositInfo(info) {

package/components/common/payment/payment_card/googlepay/googlepay.scss

@@ -0,0 +1,73 @@
+@import "@/assets/scss/ui_kit";
+@import "@/assets/scss/variables";
+
+.example {
+  margin: 5px;
+  display: flex;
+  flex-direction: row;
+}
+
+.example > .title {
+  width: 250px;
+  align-items: center;
+  display: inherit;
+}
+
+.example > .demo {
+  flex: 1 0 0;
+}
+
+.example > .demo > * {
+  margin: 1px;
+}
+
+.Payment {
+  &__wrapper {
+    .pin-form-field {
+      // @extend .form-field;
+      // @extend .labelless;
+      border-radius: 0px;
+      background-color: #F4F4F4;
+    }
+  }
+  &__field-container {
+    width: 100%;
+  }
+  &__message {
+    padding: 50px 140px;
+  }
+  &__content {
+    position: relative;
+    min-height: 100px;
+  }
+  &__fileds-spinner {
+    background-color: white;
+  }
+  &__terms {
+    margin-top: 20px;
+  }
+  &__label-with-checkbox {
+    display: flex !important;
+    align-items: center;
+    margin-bottom: 3px !important;
+    a {
+      color: $green;
+    }
+  }
+}
+
+.form-row--cols {
+  @media (max-width: $bp-extra-small-max) {
+    flex-direction: column;
+  }
+  .col-half {
+    @media (max-width: $bp-extra-small-max) {
+      flex-basis: 100%;
+      width: 100%;
+      margin-left: 0 !important;
+      &:nth-child(2) {
+        margin-top: 20px;
+      }
+    }
+  }
+}

package/components/common/payment/payment_card/googlepay/googlepay.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="Payment__wrapper">
+    <div v-if="(hasSpinner && processing) || loading">
+      <spinner />
+    </div>
+    <div
+      :style="{
+        opacity: loading ? 0 : 1
+      }">
+      <div
+        v-if="amount"
+        class="form-row">
+        <label
+          for="payment-amount"
+          class="form-label">
+          Amount to Pay
+        </label>
+        <input
+          id="payment-amount"
+          :value="`${amount} AUD`"
+          name="payment-amount"
+          placeholder="payment-amount"
+          disabled
+          type="text"
+          class="form-field labelless" />
+      </div>
+      <div class="examples">
+        <div>
+          <div class="example">
+            <div class="demo">
+              <google-pay-button
+                v-if="!loading"
+                environment="TEST"
+                button-type="plain"
+                button-color="black"
+                v-bind:paymentRequest.prop="{
+                  apiVersion: 2,
+                  apiVersionMinor: 0,
+                  allowedPaymentMethods: [
+                    {
+                      type: 'CARD',
+                      parameters: {
+                        allowedAuthMethods: ['PAN_ONLY', 'CRYPTOGRAM_3DS'],
+                        allowedCardNetworks: ['MASTERCARD', 'VISA'],
+                      },
+                      tokenizationSpecification: {
+                        type: 'PAYMENT_GATEWAY',
+                        parameters: {
+                          gateway: 'pinpayments',
+                          gatewayMerchantId: app.PAYMENT_GOOGLE_GATEWAY,
+                        }
+                      },
+                    },
+                  ],
+                  merchantInfo: {
+                    merchantId: app.PAYMENT_GOOGLE_MERCHANT_ID,
+                    merchantName: app.PAYMENT_GOOGLE_MERCHANT_NAME,
+                  },
+                  transactionInfo: {
+                    totalPriceStatus: 'FINAL',
+                    totalPriceLabel: 'Total',
+                    totalPrice: amountString,
+                    currencyCode: currencyCode,
+                    countryCode: countryCode
+                  },
+                }"
+                @loadpaymentdata="onLoadPaymentData"
+                @error="onError" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <slot v-if="!loading" name="controls" v-bind="{ processing }"></slot>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import '@google-pay/button-element';
+
+let timer = null;
+let googlepayStartLoaded = false;
+
+export default {
+  name: 'Googlepay',
+  props: {
+    order: {
+      type: Object,
+      required: true
+    },
+    amount: {
+      type: Number
+    },
+    hasSpinner: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      paymentData: null,
+      paymentError: null,
+      processing: false,
+      loading: false,
+      fields: null
+    };
+  },
+  async mounted() {
+    this.loading = true;
+    await this.loadGooglepay();
+    this.loading = false;
+  },
+  destroyed() {
+    clearInterval(timer);
+  },
+  computed: {
+    ...mapGetters(['country', 'currency', 'app']),
+    amountString() {
+      return `${this.amount.toFixed(2)}`;
+    },
+    currencyCode() {
+      return this.currency?.isoCode || 'AUSD';
+    },
+    countryCode() {
+      return this.country?.isoCode || 'AU';
+    }
+  },
+  methods: {
+    onLoadPaymentData(event) {
+      const token = JSON.parse(event.detail.paymentMethodData.tokenizationData.token);
+      this.paymentData = { google: true, token }
+    },
+    onError(event) {
+      this.paymentError = event.error;
+      console.log('this.paymentError: ', this.paymentError);
+    },
+    tokenize() {
+      this.processing = true;
+      return new Promise((resolve, reject) => {
+        if (this.paymentError || !this.paymentData) {
+          reject(!this.paymentData ? 'Payment Failed. Need to choose card' : 'Payment Failed')
+        } else {
+          resolve(this.paymentData);
+        }
+        this.processing = false;
+      });
+    },
+    async loadGooglepay() {
+      if (process.browser) {
+        await (new Promise((resolve, reject) => {
+          if (!googlepayStartLoaded) {
+            googlepayStartLoaded = true;
+            resolve();
+            googlepayStartLoaded = false;
+            // let domElement = document.createElement('script');
+            // domElement.type = "text/javascript";
+            // domElement.setAttribute('src', 'https://cdn.pinpayments.com/pin.hosted_fields.v1.js');
+            // domElement.onload = () => {
+            //   resolve();
+            // };
+            // domElement.onerror = () => {
+            //   setTimeout(() => this.loadPinpayments(), 1000);
+            // };
+            // document.body.appendChild(domElement);
+          } else {
+            let repeated = 0;
+            timer = setInterval(() => {
+              if (!googlepayStartLoaded || repeated++ > 40) {
+                clearInterval(timer);
+                resolve();
+              }
+            }, 500);
+          }
+        }));
+      }
+    }
+  }
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import 'googlepay.scss';
+</style>

package/components/common/payment/payment_card/payment-card.vue

@@ -17,6 +17,7 @@ import { mapGetters } from 'vuex';
 export default {
   name: 'PaymentCard',
   components: {
+    Googlepay: () => import('./googlepay/googlepay'),
     Pinpayment: () => import('./pinpayment/pinpayment'),
     Stripe: () => import('./stripe_card/stripe-card'),
     StripePayment: () => import('./stripe_payment/stripe-payment')
@@ -28,11 +29,17 @@ export default {
     },
     amount: {
       type: Number
+    },
+    google: {
+      type: Boolean
     }
   },
   computed: {
     ...mapGetters(['payment']),
     cardComponent() {
+      if (this.google) {
+        return 'googlepay';
+      }
       return this.payment?.type || 'stripe-payment';
     }
   },

package/mixins/payment.js

@@ -38,7 +38,7 @@ export default {
     ...mapMutations('layers', ['resetLayers']),
     handleErrors(err) {
       // err.messages.forEach(({ message }) => this.$toastr.e(message));
-      const defaultMessage = 'Payment error';
+      const defaultMessage = typeof err === 'string' ? err : 'Payment error';
       this.errorMessage = (err.messages ? err.messages.map(({ message }) => message).join(', ') : (err.error_description)) || err.message || defaultMessage;
     },
     async proceedPayment(card) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.354",
+  "version": "0.0.355",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/store/index.js

@@ -13,6 +13,7 @@ export const state = () => ({
   payment: null,
   shop: {},
   menus: [],
+  app: {},
   contacts: {},
   orderInfo: {},
   pricing: {},
@@ -23,6 +24,7 @@ export const state = () => ({
 });
 
 export const getters = {
+  app: ({ app }) => app,
   stockCountry: ({ stockCountry }) => stockCountry,
   country: ({ country }) => country,
   countries: ({ shop }) => (shop.countries || []).map(({ country }) => country).filter(c => !!c),
@@ -147,7 +149,8 @@ export const mutations = {
   setCurrency(state, currency) {
     state.currency = currency;
   },
-  setSettings(state, { contacts, notificationBar, discountPopup, order, depositInfo, pricing }) {
+  setSettings(state, { contacts, notificationBar, discountPopup, order, depositInfo, pricing, app }) {
+    state.app = app;
     state.contacts = contacts;
     state.orderInfo = order;
     state.notificationBar = notificationBar;