@salla.sa/applepay 1.0.30 → 2.11.72

package/package.json

@@ -1,37 +1,30 @@
 {
   "name": "@salla.sa/applepay",
-  "version": "1.0.30",
-  "description": "Salla Apple Pay",
+  "version": "2.11.72",
+  "description": "Salla Apple Pay light",
   "main": "dist/app.js",
   "scripts": {
-    "dev": "npm run development",
-    "development": "",
-    "watch": "",
-    "watch-poll": "npm run watch -- --watch-poll",
-    "hot": "",
-    "prod": "npm run production",
-    "production": "",
-    "lint": "eslint ./src --fix",
+    "watch": "echo \"There is no watch!\"",
+    "build": "echo \"There is no build!\"",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/SallaApp/applePay-js.git"
+    "url": "git+https://github.com/SallaApp/twilight.git"
   },
   "keywords": [
     "salla",
-    "ui"
+    "ui",
+    "apple-pay"
   ],
-  "publishConfig": {
-    "registry": "https://npm.pkg.github.com/"
-  },
   "author": "rasha@salla.sa",
   "bugs": {
-    "url": "https://github.com/SallaApp/applePay-js/issues"
+    "url": "https://github.com/SallaApp/twilight/issues"
   },
   "license": "UNLICENSED",
-  "homepage": "https://github.com/SallaApp/applePay-js#readme",
+  "homepage": "https://github.com/SallaApp/twilight#readme",
   "dependencies": {
     "axios": "^0.23.0"
-  }
+  },
+  "gitHead": "a87be34f17cb8d64433d80540137b519a1e3be43"
 }

package/src/http.js

