Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2776894

Timestamp:

08/29/2022 04:04:15 AM (4 years ago)

Author:

zipmoney

Message:

add tokenisation feature

Location:

zipmoney-payments-woocommerce

Files:

: 242 added
: 18 edited

Legend:

: Unmodified
: Added
: Removed

zipmoney-payments-woocommerce/trunk/README.txt

-                      r2685692
+                      r2776894
 Tags: zipmoney payments woocommerce, zipmoney payments module for woocommerce, zipmoney woocommerce addon , zipmoney payment gateway for woocommerce, zipmoney for woocommerce, zipmoney payment gateway for wordpress, buy now pay later, zippay woocommerce plugin, Own it now, pay later, Zip Co, Zip
 Requires at least: WP 4.0
 Tested up to: 5.9
 Stable tag: 2.3.13
+Tested up to: 6.0.1
+Stable tag: 2.3.14
 License: GPLv2 or later License http://www.gnu.org/licenses/gpl-2.0.html
 …
 * Plugin tested under wordpress version 5.9
 * fixed Divi plugin Interfering issue
+= 2.3.14 =
+* Plugin tested under wordpress version 6.0.1
+* Plugin tested under woocommerce version 6.7.0
+* Added tokenisation feature

zipmoney-payments-woocommerce/trunk/assets/css/woocommerce-zipmoney-payment-front.css

-                      r2464696
+                      r2776894
     -ms-transform: translate(-50%,-50%);
+}
+.save-zip-account{
+    margin-left: 10px;
+    display: inline;
+}

zipmoney-payments-woocommerce/trunk/assets/js/zip_order_button.js

-                      r2464696
+                      r2776894
+            }
         });
+        $(".wc-block-components-checkout-place-order-button").on('click', function(e){
+            var payment_method = $('input[name="radio-control-wc-payment-method-options"]:checked').val();
+            //show the over lay
+            if (payment_method == 'zipmoney') {
+                $('div.zip-overlay').css('display', 'block');
+            }
+        });
     });

zipmoney-payments-woocommerce/trunk/build/index.asset.php

r2662714	r2776894
1		<?php return array('dependencies' => array('wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-i18n'), 'version' => '~~d1f398c13142613a11516c4c7e32b5fc~~');
	1	<?php return array('dependencies' => array('wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-i18n'), 'version' => 'eb121aaca370f966dd6eda9416301a5e');

zipmoney-payments-woocommerce/trunk/build/index.js

-                      r2662714
+                      r2776894
+!function(){"use strict";var e=window.wp.element,t=window.wp.i18n,n=window.wc.wcSettings,i=window.wc.wcBlocksRegistry;const a="zipmoney";var o;const l=(0,n.getSetting)("zipmoney_data",{}),c=(0,t.__)("Zip now, pay later","zippayment"),r=l.title?l.title:c,s=()=>l.description?l.description:"",p={name:a,label:(0,e.createElement)((t=>{const{PaymentMethodLabel:n}=t.components;return(0,e.createElement)(n,{text:r})}),null),content:(0,e.createElement)(s,null),edit:(0,e.createElement)(s,null),canMakePayment:()=>!0,paymentMethodId:a,ariaLabel:r,supports:{features:null!==(o=null==l?void 0:l.supports)&&void 0!==o?o:[]}};(0,i.registerPaymentMethod)(p)}();
+/******/ (function() { // webpackBootstrap
+/******/    "use strict";
+/******/    var __webpack_modules__ = ({
+/***/ "./client/blocks/constants.js":
+/*!************************************!*\
+  !*** ./client/blocks/constants.js ***!
+  \************************************/
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "PAYMENT_METHOD_NAME": function() { return /* binding */ PAYMENT_METHOD_NAME; }
+/* harmony export */ });
+const PAYMENT_METHOD_NAME = 'zipmoney';
+/***/ }),
+/***/ "@woocommerce/blocks-registry":
+/*!******************************************!*\
+  !*** external ["wc","wcBlocksRegistry"] ***!
+  \******************************************/
+/***/ (function(module) {
+module.exports = window["wc"]["wcBlocksRegistry"];
+/***/ }),
+/***/ "@woocommerce/settings":
+/*!************************************!*\
+  !*** external ["wc","wcSettings"] ***!
+  \************************************/
+/***/ (function(module) {
+module.exports = window["wc"]["wcSettings"];
+/***/ }),
+/***/ "@wordpress/element":
+/*!*********************************!*\
+  !*** external ["wp","element"] ***!
+  \*********************************/
+/***/ (function(module) {
+module.exports = window["wp"]["element"];
+/***/ }),
+/***/ "@wordpress/i18n":
+/*!******************************!*\
+  !*** external ["wp","i18n"] ***!
+  \******************************/
+/***/ (function(module) {
+module.exports = window["wp"]["i18n"];
+/***/ })
+/******/    });
+/************************************************************************/
+/******/    // The module cache
+/******/    var __webpack_module_cache__ = {};
+/******/
+/******/    // The require function
+/******/    function __webpack_require__(moduleId) {
+/******/        // Check if module is in cache
+/******/        var cachedModule = __webpack_module_cache__[moduleId];
+/******/        if (cachedModule !== undefined) {
+/******/            return cachedModule.exports;
+/******/        }
+/******/        // Create a new module (and put it into the cache)
+/******/        var module = __webpack_module_cache__[moduleId] = {
+/******/            // no module.id needed
+/******/            // no module.loaded needed
+/******/            exports: {}
+/******/        };
+/******/
+/******/        // Execute the module function
+/******/        __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/
+/******/        // Return the exports of the module
+/******/        return module.exports;
+/******/    }
+/******/
+/************************************************************************/
+/******/    /* webpack/runtime/compat get default export */
+/******/    !function() {
+/******/        // getDefaultExport function for compatibility with non-harmony modules
+/******/        __webpack_require__.n = function(module) {
+/******/            var getter = module && module.__esModule ?
+/******/                function() { return module['default']; } :
+/******/                function() { return module; };
+/******/            __webpack_require__.d(getter, { a: getter });
+/******/            return getter;
+/******/        };
+/******/    }();
+/******/
+/******/    /* webpack/runtime/define property getters */
+/******/    !function() {
+/******/        // define getter functions for harmony exports
+/******/        __webpack_require__.d = function(exports, definition) {
+/******/            for(var key in definition) {
+/******/                if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+/******/                    Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/                }
+/******/            }
+/******/        };
+/******/    }();
+/******/
+/******/    /* webpack/runtime/hasOwnProperty shorthand */
+/******/    !function() {
+/******/        __webpack_require__.o = function(obj, prop) { return Object.prototype.hasOwnProperty.call(obj, prop); }
+/******/    }();
+/******/
+/******/    /* webpack/runtime/make namespace object */
+/******/    !function() {
+/******/        // define __esModule on exports
+/******/        __webpack_require__.r = function(exports) {
+/******/            if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/                Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/            }
+/******/            Object.defineProperty(exports, '__esModule', { value: true });
+/******/        };
+/******/    }();
+/******/
+/************************************************************************/
+var __webpack_exports__ = {};
+// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
+!function() {
+/*!********************************!*\
+  !*** ./client/blocks/index.js ***!
+  \********************************/
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _wordpress_element__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @wordpress/element */ "@wordpress/element");
+/* harmony import */ var _wordpress_element__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_wordpress_element__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @wordpress/i18n */ "@wordpress/i18n");
+/* harmony import */ var _wordpress_i18n__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _woocommerce_settings__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @woocommerce/settings */ "@woocommerce/settings");
+/* harmony import */ var _woocommerce_settings__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_woocommerce_settings__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _woocommerce_blocks_registry__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @woocommerce/blocks-registry */ "@woocommerce/blocks-registry");
+/* harmony import */ var _woocommerce_blocks_registry__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_woocommerce_blocks_registry__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./constants */ "./client/blocks/constants.js");
+/**
+ * External dependencies
+ */
+/**
+ * Internal dependencies
+ */
+const settings = (0,_woocommerce_settings__WEBPACK_IMPORTED_MODULE_2__.getSetting)('zipmoney_data', {});
+console.log('zip settings:'.settings);
+const defaultLabel = (0,_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__.__)('Zip now, pay later', 'zippayment');
+const label = settings.title ? settings.title : defaultLabel;
+/**
+ * @typedef {import('@woocommerce/type-defs/registered-payment-method-props').RegisteredPaymentMethodProps} RegisteredPaymentMethodProps
+ */
+const saveZip = () => {
+  return settings.savezip;
+};
+const SaveZipCheckbox = () => {
+  const [isChecked, setChecked] = (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.useState)(saveZip);
+  const handleChange = event => {
+    setChecked(!isChecked);
+    let formData = new FormData();
+    formData.append("savezipaccount", !isChecked);
+    const requestOptions = {
+      method: 'POST',
+      body: formData
+    };
+    fetch(settings.sessionUrl, requestOptions).then(response => response.json());
+  };
+  (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
+    Zip.Widget.render();
+  }, []);
+  if (settings.tokenisation === true) {
+    return (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, ' ', (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
+      class: "zip-overlay",
+      onclick: "this.style.display = 'none';"
+    }, (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
+      class: "zip-overlay-text"
+    }, "Creating charge, please wait...")), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("a", {
+      id: "zipmoney-learn-more",
+      class: "zip-hover",
+      "zm-widget": "popup",
+      "zm-popup-asset": "checkoutdialog"
+    }, "Learn More"), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("input", {
+      type: "checkbox",
+      rel: "saveZipAccount",
+      value: "{isChecked}",
+      id: "saveZipAccount",
+      checked: isChecked,
+      onChange: handleChange,
+      disabled: false
+    }), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("label", {
+      className: "save-zip-account",
+      htmlFor: "saveZipAccount"
+    }, "Save Zip Account for future purchases"));
+  }
+  return (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, ' ', (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
+    class: "zip-overlay",
+    onclick: "this.style.display = 'none';"
+  }, (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("div", {
+    class: "zip-overlay-text"
+  }, "Creating charge, please wait...")), (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)("a", {
+    id: "zipmoney-learn-more",
+    class: "zip-hover",
+    "zm-widget": "popup",
+    "zm-popup-asset": "checkoutdialog"
+  }, "Learn More"));
+};
+/**
+ * Label component
+ *
+ * @param {*} props Props from payment API.
+ */
+const Label = props => {
+  const {
+    PaymentMethodLabel
+  } = props.components;
+  return (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(PaymentMethodLabel, {
+    text: label
+  });
+};
+/**
+ * Zipmoney payment method config object.
+ */
+const zipMoneyPaymentMethod = {
+  name: _constants__WEBPACK_IMPORTED_MODULE_4__.PAYMENT_METHOD_NAME,
+  label: (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(Label, null),
+  content: (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(SaveZipCheckbox, null),
+  edit: (0,_wordpress_element__WEBPACK_IMPORTED_MODULE_0__.createElement)(SaveZipCheckbox, null),
+  canMakePayment: () => true,
+  paymentMethodId: _constants__WEBPACK_IMPORTED_MODULE_4__.PAYMENT_METHOD_NAME,
+  supports: {
+    features: ['products']
+  },
+  ariaLabel: label
+};
+(0,_woocommerce_blocks_registry__WEBPACK_IMPORTED_MODULE_3__.registerPaymentMethod)(zipMoneyPaymentMethod);
+}();
+/******/ })()
+;
+//# sourceMappingURL=index.js.map

