WordPress.org
Get WordPress

Plugin Directory

Changeset 2708315


Ignore:
Timestamp:
04/12/2022 03:47:10 AM (4 years ago)
Author:
payadvantage
Message:

Publish 3.1.2

Location:
pay-advantage/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • pay-advantage/trunk/payadvantage.php

    r2707743 r2708315  
    1616 * Plugin URI:        https://www.payadvantage.com.au/
    1717 * Description:       This plugin adds a payment gateway to Woo Commerce as well as a widget for credit card and BPay payments.
    18  * Version:           3.1.1
     18 * Version:           3.1.2
    1919 * Author:            Pay Advantage
    2020 * Author URI:        https://www.payadvantage.com.au/
    … …  
    3030 * Current plugin version.
    3131 */
    32 define( 'PayAdvantagePluginVersion', '3.1.1' );
     32define( 'PayAdvantagePluginVersion', '3.1.2' );
    3333
    3434include( plugin_dir_path( __FILE__ ) . '/includes/payadvantage-files.php' );

  • pay-advantage/trunk/public/js/common.js

    r2693371 r2708315  
    9191                        console.log(response);
    9292                        reject(new Error(response.Messages.join(' ')));
     93                    } else {
     94                        resolve(response);
    9395                    }
    94                     resolve(response);
    9596                },
    9697                error: function (response) {

  • pay-advantage/trunk/public/js/credit-card-payment-wc.js

    r2707743 r2708315  
    2222  var $orderId = null;
    2323  var $paidNonce = null;
    24   var isPaid = false;
    25   var isCancelled = false;
    2624
    2725  /**
    … …  
    243241          $orderId = result.orderId;
    244242          $paidNonce = result.paidNonce;
    245           isPaid = false;
    246           isCancelled = false;
    247243          payAdvantage.initialiseCreditCardCapture();
     244          payAdvantage.creditCardCapture.addEventListener('closing', creditCardDialogClosedHandler);
     245          payAdvantage.creditCardCapture.addEventListener('cancel', creditCardCancelHandler );
     246          payAdvantage.creditCardCapture.addEventListener('paid', creditCardPaidHandler);
    248247          return payAdvantage.creditCardCapture.show(result.iframeUrl, result.payment, result.cardHolder);
    249248        })
    250249        .then(function (result) {
    251           payAdvantage.creditCardCapture.addEventListener('closing', creditCardDialogClosedHandler);
    252           payAdvantage.creditCardCapture.addEventListener('paid', creditCardPaidHandler);
    253250          wc_stopProcessing();
    254251        })
    … …  
    271268   */
    272269  function creditCardDialogClosedHandler( event ) {
    273     if (!isPaid && !isCancelled) {
    274       event.preventDefault();
    275       creditCardCancelHandler(event);
    276       return;
    277     }
    278 
    279     payAdvantage.creditCardCapture.removeEventListener( 'closing', creditCardDialogClosedHandler );
    280     payAdvantage.creditCardCapture.removeEventListener( 'paid', creditCardPaidHandler );
     270    payAdvantage.creditCardCapture.removeEventListener('closing', creditCardDialogClosedHandler );
     271    payAdvantage.creditCardCapture.removeEventListener('cancel', creditCardCancelHandler );
     272    payAdvantage.creditCardCapture.removeEventListener('paid', creditCardPaidHandler );
    281273
    282274    if ($redirectOnCloseUrl) {
    … …  
    365357  function creditCardPaidHandler(eventArgs) {
    366358    payAdvantage.creditCardCapture.setUserProcessing(true);
    367     isPaid = true;
    368359    payAdvantage.common.postAjax('pay_advantage_wc_mark_order_as_paid',
    369360        {
    … …  
    391382  function creditCardCancelHandler(eventArgs) {
    392383    payAdvantage.creditCardCapture.setUserProcessing(true);
    393     payAdvantage.common.postAjax('pay_advantage_wc_mark_order_as_cancelled',
     384    eventArgs.promise = payAdvantage.common.postAjax('pay_advantage_wc_mark_order_as_cancelled',
    394385        {
    395386          'orderid': $orderId,
    … …  
    398389        .then(function (response) {
    399390          payAdvantage.creditCardCapture.setUserProcessing(false);
    400           isCancelled = true;
    401           $redirectOnCloseUrl = response.redirect;
    402           payAdvantage.creditCardCapture.close();
    403391        })
    404392        .catch(function (error) {
    … …  
    406394          payAdvantage.creditCardCapture.setUserProcessing(false);
    407395          payAdvantage.creditCardCapture.setError('There was an unexpected error updating the order to paid. Please contact the administrator of this site to update your order. ' + error.message);
    408           $redirectOnCloseUrl = null;
    409396        });
    410397  }
Note: See TracChangeset for help on using the changeset viewer.