@@ -3,7 +3,7 @@ import axios from 'axios'
 export default {
     request(method, url, data, successCb = null, errorCb = null) {
         return axios
-            .request({ url, data, method: method.toLowerCase(), responseType: 'json'})
+            .request({url, data, method: method.toLowerCase(), responseType: 'json'})
             .then(successCb)
             .catch(errorCb);
     },
@@ -11,12 +11,12 @@ export default {
     get(url, successCb = null, errorCb = null, data) {
         // return this.request('get', url, data, successCb, errorCb);
         return axios
-            .get(url, { params: data })
+            .get(url, {params: data})
             .then(successCb)
             .catch(errorCb);
     },
 
-    post(url, data, successCb = null, errorCb = null ) {
+    post(url, data, successCb = null, errorCb = null) {
         return this.request('post', url, data, successCb, errorCb);
     },
 
@@ -26,5 +26,33 @@ export default {
 
     delete(url, data, successCb = null, errorCb = null) {
         return this.request('delete', url, data, successCb, errorCb);
+    },
+
+    requestWithSupportAjax(url, payload, method = 'post') {
+        return new Promise((resolve, reject) => {
+            if (!window?.isLegacyTheme) {
+                return this.request(method, url, payload, ({data}) => {
+                    return resolve(data);
+                }, ({response}) => {
+                    return reject(response);
+                })
+            }
+
+            /**
+             * @deprecated to support legacy themes
+             */
+            $.ajax({
+                url: url,
+                method: method.toUpperCase(),
+                data: payload,
+                async: false,
+                success: function ({data}) {
+                    return resolve(data);
+                },
+                error: function ({response}) {
+                    return reject(response);
+                }
+            });
+        })
     }
 };

package/src/index.js

@@ -1 +1,518 @@
-require('./ApplePay');
+import Http from './http';
+import DetectOS from './DetectOS';
+
+window.Salla = window.Salla || {};
+window.Salla.Payments = window.Salla.Payments || {};
+
+/**
+ * Full Example
+ *
+ * Salla.event.createAndDispatch('payments::apple-pay.start-transaction', {
+ *                  amount: 1000,
+ *                  validateMerchant: {
+ *                      url: '{{ route('cp.marketplace.cart.pay', ['cart' => $cart]) }}',
+ *                      // onFailed: (response) => {
+ *                      //     laravel.ajax.errorHandler(response);
+ *                      //     this.onCancel({}, response.data.error.message);
+ *                      // },
+ *                      // onSuccess: (response) => {
+ *                      //     laravel.ajax.successHandler(response);
+ *                      // }
+ *                  },
+ *                  authorized: {
+ *                      url: '{{ route('cp.marketplace.cart.confirm', ['cart' => $cart]) }}',
+ *                      // onFailed: (response) => {
+ *                      //     laravel.ajax.errorHandler(response);
+ *                      //     this.onCancel({}, response.data.error.message);
+ *                      // },
+ *                      // onSuccess: (response) => {
+ *                      //     // nothing
+ *                      // }
+ *                  },
+ *                  // onError: function (message) {
+ *                  //     laravel.alert(message);
+ *                  // }
+ *              });
+ */
+window.SallaApplePay = {
+    session: null,
+    detail: null,
+    address_id: null,
+    shipping_methods: [],
+    total: undefined,
+    request: undefined,
+    id: undefined,
+    init: function () {
+        document.removeEventListener('payments::apple-pay.start-transaction', SallaApplePay.startSession);
+        Salla.event.addEventListener('payments::apple-pay.start-transaction', SallaApplePay.startSession);
+    },
+
+    initDefault: function () {
+        if (!SallaApplePay.detail.onError) {
+            SallaApplePay.detail.onError = function (message) {
+                salla.notify.error(message);
+            };
+        }
+
+        if (!SallaApplePay.detail.authorized.onFailed) {
+            SallaApplePay.detail.authorized.onFailed = (response) => {
+                salla.logger.log(JSON.stringify(response))
+                salla.api.handleErrorResponse(response);
+                SallaApplePay.onCancel({}, response.data.error.message);
+            };
+        }
+
+        if (!SallaApplePay.detail.validateMerchant.onFailed) {
+            SallaApplePay.detail.validateMerchant.onFailed = (response) => {
+                salla.logger.log(JSON.stringify(response))
+                salla.api.handleErrorResponse(response);
+                SallaApplePay.onCancel({}, response.data.error.message);
+            };
+        }
+
+        if (!SallaApplePay.detail.authorized.onSuccess) {
+            SallaApplePay.detail.authorized.onSuccess = (response) => {
+                salla.logger.log(JSON.stringify(response))
+                salla.api.handleAfterResponseActions(response);
+            };
+        }
+    },
+
+    prepareLineItems: function () {
+        if(!SallaApplePay.detail?.items?.length){
+            SallaApplePay.detail.items = [
+                {
+                    label: salla.lang.get('pages.cart.items_total'),
+                    amount: SallaApplePay.detail.amount
+                }
+            ]
+        }
+
+        return SallaApplePay.detail.items;
+    },
+
+    prepareTotal: function () {
+       return {
+           // apple ask to use business name
+           label: window.location.hostname || 'Salla',
+           //label: salla.lang.get('pages.cart.final_total'),
+           amount: SallaApplePay.detail.amount
+       }
+    },
+
+    startSession: async function (event) {
+
+        SallaApplePay.detail = event.detail || event;
+
+        salla.log('🍏 Pay: payments::apple-pay.start-transaction', SallaApplePay.detail);
+
+        SallaApplePay.initDefault();
+
+        let version = SallaApplePay.getApplePaySessionVersion();
+        let supportedNetworks = SallaApplePay.detail.supportedNetworks || ['masterCard', 'visa'];
+
+        if (version === 5) {
+            supportedNetworks.push('mada');
+        }
+
+        SallaApplePay.request = {
+            countryCode: 'SA',
+            supportsCouponCode: true,
+            couponCode: '',
+            currencyCode: SallaApplePay.detail.currency || 'SAR',
+            requiredShippingContactFields: SallaApplePay.detail.requiredShippingContactFields ? SallaApplePay.detail.requiredShippingContactFields : [],
+            merchantCapabilities: ['supports3DS'],
+            supportedNetworks: supportedNetworks,
+            supportedCountries: SallaApplePay.detail.supportedCountries || ['SA'],
+            total: SallaApplePay.prepareTotal(),
+            shippingContact: SallaApplePay.detail.shippingContact ? SallaApplePay.detail.shippingContact : {},
+            shippingMethods: SallaApplePay.detail.shippingMethods && SallaApplePay.detail.shippingMethods.length ? SallaApplePay.mappingShippingMethods(event.detail.shippingMethods) : [],
+            lineItems: SallaApplePay.prepareLineItems()
+        };
+
+        salla.log('🍏 Pay: init ', SallaApplePay.request);
+
+        // https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypaymentrequest
+        SallaApplePay.session = new ApplePaySession(version, SallaApplePay.request);
+
+        SallaApplePay.session.onshippingcontactselected = SallaApplePay.onShippingContactSelected;
+        SallaApplePay.session.onshippingmethodselected = SallaApplePay.onShippingMethodSelected;
+        SallaApplePay.session.onvalidatemerchant = SallaApplePay.onValidateMerchant;
+        SallaApplePay.session.onpaymentauthorized = SallaApplePay.onPaymentAuthorized;
+        SallaApplePay.session.oncancel = SallaApplePay.onCancel;
+        SallaApplePay.session.oncouponcodechanged = SallaApplePay.oncouponcodechanged;
+
+        SallaApplePay.session.begin();
+    },
+
+    oncouponcodechanged(event) {
+        Salla.event.dispatch('payments::apple-pay.coupon.change', event);
+
+        return Http.post(SallaApplePay.detail.oncouponcodechanged.url.replace('{id}', SallaApplePay.id), {
+            'coupon': event.couponCode,
+            'payment_method': 'apple_pay',
+        }, async ({data}) => {
+            if (typeof SallaApplePay.detail.oncouponcodechanged.onSuccess === 'function') {
+                SallaApplePay.detail.oncouponcodechanged.onSuccess(data);
+            }
+
+            salla.log('🍏 Pay: Coupon applied success');
+
+            await SallaApplePay.recalculateTotal();
+
+            SallaApplePay.session.completeCouponCodeChange({
+                newTotal: SallaApplePay.prepareTotal(),
+                newLineItems: SallaApplePay.prepareLineItems()
+            });
+        }, async (error) => {
+            let response = error?.response;
+
+            Salla.event.dispatch('payments::apple-pay.coupon.failed', response);
+
+            // SallaApplePay.abortSession();
+            if (typeof SallaApplePay.detail.oncouponcodechanged.onFailed === 'function') {
+                SallaApplePay.detail.oncouponcodechanged.onFailed(response);
+            }
+
+            await SallaApplePay.recalculateTotal();
+
+            SallaApplePay.session.completeCouponCodeChange({
+                newTotal: SallaApplePay.prepareTotal(),
+                newLineItems: SallaApplePay.prepareLineItems(),
+                errors: [new window.ApplePayError('couponCodeInvalid')]
+            });
+        });
+    },
+
+    onCancel: (event = {}, message = null) => {
+        SallaApplePay.detail.onError(message || salla.lang.get('pages.checkout.payment_failed'));
+        Salla.event.createAndDispatch('payments::apple-pay.canceled', event);
+    },
+
+    /**
+     * Confirm payment after authorization.
+     *
+     * @param event
+     */
+    onPaymentAuthorized: (event) => {
+        salla.logger.log('🍏 Pay: onPaymentAuthorized', event.payment);
+
+        Salla.event.dispatch('payments::apple-pay.authorized.init', event);
+        Http.post(SallaApplePay.detail.authorized.url.replace('{id}', SallaApplePay.id), {
+            payment_method: 'apple_pay',
+            applepay_token: JSON.stringify(event.payment)
+        }, ({data}) => {
+            Salla.event.dispatch('payments::apple-pay.authorized.success', data);
+
+            SallaApplePay.session.completePayment(ApplePaySession.STATUS_SUCCESS);
+
+            if (typeof SallaApplePay.detail.authorized.onSuccess === 'function') {
+                SallaApplePay.detail.authorized.onSuccess(data);
+            }
+        }, (error) => {
+
+            let response = error?.response;
+
+            Salla.event.dispatch('payments::apple-pay.authorized.failed', response);
+
+            SallaApplePay.session.completePayment({
+                status: ApplePaySession.STATUS_FAILURE,
+                errors: [new ApplePayError("unknown", undefined, response?.data?.error?.message || response?.data?.error?.code || 'Failed to parse authorized response')]
+            })
+
+            if (typeof SallaApplePay.detail.authorized.onFailed === 'function') {
+                SallaApplePay.detail.authorized.onFailed(response);
+            }
+        });
+    },
+
+    /**
+     * Validate Submit.
+     *
+     * @param event
+     */
+    onValidateMerchant: (event) => {
+        Salla.event.dispatch('payments::apple-pay.validate-merchant.init', event);
+
+        Http.post(SallaApplePay.detail.validateMerchant.url.replace('{id}', SallaApplePay.id), {
+            validation_url: event.validationURL
+        }, ({data}) => {
+
+            Salla.event.dispatch('payments::apple-pay.validate-merchant.success', data);
+
+            if (typeof SallaApplePay.detail.validateMerchant.onSuccess === 'function') {
+                SallaApplePay.detail.validateMerchant.onSuccess(data).then((response) => {
+                    // check if there are redirect
+                    if (response?.redirect) {
+                        window.location = response.redirect;
+                        return SallaApplePay.abortValidateMerchant(response);
+                    }
+
+                    SallaApplePay.session.completeMerchantValidation(data.data);
+                }).catch((response) => {
+                    SallaApplePay.abortValidateMerchant(response);
+                });
+            } else {
+                SallaApplePay.session.completeMerchantValidation(data.data);
+            }
+
+        }, ({response}) => {
+            SallaApplePay.abortValidateMerchant(response);
+        });
+    },
+
+    abortValidateMerchant: (response = null) => {
+
+        SallaApplePay.abortSession();
+        Salla.event.dispatch('payments::apple-pay.validate-merchant.failed', response);
+
+        if (typeof SallaApplePay.detail.validateMerchant.onFailed === 'function') {
+            SallaApplePay.detail.validateMerchant.onFailed(response);
+        }
+    },
+
+    /**
+     * Select Shipping Contact
+     *
+     * @param event
+     */
+    onShippingContactSelected: async (event) => {
+        salla.logger.log('🍏 Pay: onShippingContactSelected', event.shippingContact);
+
+        if (!SallaApplePay.detail.requiredShippingContactFields) {
+            return;
+        }
+
+        // Create New Address
+        return Http.post(SallaApplePay.detail.shippingContactSelected.url.replace('{id}', SallaApplePay.id),
+            {
+                'country': event.shippingContact.country,
+                'city': event.shippingContact.locality,
+                'local': event.shippingContact.subLocality,
+                'description': event.shippingContact.subAdministrativeArea,
+                'street': event.shippingContact.administrativeArea,
+                'country_code': event.shippingContact.countryCode,
+                'postal_code': event.shippingContact.postalCode
+            },
+            async ({data}) => {
+                if (typeof SallaApplePay.detail.shippingContactSelected.onSuccess === 'function') {
+                    SallaApplePay.detail.shippingContactSelected.onSuccess(data);
+                }
+
+                SallaApplePay.address_id = data.data.address_id;
+                SallaApplePay.shipping_methods = data.data.shipping_methods;
+
+                if (!SallaApplePay.shipping_methods || (SallaApplePay.shipping_methods && !SallaApplePay.shipping_methods.length)) {
+                    salla.logger.warn('🍏 Pay: We dont found any supported methods', data);
+
+                    return SallaApplePay.session.completeShippingContactSelection({
+                        status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+                        errors: [
+                            new window.ApplePayError('addressUnserviceable')
+                        ]
+                    });
+                }
+
+                try {
+                    await SallaApplePay.selectApplePayShippingMethod(SallaApplePay.shipping_methods[0]['ship_id'], SallaApplePay.shipping_methods[0]['private_ship_id']);
+                } catch (error) {
+                    salla.logger.warn('Failed set the shipping details to api', error);
+
+                    return SallaApplePay.session.completeShippingContactSelection({
+                        status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+                        errors: [
+                            new window.ApplePayError('addressUnserviceable')
+                        ]
+                    });
+                }
+
+                try {
+                    await SallaApplePay.recalculateTotal();
+                } catch (error) {
+                    salla.logger.warn('🍏 Pay: Failed recalculate total', error);
+
+                    return SallaApplePay.session.completeShippingContactSelection({
+                        status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+                        errors: [
+                            new window.ApplePayError('addressUnserviceable')
+                        ]
+                    });
+                }
+
+                SallaApplePay.session.completeShippingContactSelection({
+                    newTotal: SallaApplePay.prepareTotal(),
+                    newLineItems: SallaApplePay.prepareLineItems(),
+                    newShippingMethods: SallaApplePay.mappingShippingMethods(SallaApplePay.shipping_methods)
+                });
+
+            }, ({response}) => {
+                salla.logger.warn('🍏 Pay: Failed add address via api', response);
+
+                if (typeof SallaApplePay.detail.shippingContactSelected.onFailed === 'function') {
+                    SallaApplePay.detail.shippingContactSelected.onFailed(response);
+                }
+
+                // parse 422 errors
+                let fields = response?.data?.error?.fields;
+
+                let errors = [];
+
+                if (fields?.country_code) {
+                    errors.push(new window.ApplePayError('shippingContactInvalid', 'countryCode', fields?.country_code[0]))
+                }
+
+                if (fields?.city) {
+                    errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', fields?.city[0]))
+                }
+
+                if (fields?.country) {
+                    errors.push(new window.ApplePayError('shippingContactInvalid', 'country', fields?.country[0]))
+                }
+
+                if (errors.length === 0 && response?.data?.error?.message) {
+                    errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', response?.data?.error?.message))
+                }
+
+                SallaApplePay.session.completeShippingContactSelection({
+                    newTotal: SallaApplePay.prepareTotal(),
+                    newLineItems: SallaApplePay.prepareLineItems(),
+                    status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+                    errors: errors
+                });
+            });
+    },
+
+    /**
+     * Select Shipping Method
+     *
+     * @param event
+     *
+     */
+    onShippingMethodSelected: async (event) => {
+        salla.logger.log(event);
+
+        let shipping_ids = event.shippingMethod.identifier.split(',');
+
+        try {
+            await SallaApplePay.selectApplePayShippingMethod(shipping_ids[0], typeof shipping_ids[1] === 'undefined' ? null : shipping_ids[1]);
+
+            await SallaApplePay.recalculateTotal();
+
+            SallaApplePay.session.completeShippingMethodSelection({
+                newTotal: SallaApplePay.prepareTotal(),
+                newLineItems: SallaApplePay.prepareLineItems(),
+            });
+        } catch (error) {
+            salla.logger.warn('🍏 Pay: Failed set the shipping details to api', error);
+
+            // todo :: find a better handling for error without abort session
+            SallaApplePay.abortSession();
+        }
+    },
+
+
+    abortSession: () => {
+        if (SallaApplePay.session) {
+            SallaApplePay.session.abort();
+        }
+    },
+
+    getApplePaySessionVersion: () => {
+        const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+
+        if (userAgent === 'sallapp') {
+            return 5;
+        }
+
+        // can't handle custom user agent like sallapp
+        let detection = DetectOS.init();
+        let v = parseFloat(detection.os.version);
+
+        if (detection.os.name === 'Macintosh') {
+            if (v < 10.142) {
+                return 1;
+            }
+        } else {
+            if (v < 12.11) {
+                return 1;
+            }
+        }
+
+        return 5;
+    },
+
+    recalculateTotal: () => {
+        salla.logger.log('Recalculate Total');
+
+        return Http.requestWithSupportAjax(SallaApplePay.detail.recalculateTotal.url.replace('{id}', SallaApplePay.id),{}, 'get').then((data) => {
+            console.log(data);
+            // todo :: enhance response from backend
+            SallaApplePay.detail.amount = data.data.initial_data.cart.total;
+            SallaApplePay.detail.items = data.data.initial_data.cart.items.map((item) => {
+                return {
+                    label: item.title,
+                    amount: item.amount === 'مجاني' ? 0 : item.amount.toString().replace('+', ''),
+                };
+            })
+
+            // lets remove last element (final total)
+            SallaApplePay.detail.items.pop();
+
+            return data;
+        }).catch((error) => {
+            salla.logger.warn('🍏 Pay: recalculate total failed', error);
+
+            // general error
+            return error?.response?.data?.message;
+        });
+    },
+
+
+    selectApplePayShippingMethod: (company_id, private_company_id) => {
+        salla.logger.log('🍏 Pay: select shipping method ', 'company_id : ' + company_id, 'private_company_id: ' + private_company_id);
+
+        return Http.requestWithSupportAjax(SallaApplePay.detail.shippingMethodSelected.url.replace('{id}', SallaApplePay.id), {
+            address_id: SallaApplePay.address_id,
+            company_id: company_id,
+            private_company_id: private_company_id,
+            payment_method: 'apple_pay'
+        }, 'post').then(() => {
+            if (typeof SallaApplePay.detail. shippingMethodSelected.onSuccess === 'function') {
+                SallaApplePay.detail.shippingMethodSelected.onSuccess(data);
+            }
+
+            // we don't have any data in this request, lets resolve the promise
+            return true;
+        }).catch((error) => {
+            salla.logger.warn('🍏 Pay: Set shipping method failed', error);
+
+            if (typeof SallaApplePay.detail.shippingMethodSelected.onFailed === 'function') {
+                SallaApplePay.detail.shippingMethodSelected.onFailed(error);
+            }
+
+            // parse 422 errors
+            let response = error?.response?.data?.error;
+
+            // address id is not valid
+            if (response?.data?.fields?.address_id) {
+                return response?.data?.fields?.address_id[0];
+            }
+
+            // general error
+            return response?.data?.message;
+        });
+    },
+    mappingShippingMethods: methods => methods.map(method => ({
+        'label': method.shipping_title,
+        'amount': method.enable_free_shipping ? 0 : method.ship_cost,
+        'detail': '',
+        'identifier': method.ship_id.toString() + (method.private_ship_id ? ',' + method.private_ship_id.toString() : '')
+    }))
+}
+
+if (window.ApplePaySession && ApplePaySession.canMakePayments()) {
+    SallaApplePay.init();
+} else {
+    // You can hide the Apple Pay button easy with add data-show-if-apple-pay-supported to element like <div data-show-if-apple-pay-supported>
+    document.querySelectorAll('data-show-if-apple-pay-supported').forEach(element => element.style.display = 'none');
+}

package/.github/dependabot.yml

@@ -1,15 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options: 
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "composer" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "daily"

package/.github/workflows/npm-published.yml

@@ -1,28 +0,0 @@
-name: Publish NPM Package
-on:
-  push:
-    branches:
-      - master
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Access package.json
-        run: cat ./package.json
-      - name: Automated Version Bump
-        uses: phips28/gh-action-bump-version@master
-        with:
-          tag-prefix: ''
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-      - name: Publish New Version
-        uses: actions/setup-node@master
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-          scope: 'salla.sa'
-      - name: Publish to NPM Package Registry
-        run: npm publish --access private 
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}