zipmoney-payments-woocommerce/trunk/build/index.js.map

r2662714	r2776894
1		{"version":3,"file":"index.js","mappings":";;;;;;;;;;;;;;AAAO,MAAMA,mBAAmB,GAAG,UAA5B;;;;;;;;;;ACAP;;;;;;;;;;ACAA;;;;;;;;;;ACAA;;;;;;;;;;ACAA;;;;;;UCAA;UACA;;UAEA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;;UAEA;UACA;;UAEA;UACA;UACA;;;;;WCtBA;WACA;WACA;WACA,eAAe,4BAA4B;WAC3C,eAAe;WACf,iCAAiC,WAAW;WAC5C;WACA;;;;;WCPA;WACA;WACA;WACA;WACA,yCAAyC,wCAAwC;WACjF;WACA;WACA;;;;;WCPA,8CAA8C;;;;;WCA9C;WACA;WACA;WACA,uDAAuD,iBAAiB;WACxE;WACA,gDAAgD,aAAa;WAC7D;;;;;;;;;;;;;;;;;;;;;;;;ACNA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;;AACA;AAEA,MAAMI,QAAQ,GAAGF,iEAAU,CAAE,eAAF,EAAmB,EAAnB,CAA3B;;AACA,MAAMG,YAAY,GAAGJ,mDAAE,CAAE,oBAAF,EAAwB,YAAxB,CAAvB;;AACA,MAAMK,KAAK,GAAGF,QAAQ,CAACG,KAAT,GAAiBH,QAAQ,CAACG,KAA1B,GAAkCF,YAAhD;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AACA,MAAMG,OAAO,GAAG,MAAM;AACrB,SAAOJ,QAAQ,CAACK,WAAT,GAAuBL,QAAQ,CAACK,WAAhC,GAA8C,EAArD;AACA,CAFD;AAIA;AACA;AACA;AACA;AACA;;;AACA,MAAMC,KAAK,GAAKC,KAAF,IAAa;AAC1B,QAAM;AAAEC,IAAAA;AAAF,MAAyBD,KAAK,CAACE,UAArC;AACA,SAAO,kEAAC,kBAAD;AAAoB,QAAI,EAAGP;AAA3B,IAAP;AACA,CAHD;AAKA;AACA;AACA;;;AACA,MAAMQ,qBAAqB,GAAG;AAC7BC,EAAAA,IAAI,EAAEf,2DADuB;AAE7BM,EAAAA,KAAK,EAAE,kEAAC,KAAD,OAFsB;AAG7BU,EAAAA,OAAO,EAAE,kEAAC,OAAD,OAHoB;AAI7BC,EAAAA,IAAI,EAAE,kEAAC,OAAD,OAJuB;AAK7BC,EAAAA,cAAc,EAAE,MAAM,IALO;AAM7BC,EAAAA,eAAe,EAAEnB,2DANY;AAO7BoB,EAAAA,SAAS,EAAEd,KAPkB;AAQ7Be,EAAAA,QAAQ,EAAE;AACTC,IAAAA,QAAQ,wBAAElB,QAAF,aAAEA,QAAF,uBAAEA,QAAQ,CAAEiB,QAAZ,mEAAwB;AADvB;AARmB,CAA9B;AAaAlB,mFAAqB,CAAEW,qBAAF,CAArB,C","sources":["webpack://zipmoney-payments-woocommerce/./client/blocks/constants.js","webpack://zipmoney-payments-woocommerce/external window [\"wc\",\"wcBlocksRegistry\"]","webpack://zipmoney-payments-woocommerce/external window [\"wc\",\"wcSettings\"]","webpack://zipmoney-payments-woocommerce/external window [\"wp\",\"element\"]","webpack://zipmoney-payments-woocommerce/external window [\"wp\",\"i18n\"]","webpack://zipmoney-payments-woocommerce/webpack/bootstrap","webpack://zipmoney-payments-woocommerce/webpack/runtime/compat get default export","webpack://zipmoney-payments-woocommerce/webpack/runtime/define property getters","webpack://zipmoney-payments-woocommerce/webpack/runtime/hasOwnProperty shorthand","webpack://zipmoney-payments-woocommerce/webpack/runtime/make namespace object","webpack://zipmoney-payments-woocommerce/./client/blocks/index.js"],"sourcesContent":["export const PAYMENT_METHOD_NAME = 'zipmoney';\n","module.exports = window[\"wc\"][\"wcBlocksRegistry\"];","module.exports = window[\"wc\"][\"wcSettings\"];","module.exports = window[\"wp\"][\"element\"];","module.exports = window[\"wp\"][\"i18n\"];","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = function(module) {\n\tvar getter = module && module.__esModule ?\n\t\tfunction() { return module['default']; } :\n\t\tfunction() { return module; };\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = function(exports, definition) {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = function(obj, prop) { return Object.prototype.hasOwnProperty.call(obj, prop); }","// define __esModule on exports\n__webpack_require__.r = function(exports) {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","/*\n External dependencies\n /\nimport { __ } from '@wordpress/i18n';\nimport { getSetting } from '@woocommerce/settings';\nimport { registerPaymentMethod } from '@woocommerce/blocks-registry';\n\n/\n Internal dependencies\n /\nimport { PAYMENT_METHOD_NAME } from './constants';\n\nconst settings = getSetting( 'zipmoney_data', {} );\nconst defaultLabel = __( 'Zip now, pay later', 'zippayment' );\nconst label = settings.title ? settings.title : defaultLabel;\n\n/\n @typedef {import('@woocommerce/type-defs/registered-payment-method-props').RegisteredPaymentMethodProps} RegisteredPaymentMethodProps\n /\n\n/\n Content component\n /\nconst Content = () => {\n\treturn settings.description ? settings.description : '';\n};\n\n/\n Label component\n \n @param {} props Props from payment API.\n /\nconst Label = ( props ) => {\n\tconst { PaymentMethodLabel } = props.components;\n\treturn <PaymentMethodLabel text={ label } />;\n};\n\n/*\n Zipmoney payment method config object.\n */\nconst zipMoneyPaymentMethod = {\n\tname: PAYMENT_METHOD_NAME,\n\tlabel: <Label />,\n\tcontent: <Content />,\n\tedit: <Content />,\n\tcanMakePayment: () => true,\n\tpaymentMethodId: PAYMENT_METHOD_NAME,\n\tariaLabel: label,\n\tsupports: {\n\t\tfeatures: settings?.supports ?? [],\n\t},\n};\n\nregisterPaymentMethod( zipMoneyPaymentMethod );\n"],"names":["PAYMENT_METHOD_NAME","__","getSetting","registerPaymentMethod","settings","defaultLabel","label","title","Content","description","Label","props","PaymentMethodLabel","components","zipMoneyPaymentMethod","name","content","edit","canMakePayment","paymentMethodId","ariaLabel","supports","features"],"sourceRoot":""}
	1	{"version":3,"file":"index.js","mappings":";;;;;;;;;;;;;;AAAO,MAAMA,mBAAmB,GAAG,UAA5B;;;;;;;;;;ACAP;;;;;;;;;;ACAA;;;;;;;;;;ACAA;;;;;;;;;;ACAA;;;;;;UCAA;UACA;;UAEA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;;UAEA;UACA;;UAEA;UACA;UACA;;;;;WCtBA;WACA;WACA;WACA,eAAe,4BAA4B;WAC3C,eAAe;WACf,iCAAiC,WAAW;WAC5C;WACA;;;;;WCPA;WACA;WACA;WACA;WACA,yCAAyC,wCAAwC;WACjF;WACA;WACA;;;;;WCPA,8CAA8C;;;;;WCA9C;WACA;WACA;WACA,uDAAuD,iBAAiB;WACxE;WACA,gDAAgD,aAAa;WAC7D;;;;;;;;;;;;;;;;;;;;;;ACNA;AACA;AACA;AACC;AACA;AACA;AACA;AAEA;AACD;AACA;;AACC;AAEA,MAAMM,QAAQ,GAAGJ,iEAAU,CAAE,eAAF,EAAmB,EAAnB,CAA3B;AACAK,OAAO,CAACC,GAAR,CAAY,gBAAgBF,QAA5B;;AACA,MAAMG,YAAY,GAAGR,mDAAE,CAAE,oBAAF,EAAwB,YAAxB,CAAvB;;AACA,MAAMS,KAAK,GAAGJ,QAAQ,CAACK,KAAT,GAAiBL,QAAQ,CAACK,KAA1B,GAAkCF,YAAhD;AAEA;AACD;AACA;;AAEC,MAAMG,OAAO,GAAG,MAAM;AACrB,SAAON,QAAQ,CAACO,OAAhB;AACA,CAFD;;AAIA,MAAMC,eAAe,GAAG,MAAM;AAC9B,QAAM,CAAEC,SAAF,EAAaC,UAAb,IAA4BX,4DAAQ,CAAEO,OAAF,CAA1C;;AACA,QAAMK,YAAY,GAAIC,KAAD,IAAW;AAC/BF,IAAAA,UAAU,CAAC,CAACD,SAAF,CAAV;AACA,QAAII,QAAQ,GAAG,IAAIC,QAAJ,EAAf;AACUD,IAAAA,QAAQ,CAACE,MAAT,CAAgB,gBAAhB,EAAkC,CAACN,SAAnC;AACV,UAAMO,cAAc,GAAG;AACtBC,MAAAA,MAAM,EAAE,MADc;AAEtBC,MAAAA,IAAI,EAAEL;AAFgB,KAAvB;AAIAM,IAAAA,KAAK,CAACnB,QAAQ,CAACoB,UAAV,EAAsBJ,cAAtB,CAAL,CACEK,IADF,CACOC,QAAQ,IAAIA,QAAQ,CAACC,IAAT,EADnB;AAEE,GAVH;;AAWEzB,EAAAA,6DAAS,CAAC,MAAM;AACjB0B,IAAAA,GAAG,CAACC,MAAJ,CAAWC,MAAX;AACE,GAFQ,EAEN,EAFM,CAAT;;AAGA,MAAG1B,QAAQ,CAAC2B,YAAT,KAA0B,IAA7B,EAAmC;AACrC,WACC,kIACG,GADH,EAEC;AAAK,WAAK,EAAC,aAAX;AAAyB,aAAO,EAAC;AAAjC,OACI;AAAK,WAAK,EAAC;AAAX,yCADJ,CAFD,EAKC;AAAI,QAAE,EAAC,qBAAP;AAA6B,WAAK,EAAC,WAAnC;AAAgD,mBAAU,OAA1D;AAAmE,wBAAe;AAAlF,oBALD,EAMC;AACC,UAAI,EAAC,UADN;AAEC,SAAG,EAAC,gBAFL;AAGC,WAAK,EAAC,aAHP;AAIC,QAAE,EAAC,gBAJJ;AAKC,aAAO,EAAGlB,SALX;AAMC,cAAQ,EAAGE,YANZ;AAOC,cAAQ,EAAG;AAPZ,MAND,EAgBC;AAAO,eAAS,EAAC,kBAAjB;AAAoC,aAAO,EAAG;AAA9C,OACO,uCADP,CAhBD,CADD;AAuBG;;AACF,SACA,kIACE,GADF,EAEA;AAAK,SAAK,EAAC,aAAX;AAAyB,WAAO,EAAC;AAAjC,KACI;AAAK,SAAK,EAAC;AAAX,uCADJ,CAFA,EAKA;AAAI,MAAE,EAAC,qBAAP;AAA6B,SAAK,EAAC,WAAnC;AAAgD,iBAAU,OAA1D;AAAmE,sBAAe;AAAlF,kBALA,CADA;AASD,CAlDA;AAoDA;AACD;AACA;AACA;AACA;;;AACC,MAAMiB,KAAK,GAAKC,KAAF,IAAa;AAC1B,QAAM;AAAEC,IAAAA;AAAF,MAAyBD,KAAK,CAACE,UAArC;AACA,SAAO,kEAAC,kBAAD;AAAoB,QAAI,EAAG3B;AAA3B,IAAP;AACA,CAHD;AAKA;AACD;AACA;;;AACC,MAAM4B,qBAAqB,GAAG;AAC7BC,EAAAA,IAAI,EAAEvC,2DADuB;AAE7BU,EAAAA,KAAK,EAAE,kEAAC,KAAD,OAFsB;AAG7B8B,EAAAA,OAAO,EAAE,kEAAC,eAAD,OAHoB;AAI7BC,EAAAA,IAAI,EAAE,kEAAC,eAAD,OAJuB;AAK7BC,EAAAA,cAAc,EAAE,MAAM,IALO;AAM7BC,EAAAA,eAAe,EAAE3C,2DANY;AAO7B4C,EAAAA,QAAQ,EAAE;AACTC,IAAAA,QAAQ,EAAE,CAAE,UAAF;AADD,GAPmB;AAU7BC,EAAAA,SAAS,EAAEpC;AAVkB,CAA9B;AAaAP,mFAAqB,CAAEmC,qBAAF,CAArB,C","sources":["webpack://zipmoney-payments-woocommerce/./client/blocks/constants.js","webpack://zipmoney-payments-woocommerce/external window [\"wc\",\"wcBlocksRegistry\"]","webpack://zipmoney-payments-woocommerce/external window [\"wc\",\"wcSettings\"]","webpack://zipmoney-payments-woocommerce/external window [\"wp\",\"element\"]","webpack://zipmoney-payments-woocommerce/external window [\"wp\",\"i18n\"]","webpack://zipmoney-payments-woocommerce/webpack/bootstrap","webpack://zipmoney-payments-woocommerce/webpack/runtime/compat get default export","webpack://zipmoney-payments-woocommerce/webpack/runtime/define property getters","webpack://zipmoney-payments-woocommerce/webpack/runtime/hasOwnProperty shorthand","webpack://zipmoney-payments-woocommerce/webpack/runtime/make namespace object","webpack://zipmoney-payments-woocommerce/./client/blocks/index.js"],"sourcesContent":["export const PAYMENT_METHOD_NAME = 'zipmoney';\r\n","module.exports = window[\"wc\"][\"wcBlocksRegistry\"];","module.exports = window[\"wc\"][\"wcSettings\"];","module.exports = window[\"wp\"][\"element\"];","module.exports = window[\"wp\"][\"i18n\"];","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = function(module) {\n\tvar getter = module && module.__esModule ?\n\t\tfunction() { return module['default']; } :\n\t\tfunction() { return module; };\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = function(exports, definition) {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = function(obj, prop) { return Object.prototype.hasOwnProperty.call(obj, prop); }","// define __esModule on exports\n__webpack_require__.r = function(exports) {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","/*\r\n External dependencies\r\n /\r\n import { __ } from '@wordpress/i18n';\r\n import { getSetting } from '@woocommerce/settings';\r\n import { registerPaymentMethod } from '@woocommerce/blocks-registry';\r\n import { useEffect, useState } from '@wordpress/element';\r\n \r\n /\r\n Internal dependencies\r\n /\r\n import { PAYMENT_METHOD_NAME } from './constants';\r\n \r\n const settings = getSetting( 'zipmoney_data', {} );\r\n console.log('zip settings:'.settings);\r\n const defaultLabel = __( 'Zip now, pay later', 'zippayment' );\r\n const label = settings.title ? settings.title : defaultLabel;\r\n \r\n /\r\n @typedef {import('@woocommerce/type-defs/registered-payment-method-props').RegisteredPaymentMethodProps} RegisteredPaymentMethodProps\r\n /\r\n \r\n const saveZip = () => {\r\n\t return settings.savezip;\r\n }\r\n \r\n const SaveZipCheckbox = () => {\r\n\tconst [ isChecked, setChecked ] = useState( saveZip );\r\n\tconst handleChange = (event) => {\r\n\t\tsetChecked(!isChecked);\r\n\t\tlet formData = new FormData();\r\n formData.append(\"savezipaccount\", !isChecked);\r\n\t\tconst requestOptions = {\r\n\t\t\tmethod: 'POST',\r\n\t\t\tbody: formData\r\n\t\t};\r\n\t\tfetch(settings.sessionUrl, requestOptions)\r\n\t\t\t.then(response => response.json());\r\n\t };\r\n\t useEffect(() => {\r\n\t\tZip.Widget.render();\r\n\t }, []);\r\n\t if(settings.tokenisation === true) {\r\n\treturn (\r\n\t\t<>\r\n\t\t\t{ ' ' }\r\n\t\t\t<div class=\"zip-overlay\" onclick=\"this.style.display = 'none';\">\r\n \t\t\t<div class=\"zip-overlay-text\">Creating charge, please wait...</div>\r\n\t\t\t</div>\r\n\t\t\t<a id=\"zipmoney-learn-more\" class=\"zip-hover\" zm-widget=\"popup\" zm-popup-asset=\"checkoutdialog\">Learn More</a>\r\n\t\t\t<input\r\n\t\t\t\ttype=\"checkbox\"\r\n\t\t\t\trel=\"saveZipAccount\"\r\n\t\t\t\tvalue=\"{isChecked}\"\r\n\t\t\t\tid=\"saveZipAccount\"\r\n\t\t\t\tchecked={ isChecked }\r\n\t\t\t\tonChange={ handleChange }\r\n\t\t\t\tdisabled={ false }\r\n\r\n\t\t\t/>\r\n\t\t\t<label className='save-zip-account' htmlFor={ \"saveZipAccount\" }>\r\n\t\t\t\t\t\t\t\t{ \"Save Zip Account for future purchases\" }\r\n\t\t\t</label>\r\n\t\t</>\t\r\n\t\t\r\n\t);\r\n\t }\r\n\t return (\r\n\t\t<>\r\n\t\t{ ' ' }\r\n\t\t<div class=\"zip-overlay\" onclick=\"this.style.display = 'none';\">\r\n \t\t<div class=\"zip-overlay-text\">Creating charge, please wait...</div>\r\n\t\t</div>\r\n\t\t<a id=\"zipmoney-learn-more\" class=\"zip-hover\" zm-widget=\"popup\" zm-popup-asset=\"checkoutdialog\">Learn More</a>\r\n\t\t</>\r\n\t ); \r\n};\r\n\r\n /\r\n Label component\r\n \r\n @param {} props Props from payment API.\r\n /\r\n const Label = ( props ) => {\r\n\t const { PaymentMethodLabel } = props.components;\r\n\t return <PaymentMethodLabel text={ label } />;\r\n };\r\n \r\n /*\r\n Zipmoney payment method config object.\r\n */\r\n const zipMoneyPaymentMethod = {\r\n\t name: PAYMENT_METHOD_NAME,\r\n\t label: <Label />,\r\n\t content: <SaveZipCheckbox />,\r\n\t edit: <SaveZipCheckbox />,\r\n\t canMakePayment: () => true,\r\n\t paymentMethodId: PAYMENT_METHOD_NAME,\r\n\t supports: {\r\n\t\t features: [ 'products' ],\r\n\t },\r\n\t ariaLabel: label,\r\n };\r\n \r\n registerPaymentMethod( zipMoneyPaymentMethod );\r\n "],"names":["PAYMENT_METHOD_NAME","__","getSetting","registerPaymentMethod","useEffect","useState","settings","console","log","defaultLabel","label","title","saveZip","savezip","SaveZipCheckbox","isChecked","setChecked","handleChange","event","formData","FormData","append","requestOptions","method","body","fetch","sessionUrl","then","response","json","Zip","Widget","render","tokenisation","Label","props","PaymentMethodLabel","components","zipMoneyPaymentMethod","name","content","edit","canMakePayment","paymentMethodId","supports","features","ariaLabel"],"sourceRoot":""}

