Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Classic EC - Taxes are not passing correctly to PayPal when secondary rule is triggered. - PFWMA-283 #109

Merged
merged 2 commits into from
Jul 19, 2022
Merged

Classic EC - Taxes are not passing correctly to PayPal when secondary rule is triggered. - PFWMA-283 #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a793022
Classic EC - Taxes are not passing correctly to PayPal when secondary…
kcppdevelopers Jul 12, 2022
bc616c5
Update returnurl and cancelurl URL value, PFWMA-283
kcppdevelopers Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 44 additions & 39 deletions admin/class-paypal-for-woocommerce-multi-account-management-admin-express-checkout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ public function angelleye_get_account_for_ec_parallel_payments($gateways, $gatew
if (empty($passed_rules['buyer_countries'])) {
continue;
}



$buyer_states = get_post_meta($value->ID, 'buyer_states', true);
if (!empty($buyer_states)) {
foreach ($buyer_states as $buyer_states_key => $buyer_states_value) {
Expand Down Expand Up @@ -348,10 +348,10 @@ public function angelleye_get_account_for_ec_parallel_payments($gateways, $gatew
if (empty($passed_rules['buyer_states'])) {
continue;
}




$postcode_string = get_post_meta($value->ID, 'postcode', true);
if (!empty($postcode_string)) {
$postcode = explode(',', $postcode_string);
Expand Down Expand Up @@ -765,16 +765,16 @@ public function angelleye_paypal_for_woocommerce_multi_account_api_paypal_expres
public function angelleye_unset_multi_account_dataset($gateways) {
try {
if (isset($gateways) || isset($gateways->testmode)) {
if ($gateways->testmode == true) {
if ($gateways->testmode == true) {
$session_key_account = 'angelleye_sandbox_payment_load_balancer_ec_account';
} else {
$session_key_account = 'angelleye_payment_load_balancer_ec_account';
}
$angelleye_payment_load_balancer_account = WC()->session->get($session_key_account);
if(!empty($angelleye_payment_load_balancer_account) && isset($angelleye_payment_load_balancer_account['multi_account_id']) && $angelleye_payment_load_balancer_account['multi_account_id'] !== 'default') {
if (!empty($angelleye_payment_load_balancer_account) && isset($angelleye_payment_load_balancer_account['multi_account_id']) && $angelleye_payment_load_balancer_account['multi_account_id'] !== 'default') {
update_post_meta($angelleye_payment_load_balancer_account['multi_account_id'], 'woocommerce_paypal_express_enable', '');
}
}
}
delete_transient('angelleye_multi_ec_payment_load_balancer_synce_sandbox');
delete_transient('angelleye_multi_ec_payment_load_balancer_synce');
WC()->session->set('multi_account_api_username', '');
Expand All @@ -787,8 +787,6 @@ public function angelleye_unset_multi_account_dataset($gateways) {
WC()->session->__unset('angelleye_sandbox_payment_load_balancer_ec_account');
WC()->session->set('angelleye_payment_load_balancer_ec_account', '');
WC()->session->__unset('angelleye_payment_load_balancer_ec_account');


} catch (Exception $ex) {

}
Expand Down Expand Up @@ -1730,28 +1728,34 @@ public function angelleye_modified_ec_parallel_parameter($request, $gateways, $o
if (abs($Difference) > 0.000001 && 0.0 !== (float) $Difference) {
if (isset($new_payments[0]['amt']) && $new_payments[0]['amt'] > 1) {
$new_payments[0]['amt'] = $new_payments[0]['amt'] + $Difference;
$item_names = array();
if (!empty($new_payments[0]['order_items'])) {
$first_line_item = $new_payments[0]['order_items'];
}
if (!empty($first_line_item)) {
unset($new_payments[0]['order_items']);
$new_payments[0]['order_items'] = array();
$new_payments[0]['itemamt'] = $new_payments[0]['amt'];
foreach ($first_line_item as $key => $value) {
$item_names[] = $value['name'] . ' x ' . $value['qty'];
if (isset($new_payments[0]['taxamt']) && $new_payments[0]['taxamt'] > 1) {
$new_payments[0]['taxamt'] = $new_payments[0]['taxamt'] + $Difference;
} elseif (isset($new_payments[0]['shippingamt']) && $new_payments[0]['shippingamt'] > 1) {
$new_payments[0]['shippingamt'] = $new_payments[0]['shippingamt'] + $Difference;
} else {
$item_names = array();
if (!empty($new_payments[0]['order_items'])) {
$first_line_item = $new_payments[0]['order_items'];
}
$item_details = implode(', ', $item_names);
$item_details = html_entity_decode(wc_trim_string($item_details ? wp_strip_all_tags($item_details) : __('Item', 'paypal-for-woocommerce-multi-account-management'), 127), ENT_NOQUOTES, 'UTF-8');
$new_payments[0]['order_items'][0] = array(
'name' => $item_details,
'desc' => '',
'amt' => $new_payments[0]['amt'],
'qty' => 1
);
if (!empty($first_line_item)) {
unset($new_payments[0]['order_items']);
$new_payments[0]['order_items'] = array();
$new_payments[0]['itemamt'] = $new_payments[0]['amt'];
foreach ($first_line_item as $key => $value) {
$item_names[] = $value['name'] . ' x ' . $value['qty'];
}
$item_details = implode(', ', $item_names);
$item_details = html_entity_decode(wc_trim_string($item_details ? wp_strip_all_tags($item_details) : __('Item', 'paypal-for-woocommerce-multi-account-management'), 127), ENT_NOQUOTES, 'UTF-8');
$new_payments[0]['order_items'][0] = array(
'name' => $item_details,
'desc' => '',
'amt' => $new_payments[0]['amt'],
'qty' => 1
);
}
unset($new_payments[0]['shippingamt']);
unset($new_payments[0]['taxamt']);
}
unset($new_payments[0]['shippingamt']);
unset($new_payments[0]['taxamt']);
}
}
}
Expand Down Expand Up @@ -2662,16 +2666,16 @@ public function angelleye_is_account_ready_to_paid($bool, $email) {
$paypal = new Angelleye_PayPal_WC($PayPalConfig);
$SECFields = array(
'token' => '',
'returnurl' => 'https://www.google.com/',
'cancelurl' => 'https://www.google.com/',
'returnurl' => 'https://www.paypal.com/checkoutnow/error',
'cancelurl' => 'https://www.paypal.com/checkoutnow/error',
);
$Payments = array();
$Payment = array(
'amt' => '1.00',
'currencycode' => 'USD',
'invnum' => time().'testing',
'currencycode' => 'USD',
'invnum' => time() . 'testing',
'paymentaction' => 'Sale',
'paymentrequestid' => time() .'-id',
'paymentrequestid' => time() . '-id',
'sellerpaypalaccountid' => $email
);
array_push($Payments, $Payment);
Expand All @@ -2680,12 +2684,12 @@ public function angelleye_is_account_ready_to_paid($bool, $email) {
'Payments' => $Payments
);
$paypal_response = $paypal->SetExpressCheckout($PayPalRequest);
if( isset($paypal_response['ACK']) && 'Success' === $paypal_response['ACK']) {
if (isset($paypal_response['ACK']) && 'Success' === $paypal_response['ACK']) {
return true;
}
return false;
}

public function angelleye_multi_account_dokan_refund_approve($refund, $args, $vendor_refund) {
$parent_order_id = '';
$order = wc_get_order($refund->get_order_id());
Expand Down Expand Up @@ -2778,4 +2782,5 @@ public function angelleye_multi_account_dokan_refund_approve($refund, $args, $ve
}
}
}

}