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.

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

PFWA-3 #1285

Merged
merged 23 commits into from Feb 27, 2019
Merged

PFWA-3 #1285

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4fba668
Marketing Sidebar, PFWA-3
kcppdevelopers Feb 4, 2019
d3c802c
Marketing Sidebar, PFWA-3
kcppdevelopers Feb 4, 2019
184e1ea
Marketing Sidebar, PFWA-3
kcppdevelopers Feb 5, 2019
e7875d5
Marketing Sidebar, PFWA-3
kcppdevelopers Feb 5, 2019
aa723c7
Marketing Sidebar, PFWA-3
kcppdevelopers Feb 5, 2019
e8bd47c
Marketing Sidebar, PFWA-3
kcppdevelopers Feb 6, 2019
7e99400
Marketing Sidebar, PFWA-3
kcppdevelopers Feb 6, 2019
7818749
Checkout WC Marketing Sidebar Referral Link, PFWA-4
kcppdevelopers Feb 6, 2019
b23d0d5
update url, PFWA-4 PFWA-3
kcppdevelopers Feb 6, 2019
561b219
add sidebar each admin page tabs, PFWA-3
kcppdevelopers Feb 7, 2019
11d3ab2
make inquired field, PFWA-3
kcppdevelopers Feb 7, 2019
dec99fe
make inquired field, PFWA-3
kcppdevelopers Feb 7, 2019
f5b3d79
make inquired field, PFWA-3
kcppdevelopers Feb 7, 2019
1e02cdf
make inquired field, PFWA-3
kcppdevelopers Feb 7, 2019
09ec095
Merge branch 'release' of https://github.com/angelleye/paypal-woocomm…
kcppdevelopers Feb 18, 2019
6deef6f
Merge branch 'release' of https://github.com/angelleye/paypal-woocomm…
kcppdevelopers Feb 20, 2019
62f81db
allow more emails to newsletter, PFWA-3
kcppdevelopers Feb 20, 2019
a13937c
allow more emails to newsletter, PFWA-3
kcppdevelopers Feb 20, 2019
372b217
Responsive Design, Newsletter Validation, PFWA-3
kcppdevelopers Feb 21, 2019
3d058c2
update css, PFWA-3
kcppdevelopers Feb 21, 2019
f8b7b14
Merge branch 'PFWA-3' of https://github.com/angelleye/paypal-woocomme…
kcppdevelopers Feb 21, 2019
cf85000
update css, PFWA-3
kcppdevelopers Feb 21, 2019
63c1df3
Merge branch 'PFWA-3' of https://github.com/angelleye/paypal-woocomme…
kcppdevelopers Feb 21, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Merge branch 'release' of https://github.com/angelleye/paypal-woocomm…

…erce into PFWA-3
  • Loading branch information...
kcppdevelopers committed Feb 18, 2019
commit 09ec09536e51081a436e54fb56669020b0e94d97
@@ -2230,4 +2230,47 @@ public static function angelleye_display_marketing_sidebar($id = null) {
wp_enqueue_style('angelleye_marketing_css');
require_once( PAYPAL_FOR_WOOCOMMERCE_PLUGIN_DIR . '/template/sidebar.php' );
}
public static function angelleye_get_push_notifications() {
$args = array(
'plugin_name' => 'paypal-for-woocommerce',
);
$api_url = PAYPAL_FOR_WOOCOMMERCE_PUSH_NOTIFICATION_WEB_URL . '?Wordpress_Plugin_Notification_Sender';
$api_url .= '&action=angelleye_get_plugin_notification';
$request = wp_remote_post($api_url, array(
'method' => 'POST',
'timeout' => 45,
'redirection' => 5,
'httpversion' => '1.0',
'blocking' => true,
'headers' => array('user-agent' => 'AngellEYE'),
'body' => $args,
'cookies' => array(),
'sslverify' => false
));
if (is_wp_error($request) or wp_remote_retrieve_response_code($request) != 200) {
return false;
}
if ($request != '') {
$response = json_decode(wp_remote_retrieve_body($request));
} else {
$response = false;
}
return $response;
}
public static function angelleye_display_push_notification($response_data) {
echo '<div class="notice notice-success angelleye-notice" style="display:none;">'
. '<div class="angelleye-notice-logo-push"><span> <img src="'.$response_data->ans_company_logo.'"> </span></div>'
. '<div class="angelleye-notice-message">'
. '<h3>' . $response_data->ans_message_title .'</h3>'
. '<div class="angelleye-notice-message-inner">'
. $response_data->ans_message_description
. '</div>'
. '</div>'
. '<div class="angelleye-notice-cta">'
. '<a href="'.$response_data->ans_button_url.'" class="button button-primary">'.$response_data->ans_button_label.'</a>'
. '<button class="angelleye-notice-dismiss angelleye-dismiss-welcome" data-msg="'.$response_data->id.'">Dismiss</button>'
. '</div>'
. '</div>';
}
}
@@ -364,7 +364,9 @@ label[for=woocommerce_paypal_express_paypal_marketing_solutions_enabled] {
background-position: 50% 50%;
}


.angelleye-notice-logo-push span {
display: block;
}
@media only all and (max-width: 1200px) {
.angelleye-notice-dismiss {
display: block;
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.