zipmoney-payments-woocommerce/trunk/includes/api/class-wc-zipmoney-payment-gateway-api-charge.php

-                      r2560395
+                      r2776894
 use \zipMoney\ObjectSerializer;
 use \zipMoney\Api\CheckoutsApi;
+use \zipMoney\Api\TokensApi;
+use \zipMoney\Model\CreateTokenRequest;
 class WC_Zipmoney_Payment_Gateway_API_Request_Charge extends WC_Zipmoney_Payment_Gateway_API_Abstract
 …
      *                      )
      */
     public function create_charge(WC_Session $WC_Session, $checkout_id, $api_key)
+    public function create_charge(WC_Session $WC_Session, $checkout_id, $orderId, $api_key)
+    {
         $response = array(
 …
             'message' => ''
         );
         parent::set_api_key($api_key);
         try {
+            $order_id = get_option($checkout_id);
+            if ($this->WC_Zipmoney_Payment_Gateway->doTokenisation()) {
+                $order_id = $orderId;
+            }
+            if (!$order_id) {
+                $order_id = get_option($checkout_id);
+            }
             //$region = $this->WC_Zipmoney_Payment_Gateway->get_option(WC_Zipmoney_Payment_Gateway_Config::CONFIG_SELECT_REGION);
             if($order_id == null) {
+            if ($order_id == null) {
                 WC_Zipmoney_Payment_Gateway_Util::log(" get checkout API");
 …
+            }
             $order = new WC_Order( $order_id );
             if($order->get_status() == "processing" || $order->get_status() == "zip-authorised"){
                     WC_Zipmoney_Payment_Gateway_Util::log(" calling charge 2nd time, order completed, redirect to thank you page");
                     wp_redirect($order->get_checkout_order_received_url());
                     exit;
+            }
+            $order = new WC_Order($order_id);
+            if ($order->get_status() == "processing" || $order->get_status() == "zip-authorised") {
+                WC_Zipmoney_Payment_Gateway_Util::log(" calling charge 2nd time, order completed, redirect to thank you page");
+                wp_redirect($order->get_checkout_order_received_url());
+                exit;
+            }
             $body = $this->_prepare_charges_request($checkout_id, $order_id, $order);
             WC_Zipmoney_Payment_Gateway_Util::log(sprintf('Charge request sent for order (%s)', $order_id) , WC_Zipmoney_Payment_Gateway_Config::LOG_LEVEL_DEBUG);
+            WC_Zipmoney_Payment_Gateway_Util::log(sprintf('Charge request sent for order (%s)', $order_id), WC_Zipmoney_Payment_Gateway_Config::LOG_LEVEL_DEBUG);
             //write the charge object info to order meta
 …
                 WC_Zipmoney_Payment_Gateway_Util::log('Order cancelled', WC_Zipmoney_Payment_Gateway_Config::LOG_LEVEL_DEBUG);
+            }
         } catch (ApiException $exception){
+        } catch (ApiException $exception) {
             $response = WC_Zipmoney_Payment_Gateway_Util::handle_create_charge_api_exception($exception);
             WC_Zipmoney_Payment_Gateway_Util::log($response['message'], WC_Zipmoney_Payment_Gateway_Config::LOG_LEVEL_INFO);
+            if(!empty($order)){
+            if ($this->WC_Zipmoney_Payment_Gateway->doTokenisation() && $response['code'] == 403) {
+                $current_user = wp_get_current_user();
+                $uId = $current_user->ID;
+                $this->_removeCustomerToken($uId);
+            }
+            if (!empty($order)) {
                 $order->add_order_note($response['message']);
                 $order->update_status('cancelled', 'order_note');
 …
             //delete the option
             delete_option($checkout_id);
         } catch (Exception $exception) {
             if(!empty($order)){
+            if (!empty($order)) {
                 $order->add_order_note($exception->getCode() . $exception->getMessage());
                 $order->update_status('cancelled', 'order_note');
 …
             $response['message'] = $exception->getMessage();
             WC_Zipmoney_Payment_Gateway_Util::log("Create charge exception ". $exception->getCode() . $exception->getMessage(), WC_Zipmoney_Payment_Gateway_Config::LOG_LEVEL_INFO);
+            WC_Zipmoney_Payment_Gateway_Util::log("Create charge exception " . $exception->getCode() . $exception->getMessage(), WC_Zipmoney_Payment_Gateway_Config::LOG_LEVEL_INFO);
             wc_add_notice(__('Payment error:', 'zippayment') . $exception->getMessage(), 'error');
             delete_option($checkout_id);
 …
         //get the charge order
         $charge_order = $this->_create_charge_order($order_id, $order);
+        $accountType = 'checkout_id';
+        $accountValue = $checkout_id;
+        if ($this->WC_Zipmoney_Payment_Gateway->doTokenisation()) {
+            $accountType = 'account_token';
+            $accountValue = $this->getCustomerToken($checkout_id);
+        }
         //get authority
         $authority = new Authority(
             array(
                 'type' => 'checkout_id',
                 'value' => $checkout_id
+                'type' => $accountType,
+                'value' => $accountValue
+            )
         );
 …
+    {
         $is_pickup = false;
         //check order containing physical products, then create shipping address
         // if order contains only virtual & downloadable products shipping address is not required.
+        if (WC_Zipmoney_Order_Compatibility::has_shipping_address($order)){
+                 $order_shipping = new OrderShipping(
+                        array(
+                        'address' => $this->_create_shipping_address($order),
+                        'pickup' => $is_pickup
+                    )
+                );
+            }
+            else{
+                $is_pickup = true;
+                $order_shipping = new OrderShipping(
+                    array(
+                        'pickup' => $is_pickup
+                    )
+                );
+            }
+        $website_abbr = substr(sanitize_key( get_bloginfo( 'name' ) ), 0, 3);
+        if (WC_Zipmoney_Order_Compatibility::has_shipping_address($order)) {
+            $order_shipping = new OrderShipping(
+                array(
+                    'address' => $this->_create_shipping_address($order),
+                    'pickup' => $is_pickup
+                )
+            );
+        } else {
+            $is_pickup = true;
+            $order_shipping = new OrderShipping(
+                array(
+                    'pickup' => $is_pickup
+                )
+            );
+        }
+        $website_abbr = substr(sanitize_key(get_bloginfo('name')), 0, 3);
         return new ChargeOrder(
             array(
                 'reference' =>  strtoupper($website_abbr) ."-". $order_id ."-". strtotime("now"),
+                'reference' =>  strtoupper($website_abbr) . "-" . $order_id . "-" . strtotime("now"),
                 'shipping' => $order_shipping,
                 'items' => $this->_get_order_items($order)
 …
         );
+    }
+    /**
+     * save customer in the DB
+     */
+    private function _saveToken($customerId, $token)
+    {
+        global $wpdb;
+        $table_name = $wpdb->prefix . 'zip_tokenisation';
+        $encrypttedToken = WC_Zipmoney_Payment_Gateway_Util::wpcodetips_twoway_encrypt($token, 'e');
+        $wpdb->insert($table_name, array('customer_id' => $customerId, 'token' => $encrypttedToken));
+    }
+    /**
+     * check the DB for customer token.
+     * if not in the DB then get it by call token api
+     */
+    public function getCustomerToken($checkout_id)
+    {
+        global $wpdb;
+        $current_user = wp_get_current_user();
+        $uId = $current_user->ID;
+        $tokenTable = $wpdb->prefix . 'zip_tokenisation';
+        $result = $wpdb->get_results("SELECT * FROM $tokenTable WHERE `customer_id` = $uId");
+        foreach ($result as $customerToken) {
+            $dycrpttedToken = WC_Zipmoney_Payment_Gateway_Util::wpcodetips_twoway_encrypt($customerToken->token, 'd');
+            return $dycrpttedToken;
+        }
+        //get authority
+        $authority = new Authority(
+            array(
+                'type' => 'checkout_id',
+                'value' => $checkout_id
+            )
+        );
+        $tokenReq = new CreateTokenRequest();
+        $tokenReq->setAuthority($authority);
+        $tokenApi = new TokensApi();
+        $token = $tokenApi->tokensCreate($tokenReq, WC_Zipmoney_Payment_Gateway_Util::get_uuid());
+        $this->_saveToken($uId, $token->getValue());
+        return $token->getValue();
+    }
+    private function _removeCustomerToken($customerId)
+    {
+        global $wpdb;
+        $table_name = $wpdb->prefix . 'zip_tokenisation';
+        $wpdb->delete($table_name, array('customer_id' => $customerId));
+    }
+}

zipmoney-payments-woocommerce/trunk/includes/api/class-wc-zipmoney-payment-gateway-api-checkout.php

-                      r2560395
+                      r2776894
 <?php
 use \zipMoney\ApiException;
 use \zipMoney\Model\CheckoutConfiguration;
 …
 use \zipMoney\Model\OrderShipping;
 use \zipMoney\Model\Shopper;
+use \zipMoney\Model\CheckoutFeatures;
+use \zipMoney\Model\CreateCheckoutRequestFeaturesTokenisation as Tokenisation;
 class WC_Zipmoney_Payment_Gateway_API_Request_Checkout extends WC_Zipmoney_Payment_Gateway_API_Abstract
 …
+            )
         );
+        return new CreateCheckoutRequest(
+            array(
+                'shopper' => $shopper,
+                'order' => $checkout_order,
+                'metadata' => $this->_getMetadata(),
+                'config' => $checkout_configuration,
+            )
+        );
+        $checkoutReq = new CreateCheckoutRequest();
+        $checkoutReq->setType("standard")
+            ->setShopper($shopper)
+            ->setOrder($checkout_order)
+            ->setMetadata($this->_getMetadata())
+            ->setConfig($checkout_configuration);
+        if ($this->WC_Zipmoney_Payment_Gateway->doTokenisation()) {
+            $checkoutReq->setFeatures($this->getTokenisationFeature());
+        }
+        return $checkoutReq;
+    }
+    /**
+     * get tokenisation feature when tokenisation is enable
+     */
+    public function getTokenisationFeature()
+    {
+        $feature = new CheckoutFeatures;
+        $tokenisation = new Tokenisation;
+        $tokenisation->setRequired(true);
+        $feature->setTokenisation($tokenisation);
+        return $feature;
+    }

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-blocks-support.php

-                      r2662714
+                      r2776894
      * @return array
      */
+    public function get_payment_method_data() {
+        return [
+            'title'       => $this->get_setting( 'title' ),
+            'description' => $this->get_setting( 'description' ),
+            'supports'    => $this->get_supported_features(),
+    public function get_payment_method_data()
+    {
+        $url = home_url() . "/?p=zipmoneypayment&route=updatesession";
+        $payment_method_data = [
+            'title'          => $this->WC_Zipmoney_Payment_Gateway->title,
+            'description'    => $this->WC_Zipmoney_Payment_Gateway->description,
+            'supports'       => $this->get_supported_features(),
+            'tokenisation' => $this->WC_Zipmoney_Payment_Gateway->showSaveAccountInCheckout(),
+            'savezip' => $this->WC_Zipmoney_Payment_Gateway->customerHasToken(),
+            'sessionUrl' => $url,
         ];
+        return $payment_method_data;
+    }

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-config.php

-                      r2633893
+                      r2776894
     const CONFIG_SELECT_REGION = 'select_region';
     const CONFIG_CHECK_CREDENTIALS_BTN = 'check_credentials';
+    const CONFIG_ENABLE_TOKENISATION = 'enable_tokenisation';
     /*const PRODUCT_ZIP_MONEY = 'zipMoney';
     const PRODUCT_ZIP_PAY = 'zipPay';*/
 …
                 $( '.woocommerce_banner_option' ).closest( 'tr' ).hide();
+            }
+            if($('#woocommerce_zipmoney_select_region :selected').val() === 'au'){
+                $( '.woocommerce_banner_enable' ).closest( 'tr' ).show();
+                $('.woocommerce_tokenisation_enable_option').closest( 'tr' ).show();
+                $('.woocommerce_iframe_enable_option').closest( 'tr' ).show();
+                if($('.woocommerce_banner_enable').prop('checked') == true){
+                    $( '.woocommerce_banner_option' ).closest( 'tr' ).show();
+                }else{
+                    $( '.woocommerce_banner_option' ).closest( 'tr' ).hide();
+                }
+            }else{
+                $( '.woocommerce_banner_enable' ).closest( 'tr' ).hide();
+                $('.woocommerce_tokenisation_enable_option').closest( 'tr' ).hide();
+                $('.woocommerce_iframe_enable_option').closest( 'tr' ).hide();
+                $( '.woocommerce_banner_option' ).closest( 'tr' ).hide();
+            }
 …
             });
+            $('#woocommerce_zipmoney_select_region').on('change',function(){
+                //Getting Value
+                var selValue = $('#woocommerce_zipmoney_select_region :selected').val();
+                if(selValue === 'au'){
+                    $( '.woocommerce_banner_enable' ).closest( 'tr' ).show();
+                    $('.woocommerce_tokenisation_enable_option').closest( 'tr' ).show();
+                    $('.woocommerce_iframe_enable_option').closest( 'tr' ).show();
+                    if($('.woocommerce_banner_enable').prop('checked') == true){
+                        $( '.woocommerce_banner_option' ).closest( 'tr' ).show();
+                    }else{
+                        $( '.woocommerce_banner_option' ).closest( 'tr' ).hide();
+                    }
+                }else{
+                    $( '.woocommerce_banner_enable' ).closest( 'tr' ).hide();
+                    $('.woocommerce_tokenisation_enable_option').closest( 'tr' ).hide();
+                    $('.woocommerce_iframe_enable_option').closest( 'tr' ).hide();
+                    $( '.woocommerce_banner_option' ).closest( 'tr' ).hide();
+                }
+            });
             $( '.woocommerce_banner_enable' ).change( function( event ) {
                 var checked = $( event.target ).is( ':checked' );
 …
                 'class' => 'check_private_key',
                 'desc_tip'          => true,
+            ),
+            self::CONFIG_SELECT_REGION => array(
+                'title'     => __('Widget Region', 'zippayment'),
+                'type' => 'select',
+                'desc_tip' => __('Select Region to show proper zip widget in product, cart and checkout page', 'zippayment'),
+                'default' => self::REGION_AU,
+                'options' => array(
+                    self::REGION_AU => 'Australia',
+                    self::REGION_CA => 'Canada',
+                    self::REGION_MX => 'Mexico',
+                    self::REGION_NZ => 'New Zealand',
+                    self::REGION_SG => 'Singapore',
+                    self::REGION_ZA => 'South Africa',
+                    self::REGION_AE => 'United Arab Emirates',
+                    self::REGION_GB => 'United Kingdom',
+                    self::REGION_US => 'United States',
+                )
+            ),
+            self::CONFIG_ENABLE_TOKENISATION => array(
+                'title' => __('Tokenisation', 'zippayment'),
+                'label' => __('Enable Tokenisation', 'zippayment'),
+                'class' => 'woocommerce_tokenisation_enable_option',
+                'type' => 'checkbox',
+                'description' => __('Tokenisation allows a seamless one-click checkout experience for returning Zip customers, removing the need to redirect and complete a Zip login after their first purchase. (Australia only)', 'zippayment'),
+                'default' => 'no'
             ),
             self::CONFIG_CHARGE_CAPTURE => array(
 …
                 'title' => __('In-context checkout', 'zippayment'),
                 'label' => __('Enable in-context checkout flow', 'zippayment'),
+                'class' => 'woocommerce_iframe_enable_option',
                 'type' => 'checkbox',
                 'desc_tip' => __('Enable to offer your customers an iframe checkout experience without being redirected away from your website. But this feature only work for AU region. Other region customer will redirect to zip for payment.', 'zippayment'),
                 'description' => __('Iframe zip checkout only work for AU region. Other region customer will redirect to zip for payment. ', 'zippayment'),
+                'description' => __('Iframe Zip checkout will only work for merchants based in Australia”', 'zippayment'),
                 'default' => 'no'
             ),
 …
                 'desc_tip' => __('Set the maximum shopping cart value that Zip will be available for use.', 'zippayment'),
                 'default' => 1500
-            ),
-            self::CONFIG_SELECT_REGION => array(
-                'title'     => __('Widget Region', 'zippayment'),
-                'type' => 'select',
-                'desc_tip' => __('Select Region to show proper zip widget in product, cart and checkout page', 'zippayment'),
-                'default' => self::REGION_AU,
-                'options' => array(
-                    self::REGION_AU => 'Australia',
-                    self::REGION_CA => 'Canada',
-                    self::REGION_MX => 'Mexico',
-                    self::REGION_NZ => 'New Zealand',
-                    self::REGION_SG => 'Singapore',
-                    self::REGION_ZA => 'South Africa',
-                    self::REGION_AE => 'United Arab Emirates',
-                    self::REGION_GB => 'United Kingdom',
-                    self::REGION_US => 'United States',
+                )
             ),
             self::CONFIG_DISPLAY_WIDGET_MODE => array(
 …
                 'label' => __('Display on product page', 'zippayment'),
                 'type' => 'checkbox',
                 'desc_tip' => __('Enable to display the Zip widget below the add to cart button on the product page.', 'zippayment'),
+                'desc_tip' => __('The product widget will break down the price of the item and display a minimum weekly repayment or divide the price by 4 and show the customer an equal price breakdown', 'zippayment'),
                 'default' => 'yes'
             ),
 …
                 'label' => __('Display on cart page', 'zippayment'),
                 'type' => 'checkbox',
                 'desc_tip' => __('Enable to display the Zip widget below the checkout button on the cart page.', 'zippayment'),
+                'desc_tip' => __('The cart widget will break down the price of the item and display a minimum weekly repayment or divide the price by 4 and show the customer an equal price breakdown', 'zippayment'),
                 'default' => 'yes'
             ),
 …
                 'title' => __('Marketing taglines', 'zippayment'),
                 'label' => __('Display on product page', 'zippayment'),
                 'desc_tip' => __('Enable to display the Zip tagline widget below the price on the product page.', 'zippayment'),
+                'desc_tip' => __('The tagline does not show any price breakdown or minimum repayments. A tagline will show a static message of "Own it now, pay later."', 'zippayment'),
                 'type' => 'checkbox',
                 'default' => 'no'
 …
             self::CONFIG_DISPLAY_TAGLINE_CART => array(
                 'label' => __('Display on cart page', 'zippayment'),
                 'desc_tip' => __('Enable to display the Zip tagline widget below the total price on the cart page.', 'zippayment'),
+                'desc_tip' => __('The tagline does not show any price breakdown or minimum repayments. A tagline will show a static message of "Own it now, pay later".', 'zippayment'),
                 'type' => 'checkbox',
                 'default' => 'no'

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-util.php

-                      r2476029
+                      r2776894
         WC()->session->set('zip_shipping_details', $zip_shipping_details);
+    }
+    // encrypt and decrypt token
+    public static function wpcodetips_twoway_encrypt($stringToHandle = "", $encryptDecrypt = 'e')
+    {
+        // Set secret keys
+        require_once plugin_dir_path(__FILE__) . '/class-wc-zipmoney-payment-gateway.php';
+        $WC_Zipmoney_Payment_Gateway = new WC_Zipmoney_Payment_Gateway();
+        $WC_Zipmoney_Payment_Gateway_Config = new WC_Zipmoney_Payment_Gateway_Config($WC_Zipmoney_Payment_Gateway);
+        $secret_key = $WC_Zipmoney_Payment_Gateway_Config->get_merchant_public_key(); // Change this!
+        $secret_iv = $WC_Zipmoney_Payment_Gateway_Config->get_merchant_private_key(); // Change this!
+        $key = hash('sha256', $secret_key);
+        $iv = substr(hash('sha256', $secret_iv), 0, 16);
+        // Check whether encryption or decryption
+        if ($encryptDecrypt == 'e') {
+            // We are encrypting
+            $output = base64_encode(openssl_encrypt($stringToHandle, "AES-256-CBC", $key, 0, $iv));
+        } else if ($encryptDecrypt == 'd') {
+            // We are decrypting
+            $output = openssl_decrypt(base64_decode($stringToHandle), "AES-256-CBC", $key, 0, $iv);
+        }
+        return $output;
+    }
+}

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-widget.php

