Merge pull request #173 from paynl/v4

RC4 - Using new PHP-SDK

Author: woutse

assets/js/payorder.js

@@ -24,24 +24,26 @@ function submitPinRefund($) {
     doAjaxRequest($, amount, 'refund')
 }
 
-function submitPinTransaction($) {
+function submitPinTransaction($)
+{
     var amount = parseFloat(paynl_order.order_total.toString().replace(',', '.'));
     if (amount == 0) {
         alert(paynl_order.texts.i18n_pinmoment_error_zero);
         return;
     }
-
     doAjaxRequest($, amount, 'pinmoment')
 }
 
-function doAjaxRequest($, amount, type) {
+function doAjaxRequest($, amount, type)
+{
     var terminal = $('#pin_terminal').val();
     var ajaxurl = '/?wc-api=Wc_Pay_Gateway_Pinrefund';
     var data = {
         'amount': amount,
         'terminal': terminal,
         'order_id': paynl_order.order_id,
-        'returnUrl': window.location.href
+        'returnUrl': window.location.href,
+        'type': type
     };
 
     $.ajax({
@@ -62,6 +64,9 @@ function doAjaxRequest($, amount, type) {
     })
 }
 
+/**
+ * Button for: retour-pin
+ */
 function addButton($) {
     let buttonPlaced = $('#paynl-pin-refund').length > 0;
     paynl_order.max_amount = parseFloat(paynl_order.max_amount);
@@ -78,9 +83,15 @@ function addButton($) {
 }
 
 
-function addPinButton($) {
+/**
+ * Button for payment an order by "pin" from out the order
+ * @param $
+ */
+function addPinButton($)
+{
     let buttonPlaced = $('#paynl-pin-transaction').length > 0;
     paynl_order.order_total = parseFloat(paynl_order.order_total);
+
     if (!buttonPlaced && paynl_order.order_total > 0) {
         $('.wc-order-bulk-actions').prepend('<button style="background-color:#2271B1;;float: right; margin-left: 5px;" type="button" id="paynl-pin-transaction" class="button button-primary do-api-pin-transaction">' + paynl_order.texts.i18n_pinmoment_title + '</button>');
         $('#paynl-pin-transaction').click(function () {
@@ -95,10 +106,10 @@ function getTerminalOptions($) {
     var options = '';
     paynl_order.terminals.forEach((element) => {
         var selected = '';
-        if (element.id == paynl_order.default_terminal) {
+        if (element.code == paynl_order.default_terminal) {
             selected = 'selected="selected"';
         }
-        options += '<option value="' + element.id + '" ' + selected + '>' + element.name + '</option>';
+        options += '<option value="' + element.code + '" ' + selected + '>' + element.name + '</option>';
     })
 
     return options;

assets/logos/payment_method_groups/CNP.png

@@ -1,14 +1,8 @@
 {
-    "name": "paynl/woocommerce-plugin",
-    "description": "Pay. woocommerce plugin",
+  "name": "paynl/woocommerce-plugin",
+  "description": "Pay. woocommerce plugin",
+  "license": "MIT",
     "require": {
-        "paynl/sdk": "^1.2"
-    },
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Andy Pieters",
-            "email": "andy@pay.nl"
-        }
-    ]
+    "paynl/php-sdk": "^1.0"
+  }
 }