Changeset 2666098

Timestamp:

01/26/2022 04:18:40 PM (4 years ago)

Author:

iwdagency

Message:

add braintree

Location:

iwd-checkout-connector/trunk

Files:

• includes/api/class-iwd-con-paypal-checkout.php (modified) (1 diff)
• includes/api/class-iwd-order-update.php (modified) (1 diff)
• includes/checkout/class-iwd-con-buttons.php (modified) (2 diffs)
• includes/checkout/class-iwd-con-iframe.php (modified) (1 diff)
• iwd-checkout-connector.php (modified) (2 diffs)
• public/js/payment/braintree (added)
• public/js/payment/braintree/iwd_braintree_apple_pay.js (added)
• public/js/payment/iwd_paypal_button.js (modified) (3 diffs)
• public/templates/iwd-checkout-saas.php (modified) (1 diff)

iwd-checkout-connector/trunk/includes/api/class-iwd-con-paypal-checkout.php

@@ -43 +43 @@
         }
 
-        $new_session_obj = new WC_Session_Handler();
-        $session_data    = $new_session_obj->get_session( $api->quote_id );
+        $this->init();
 
-        $data['delivery_methods']       = IWD_CONNECTOR()->shipping->getShippingMethods( $session_data );
-        $data['chosen_delivery_method'] = IWD_CONNECTOR()->shipping->getSelectedShipping( $session_data );
-        $data['addresses']              = IWD_CONNECTOR()->customer->getAddresses( $session_data );
-        $data['cart_items']             = IWD_CONNECTOR()->cart->getCartItems( $session_data );
-        $data['cart']                   = IWD_CONNECTOR()->cart->getCart( $session_data );
+        if ( ! empty( (array) $api->data ) ) {
+            $this->setSessionData( $api->quote_id );
+            $session_data = $this->getSessionData( $api->quote_id );
+            $customer     = unserialize( $session_data['customer'] );
+            IWD_CONNECTOR()->customer->saveAddresses( $api->data, $customer['id'] );
+            $updated_session = $this->updateSessionData( $api->quote_id );
+        } else {
+            $updated_session = $this->getSessionData( $api->quote_id );
+        }
+
+        $data['delivery_methods']       = IWD_CONNECTOR()->shipping->getShippingMethods( $updated_session );
+        $data['chosen_delivery_method'] = IWD_CONNECTOR()->shipping->getSelectedShipping( $updated_session );
+        $data['addresses']              = IWD_CONNECTOR()->customer->getAddresses( $updated_session );
+        $data['cart_items']             = IWD_CONNECTOR()->cart->getCartItems( $updated_session );
+        $data['cart']                   = IWD_CONNECTOR()->cart->getCart( $updated_session );
 
         return $data;

iwd-checkout-connector/trunk/includes/api/class-iwd-order-update.php

@@ -68 +68 @@
                 $order->add_order_note( sprintf( __( 'Transaction %1$s has been voided in PayPal.' ), $transaction->id ) );
                 $order->update_status( 'cancelled' );
-            }
+            } elseif ( 'hold' == $paymentAction ) {
+                if ( (property_exists($transaction, 'dispute')) ) {
+                    $order->add_order_note('The Order was put on Hold because the Dispute with ID: '.$transaction->dispute->id
+                        .' has been opened. Please access your Braintree account for more information.');
+                } else {
+                    $order->add_order_note('Order was put on Hold.');
+                }
+                $order->update_status( 'on-hold' );
+            }
             $order->save();
 

iwd-checkout-connector/trunk/includes/checkout/class-iwd-con-buttons.php

@@ -58 +58 @@
         wp_enqueue_style('iwd-buttons-css-apple-pay', IWD_CONNECTOR_URL . 'public/css/iwd_apple_pay_buttons.css', array(), IWD_CONNECTOR_VERSION);
         wp_enqueue_script('iwd-buttons-subscr', IWD_CONNECTOR_URL . 'public/js/payment/iwd_paypal_subscription.js', array('jquery', 'jquery-blockui',), IWD_CONNECTOR_VERSION);