-                      r2685692
+                      r2776894
     public function init_hooks()
+    {
+        add_action('woocommerce_before_main_content', array($this, 'render_root_el'));
+        add_action('woocommerce_before_single_product_summary', array($this, 'render_root_el'));
+        add_action('woocommerce_before_cart', array($this, 'render_root_el'));
+        add_action('woocommerce_before_checkout_form', array($this, 'render_root_el'));
+        add_action('wp_footer', array($this, 'render_root_el'));
         add_filter('woocommerce_gateway_description', array($this, 'updateMethodDescription'), 10, 2);
 …
         //inject the order button
         if($WC_Zipmoney_Payment_Gateway_Config->is_it_iframe_flow()){
+        if ($WC_Zipmoney_Payment_Gateway_Config->is_it_iframe_flow()) {
             add_filter('woocommerce_order_button_html', array($this, 'order_button'), 10, 2);
+        }
         //use this hook to convert customer address
         add_action('woocommerce_checkout_update_order_review', array('WC_Zipmoney_Payment_Gateway_Util', 'update_customer_details'));
 …
     public function updateMethodDescription($description, $id)
+    {
         if ($id != $this->WC_Zipmoney_Payment_Gateway->id){
+        if ($id != $this->WC_Zipmoney_Payment_Gateway->id) {
             return $description;
+        }
+        return '<span zm-widget=\'inline\' zm-asset=\'checkoutdescription\'></span> <a  id="zipmoney-learn-more" class="zip-hover"  zm-widget="popup"  zm-popup-asset="checkoutdialog">Learn More</a>
+    <script>if(window.$zmJs!==undefined) window.$zmJs._collectWidgetsEl(window.$zmJs);</script>';
+        $description = '<span zm-widget=\'inline\' zm-asset=\'checkoutdescription\'></span> <a  id="zipmoney-learn-more" class="zip-hover"  zm-widget="popup"  zm-popup-asset="checkoutdialog">Learn More</a>';
+        // show Save Zip account option in checkout when tokenisation is enable and customer logged in
+        if ($this->WC_Zipmoney_Payment_Gateway->showSaveAccountInCheckout()) {
+            $checked = ($this->WC_Zipmoney_Payment_Gateway->customerHasToken()) ? 'checked' : '';
+            session_status() === PHP_SESSION_ACTIVE ?: session_start();
+            $_SESSION["saveZipAccount"] = $this->WC_Zipmoney_Payment_Gateway->customerHasToken();
+            $description .= '<label><input type="checkbox" id="saveZipAccount" ' . $checked . ' onchange="Check(this)" /><span>Save Zip Account for future purchases</span></label>';
+        }
+        $description .= '<script>if(window.$zmJs!==undefined) window.$zmJs._collectWidgetsEl(window.$zmJs);</script>';
+        return $description;
+    }

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway.php

-                      r2685692
+                      r2776894
+{
     const ADMIN_CSS_VERSION = '1.0';
     const FRONT_CSS_VERSION = '1.1';
+    const FRONT_CSS_VERSION = '1.2';
     //essential settings
 …
     public $description = 'Own the way you pay';
     public $version = '2.3.13';
+    public $version = '2.3.14';
     public $supports = array('products', 'refunds');
 …
         add_filter('woocommerce_order_get_payment_method_title', array($this, 'zip_order_payment_title'), 10, 2);
         add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+    }
+        add_action('wp_footer', array($this, 'update_zip_session'));
+    }
     // when zip private key is not valid then show this error in admin
     public function invalid_key_error_notice($display = false)
 …
     /**
+     * get tokenisation option status from zip admin setting
+     */
+    public function get_tokenisation_status()
+    {
+        $this->WC_Zipmoney_Payment_Gateway_Config = new WC_Zipmoney_Payment_Gateway_Config($this);
+        return $this->WC_Zipmoney_Payment_Gateway_Config->is_bool_config_by_key(WC_Zipmoney_Payment_Gateway_Config::CONFIG_ENABLE_TOKENISATION);
+    }
+    /**
      * Check the environment meet the minimum requirement
      */
 …
                 wp_send_json($result);
                 break;
+            case 'updatesession':
+                // this route use for setting session for save zip account option wheither it is checked or unchecked
+                $saveZipaccount = sanitize_text_field($_POST['savezipaccount']);
+                session_status() === PHP_SESSION_ACTIVE ?: session_start();
+                $_SESSION["saveZipAccount"] = $saveZipaccount;
+                $result =  $result = array(
+                    'code' => 200,
+                    'message' => 'success',
+                );
+                wp_send_json($result);
+        }
+    }
 …
             set_post_type($order_id, 'shop_quote');
             $response = array();
             $response = $checkout_controller->create_checkout($_POST, $order_id);
