Changeset 2212885

Timestamp:

12/16/2019 12:04:10 PM (6 years ago)

Author:

wp_estatic

Message:

Remove Depricated Funcations

Location:

woo-sagepay-addon/trunk

Files:

• README.txt (modified) (2 diffs)
• woo-sagepay-addon.php (modified) (10 diffs)

woo-sagepay-addon/trunk/README.txt

@@ -1 @@
-=== Woo Sage Pay Addon ===
+=== Addon for sagepay and WooCommerce ===
 Contributors: wp_estatic
 Tags: woocommerce, Sage Pay, payment gateway, credit card, ecommerce, e-commerce, commerce, cart, checkout, Sage Pay addon,refund,credit cards payment Sage Pay and woocommerce, Sage Pay for woocommerce, Sage Pay payment gateway for woocommerce, Sage Pay payment in wordpress, Sage Pay payment refunds, Sage Pay plugin for woocommerce, Sage Pay woocommerce addon, free Sage Pay woocommerce plugin, woocommerce credit cards payment with Sage Pay, woocommerce plugin Sage Pay.
 Requires at least: 4.0 & WooCommerce 2.3+
-Tested up to: 4.9.8 & Woocommerce 3.4.5
+Tested up to: 5.3 & Woocommerce 3.8.1
 Stable tag: trunk
 License: GPLv3
@@ -109 +109 @@
 = 1.0.3 =
 * Fix - Payment method reduce issue
+= 1.0.4 =
+* Fix - Remove depricated funcations
 == Upgrade Notice ==

woo-sagepay-addon/trunk/woo-sagepay-addon.php

@@ -2 +2 @@
 
 /**
- * Plugin Name:         Woo sagepay Addon
- * Plugin URL:          Woo sagepay Addon
- * Description:         Woo sagepay Addon allows you to accept payments on your Woocommerce store. It accpets credit card payments and processes them securely with your merchant account.
- * Version:             1.0.3
+ * Plugin Name:         Addon for sagepay and WooCommerce
+ * Plugin URL:          Addon for sagepay and WooCommerce
+ * Description:         Addon for sagepay and WooCommerce allows you to accept payments on your Woocommerce store. It accpets credit card payments and processes them securely with your merchant account.
+ * Version:             1.0.4
  * WC requires at least:2.3
- * WC tested up to:     3.4.5
+ * WC tested up to:     3.8.1
  * Requires at least:   4.0+
- * Tested up to:        4.9.8
+ * Tested up to:        5.3
  * Contributors:        wp_estatic
  * Author:              Estatic Infotech Pvt Ltd
@@ -69 +69 @@
             $this->title = $this->get_option('title');
             $this->method_description = sprintf(__('sagepay allows you to accept payments on your Woocommerce store. It accpets credit card payments and processes them securely with your merchant account.Please dont forget to test with sandbox account first. <li style="color: red;"><span id="message">Please Add Currency Which Is Provided By Your Sagepay Merchant Account</span></li> ', 'woocommerce'));
-            //   $this->method_description = sprintf(__('test.', 'woocommerce'));
 
             $this->description = $this->get_option('description');
@@ -91 +90 @@
             add_action('woocommerce_order_status_completed_to_refunded', array($this, 'restore_order_stock'), 10, 1);
             add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'restore_order_stock'), 10, 1);
-            //     add_action('woocommerce_order_details_after_order_table', 'wdm_my_custom_notes_on_single_order_page', 10, 1);
-            //  add_filter('woocommerce_credit_card_form_fields', array($this, 'sagepay_fields'), 10, 2);
         }
 
@@ -113 +110 @@
 
                 foreach ($this->sagepay_cardtypes as $value) {
-                    //   
+                    //
                     $new_cards_type .= '<option value="' . $value . '">' . $value . '</option>';
                 }
@@ -126 +123 @@
                     <input id="' . esc_attr($payment_id) . '-card-name" class="input-text wc-credit-card-form-card-name" type="text" maxlength="20" autocomplete="off" placeholder="Name on Card" ' . $this->field_name('card-name') . ' />
                 </p>',
-                        ), $args
+                ), $args
                 );
             }
@@ -330 +327 @@
 
             $sagepay_args = array_merge(
-                    array(
-                        'PaReq' => WC()->session->get('set_pareq'),
-                        'MD' => WC()->session->get('set_md'),
-                        'TermUrl' => $this->notify_url
-                    )
+                array(
+                    'PaReq' => WC()->session->get('set_pareq'),
+                    'MD' => WC()->session->get('set_md'),
+                    'TermUrl' => $this->notify_url
+                )
             );
 
@@ -367 +364 @@
 
             $order = new WC_Order($order_id);
-
-            //  $cardtype = $this->get_card_type(sanitize_text_field(str_replace(' ', '', $_POST['sagepay-card-number'])));
-            /*
-              if (!in_array($cardtype, $this->sagepay_cardtypes)) {
-              wc_add_notice('Merchant do not accept/support payments using ' . ucwords($cardtype) . ' card', $notice_type = 'error');
-              return array(
-              'result' => 'success',
-              'redirect' => WC()->cart->get_checkout_url(),
-              );
-              die;
-              }
-             * 
-             */
 
             $credit_card = preg_replace('/(?<=\d)\s+(?=\d)/', '', trim(sanitize_text_field($_POST['sagepay-card-number'])));
