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

Add section in trigger condition : PFWMA-165 #67

Merged
merged 3 commits into from
Aug 1, 2020
Merged

Add section in trigger condition : PFWMA-165 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73036ba
Add section, PFWMA-165
kcppdevelopers Jul 30, 2020
c4d3fb7
Add CSS, PFWMA-165
kcppdevelopers Jul 30, 2020
7c87d2c
update tag, PFWMA-165
kcppdevelopers Jul 31, 2020
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
104 changes: 70 additions & 34 deletions admin/class-paypal-for-woocommerce-multi-account-management-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ public function angelleye_display_multi_account_list() {
if (!empty($gateway_list[$gateway_key])) {
$gateway_value = $gateway_list[$gateway_key];
$gateway_option_Selected = "<option value='$gateway_key'>$gateway_value</option>";
echo sprintf('<tr><th>%1$s</th><td><select class="angelleye_multi_account_choose_payment_gateway wc-enhanced-select" name="angelleye_multi_account_choose_payment_gateway">%2$s</select></td></tr>', __('Select Payment Gateway', ''), $gateway_option_Selected);
echo sprintf('<tr><th>%1$s</th><td><select class="angelleye_multi_account_choose_payment_gateway wc-enhanced-select" name="angelleye_multi_account_choose_payment_gateway">%2$s</select></td></tr>', __('Payment Gateway', ''), $gateway_option_Selected);
}
}
} else {
$gateway_option_Selected = "<option value='paypal_express'>PayPal Express Checkout</option>";
echo sprintf('<tr><th>%1$s</th><td><select class="wc-enhanced-select angelleye_multi_account_choose_payment_gateway" name="angelleye_multi_account_choose_payment_gateway">%2$s</select></td></tr>', __('Select Payment Gateway', ''), $gateway_option_Selected);
echo sprintf('<tr><th>%1$s</th><td><select class="wc-enhanced-select angelleye_multi_account_choose_payment_gateway" name="angelleye_multi_account_choose_payment_gateway">%2$s</select></td></tr>', __('Payment Gateway', ''), $gateway_option_Selected);
}