+            $checkout = array();
+            $checkout = $checkout_controller->create_checkout($_POST, $order_id);
         } catch (ApiException $exception) {
             WC_Zipmoney_Payment_Gateway_Util::log($exception->getCode() . $exception->getMessage());
 …
             );
+        }
+        if (isset($response['redirect_uri'])) {
+            return array(
+                'result' => $response['result'],
+                'checkout_id' => $response['checkout_id'],
+                'redirect' => $response['redirect_uri']
+        if (isset($checkout['redirect_uri'])) {
+            $response = array(
+                'result' => $checkout['result'],
+                'checkout_id' => $checkout['checkout_id'],
+                'redirect' => $checkout['redirect_uri']
             );
+        }
+        wc_add_notice(__('Payment error: ', 'zippayment') . $response['message'], 'error');
+            if (isset($checkout['token'])) {
+                $token = $checkout['token'];
+                $response['token'] = $token;
+            }
+            return $response;
+        }
+        wc_add_notice(__('Payment error: ', 'zippayment') . $checkout['message'], 'error');
+    }
 …
+        }
+    }
+    /**
+     *  check tokenisation is enable, user logged in and currency is AUD
+     */
+    public function showSaveAccountInCheckout()
+    {
+        $currency = get_option('woocommerce_currency');
+        if (is_user_logged_in() && $this->get_tokenisation_status() && $currency == CurrencyUtil::CURRENCY_AUD) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * check tokenisation is enable, user logged in and currency is AUD
+     * as well as checking saveZipAccount is checked or not
+     */
+    public function doTokenisation()
+    {
+        session_status() === PHP_SESSION_ACTIVE ?: session_start();
+        if (isset($_SESSION['saveZipAccount']) && filter_var($_SESSION['saveZipAccount'], FILTER_VALIDATE_BOOLEAN) && $this->showSaveAccountInCheckout()) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * check customer has token
+     */
+    public function customerHasToken()
+    {
+        global $wpdb;
+        $current_user = wp_get_current_user();
+        $uid = $current_user->ID;
+        $tokenTable = $wpdb->prefix . 'zip_tokenisation';
+        $result = $wpdb->get_results("SELECT * FROM $tokenTable WHERE `customer_id` = $uid");
+        foreach ($result as $customerToken) {
+            return $customerToken->token;
+        }
+        return false;
+    }
+    /**
+     * update session when customer check or uncheck Save Zip account in checkout page
+     */
+    public function update_zip_session()
+    {
+        $url = home_url();
+?>
+        <script type="text/javascript">
+            function Check(value) {
+                let formData = new FormData();
+                var url = '<?php echo $url . "/?p=zipmoneypayment&route=updatesession"; ?>';
+                formData.append("savezipaccount", value.checked);
+                const requestOptions = {
+                    method: "POST",
+                    body: formData
+                };
+                fetch(url, requestOptions)
+                    .then(response => response.json());
+            };
+        </script>
+<?php
+    }
+}

zipmoney-payments-woocommerce/trunk/includes/controller/class-wc-zipmoney-payment-charge-controller.php

-                      r2560395
+                      r2776894
                     //Once the result is approved, change the post_type from "shop_quote" to "shop_order"
+                    //$order_id = WC()->session->get('_post_id');
+                    $order_id = get_option($checkoutId);
+                    if ($this->WC_Zipmoney_Payment_Gateway->doTokenisation()) {
+                        $order_id = wc_get_order_id_by_order_key(wc_clean(wp_unslash($options['key'])));
+                    }
+                    if (!$order_id) {
+                        $order_id = get_option($checkoutId);
+                    }
                     // AU SMI adding prefix but lightbox redirect will not have prefix
                     if (!$order_id) {
                         $order_id = get_option('au-' . $checkoutId);
                         if($order_id){
                             $checkoutId = 'au-'.$checkoutId;
+                        if ($order_id) {
+                            $checkoutId = 'au-' . $checkoutId;
+                        }
+                    }
 …
                             WC()->session,
                             $checkoutId,
+                            $order_id,
                             $this->WC_Zipmoney_Payment_Gateway_Config->get_merchant_private_key()
                         );
 …
                             //wc_add_notice('Your zip payment successful, thank you.', 'success');
                         } else {
+                            $result['redirect_url'] = $this->wc_get_checkout_url();
                             $result['content'] = $response['message'];
                             $result['title'] = 'Error';
                             wc_add_notice(__("An error occurred while processing payment","zippayment"), 'error');
+                            wc_add_notice(__("An error occurred while processing payment", "zippayment"), 'error');
+                        }
                     } else {
 …
                         $result['content'] = 'Could not find the order, please try again later.';
                         $result['title'] = 'Error';
                         wc_add_notice(__("Could not find the order, please try again later.","zippament"), 'error');
+                        wc_add_notice(__("Could not find the order, please try again later.", "zippament"), 'error');
+                    }
                     break;
 …
                     $result['title'] = 'The payment is in referred state';
                     $result['content'] = 'Your application is currently under review by zipMoney and will be processed very shortly. You can contact the customer care at [email protected] for any enquiries.';
                     wc_add_notice(__('Payment pending, your application is currently under review and will be processed shortly.',"zippayment"), 'success');