@@ -472 +456 @@
             $product_item['VPSTxID'] = //   $product_item['CreateToken'] = 1;
 
-                    $post_values = "";
+            $post_values = "";
             foreach ($product_item as $key => $value) {
                 $post_values .= "$key=" . urlencode($value) . "&";
@@ -568 +552 @@
                     }
                 }
-
-                if ($this->transtype == "DEFERRED") {
-
-                    $body = '{' .
-                            '"transactionType": "Deferred",' .
-                            '"paymentMethod": {' .
-                            '    "card": {' .
-                            '        "merchantSessionKey": "' . $merchantSessionKey . '",' .
-                            '        "cardIdentifier": "' . $cardIdentifier . '",' .
-                            '        "save": "false",' .
-                            '    }' .
-                            '},' .
-                            '"vendorTxCode": "demotransaction' . time() . '",' .
-                            '"amount": 10000,' .
-                            '"currency": "GBP",' .
-                            '"description": "Demo transaction",' .
-                            '"apply3DSecure": "UseMSPSetting",' .
-                            '"customerFirstName": "Sam",' .
-                            '"customerLastName": "Jones",' .
-                            '"billingAddress": {' .
-                            '    "address1": "407 St. John Street",' .
-                            '    "city": "London",' .
-                            '    "postalCode": "EC1V 4AB",' .
-                            '    "country": "GB"' .
-                            '},' .
-                            '"entryMethod": "Ecommerce"' .
-                            '}';
-
-                    $args = array(
-                        'body' => $body,
-                        'method' => 'POST',
-                        'headers' => array(
-                            "Authorization: Basic ZGl2eWVzaDpkaXZ5ZXNoQDEyMw==",
-                            "Cache-Control: no-cache",
-                            "Content-Type: application/json"
-                        )
-                    );
-
-                    $response = wp_remote_post('https://pi-test.sagepay.com/api/v1/transactions', $args);
-                }
             } else {
                 wc_add_notice(__('Error. Please Contact Us.', 'woocommerce'), 'error');
@@ -657 +601 @@
 
                 if ($item['product_id'] > 0) {
-                    $_product = $order->get_product_from_item($item);
-
-                    if ($_product && $_product->exists() && $_product->managing_stock()) {
-
-                        if ($this->mode == 'test') {
-                            $refund__url = 'https://test.sagepay.com/gateway/service/refund.vsp';
-                        } else if ($this->mode == 'live') {
-                            $refund__url = 'https://live.sagepay.com/gateway/service/refund.vsp';
-                        }
-                        $url = $refund__url;
-                        $params = array();
-                        $params['VPSProtocol'] = urlencode('3.00');
-                        $params['TxType'] = urlencode('REFUND');
-                        $params['Vendor'] = urlencode('chestnutregistr');
-                        $params['VendorTxCode'] = urlencode($generat);            //Sample value given by me
-                        $params['Amount'] = urlencode($custom['_order_total'][$i]);
-                        $params['Currency'] = urlencode($custom['_order_currency'][$i]);
-                        $params['Description'] = urlencode('Testing Refunds');
-                        $params['RelatedVPSTxId'] = urlencode($VPSTxId);     //VPSTxId of main transaction /* '210C00C7-8B04-CF68-6BE0-7AE59C18F5A8' */
-                        $params['RelatedVendorTxCode'] = urlencode($custom['VendorTxCode'][$i]);         //VendorTxCode of main transaction
-                        $params['RelatedSecurityKey'] = urlencode($custom['SecurityKey'][$i]);       //securitykey of main transaction
-                        $params['RelatedTxAuthNo'] = urlencode($custom['TxAuthNo'][$i]);
-
-                        $args = array(
-                            'body' => $params,
-                            'method' => 'POST',
-                            'sslverify' => FALSE,
-                            'timeout' => '5',
-                            'headers' => array()
-                        );
-
-                        $response = wp_remote_post($url, $args);
-
-                        if (strpos($response, 'INVALID') == false) {
-                            $old_stock = $_product->stock;
-
-                            $qty = apply_filters('woocommerce_order_item_quantity', $item['qty'], $this, $item);
-
-                            $new_quantity = $_product->increase_stock($qty);
-
-                            do_action('woocommerce_auto_stock_restored', $_product, $item);
-
-                            $order->add_order_note(__('Item stock incremented from ' . $old_stock . ' to ' . $new_quantity . ' product id ' . $item['product_id'], 'woocommerce'), $item['product_id'], $old_stock, $new_quantity);
-
-                            $order->send_stock_notifications($_product, $new_quantity, $item['qty']);
-                        }
+
+                    if ($this->mode == 'test') {
+                        $refund__url = 'https://test.sagepay.com/gateway/service/refund.vsp';
+                    } else if ($this->mode == 'live') {
+                        $refund__url = 'https://live.sagepay.com/gateway/service/refund.vsp';
                     }
+                    $url = $refund__url;
+                    $params = array();
+                    $params['VPSProtocol'] = urlencode('3.00');
+                    $params['TxType'] = urlencode('REFUND');
+                    $params['Vendor'] = urlencode('chestnutregistr');
+                    $params['VendorTxCode'] = urlencode($generat);            //Sample value given by me
+                    $params['Amount'] = urlencode($custom['_order_total'][$i]);
+                    $params['Currency'] = urlencode($custom['_order_currency'][$i]);
+                    $params['Description'] = urlencode('Testing Refunds');
+                    $params['RelatedVPSTxId'] = urlencode($VPSTxId);     //VPSTxId of main transaction /* '210C00C7-8B04-CF68-6BE0-7AE59C18F5A8' */
+                    $params['RelatedVendorTxCode'] = urlencode($custom['VendorTxCode'][$i]);         //VendorTxCode of main transaction
+                    $params['RelatedSecurityKey'] = urlencode($custom['SecurityKey'][$i]);       //securitykey of main transaction
+                    $params['RelatedTxAuthNo'] = urlencode($custom['TxAuthNo'][$i]);
+
+                    $args = array(
+                        'body' => $params,
+                        'method' => 'POST',
+                        'sslverify' => FALSE,
+                        'timeout' => '5',
+                        'headers' => array()
+                    );
+
+                    $response = wp_remote_post($url, $args);
+
+                    if (strpos($response, 'INVALID') == false) {
+
+                        // $qty = apply_filters('woocommerce_order_item_quantity', $item['qty'], $this, $item);
+
+                        //  $new_quantity = $_product->increase_stock($qty);
+
+                        //do_action('woocommerce_auto_stock_restored', $_product, $item);
+
+                        // $order->add_order_note(__('Item stock incremented from ' . $old_stock . ' to ' . $new_quantity . ' product id ' . $item['product_id'], 'woocommerce'), $item['product_id'], $old_stock, $new_quantity);
+
+                        // $order->send_stock_notifications($_product, $new_quantity, $item['qty']);
+                    }
+
                 }
                 $i++;