@salla.sa/applepay 1.0.28 → 1.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salla.sa/applepay",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "Salla Apple Pay",
   "main": "dist/app.js",
   "scripts": {

package/src/ApplePay.js

@@ -3,7 +3,6 @@ import DetectOS from './DetectOS';
 
 window.Salla = window.Salla || {};
 window.Salla.Payments = window.Salla.Payments || {};
-
 /**
  * Full Example
  *
@@ -38,7 +37,7 @@ window.Salla.Payments = window.Salla.Payments || {};
  *
  * @type {{init: Window.Salla.Payments.ApplePay.init, initDefault: Window.Salla.Payments.ApplePay.initDefault, onCancel: Window.Salla.Payments.ApplePay.onCancel, onPaymentAuthorized: Window.Salla.Payments.ApplePay.onPaymentAuthorized, getApplePaySessionVersion: (function(): number), startSession: (function(*): undefined), abortSession: Window.Salla.Payments.ApplePay.abortSession, onValidateMerchant: Window.Salla.Payments.ApplePay.onValidateMerchant}}
  */
-window.Salla.Payments.ApplePay = function() {
+window.Salla.Payments.ApplePay = function () {
 
   const session = null;
   const detail = null;
@@ -49,21 +48,24 @@ window.Salla.Payments.ApplePay = function() {
   let id;
 
   return {
-    init: function() {
+    init: function () {
+      window.isLegacyTheme = window.$ && ['theme_1', 'theme_2', 'theme_3', 'theme_4', 'theme_5', 'theme_6', 'default'].includes(Salla?.theme?.name);
       // init the helpers
       document.removeEventListener('payments::apple-pay.start-transaction', window.Salla.Payments.ApplePay.startSession);
       Salla.event.addEventListener('payments::apple-pay.start-transaction', window.Salla.Payments.ApplePay.startSession);
 
-      if (!(window.ApplePaySession && ApplePaySession.canMakePayments())) {
-        $('[data-show-if-apple-pay-supported]').hide();
+      if (window.ApplePaySession && ApplePaySession.canMakePayments()) {
+        return;
       }
+
+      document.querySelectorAll('data-show-if-apple-pay-supported').forEach(btn => btn.style.display = 'none');
     },
 
-    initDefault: function() {
+    initDefault: function () {
       let _this = window.Salla.Payments.ApplePay;
 
       if (!_this.detail.onError) {
-        _this.detail.onError = function(message) {
+        _this.detail.onError = function (message) {
           laravel.alert(message);
         };
       }
@@ -89,7 +91,7 @@ window.Salla.Payments.ApplePay = function() {
       }
     },
 
-    startSession: function(event) {
+    startSession: function (event) {
       console.log('start session : payments::apple-pay.start-transaction');
 
       let _this = window.Salla.Payments.ApplePay;
@@ -114,20 +116,20 @@ window.Salla.Payments.ApplePay = function() {
 
 
       _this.total = {
-        type: 'final',
-        label: label,
+        type  : 'final',
+        label : label,
         amount: _this.detail.amount
       };
 
       _this.request = {
-        countryCode: 'SA',
-        currencyCode: _this.detail.currency || 'SAR',
+        countryCode                  : 'SA',
+        currencyCode                 : _this.detail.currency || 'SAR',
         requiredShippingContactFields: _this.detail.requiredShippingContactFields ? _this.detail.requiredShippingContactFields : [],
-        merchantCapabilities: ['supports3DS'],
-        supportedNetworks: _this.detail.supportedNetworks || supportedNetworks,
-        total: _this.total,
-        shippingContact: _this.detail.shippingContact ? _this.detail.shippingContact : {},
-        shippingMethods: _this.detail.shippingMethods && _this.detail.shippingMethods.length ? _this.mappingShippingMethods(event.detail.shippingMethods) : []
+        merchantCapabilities         : ['supports3DS'],
+        supportedNetworks            : _this.detail.supportedNetworks || supportedNetworks,
+        total                        : _this.total,
+        shippingContact              : _this.detail.shippingContact ? _this.detail.shippingContact : {},
+        shippingMethods              : _this.detail.shippingMethods && _this.detail.shippingMethods.length ? _this.mappingShippingMethods(event.detail.shippingMethods) : []
       };
 
       console.log('apple pay payment request:', _this.request);
@@ -191,7 +193,7 @@ window.Salla.Payments.ApplePay = function() {
       Salla.event.createAndDispatch('payments::apple-pay.validate-merchant.init', event);
 
       Http.post(_this.detail.validateMerchant.url.replace('{id}', _this.id), {
-        amount: _this.detail.amount,
+        amount        : _this.detail.amount,
         validation_url: event.validationURL,
         payment_method: 'apple_pay'
       }, ({data}) => {
@@ -205,7 +207,7 @@ window.Salla.Payments.ApplePay = function() {
             if (response.data) {
               _this.id = response.data.id || response.data.data.id;
             }
-              
+
             _this.session.completeMerchantValidation(data.data);
 
           }).catch((response) => {
@@ -248,58 +250,58 @@ window.Salla.Payments.ApplePay = function() {
       return new Promise((resolve, reject) => {
         // Create New Address
         Http.post(_this.detail.shippingContactSelected.url.replace('{id}', _this.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
-            },
-            ({data}) => {
-              if (typeof _this.detail.shippingContactSelected.onSuccess === 'function') {
-                _this.detail.shippingContactSelected.onSuccess(data);
-              }
-
-              _this.address_id = data.data.address_id;
-              _this.shipping_methods = data.data.shipping_methods;
-
-              if (!_this.shipping_methods || (_this.shipping_methods && !_this.shipping_methods.length)) {
-                reject('لايوجد شركات شحن لهذا العنوان');
-              }
-
-              resolve(data);
-
-            }, ({response}) => {
-              console.log(response);
-              // _this.abortSession();
-              if (typeof _this.detail.shippingContactSelected.onFailed === 'function') {
-                _this.detail.shippingContactSelected.onFailed(response);
-              }
-              _this.session.completeShippingContactSelection({
-                'newTotal': _this.total,
-                'errors': [new window.ApplePayError('shippingContactInvalid', 'locality', response.data.error.message)]
-              });
+          {
+            '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
+          },
+          ({data}) => {
+            if (typeof _this.detail.shippingContactSelected.onSuccess === 'function') {
+              _this.detail.shippingContactSelected.onSuccess(data);
+            }
+
+            _this.address_id = data.data.address_id;
+            _this.shipping_methods = data.data.shipping_methods;
+
+            if (!_this.shipping_methods || (_this.shipping_methods && !_this.shipping_methods.length)) {
+              reject('لايوجد شركات شحن لهذا العنوان');
+            }
+
+            resolve(data);
+
+          }, ({response}) => {
+            console.log(response);
+            // _this.abortSession();
+            if (typeof _this.detail.shippingContactSelected.onFailed === 'function') {
+              _this.detail.shippingContactSelected.onFailed(response);
+            }
+            _this.session.completeShippingContactSelection({
+              'newTotal': _this.total,
+              'errors'  : [new window.ApplePayError('shippingContactInvalid', 'locality', response.data.error.message)]
             });
+          });
 
       }).then(() => {
         _this.selectApplePayShippingMethod(_this.shipping_methods[0]['ship_id'], _this.shipping_methods[0]['private_ship_id']);
       }).then(() => {
         console.log('shipping contact selected success');
         _this.session.completeShippingContactSelection(
-            {
-              'newTotal': _this.total,
-              'newShippingMethods': _this.mappingShippingMethods(_this.shipping_methods)
-            }
+          {
+            'newTotal'          : _this.total,
+            'newShippingMethods': _this.mappingShippingMethods(_this.shipping_methods)
+          }
         );
-      }).catch(function(error) {
+      }).catch(function (error) {
         console.log(error);
         _this.session.completeShippingContactSelection(
-            {
-              'newTotal': _this.total,
-              'errors': [new window.ApplePayError('shippingContactInvalid', 'locality', error)]
-            });
+          {
+            'newTotal': _this.total,
+            'errors'  : [new window.ApplePayError('shippingContactInvalid', 'locality', error)]
+          });
         //_this.abortSession();
       });
     },
@@ -317,15 +319,15 @@ window.Salla.Payments.ApplePay = function() {
       return new Promise((resolve, reject) => {
         let shipping_ids = event.shippingMethod.identifier.split(',');
         _this.selectApplePayShippingMethod(
-            shipping_ids[0],
-            typeof shipping_ids[1] === 'undefined' ? null : shipping_ids[1]
+          shipping_ids[0],
+          typeof shipping_ids[1] === 'undefined' ? null : shipping_ids[1]
         );
         resolve();
 
       }).then(() => {
         _this.session.completeShippingMethodSelection({'newTotal': _this.total});
 
-      }).catch(function(error) {
+      }).catch(function (error) {
         console.log(error);
         _this.abortSession();
       });
@@ -367,12 +369,32 @@ window.Salla.Payments.ApplePay = function() {
     recalculateTotal: () => {
       console.log('Recalculate Total');
       let _this = window.Salla.Payments.ApplePay;
+      const url = _this.detail.recalculateTotal.url.replace('{id}', _this.id);
+
+      if (!window.isLegacyTheme) {
+        //twilight
+        try {
+          let data = salla.api.payment.recalculateTotal(url);
+          _this.total = Object.assign({}, _this.total, {
+            amount: data.data.initial_data.cart.total
+          });
 
+          let total = _this.total;
+          _this.request = Object.assign({}, _this.request, {total});
+        } catch (error) {
+          console.error(error);
+          // expected output: ReferenceError: nonExistentFunction is not defined
+          // Note - error messages will vary depending on browser
+        }
+        return;
+      }
+
+      //we are sure that this is called in a legacy theme
       $.ajax({
-        url: _this.detail.recalculateTotal.url.replace('{id}', _this.id),
-        method: 'GET',
-        async: false,
-        success: function(data) {
+        url    : url,
+        method : 'GET',
+        async  : false,
+        success: function (data) {
           _this.total = Object.assign({}, _this.total, {
             amount: data.data.initial_data.cart.total
           });
@@ -381,7 +403,7 @@ window.Salla.Payments.ApplePay = function() {
           _this.request = Object.assign({}, _this.request, {total});
           console.log('Recalculate Total Success', total);
         },
-        error: function(e) {
+        error  : function (e) {
           console.log('Recalculate Total Failed');
           console.log(response);
         }
@@ -391,24 +413,42 @@ window.Salla.Payments.ApplePay = function() {
     selectApplePayShippingMethod: (company_id, private_company_id) => {
       let _this = window.Salla.Payments.ApplePay;
       console.log('select shipping method ', 'company_id : ' + company_id, 'private_company_id: ' + private_company_id);
+      let url = _this.detail.shippingMethodSelected.url.replace('{id}', _this.id)
+      let payload = {
+        address_id        : _this.address_id,
+        company_id        : company_id,
+        private_company_id: private_company_id,
+        payment_method    : 'apple_pay'
+      };
 
+      if (!window.isLegacyTheme) {
+        try {
+          let data = salla.api.payment.selectShippingMethod(url, payload)
+          if (typeof _this.detail.shippingMethodSelected.onSuccess === 'function') {
+            _this.detail.shippingMethodSelected.onSuccess(data);
+          }
+          _this.recalculateTotal();
+        } catch (error) {
+          if (typeof _this.detail.shippingMethodSelected.onFailed === 'function') {
+            _this.detail.shippingMethodSelected.onFailed(error);
+          }
+        }
+        return;
+      }
+
+      //we are sure that this is called in a legacy theme
       $.ajax({
-        url: _this.detail.shippingMethodSelected.url.replace('{id}', _this.id),
-        method: 'POST',
-        data: {
-          address_id: _this.address_id,
-          company_id: company_id,
-          private_company_id: private_company_id,
-          payment_method: 'apple_pay'
-        },
-        async: false,
-        success: function(data) {
+        url    : url,
+        method : 'POST',
+        data   : payload,
+        async  : false,
+        success: function (data) {
           if (typeof _this.detail.shippingMethodSelected.onSuccess === 'function') {
             _this.detail.shippingMethodSelected.onSuccess(data);
           }
           _this.recalculateTotal();
         },
-        error: function(response) {
+        error  : function (response) {
           // _this.abortSession();
           if (typeof _this.detail.shippingMethodSelected.onFailed === 'function') {
             _this.detail.shippingMethodSelected.onFailed(response);
@@ -419,16 +459,16 @@ window.Salla.Payments.ApplePay = function() {
 
     mappingShippingMethods: (methods) => {
 
-      return methods.map(function(method) {
+      return methods.map(function (method) {
         let identifier = method.ship_id.toString();
 
         if (method.private_ship_id) {
           identifier += ',' + method.private_ship_id.toString();
         }
         return {
-          'label': method.shipping_title,
-          'amount': method.enable_free_shipping ? 0 : method.ship_cost,
-          'detail': '',
+          'label'     : method.shipping_title,
+          'amount'    : method.enable_free_shipping ? 0 : method.ship_cost,
+          'detail'    : '',
           'identifier': identifier
         };
       });

package/.github/auto-merge.yaml

@@ -1,3 +0,0 @@
-- match:
-    dependency_type: all
-    update_type: "semver:patch" # includes patch updates!