-    }
-
+        $this->add_braintree_scripts();
+    }
+
+    public function add_braintree_scripts()
+    {
+        wp_enqueue_script('braintree', 'https://js.braintreegateway.com/web/3.85.1/js/client.min.js', false);
+        wp_enqueue_script('applepay', 'https://js.braintreegateway.com/web/3.85.1/js/apple-pay.min.js', false);
+        wp_enqueue_script('iwdApplePayDataCol', 'https://js.braintreegateway.com/web/3.85.1/js/data-collector.min.js', false);
+        wp_enqueue_script('iwd-braintree-apple-pay', IWD_CONNECTOR_URL . 'public/js/payment/braintree/iwd_braintree_apple_pay.js', array('jquery'), IWD_CONNECTOR_VERSION);
+    }
     /**
      * Buttons for cart and mini cart
@@ -100 +108 @@
                 IWD.PayPal.params = {
                     'containerId': '<?php echo esc_html($containerId); ?>',
-                    'checkoutPagePath': '<?php echo esc_html(self::CHECKOUT_PAGE_PATH); ?>',
+                    'checkoutPagePath': '<?php echo home_url(self::CHECKOUT_PAGE_PATH); ?>',
                     'grandTotalAmount': "<?php echo esc_html(WC()->cart->get_total('edit')); ?>",
                     'btnShape': '<?php echo esc_html(get_option('btn_shape')); ?>',

iwd-checkout-connector/trunk/includes/checkout/class-iwd-con-iframe.php

@@ -24 +24 @@
             }
 
+            if ( isset( $_GET['paypal_funding_source'] ) && ! empty( $_GET['paypal_funding_source'] ) ) {
+                $params['paypal_funding_source'] = sanitize_text_field( $_GET['paypal_funding_source'] );
+            }
+
             return IWD_CONNECTOR()->helper->getFrameUrl() . '?' . http_build_query( $params );
         }

iwd-checkout-connector/trunk/iwd-checkout-connector.php

@@ -5 +5 @@
  * Description: Checkout Suite Connector
  * Author: Dominate
- * Version: 1.0.4
+ * Version: 1.0.5
  * Author URI: https://www.dominate.co/
  * WC requires at least: 2.6.0
@@ -30 +30 @@
              * Define plugin minimums and constants.
              */
-            define( 'IWD_CONNECTOR_VERSION', '1.0.4' );
+            define( 'IWD_CONNECTOR_VERSION', '1.0.5' );
             define( 'IWD_CONNECTOR_FILE', __FILE__ );
             define( 'IWD_CONNECTOR_PATH', plugin_dir_path( __FILE__ ) );

iwd-checkout-connector/trunk/public/js/payment/iwd_paypal_button.js

@@ -16 +16 @@
             init: function() {
                 if (window.paypal) {
-                    let paypal = window.paypal;
+                    let paypal = window.paypal,
+                        clickedFundingSource = 'paypal';
 
                     paypal.Buttons(
@@ -29 +30 @@
                                 fundingicons: false,
                                 tagline: false,
+                            },
+
+                            onClick: function(data)  {
+                                clickedFundingSource = data.fundingSource;
                             },
 
@@ -44 +49 @@
 
                             onApprove: function(data) {
-                                window.location.href = '/' + IWD.PayPal.params.checkoutPagePath + '?paypal_order_id=' + data.orderID;
+                                window.location.href = IWD.PayPal.params.checkoutPagePath
+                                    + '?paypal_order_id=' + data.orderID + '&paypal_funding_source=' + clickedFundingSource;
                             }
                         }

iwd-checkout-connector/trunk/public/templates/iwd-checkout-saas.php

@@ -8 +8 @@
         // Remove paypal_order_id param from url
         history.replaceState && history.replaceState(
-            null, '', location.pathname + location.search.replace(/[\?&]paypal_order_id=[^&]+/, '').replace(/^&/, '?')
+            null, '', location.pathname
+                + location.search
+                    .replace(/[\?&]paypal_order_id=[^&]+/, '')
+                    .replace(/[\?&]paypal_funding_source=[^&]+/, '')
+                    .replace(/^&/, '?')
         );