Skip to content

Additional logs, api timeouts to Utility Messaging Flows #3171

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

Closed
woo-ardsouza wants to merge 1 commit into from
Closed

Additional logs, api timeouts to Utility Messaging Flows #3171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions assets/js/admin/whatsapp-events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
* @package FacebookCommerce
*/

jQuery( document ).ready( function( $ ) {
jQuery(document).ready(function ($) {
// Set Event Status for Order Placed
var orderPlacedActiveStatus = $('#order-placed-active-status');
var orderPlacedInactiveStatus = $('#order-placed-inactive-status');
if(facebook_for_woocommerce_whatsapp_events.order_placed_enabled){
if (facebook_for_woocommerce_whatsapp_events.order_placed_enabled) {
orderPlacedInactiveStatus.hide();
orderPlacedActiveStatus.show();
}
Expand All @@ -23,7 +23,7 @@ jQuery( document ).ready( function( $ ) {
// Set Event Status for Order FulFilled
var orderFulfilledActiveStatus = $('#order-fulfilled-active-status');
var orderFulfilledInactiveStatus = $('#order-fulfilled-inactive-status');
if(facebook_for_woocommerce_whatsapp_events.order_fulfilled_enabled){
if (facebook_for_woocommerce_whatsapp_events.order_fulfilled_enabled) {
orderFulfilledInactiveStatus.hide();
orderFulfilledActiveStatus.show();
}
Expand All @@ -35,7 +35,7 @@ jQuery( document ).ready( function( $ ) {
// Set Event Status for Order Refunded
var orderRefundedActiveStatus = $('#order-refunded-active-status');
var orderRefundedInactiveStatus = $('#order-refunded-inactive-status');
if(facebook_for_woocommerce_whatsapp_events.order_refunded_enabled){
if (facebook_for_woocommerce_whatsapp_events.order_refunded_enabled) {
orderRefundedInactiveStatus.hide();
orderRefundedActiveStatus.show();
}
Expand All @@ -49,7 +49,7 @@ jQuery( document ).ready( function( $ ) {

$('#woocommerce-whatsapp-manage-order-placed, #woocommerce-whatsapp-manage-order-fulfilled, #woocommerce-whatsapp-manage-order-refunded').click(function (event) {
var clickedButtonId = $(event.target).attr("id");
let view=clickedButtonId.replace("woocommerce-whatsapp-", "");
let view = clickedButtonId.replace("woocommerce-whatsapp-", "");
view = view.replaceAll("-", "_");
let url = new URL(window.location.href);
let params = new URLSearchParams(url.search);
Expand Down Expand Up @@ -90,6 +90,10 @@ jQuery( document ).ready( function( $ ) {
<p>${button}</p>
`).show();
}
console.log('Whatsapp Library Template call succeeded', response);
}
else {
console.log('Whatsapp Library Template call failed', response);
}
});
});
Expand All @@ -111,6 +115,7 @@ jQuery( document ).ready( function( $ ) {
params.set('view', 'utility_settings');
url.search = params.toString();
window.location.href = url.toString();
console.log('Whatsapp Event Config has been updated', response);
});
});

Expand Down
4 changes: 4 additions & 0 deletions assets/js/admin/whatsapp-templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@ jQuery( document ).ready( function( $ ) {
}, function ( response ) {
console.log(response);
if ( response.success ) {
console.log( 'Whatsapp Template Insights Info was fetched successfully', response );
var business_id = response.data.business_id;
var asset_id = response.data.waba_id;
const MANAGE_TEMPLATES_URL = `https://business.facebook.com/latest/whatsapp_manager/message_templates?business_id=${business_id}&asset_id=${asset_id}`;
window.open(MANAGE_TEMPLATES_URL);
}
else {
console.log( 'Whatsapp Template Insights Info fetch call failed', response );
}
} );
});
} );
20 changes: 19 additions & 1 deletion includes/Handlers/WhatsAppUtilityConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public static function get_template_library_content( $event, $bisu_token ) {
'Authorization' => $bisu_token,
),
'body' => array(),
'timeout' => 300, // 5 minutes
);

$response = wp_remote_request( $url, $options );
Expand Down Expand Up @@ -113,6 +114,7 @@ public static function wc_facebook_whatsapp_connect_utility_messages_call( $waba
'Authorization' => $bisu_token,
),
'body' => array(),
'timeout' => 300, // 5 minutes
);
$response = wp_remote_post( $base_url, $options );
wc_get_logger()->info(
Expand Down Expand Up @@ -169,6 +171,7 @@ public static function wc_facebook_disconnect_whatsapp( $waba_id, $integration_c
'Authorization' => $bisu_token,
),
'body' => array(),
'timeout' => 300, // 5 minutes
);
$response = wp_remote_post( $base_url, $options );
wc_get_logger()->info(
Expand Down Expand Up @@ -284,6 +287,13 @@ public static function post_whatsapp_utility_messages_event_configs_call( $event
$data = explode( "\n", wp_remote_retrieve_body( $response ) );
$response_object = json_decode( $data[0] );
$is_error = is_wp_error( $response );
wc_get_logger()->info(
sprintf(
/* translators: %s $error_message */
__( 'Event Configs Post API call Response: %1$s ', 'facebook-for-woocommerce' ),
json_encode( $response ),
)
);
if ( is_wp_error( $response ) || 200 !== $status_code ) {
$error_message = $response_object->error->error_user_title ?? $response_object->error->message ?? 'Something went wrong. Please try again later!';
wc_get_logger()->info(
Expand Down Expand Up @@ -349,7 +359,7 @@ public static function post_whatsapp_utility_messages_events_call( $event, $even
$name = self::EVENT_TO_LIBRARY_TEMPLATE_MAPPING[ $event ];
$components = self::get_components_for_event( $event, $order_id, $first_name, $refund_value, $currency );
$options = array(
'body' => array(
'body' => array(
'messaging_product' => 'whatsapp',
'to' => $phone_number,
'template' => array(
Expand All @@ -361,11 +371,19 @@ public static function post_whatsapp_utility_messages_events_call( $event, $even
),
'type' => 'template',
),
'timeout' => 300, // 5 minutes
);
$response = wp_remote_post( $base_url, $options );
$status_code = wp_remote_retrieve_response_code( $response );
$data = explode( "\n", wp_remote_retrieve_body( $response ) );
$response_object = json_decode( $data[0] );
wc_get_logger()->info(
sprintf(
/* translators: %s $error_message */
__( 'Messages Post API call Response: %1$s ', 'facebook-for-woocommerce' ),
json_encode( $response ),
)
);
if ( is_wp_error( $response ) || 200 !== $status_code ) {
$error_message = $response_object->error->error_user_title ?? $response_object->error->message ?? 'Something went wrong. Please try again later!';
wc_get_logger()->info(
Expand Down