+                    wc_add_notice(__('Payment pending, your application is currently under review and will be processed shortly.', "zippayment"), 'success');
                     WC()->cart->empty_cart();
                     break;
 …
                     $result['content'] = 'Your application has been declined by zipMoney. Please contact zipMoney for further information.';
                     $result['redirect_url'] = $this->wc_get_checkout_url();
                     wc_add_notice(__('Your application has been declined. Please contact Zip Co for further information.',"zippayment"), 'error');
+                    wc_add_notice(__('Your application has been declined. Please contact Zip Co for further information.', "zippayment"), 'error');
                     //remove the wp_option
                     delete_option($checkoutId);
 …
                     $result['title'] = 'The checkout has been cancelled';
                     $result['content'] = 'The checkout has been cancelled.';
                     wc_add_notice(__('The payment has been cancelled.',"zippayment"), 'error');
+                    wc_add_notice(__('The payment has been cancelled.', "zippayment"), 'error');
                     $result['redirect_url'] = $this->wc_get_checkout_url();
                     //remove the wp_option

zipmoney-payments-woocommerce/trunk/includes/controller/class-wc-zipmoney-payment-checkout-controller.php

-                      r2560395
+                      r2776894
             new CheckoutsApi()
         );
+        $redirect_url = WC_Zipmoney_Payment_Gateway_Util::get_complete_endpoint_url();
+        $user = wp_get_current_user();
+        if ($this->WC_Zipmoney_Payment_Gateway->doTokenisation()) {
+            if ($this->WC_Zipmoney_Payment_Gateway->customerHasToken()) {
+                WC_Zipmoney_Payment_Gateway_Util::log('customerHasToken');
+                $order       = wc_get_order($order_id);
+                $order_key   = $order->get_order_key();
+                $redirect_url .= "&result=approved&token=true&checkoutId=checkoutId&key=" . $order_key;
+                return array(
+                    'redirect_uri' => $redirect_url,
+                    'message' => 'Redirecting to charge.',
+                    'result' => 'success',
+                    'checkout_id' => 'checkoutId',
+                    'token' => true,
+                );
+            }
+        } else {
+            if ($this->WC_Zipmoney_Payment_Gateway->showSaveAccountInCheckout()) {
+                $this->_removeCustomerToken($user->ID);
+            }
+        }
         $checkout_response = $WC_Zipmoney_Payment_Gateway_API_Request_Checkout->create_checkout(
             WC()->session,
             WC_Zipmoney_Payment_Gateway_Util::get_complete_endpoint_url(),
+            $redirect_url,
             $this->WC_Zipmoney_Payment_Gateway_Config->get_merchant_private_key(),
             $order_id
 …
+        }
         return array(
             'message' => __("An error occurred while getting the redirect url from Zip.","zippayment"),
+            'message' => __("An error occurred while getting the redirect url from Zip.", "zippayment"),
             'result' => 'failure'
         );