if ($this->gateway_key == 'paypal_express') {
Expand Down Expand Up @@ -340,8 +340,6 @@ public function angelleye_display_multi_account_list() {
}
}
if ($angelleye_payment_load_balancer == '') {
$option_one = __('Trigger Conditions', 'paypal-for-woocommerce-multi-account-management');
$option_two = 'transaction_amount';
$option_three_array = array('greaterthan' => __('Greater than', 'paypal-for-woocommerce-multi-account-management'), 'lessthan' => __('Less than', 'paypal-for-woocommerce-multi-account-management'), 'equalto' => __('Equal to', 'paypal-for-woocommerce-multi-account-management'));
$option_three = '';
foreach ($option_three_array as $key => $value) {
Expand All @@ -352,7 +350,7 @@ public function angelleye_display_multi_account_list() {
}
}
$option_four = !empty($microprocessing['woocommerce_paypal_express_api_condition_value']) ? $microprocessing['woocommerce_paypal_express_api_condition_value'][0] : '';
$option_five = '<p class="description">' . __('Select Buyer Role', 'paypal-for-woocommerce-multi-account-management') . '</p>';
$option_five = '<p class="description">' . __('Buyer Role', 'paypal-for-woocommerce-multi-account-management') . '</p>';
$option_five .= '<select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_paypal_express_api_user_role" id="woocommerce_paypal_express_api_user_role">';
$option_five .= '<option value="all">' . __('All', 'paypal-for-woocommerce-multi-account-management') . '</option>';
$editable_roles = array_reverse(get_editable_roles());
Expand All @@ -366,7 +364,7 @@ public function angelleye_display_multi_account_list() {
}
$option_five .= '</select>';

$option_five_one = "<p class='description'>" . __('Select Seller/Product Author', 'paypal-for-woocommerce-multi-account-management') . "</p>";
$option_five_one = "<p class='description'>" . __('Seller/Product Author', 'paypal-for-woocommerce-multi-account-management') . "</p>";
$option_five_one .= "<select class='wc-customer-search smart_forwarding_field' id='woocommerce_paypal_express_api_user' name='woocommerce_paypal_express_api_user' data-placeholder='" . __( 'All', 'paypal-for-woocommerce-multi-account-management'). "' data-minimum_input_length='3' data-allow_clear='true'>";
$user_string = __( 'All', 'paypal-for-woocommerce-multi-account-management');
if( !empty($selected_user) ) {
Expand All @@ -383,7 +381,7 @@ public function angelleye_display_multi_account_list() {
}
$option_five_one .= "<option selected='selected' value='" . esc_attr( $selected_user ) . "' > $user_string </option>";
$option_five_one .= "</select>";
$option_ten = '<p class="description">' . __('Select Priority', 'paypal-for-woocommerce-multi-account-management') . '</p>';
$option_ten = '<p class="description">' . __('Priority', 'paypal-for-woocommerce-multi-account-management') . '</p>';
$option_ten .= '<select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_priority" id="woocommerce_priority">';
for ($x = 0; $x <= 100; $x++) {
if ($x == 0) {
Expand Down Expand Up @@ -507,15 +505,46 @@ public function angelleye_display_multi_account_list() {
$option_twelve = '';
}
$option_six .= '</select><p class="description">' . __('Transaction Amount', 'paypal-for-woocommerce-multi-account-management') . '</p>';
echo sprintf('<tr><th scope="row" class="titledesc"><label for="woocommerce_paypal_express_api_trigger_conditions">%1$s</label></th><td class="forminp"><fieldset>%5$s %6$s %14$s %8$s %13$s %15$s %9$s %10$s %7$s <input type="hidden" name="woocommerce_paypal_express_api_condition_field" value="%2$s"><select class="smart_forwarding_field" name="woocommerce_paypal_express_api_condition_sign">%3$s</select>&nbsp;<input class="input-text regular-input" name="woocommerce_paypal_express_api_condition_value" id="woocommerce_paypal_express_api_condition_value" type="number" min="0" max="1000" step="0.01" value="%4$s">%11$s %12$s</fieldset></td></tr>', $option_one, $option_two, $option_three, $option_four, $option_ten, $option_five, $option_six, $option_seven, $option_eight, $option_nine, $option_twelve, $option_thirteen, $option_fourteen, $option_five_one, $option_fifteen);
?>
<tr>
<th scope="row" class="titledesc">
<label for="woocommerce_paypal_express_api_trigger_conditions"><?php echo __('Trigger Conditions', 'paypal-for-woocommerce-multi-account-management'); ?></label>
</th>
<td class="forminp">
<fieldset class="pfwma_section_ui">
<legend><?php echo __('Buyer Conditions', 'paypal-for-woocommerce-multi-account-management'); ?> </legend>
<?php echo $option_five; ?>
<?php echo $option_seven; ?>
</fieldset>
<fieldset class="pfwma_section_ui">
<legend><?php echo __('Seller Conditions', 'paypal-for-woocommerce-multi-account-management'); ?> </legend>
<?php echo $option_five_one; ?>
</fieldset>
<fieldset class="pfwma_section_ui">
<legend><?php echo __('Common Conditions', ''); ?> </legend>
<?php echo $option_fourteen; ?>
<?php echo $option_fifteen; ?>
<?php echo $option_eight; ?>
<?php echo $option_nine; ?>
<?php echo $option_six; ?>
<input type="hidden" name="woocommerce_paypal_express_api_condition_field" value="transaction_amount">
<select class="smart_forwarding_field" name="woocommerce_paypal_express_api_condition_sign"><?php echo $option_three; ?></select>&nbsp;
<input class="input-text regular-input" name="woocommerce_paypal_express_api_condition_value" id="woocommerce_paypal_express_api_condition_value" type="number" min="0" max="1000" step="0.01" value="<?php echo $option_four; ?>">
<?php echo $option_twelve; ?>
<?php echo $option_thirteen; ?>
<?php echo $option_ten; ?>
</fieldset>
</td>
</tr>
<?php
}
echo sprintf('<tr style="display: table-row;" valign="top">
<th scope="row" class="titledesc">
<td scope="row" class="titledesc">
<input name="is_edit" class="button-primary woocommerce-save-button" type="hidden" value="%1$s" />
<input id="microprocessing_save" name="microprocessing_save" class="button-primary" type="submit" value="%2$s" />
<a href="?page=wc-settings&tab=multi_account_management" class="button-primary button">%3$s</a>
%4$s
</th>
</td>
</tr>', $_GET['ID'], __('Save Changes', 'paypal-for-woocommerce-multi-account-management'), __('Cancel', 'paypal-for-woocommerce-multi-account-management'), wp_nonce_field('microprocessing_save'));
echo '</tbody></table></form></div>';
$this->angelleye_multi_account_tooltip_box();
Expand Down Expand Up @@ -711,12 +740,12 @@ public function angelleye_multi_account_ui() {
echo $this->angelleye_multi_account_condition_ui();
}
?>
<tr style="display: table-row;" valign="top">
<th scope="row" class="titledesc">
<tr valign="top">
<td scope="row" class="titledesc">
<input id="microprocessing_save" name="microprocessing_save" class="button-primary" type="submit" value="<?php esc_attr_e('Save Changes', 'paypal-for-woocommerce-multi-account-management'); ?>" />
<a href="?page=wc-settings&tab=multi_account_management" class="button-primary button"><?php esc_attr_e('Cancel', 'paypal-for-woocommerce-multi-account-management'); ?></a>
<?php wp_nonce_field('microprocessing_save'); ?>
</th>
</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -1385,7 +1414,7 @@ public function angelleye_multi_account_choose_payment_gateway() {
}
?>
<tr>
<th><?php _e('Select Payment Gateway', 'paypal-for-woocommerce-multi-account-management'); ?></th>
<th><?php _e('Payment Gateway', 'paypal-for-woocommerce-multi-account-management'); ?></th>
<td>

<select class="wc-enhanced-select angelleye_multi_account_choose_payment_gateway" name="angelleye_multi_account_choose_payment_gateway" <?php echo $angelleye_hidden; ?>>
Expand Down Expand Up @@ -1537,23 +1566,9 @@ public function angelleye_multi_account_condition_ui() {
<label for="woocommerce_paypal_express_api_trigger_conditions"><?php echo __('Trigger Conditions', 'paypal-for-woocommerce-multi-account-management'); ?></label>
</th>
<td class="forminp">
<fieldset>
<p class="description"><?php _e('Select Priority', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_priority" id="woocommerce_priority">
<?php
for ($x = 0; $x <= 100; $x++) {
if ($x == 0) {
$woocommerce_priority_text = $x . ' - Lowest';
} elseif ($x == 100) {
$woocommerce_priority_text = $x . ' - Highest';
} else {
$woocommerce_priority_text = $x;
}
echo "\n\t<option value='" . $x . "'>$woocommerce_priority_text</option>";
}
?>
</select>
<p class="description"><?php _e('Select Buyer Role', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<fieldset class="pfwma_section_ui">
<legend><?php echo __('Buyer Conditions', 'paypal-for-woocommerce-multi-account-management'); ?> </legend>
<p class="description"><?php _e('Buyer Role', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_paypal_express_api_user_role" id="woocommerce_paypal_express_api_user_role">
<option value="all"><?php _e('All', 'paypal-for-woocommerce-multi-account-management'); ?></option>
<?php
Expand All @@ -1564,9 +1579,6 @@ public function angelleye_multi_account_condition_ui() {
}
?>
</select>
<p class="description"><?php _e('Select Seller/Product Author', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<select id="woocommerce_paypal_express_api_user" class="wc-customer-search smart_forwarding_field" id="woocommerce_paypal_express_api_user" name="woocommerce_paypal_express_api_user" data-placeholder="<?php esc_attr_e('All', 'paypal-for-woocommerce-multi-account-management'); ?>" data-minimum_input_length="3" data-allow_clear="true">
</select>
<p class="description"><?php _e('Buyer country', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<select id="buyer_countries" name="buyer_countries[]" style="width: 78%;" class="wc-enhanced-select" multiple="multiple" data-placeholder="<?php esc_attr_e('All countries', 'paypal-for-woocommerce-multi-account-management'); ?>">
<?php
Expand All @@ -1578,6 +1590,15 @@ public function angelleye_multi_account_condition_ui() {
}
?>
</select>
</fieldset>
<fieldset class="pfwma_section_ui">
<legend><?php echo __('Seller Conditions', 'paypal-for-woocommerce-multi-account-management'); ?> </legend>
<p class="description"><?php _e('Seller/Product Author', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<select id="woocommerce_paypal_express_api_user" class="wc-customer-search smart_forwarding_field" id="woocommerce_paypal_express_api_user" name="woocommerce_paypal_express_api_user" data-placeholder="<?php esc_attr_e('All', 'paypal-for-woocommerce-multi-account-management'); ?>" data-minimum_input_length="3" data-allow_clear="true">
</select>
</fieldset>
<fieldset class="pfwma_section_ui">
<legend><?php echo __('Common Conditions', 'paypal-for-woocommerce-multi-account-management'); ?> </legend>
<p class="description"><?php _e('Store country', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<select id="store_countries" name="store_countries" style="width: 78%;" class="wc-enhanced-select" data-placeholder="<?php esc_attr_e('All countries', 'paypal-for-woocommerce-multi-account-management'); ?>">
<?php
Expand Down Expand Up @@ -1641,6 +1662,21 @@ public function angelleye_multi_account_condition_ui() {
}
?>
</select>
<p class="description"><?php _e('Priority', 'paypal-for-woocommerce-multi-account-management'); ?></p>
<select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_priority" id="woocommerce_priority">
<?php
for ($x = 0; $x <= 100; $x++) {
if ($x == 0) {
$woocommerce_priority_text = $x . ' - Lowest';
} elseif ($x == 100) {
$woocommerce_priority_text = $x . ' - Highest';
} else {
$woocommerce_priority_text = $x;
}
echo "\n\t<option value='" . $x . "'>$woocommerce_priority_text</option>";
}
?>
</select>
</fieldset>
</td>
</tr>
Expand Down
9 changes: 8 additions & 1 deletion admin/css/paypal-for-woocommerce-multi-account-management-admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,14 @@ select.smart_forwarding_field {
#angelleye_paypal_marketing_table table.fixed {
border-right: none;
}

fieldset.pfwma_section_ui {
border: 1px solid #d1c6c6;
padding: inherit;
margin: inherit;
}
fieldset.pfwma_section_ui legend {
font-weight: 600;
}
@media screen and (max-width: 782px) {
.angelleye_multi_account_left {
max-width: 100% !important;
Expand Down