+    }
+    private function _removeCustomerToken($customerId)
+    {
+        global $wpdb;
+        $table_name = $wpdb->prefix . 'zip_tokenisation';
+        $wpdb->delete($table_name, array('customer_id' => $customerId));
+    }
+}

zipmoney-payments-woocommerce/trunk/includes/view/frontend/order_button.php

-                      r2464696
+                      r2776894
 <script src="https://static.zipmoney.com.au/checkout/checkout-v1.js"></script>
 <script type="text/javascript">
 (function($){
    $(document).ready(function(){
     //your code
+    (function($) {
+        $(document).ready(function() {
+            //your code
         $('#place_order').on('click', function(e){
             var zipMoneyErrorDiv = $('#zipMoneyErrorDiv');
             var zipMoneyInfoDiv = $('#zipMoneyInfoDiv');
             zipMoneyErrorDiv.hide();
             zipMoneyInfoDiv.hide();
+            $('#place_order').on('click', function(e) {
+                var zipMoneyErrorDiv = $('#zipMoneyErrorDiv');
+                var zipMoneyInfoDiv = $('#zipMoneyInfoDiv');
+                zipMoneyErrorDiv.hide();
+                zipMoneyInfoDiv.hide();
             var payment_method = $('form[name="checkout"] input[name="payment_method"]:checked').val();
+                var payment_method = $('form[name="checkout"] input[name="payment_method"]:checked').val();
             var checkoutId = null; //log the checkoutId. if the user close the iframe, it will make an ajax call to remove the record in
+                var checkoutId = null; //log the checkoutId. if the user close the iframe, it will make an ajax call to remove the record in
             if (payment_method == 'zipmoney') {
+                if (payment_method == 'zipmoney') {
                 Zip.Checkout.init({
                     redirect: <?php echo $is_iframe_checkout ? 0 : 1?>,
                     checkoutUri: '<?php echo WC_Zipmoney_Payment_Gateway_Util::get_checkout_endpoint_url();?>',
                     redirectUri: '<?php echo WC_Zipmoney_Payment_Gateway_Util::get_complete_endpoint_url()?>',
                     onCheckout: function(resolve, reject, args) {
                         var errorDiv = $('#zipMoneyErrorDiv');
                         errorDiv.hide();
+                    Zip.Checkout.init({
+                        redirect: <?php echo $is_iframe_checkout ? 0 : 1 ?>,
+                        checkoutUri: '<?php echo WC_Zipmoney_Payment_Gateway_Util::get_checkout_endpoint_url(); ?>',
+                        redirectUri: '<?php echo WC_Zipmoney_Payment_Gateway_Util::get_complete_endpoint_url() ?>',
+                        onCheckout: function(resolve, reject, args) {
+                            var errorDiv = $('#zipMoneyErrorDiv');
+                            errorDiv.hide();
                         $.ajax({
                             type: 'POST',
                             url: '<?php echo WC_Zipmoney_Payment_Gateway_Util::get_wc_checkout_url()?>',
                             data: $('form.checkout').serialize(),
                             dataType: 'json',
                             success: function (result) {
                                 console.log('successfully triggered');
                                // console.log("test ". result);
+                            $.ajax({
+                                type: 'POST',
+                                url: '<?php echo WC_Zipmoney_Payment_Gateway_Util::get_wc_checkout_url() ?>',
+                                data: $('form.checkout').serialize(),
+                                dataType: 'json',
+                                success: function(result) {
+                                    console.log('successfully triggered');
+                                    // console.log("test ". result);
+                                if(result.checkout_id){
+                                    checkoutId = result.checkout_id;
+                                }
+                                if(result.redirect){
+                                    //if the checkout is successful
+                                    console.log('resolved');
+                                    resolve({
+                                        data: {redirect_uri: result.redirect}
+                                    });
+                                } else {
+                                    //console.log('reject');
+                                    errorDiv.html(result.messages);
+                                    errorDiv.show();
+                                    //scroll up to show the error
+                                    $('html, body').animate({
+                                        scrollTop: ( $('form.checkout').offset().top - 200)
+                                    }, 1000);
+                                    if (result.checkout_id) {
+                                        checkoutId = result.checkout_id;
+                                    }
+                                    if (result.token === true) {
+                                        $('div.zip-overlay').css('display', 'block');
+                                        window.location.href = result.redirect;
+                                        return;
+                                    }
+                                    if (result.redirect) {
+                                        //if the checkout is successful
+                                        console.log('resolved');
+                                        resolve({
+                                            data: {
+                                                redirect_uri: result.redirect
+                                            }
+                                        });
+                                    } else {
+                                        //console.log('reject');
+                                        errorDiv.html(result.messages);
+                                        errorDiv.show();
+                                        //scroll up to show the error
+                                        $('html, body').animate({
+                                            scrollTop: ($('form.checkout').offset().top - 200)
+                                        }, 1000);
+                                        reject(result);
+                                    }
+                                },
+                                error: function(jqXHR, textStatus, errorThrown) {
+                                    //console.log('error triggered');
+                                    //console.log(errorThrown);
                                     reject(result);
+                                }
+                            },
+                            error: function (jqXHR, textStatus, errorThrown) {
+                                //console.log('error triggered');
+                                //console.log(errorThrown);
+                                reject(result);
+                            });
+                        },
+                        onComplete: function(response) {
+                            //console.log('onComplete is called.');
+                            //console.log(response);
+                            if (response.state == "approved" || response.state == "referred") {
+                                //show the redirect block
+                                $('div.zip-overlay').css('display', 'block');
+                                location.href = "<?php echo WC_Zipmoney_Payment_Gateway_Util::get_complete_endpoint_url(); ?>&result=" +
+                                    response.state + "&checkoutId=" + response.checkoutId;
+                                //show the over lay
+                            } else if ((response.state == 'cancelled' || response.state == 'declined') && checkoutId) {
+                                //clear the wp_options
+                                //  console.log('clear options. ' + checkoutId);
+                                $.post('<?php echo WC_Zipmoney_Payment_Gateway_Util::get_clear_options_url() ?>', {
+                                    checkout_id: checkoutId
+                                });
+                            }
+                        });
+                    },
+                    onComplete: function (response) {
+                        //console.log('onComplete is called.');
+                        },
+                        onError: function(response) {
+                            //console.log('onError is called.');
+                            var errorMessage = "An error occurred while redirect to Zip.";
+                            var message = $(response.detail.messages).text();
+                            if (typeof message != 'undefined' && message != null && message.length > 0) {
+                                message = message.trim();
+                                message = message.replace(/\s+/g, ' ');
+                                message = message.replace(/\./g, '.\n');
+                                errorMessage = message;
+                            }
+                            alert(errorMessage);
+                        }
                         //console.log(response);
+                    });
                         if (response.state == "approved" || response.state == "referred") {
                             //show the redirect block
                             $('div.zip-overlay').css('display', 'block');
+                    e.preventDefault();
+                }
+            });
-                            location.href = "<?php echo WC_Zipmoney_Payment_Gateway_Util::get_complete_endpoint_url();?>&result=" +
-                                response.state + "&checkoutId=" + response.checkoutId;
-                            //show the over lay
-                        } else if((response.state == 'cancelled' || response.state == 'declined') && checkoutId){
-                            //clear the wp_options
-                          //  console.log('clear options. ' + checkoutId);
-                            $.post('<?php echo WC_Zipmoney_Payment_Gateway_Util::get_clear_options_url()?>', {checkout_id:checkoutId});
+                        }
-                    },
-                    onError: function(response){
-                        //console.log('onError is called.');
-                        var errorMessage = "An error occurred while redirect to Zip.";
-                        var message = $(response.detail.messages).text();
-                        if (typeof message != 'undefined' && message != null && message.length > 0) {
-                            message = message.trim();
-                            message = message.replace(/\s+/g, ' ');
-                            message = message.replace(/\./g, '.\n');
-                            errorMessage = message;
+                        }
-                        alert(errorMessage);
+                    }
-                });
-                e.preventDefault();
+            }
         });
+     });
+})(window.jQuery || window.$);
+    })(window.jQuery || window.$);
 </script>

zipmoney-payments-woocommerce/trunk/vendor/zipmoney/merchantapi-php/lib/Api/ChargesApi.php

-                      r2283719
+                      r2776894
                     $e->setResponseObject($data);
                     break;
+                case 403:
+                    $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\zipMoney\Model\ErrorResponse', $e->getResponseHeaders());
+                    $e->setResponseObject($data);
+                    break;
                 case 409:
                     $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\zipMoney\Model\ErrorResponse', $e->getResponseHeaders());

zipmoney-payments-woocommerce/trunk/zipmoney-payment-gateway.php

-                      r2685692
+                      r2776894
  * Give your customers the power to pay later, interest free and watch your sales grow.
  * Take advantage of our fast-growing customer base, proven revenue uplift, fast and simple integration.
  * Version:           2.3.13
+ * Version:           2.3.14
  * Author:            Zip
  * Author URI:        https://www.zip.co/
 …
  * Github URI:        https://github.com/zipMoney/woocommerce/
  * WC requires at least: 2.6.13
  * WC tested up to: 6.0.0
  * @version  2.3.13
+ * WC tested up to: 6.7.0
+ * @version  2.3.14
  * @package  Zip
  * @author   Zip
 …
     die;
+}
+register_activation_hook(__FILE__, 'plugin_activation');
 require_once plugin_dir_path(__FILE__) . 'vendor/autoload.php';
 define('WOOCOMMERCE_GATEWAY_ZIPMONEY_VERSION', '2.3.13');
+define('WOOCOMMERCE_GATEWAY_ZIPMONEY_VERSION', '2.3.14');
 define('WOOCOMMERCE_GATEWAY_ZIPMONEY_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
 define('WOOCOMMERCE_GATEWAY_ZIPMONEY_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
 /**
  * Add zipMoney gateway class to hook
 …
     return $methods;
+}
+/**
+ * install tokenisation table
+ */
+function plugin_activation()
+{
+    global $wpdb;
+    $charset_collate = $wpdb->get_charset_collate();
+    $table_name = $wpdb->prefix . 'zip_tokenisation';
+    $customer_table = $wpdb->prefix . 'users';
+    $sql = "CREATE TABLE `$table_name` (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    `customer_id` bigint(20) unsigned NOT NULL,
+    `token` varchar(220) DEFAULT NULL,
+    PRIMARY KEY(id),
+    INDEX customer_id(customer_id),
+    FOREIGN KEY(customer_id) REFERENCES $customer_table(id) ON UPDATE CASCADE ON DELETE CASCADE
+    ) $charset_collate ;
+    ";
+    if ($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+        dbDelta($sql);
+    }
+}
 /**

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory

Context Navigation

Changeset 2776894

Legend:

zipmoney-payments-woocommerce/trunk/README.txt

zipmoney-payments-woocommerce/trunk/assets/css/woocommerce-zipmoney-payment-front.css

zipmoney-payments-woocommerce/trunk/assets/js/zip_order_button.js

zipmoney-payments-woocommerce/trunk/build/index.asset.php

zipmoney-payments-woocommerce/trunk/build/index.js

zipmoney-payments-woocommerce/trunk/build/index.js.map

zipmoney-payments-woocommerce/trunk/includes/api/class-wc-zipmoney-payment-gateway-api-charge.php

zipmoney-payments-woocommerce/trunk/includes/api/class-wc-zipmoney-payment-gateway-api-checkout.php

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-blocks-support.php

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-config.php

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-util.php

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway-widget.php

zipmoney-payments-woocommerce/trunk/includes/class-wc-zipmoney-payment-gateway.php

zipmoney-payments-woocommerce/trunk/includes/controller/class-wc-zipmoney-payment-charge-controller.php

zipmoney-payments-woocommerce/trunk/includes/controller/class-wc-zipmoney-payment-checkout-controller.php

zipmoney-payments-woocommerce/trunk/includes/view/frontend/order_button.php

zipmoney-payments-woocommerce/trunk/vendor/zipmoney/merchantapi-php/lib/Api/ChargesApi.php

zipmoney-payments-woocommerce/trunk/zipmoney-payment-gateway.php

Download in other formats: